Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add virtio_pci to loaded modules; leave only -virtfs #10

Merged
merged 1 commit into from
Aug 28, 2023

Conversation

dimakuv
Copy link

@dimakuv dimakuv commented Aug 25, 2023

Guest kernel may not have virtio_pci module loaded by default, so load it explicitly. Also, -virtfs is a synonym to -device 'virtio-9p-pci' so the latter is redundant and can be removed.

For more info and context, see #2 (comment)

This was detected while trying to fix the Gramine Jenkins CI job linux-sgx-vm-gcc-release, which started failing after updating the host OS to Debian 12 (from Debian 11).


This change is Reviewable

Copy link
Author

@dimakuv dimakuv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 2 files reviewed, 1 unresolved discussion, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: Intel)

a discussion (no related file):
Ideally, I would like @boryspoplawski's review.

But if he's not available, could @mkow @woju and @kailun-qin take a look please? If you're into the details, this https://wiki.qemu.org/Documentation/9psetup page can help.


Copy link
Member

@woju woju left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: Intel)

Copy link
Collaborator

@kailun-qin kailun-qin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: Intel) (waiting on @boryspoplawski and @mkow)

a discussion (no related file):

Previously, dimakuv (Dmitrii Kuvaiskii) wrote…

Ideally, I would like @boryspoplawski's review.

But if he's not available, could @mkow @woju and @kailun-qin take a look please? If you're into the details, this https://wiki.qemu.org/Documentation/9psetup page can help.

I cannot approve on this repo, but LGTM. Thanks!


Copy link
Member

@mkow mkow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: Intel) (waiting on @boryspoplawski and @dimakuv)


initramfs_builder/run.sh line 18 at r1 (raw file):

    -append "console=ttyS0 loglevel=3 quiet oops=panic $*" \
    -device virtio-rng-pci \
    -virtfs 'local,path=/,id=hostfs,mount_tag=hostfs,security_model=none,readonly=on' \

Why removing =on? The docs only mention the readonly=on version.

Code quote:

readonly=on

Copy link
Collaborator

@kailun-qin kailun-qin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 2 unresolved discussions, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: Intel) (waiting on @boryspoplawski and @mkow)


initramfs_builder/run.sh line 18 at r1 (raw file):

The docs only mention the readonly=on version.

Which doc?

From https://wiki.qemu.org/Documentation/9psetup, it indicates: "readonly: Enables exporting 9p share as a readonly mount for guests. By default read-write access is given.", and the shortcut cmd gives "-virtfs ... [,readonly]...".

Copy link
Member

@mkow mkow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 2 unresolved discussions, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: Intel) (waiting on @boryspoplawski and @kailun-qin)


initramfs_builder/run.sh line 18 at r1 (raw file):
https://www.qemu.org/docs/master/system/qemu-manpage.html

[,readonly=on]

No idea which one is correct.

Guest kernel may not have `virtio_pci` module loaded by default, so load
it explicitly. Also, `-virtfs` is a synonym to `-device 'virtio-9p-pci'`
so the latter is redundant and can be removed.

Signed-off-by: Dmitrii Kuvaiskii <[email protected]>
@dimakuv dimakuv force-pushed the dimakuv/random-fixes-initramfs branch from cc94765 to d3d8886 Compare August 28, 2023 04:35
Copy link
Author

@dimakuv dimakuv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 1 of 2 files reviewed, 2 unresolved discussions, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: Intel) (waiting on @dimakuv, @kailun-qin, @mkow, and @woju)

a discussion (no related file):

Previously, kailun-qin (Kailun Qin) wrote…

I cannot approve on this repo, but LGTM. Thanks!

@kailun-qin I will try to add you as an approver in this repo now, looks like we missed this repo for you.



initramfs_builder/run.sh line 18 at r1 (raw file):

Previously, mkow (Michał Kowalczyk) wrote…

https://www.qemu.org/docs/master/system/qemu-manpage.html

[,readonly=on]

No idea which one is correct.

Done. Let's trust the official QEMU man page.

Copy link
Author

@dimakuv dimakuv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 1 of 2 files reviewed, 2 unresolved discussions, not enough approvals from maintainers (2 more required), not enough approvals from different teams (1 more required, approved so far: Intel) (waiting on @dimakuv, @kailun-qin, @mkow, and @woju)

a discussion (no related file):

Previously, dimakuv (Dmitrii Kuvaiskii) wrote…

@kailun-qin I will try to add you as an approver in this repo now, looks like we missed this repo for you.

@kailun-qin Can you check now? I've given you permissions.


Copy link
Collaborator

@kailun-qin kailun-qin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions, not enough approvals from maintainers (1 more required), not enough approvals from different teams (1 more required, approved so far: Intel) (waiting on @dimakuv and @mkow)

a discussion (no related file):

Can you check now? I've given you permissions.

Works now. Thanks!


Copy link
Member

@mkow mkow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@dimakuv dimakuv merged commit d3d8886 into master Aug 28, 2023
@dimakuv dimakuv deleted the dimakuv/random-fixes-initramfs branch August 28, 2023 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants