Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 54 additions & 29 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vhost-device-gpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ log = "0.4"
[target.'cfg(not(target_env = "musl"))'.dependencies]
rutabaga_gfx = "0.1.75"
thiserror = "2.0.17"
virglrenderer = {version = "0.1.2", optional = true }
vhost = { version = "0.15.0", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virglrenderer = { git = "https://gitlab.freedesktop.org/mtjhrc/virglrenderer-rs.git", branch = "map_info", optional = true }
vhost = { git = "https://github.com/mtjhrc/vhost.git", branch = "shmem", features = ["vhost-user-backend"] }
vhost-user-backend = { git = "https://github.com/mtjhrc/vhost.git", branch = "shmem" }
virtio-bindings = "0.2.5"
virtio-queue = "0.17.0"
vm-memory = "0.17.1"
Expand Down
63 changes: 60 additions & 3 deletions vhost-device-gpu/src/backend/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@
//
// SPDX-License-Identifier: Apache-2.0 or BSD-3-Clause

use std::sync::{Arc, Mutex};
use std::{
os::fd::{AsFd, AsRawFd},
sync::{Arc, Mutex},
};

use log::{debug, error};
use log::{debug, error, trace};
use vhost::vhost_user::{
gpu_message::{VhostUserGpuCursorPos, VhostUserGpuCursorUpdate, VhostUserGpuEdidRequest},
GpuBackend,
message::{VhostUserMMap, VhostUserMMapFlags},
Backend, GpuBackend, VhostUserFrontendReqHandler,
};
use vm_memory::VolatileSlice;

Expand All @@ -21,6 +25,59 @@ use crate::{
renderer::Renderer,
};

/// Common helper for mapping blob resources.
/// Maps a blob resource using the vhost-user backend's shmem_map.
pub fn common_map_blob(
backend: &Backend,
flags: VhostUserMMapFlags,
handle_fd: &(impl AsFd + AsRawFd),
blob_size: u64,
offset: u64,
resource_id: u32,
) -> Result<(), GpuResponse> {
trace!("Mapping blob resource_id={resource_id} offset={offset} size={blob_size}");

let map_request = VhostUserMMap {
shmid: 0,
padding: Default::default(),
fd_offset: 0,
shm_offset: offset,
len: blob_size,
flags: flags.bits(),
};

backend.shmem_map(&map_request, handle_fd).map_err(|e| {
error!("Failed to mmap by frontend: {e:?}");
ErrUnspec
})?;

Ok(())
}

/// Common helper for unmapping blob resources.
/// Unmaps a blob resource using the vhost-user backend's shmem_unmap.
pub fn common_unmap_blob(
backend: &Backend,
blob_size: u64,
offset: u64,
) -> Result<(), GpuResponse> {
let unmap_request = VhostUserMMap {
shmid: 0,
padding: Default::default(),
fd_offset: 0,
shm_offset: offset,
len: blob_size,
flags: 0,
};

backend.shmem_unmap(&unmap_request).map_err(|e| {
error!("Failed to unmap by frontend: {e:?}");
ErrUnspec
})?;

Ok(())
}

#[derive(Debug, Clone)]
pub struct VirtioGpuScanout {
pub resource_id: u32,
Expand Down
Loading