X11 passthrough and futex sharing#232
Merged
slp merged 1 commit intocontainers:mainfrom Oct 31, 2024
Merged
Conversation
b5fc39e to
e02eebd
Compare
Contributor
Author
|
Question: Should we renumber CROSS_DOMAIN_CMD_FUTEX_NEW and friends and CROSS_DOMAIN_ID_TYPE_SHM to something higher, in case upstream decides to add commands or types in the future? |
e02eebd to
06e29f1
Compare
Contributor
Author
|
There's still more work to be done on the X11 cross-domain channel so I'm marking this as draft. The prep work MR should be OK to review though (and this one too, it's just incomplete and not ready to merge yet). |
06e29f1 to
074b502
Compare
Contributor
Author
|
This should now be ready, Steam finally works stably and Portal 2 runs (including windowed) 🎉 |
9e94bdf to
2a0a6dc
Compare
Collaborator
|
Please rebase on top of #231 |
This adds the X11 cross domain channel and an ability to share futexes between the vm and the host. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com> Co-developed-by: Asahi Lina <lina@asahilina.net> Signed-off-by: Asahi Lina <lina@asahilina.net>
2a0a6dc to
4f36a56
Compare
Contributor
Author
|
Done! |
slp
approved these changes
Oct 31, 2024
Collaborator
slp
left a comment
There was a problem hiding this comment.
Tested both with sommelier and x112virtgpu
This file contains hidden or 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
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.
Add the X11 cross domain channel type and futex sharing. This is the new approach using explicit FD passing, which depends on #231 (will rebase once that is merged). Also includes a bunch of bug fixes over the previous PR, and CI now passes. I think this should be good to start reviewing.
This approach no longer needs the
LD_PRELOAD. You can just use nothing (the ptrace code in x112virtgpu should be more robust now), orxshmwrap(packaged with x112virgpu) to avoid the ptrace hack. I also sent a PR upstream to libxshmfence so we can do this with a simple env var in the future, without hacks.Compared to #213, this removes the rootfs DAX enablement, but I think @slp wants to do the DAX toggle another way anyway. DAX is still required for /dev/shm for any of this to work, but best keep that out of the scope of this PR.
Supersedes #213.