External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-04-01 20:04:37 +00:00
Code

vhost_user_fs: Add support for MAX_PAGES

Browse Source 
Add support for MAX_PAGES, corresonding to FUSE_MAX_PAGES introduced
in FUSE 7.28.

This allows us to negotiate with the kernel the maximum number of
pages that we support to transfer in a single request.

Signed-off-by: Sergio Lopez <slp@redhat.com>
This commit is contained in:
Sergio Lopez 2020-04-08 11:23:02 +02:00 committed by Rob Bradford
parent 747f31d82c
commit 926a414b90
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vhost_user_fs/src/fuse.rs
View File

@ -137,6 +137,9 @@ const POSIX_ACL: u32 = 1_048_576;
/// Reading the device after abort returns ECONNABORTED.
const ABORT_ERROR: u32 = 2_097_152;
/// Init_out.max_pages contains the max number of req pages.
const MAX_PAGES: u32 = 4_194_304;
bitflags! {
/// A bitfield passed in as a parameter to and returned from the `init` method of the
/// `FileSystem` trait.
@ -309,6 +312,14 @@ bitflags! {
///
/// This feature is not currently supported.
const ABORT_ERROR = ABORT_ERROR;
/// Indicates support for negotiating the maximum number of pages supported.
///
/// If this feature is enabled, we can tell the kernel the maximum number of pages that we
/// support to transfer in a single request.
///
/// This feature is enabled by default if supported by the kernel.
const MAX_PAGES = MAX_PAGES;
}
}
@ -848,7 +859,9 @@ pub struct InitOut {
pub congestion_threshold: u16,
pub max_write: u32,
pub time_gran: u32,
pub unused: [u32; 9],
pub max_pages: u16,
pub padding: u16,
pub unused: [u32; 8],
}
unsafe impl ByteValued for InitOut {}

8
vhost_user_fs/src/server.rs
View File

@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
use std::convert::TryInto;
use std::ffi::CStr;
use std::fs::File;
use std::io::{self, Read, Write};
@ -903,10 +904,14 @@ impl<F: FileSystem + Sync> Server<F> {
| FsOptions::HANDLE_KILLPRIV
| FsOptions::ASYNC_DIO
| FsOptions::HAS_IOCTL_DIR
| FsOptions::ATOMIC_O_TRUNC;
| FsOptions::ATOMIC_O_TRUNC
| FsOptions::MAX_PAGES;
let capable = FsOptions::from_bits_truncate(flags);
let page_size: u32 = unsafe { libc::sysconf(libc::_SC_PAGESIZE).try_into().unwrap() };
let max_pages = ((MAX_BUFFER_SIZE - 1) / page_size) + 1;
match self.fs.init(capable) {
Ok(want) => {
let enabled = capable & (want | supported);
@ -920,6 +925,7 @@ impl<F: FileSystem + Sync> Server<F> {
congestion_threshold: (::std::u16::MAX / 4) * 3,
max_write: MAX_BUFFER_SIZE,
time_gran: 1, // nanoseconds
max_pages: max_pages.try_into().unwrap(),
..Default::default()
};