pxcloud/vhost-device
5
0
Fork 0
mirror of https://github.com/rust-vmm/vhost-device.git synced 2025-12-28 16:29:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vsock: fix VhostUserVsockBackend::get_config

Browse Source 
VIRTIO spec defines `guest_cid` in LE byte order.
Let's introduce VirtioVsockConfig based on the virtio-spec 1.2.
For now it contains only `guest_cid`, but in the future it could
contain other fields.

Let's also handle correctly `offset` and `size`, returning an empty
Vec if they are not valid.

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
This commit is contained in:
Stefano Garzarella 2022-09-29 16:05:04 +02:00
parent 167206dea3
commit 498c7490e1
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
vsock/src/vhu_vsock.rs
View File

@ -2,17 +2,16 @@
use super::vhu_vsock_thread::*;
use clap::Parser;
use core::slice;
use std::convert::TryFrom;
use std::{io, mem, result, sync::Mutex, u16, u32, u64, u8};
use std::{io, result, sync::Mutex, u16, u32, u64, u8};
use thiserror::Error as ThisError;
use vhost::vhost_user::message::{VhostUserProtocolFeatures, VhostUserVirtioFeatures};
use vhost_user_backend::{VhostUserBackendMut, VringRwLock};
use virtio_bindings::bindings::{
virtio_blk::__u64, virtio_net::VIRTIO_F_NOTIFY_ON_EMPTY, virtio_net::VIRTIO_F_VERSION_1,
virtio_net::VIRTIO_F_NOTIFY_ON_EMPTY, virtio_net::VIRTIO_F_VERSION_1,
virtio_ring::VIRTIO_RING_F_EVENT_IDX,
};
use vm_memory::{GuestMemoryAtomic, GuestMemoryMmap};
use vm_memory::{ByteValued, GuestMemoryAtomic, GuestMemoryMmap, Le64};
use vmm_sys_util::{
epoll::EventSet,
eventfd::{EventFd, EFD_NONBLOCK},
@ -212,8 +211,17 @@ impl ConnMapKey {
}
}
/// Virtio Vsock Configuration
#[derive(Copy, Clone, Debug, Default, PartialEq)]
#[repr(C)]
struct VirtioVsockConfig {
pub guest_cid: Le64,
}
unsafe impl ByteValued for VirtioVsockConfig {}
pub struct VhostUserVsockBackend {
guest_cid: __u64,
config: VirtioVsockConfig,
pub threads: Vec<Mutex<VhostUserVsockThread>>,
queues_per_thread: Vec<u64>,
pub exit_event: EventFd,
@ -228,7 +236,9 @@ impl VhostUserVsockBackend {
let queues_per_thread = vec![QUEUE_MASK];
Ok(Self {
guest_cid: vsock_config.get_guest_cid(),
config: VirtioVsockConfig {
guest_cid: From::from(vsock_config.get_guest_cid()),
},
threads: vec![thread],
queues_per_thread,
exit_event: EventFd::new(EFD_NONBLOCK).map_err(Error::EventFdCreate)?,
@ -311,14 +321,17 @@ impl VhostUserBackendMut<VringRwLock, ()> for VhostUserVsockBackend {
Ok(false)
}
fn get_config(&self, _offset: u32, _size: u32) -> Vec<u8> {
let buf = unsafe {
slice::from_raw_parts(
&self.guest_cid as *const __u64 as *const _,
mem::size_of::<__u64>(),
)
};
buf.to_vec()
fn get_config(&self, offset: u32, size: u32) -> Vec<u8> {
let offset = offset as usize;
let size = size as usize;
let buf = self.config.as_slice();
if offset + size > buf.len() {
return Vec::new();
}
buf[offset..offset + size].to_vec()
}
fn queues_per_thread(&self) -> Vec<u64> {