mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-25 05:03:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gpu: allow unsandboxed implicit render server spawn"

Browse source 
This reverts commit 42ee99f25e.

Reason for revert: b/298221126 - accidentally enables render server for virglrenderer in undesired cases

BUG=b:298221126

Original change's description:
> gpu: allow unsandboxed implicit render server spawn
>
> Allow virglrenderer to implicitly spawn a render_server process when a
> render_server_socket is not provided and sandboxing is disabled.
>
> BUG=None
> TEST=cargo build --features=gpu,x,wl-dmabuf,virgl_renderer,virgl_renderer_next
>
> Change-Id: Icb682ffbf5812675d3c0c8e5a3d11006ecd53e8d
> Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4563457
> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
> Commit-Queue: Ryan Neph <ryanneph@google.com>
> Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>

BUG=None

Change-Id: I657b3537330618b3cae8ebff38ab39e525f38dd1
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4827920
Reviewed-by: Ryan Neph <ryanneph@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Jason Macnak 2023-08-30 18:32:54 +00:00 committed by crosvm LUCI
parent 688d41b1f2
commit fd94adeddf
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devices/src/virtio/gpu/mod.rs
View file

@ -1208,9 +1208,7 @@ impl Gpu {
GpuMode::ModeGfxstream => RutabagaComponentType::Gfxstream,
};
// only allow virglrenderer to fork its own render server when crosvm sandboxing is disabled
let use_render_server = rutabaga_server_descriptor.is_some()
|| gpu_parameters.allow_implicit_render_server_exec;
let use_render_server = rutabaga_server_descriptor.is_some();
let rutabaga_wsi = match gpu_parameters.wsi {
Some(GpuWsi::Vulkan) => RutabagaWsi::VulkanSwapchain,

2
devices/src/virtio/gpu/parameters.rs
View file

@ -67,7 +67,6 @@ pub struct GpuParameters {
// enforce that blob resources MUST be exportable as file descriptors
pub external_blob: bool,
pub system_blob: bool,
pub allow_implicit_render_server_exec: bool,
}
impl Default for GpuParameters {
@ -90,7 +89,6 @@ impl Default for GpuParameters {
capset_mask: 0,
external_blob: false,
system_blob: false,
allow_implicit_render_server_exec: false,
}
}
}

1
src/crosvm/sys/unix/gpu.rs
View file

@ -93,7 +93,6 @@ pub fn create_gpu_device(
let is_sandboxed = cfg.jail_config.is_some();
let mut gpu_params = cfg.gpu_parameters.clone().unwrap();
gpu_params.external_blob = is_sandboxed;
gpu_params.allow_implicit_render_server_exec = !is_sandboxed;
let mut display_backends = vec![
virtio::DisplayBackend::X(cfg.x_display.clone()),