Merge guest binaries. by WhatAmISupposedToPutHere · Pull Request #134 · AsahiLinux/muvm

WhatAmISupposedToPutHere · 2024-12-26T19:04:11Z

Merge all guest binaries into one binary and process. This removes sommelier support, but people should use x11bridge anyway. Also stop leaking muvm configuration into vm processes.

crates/muvm/src/bin/muvm.rs

crates/muvm/src/guest/bin/muvm-guest.rs

crates/muvm/src/bin/muvm.rs

crates/muvm/src/guest/bin/muvm-guest.rs

crates/muvm/src/server/worker.rs

crates/muvm/src/guest/x11.rs

crates/muvm/src/guest/hidpipe.rs

crates/muvm/src/guest/x11.rs

hoshinolina · 2024-12-29T10:23:37Z

FYI, I left a TODO in #130 about moving an env var to the muvm-guest config. If that gets merged first, please make that change too as part of the last commit here when you rebase.

It is in the way for a refactor i want to do, and you should be using x11bridge anyway. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

crates/muvm/src/guest/mount.rs

hoshinolina · 2025-01-11T13:41:54Z

Needs clippy fixes (probably just an #[allow(clippy::too_many_arguments)] in the problem functions).

We can keep the root uid in our saved set user id, and copy it to ruid/euid after fork, if launching as root is requested. Writing to drop_caches becomes a bit tricker when running unprivileged, but we can acquire the privileges in a forked process for it to work and not affect other launches. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

We no longer need the server to be a separate binary. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

crates/muvm/src/bin/muvm.rs

sbrivio-rh · 2025-01-17T22:39:49Z

Ah, thanks, it works headless again. It's also a bit faster now. Tried with #111, without these commits:

$ time for i in `seq 1 10`; do ./target/debug/muvm --sommelier -- true; done

real	0m10.397s
user	0m7.653s
sys	0m3.165s

with:

$ time for i in `seq 1 10`; do ./target/debug/muvm -- true; done

real    0m10.100s
user    0m7.162s
sys     0m2.638s

By the way:

$ time for i in `seq 1 10`; do ./target/debug/muvm --passt-socket=/tmp/passt_3.socket -- true; done

real	0m9.808s
user	0m7.053s
sys	0m2.725s

...not really substantial.

Edit:

$ time for i in `seq 1 10`; do ./target/release/muvm --mem=64 --vram=0 -c 0 -- true; done

real	0m5.049s
user	0m3.135s
sys	0m0.361s

...neat, this.

sbrivio-rh · 2025-01-17T22:54:34Z

Whee, it comes with --privileged too! \o/

WhatAmISupposedToPutHere · 2025-01-17T22:55:13Z

It being a tiny bit faster is expected (exec is not free), but is not the reason for those changes.

crates/muvm/src/bin/muvm.rs

slp · 2025-01-22T07:33:28Z

LGTM. I think we can merge this one once @teohhanhui suggestion is addressed.

Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

I keep forgetting this syntax exists, and other maintainers seem to be fond of it. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

slp · 2025-01-24T14:49:53Z

@teohhanhui do you have any other concerns before merging this one?

teohhanhui

🚀

zzyiwei · 2025-06-24T20:15:46Z

crates/muvm/src/guest/sommelier.rs

-    let gl_env = env::var("LIBGL_DRIVERS_PATH").ok();
-
-    let mut cmd = Command::new(sommelier_path);
-    cmd.args([


This comment is only for whoever still doing some testing with it for wayland passthrough ; )

It doesn't matter now since the code here has been long gone, but --enable-linux-dmabuf is missed as it's required since mesa has stripped the legacy wl-drm. For historical reasons, we didn't make it default enabled and later forgot about it. Sorry about that xD

Anyway, nice move here for x11 pasthrough!

WhatAmISupposedToPutHere requested review from alyssarosenzweig, hoshinolina, slp and teohhanhui as code owners December 26, 2024 19:04

hoshinolina mentioned this pull request Dec 29, 2024

mount: Add support for FEX merged rootfs mode #130

Merged

hoshinolina reviewed Dec 29, 2024

View reviewed changes

crates/muvm/src/guest/x11.rs Outdated Show resolved Hide resolved

WhatAmISupposedToPutHere force-pushed the the-merge branch from 320d463 to fd4381d Compare December 29, 2024 14:18

WhatAmISupposedToPutHere mentioned this pull request Dec 31, 2024

Port passthrough #135

Merged

Remove sommelier support.

7af1621

It is in the way for a refactor i want to do, and you should be using x11bridge anyway. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

WhatAmISupposedToPutHere force-pushed the the-merge branch 2 times, most recently from 9b974f5 to f614c5f Compare January 9, 2025 13:06

hoshinolina reviewed Jan 11, 2025

View reviewed changes

crates/muvm/src/guest/mount.rs Outdated Show resolved Hide resolved

WhatAmISupposedToPutHere added 4 commits January 11, 2025 16:38

Merge muvm-guest and muvm-server

e7938a9

We no longer need the server to be a separate binary. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

Merge x11bridge into the server process.

854bb17

Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

Merge hidpipe client into the main server binary

2ff99c9

Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

WhatAmISupposedToPutHere force-pushed the the-merge branch from f614c5f to 75aceea Compare January 11, 2025 15:42

sbrivio-rh reviewed Jan 17, 2025

View reviewed changes

crates/muvm/src/bin/muvm.rs Show resolved Hide resolved

WhatAmISupposedToPutHere force-pushed the the-merge branch from 75aceea to c9a0c7a Compare January 17, 2025 22:16

teohhanhui reviewed Jan 20, 2025

View reviewed changes

crates/muvm/src/bin/muvm.rs Show resolved Hide resolved

teohhanhui reviewed Jan 20, 2025

View reviewed changes

crates/muvm/src/bin/muvm.rs Outdated Show resolved Hide resolved

crates/muvm/src/bin/muvm.rs Outdated Show resolved Hide resolved

crates/muvm/src/bin/muvm.rs Outdated Show resolved Hide resolved

crates/muvm/src/bin/muvm.rs Outdated Show resolved Hide resolved

WhatAmISupposedToPutHere force-pushed the the-merge branch from c9a0c7a to f1da8f3 Compare January 20, 2025 22:07

teohhanhui reviewed Jan 20, 2025

View reviewed changes

crates/muvm/src/bin/muvm.rs Outdated Show resolved Hide resolved

WhatAmISupposedToPutHere added 3 commits January 22, 2025 17:22

Stop leaking muvm configuration into vm environment

5d9998b

Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

Add uninlined_format_args lint and fix where relevant

dd57add

I keep forgetting this syntax exists, and other maintainers seem to be fond of it. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

Delete unused old x11 passthrough code

1de6769

Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

WhatAmISupposedToPutHere force-pushed the the-merge branch from f1da8f3 to 1de6769 Compare January 22, 2025 16:31

sbrivio-rh mentioned this pull request Jan 22, 2025

config-libkrunfw_x86_64: Chop chop containers/libkrunfw#85

Merged

teohhanhui approved these changes Jan 24, 2025

View reviewed changes

slp approved these changes Jan 27, 2025

View reviewed changes

slp merged commit 40230ef into AsahiLinux:main Jan 27, 2025
2 checks passed

zzyiwei reviewed Jun 24, 2025

View reviewed changes

polarathene mentioned this pull request Jan 2, 2026

No Wayland support #8

Open

Uh oh!

Comments

Conversation

WhatAmISupposedToPutHere commented Dec 26, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hoshinolina commented Dec 29, 2024

Uh oh!

Uh oh!

hoshinolina commented Jan 11, 2025

Uh oh!

Uh oh!

sbrivio-rh commented Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sbrivio-rh commented Jan 17, 2025

Uh oh!

WhatAmISupposedToPutHere commented Jan 17, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

slp commented Jan 22, 2025

Uh oh!

slp commented Jan 24, 2025

Uh oh!

teohhanhui left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

zzyiwei Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

sbrivio-rh commented Jan 17, 2025 •

edited

Loading