[WIP] vmm: pre-create console devices #6403
Draft
+478
−339
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
praveen-pk
force-pushed
the
pre_create_console_devs
branch
from
0f98991
to
0154559
Compare
rbradford
reviewed
Apr 23, 2024
vmm/src/vm_config.rs
Outdated
| @@ -428,6 +428,11 @@ pub struct ConsoleConfig { | |||
| #[serde(default)] | |||
| pub iommu: bool, | |||
| pub socket: Option<PathBuf>, | |||
| // main_fd is the fd of the pre-created console device | |||
There was a problem hiding this comment.
I'm afraid it's not correct to put state like this in a Config struct - it's for user supplied configuration only.
rbradford
reviewed
Apr 23, 2024
Gotcha! I will move the FDs to a different struct in my next update. |
praveen-pk
force-pushed
the
pre_create_console_devs
branch
from
0154559
to
3599daf
Compare
praveen-pk
changed the title
@rbradford moving the FDs to different struct resulted in considerable refactoring. I pushed the latest version to get some early feedback on the design. Please let me know using I still have to fix some tests and re-check the patches. So, I marked this PR as draft. |
praveen-pk
force-pushed
the
pre_create_console_devs
branch
2 times, most recently
from
ca6685b
to
3ad305d
Compare
liuw
reviewed
May 21, 2024
vmm/src/lib.rs
Outdated
| @@ -1228,6 +1233,12 @@ impl RequestHandler for Vmm { | |||
| return Err(VmError::VmMissingConfig); | |||
| }; | |||
|
|
|||
| // console_info is set to None in vn_shutdown. re-populate here if empty | |||
praveen-pk
force-pushed
the
pre_create_console_devs
branch
2 times, most recently
from
b3151af
to
0dcd696
Compare
Introduce ConsoleInfo struct. This struct will be used to store FDs of console devices created in pre_create_console_devices and passed to vm_boot. Move set_raw_mode, create_pty methods to console_devices.rs to consolidate console management methods into a single module. Lastly, copy the logic to create and configure console devices into pre_create_console_devices method. Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
Move listen_for_sigwinch_on_tty to sigwinch_listener.rs module. Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
With this change all the information to manage console devices is now available within Vmm Object. Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
Use pre_create_console_devices method to create and populate console device FDs into console_info in Vmm Object. Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
While adding console devices, DeviceManager will now use the FDs in console_info instead of creating them. To reduce the size of this commit, I marked some variables are unused with '_' prefix. All those variables are cleaned up in next commit. Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
During vm_shutdown or vm_snapshot, all the console devices will be closed. When this happens stdout (FD #2) will also be closed as the console device using these FD is closed. If the VM were to be started later, FD#2 can be assigned to a different file. But pre_create_console_devices looks for FD#2 while opening tty device, which could point to any file. To avoid this problem, the STDOUT FD is duplicated when being assigned to a console device. Even if the console devices were to be closed, the duplicated FD will be closed and FD#2 will continue to point to STDOUT. Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
Rename TIOCGTPEER ioctl to it proper name:TIOCGPTPEER. Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
praveen-pk
force-pushed
the
pre_create_console_devs
branch
from
0dcd696
to
9e77b12
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Create console devices before vm_create. This will ensure required device paths exist on the host and will allow landlock to add relevant rules to allow cloud-hypervisor to access those devices at runtime.