Allow virtio_gpu to auto-fallback to a safe rutabaga config #426
Conversation
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
slp
requested review from
MatiasVara,
jakecorrenti,
mtjhrc and
tylerfanelli
as code owners
It's only possible to call VirglRenderer::init() once to prevent attempting to initialize virglrenderer twice. But this also prevents us for retrying the initialization if the first time fails. Let's only set the INIT_ONCE atomic when the call to virgl_renderer_init has been successful. Signed-off-by: Sergio Lopez <[email protected]>
So far, if the initialization of rutabaga fails, the GPU thread panics with an "expect()". Instead, let's retry the initialization with safe flags (NO_VIRGL). Fixes: containers#418 Suggested-by: Val Packett <[email protected]> Signed-off-by: Sergio Lopez <[email protected]>
|
@valpackett PTAL |
mtjhrc
reviewed
Oct 10, 2025
Comment on lines
+327
to
+338
| if ret == 0 { | ||
| // virglrenderer is a global state backed library that uses thread bound OpenGL contexts. | ||
| // Initialize it only once and use the non-send/non-sync Renderer struct to keep things tied | ||
| // to whichever thread called this function first. | ||
| static INIT_ONCE: AtomicBool = AtomicBool::new(false); | ||
| if INIT_ONCE | ||
| .compare_exchange(false, true, Ordering::Acquire, Ordering::Acquire) | ||
| .is_err() | ||
| { | ||
| return Err(RutabagaError::AlreadyInUse); | ||
| } | ||
| } |
There was a problem hiding this comment.
I think the original intention of this was to prevent calling virgl_renderer_init when it was already initialized, no? But this change allows initializing virglrenderer a second time. I'm not sure if that is even a problem though...
If we want to keep the check working you can is still keep the check before virgl_renderer_init:
if INIT_ONCE.compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst).is_err() {
return `RutabagaError::AlreadyInUse`
}But after calling virgl_renderer_init, set it to the actual result:
INIT_ONCE = (virgl_renderer_init() == 0)
(Not sure about the memory ordering...)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Instead of generating a panic when rutabaga initialization fails, let's have virtio_gpu retry with a safe configuration.