diff options
author | Xiong Zhang <xiong.y.zhang@intel.corp-partner.google.com> | 2020-03-20 10:39:55 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-04-04 19:52:11 +0000 |
commit | 773c70740e98c1aaf73a7b02e65eadaeab33c9d8 (patch) | |
tree | 9af2f03662973a833320193e21a50fcc6b066c31 /src | |
parent | c56bc989668d2d79f2a00d098a24729fc0cd6801 (diff) | |
download | crosvm-773c70740e98c1aaf73a7b02e65eadaeab33c9d8.tar crosvm-773c70740e98c1aaf73a7b02e65eadaeab33c9d8.tar.gz crosvm-773c70740e98c1aaf73a7b02e65eadaeab33c9d8.tar.bz2 crosvm-773c70740e98c1aaf73a7b02e65eadaeab33c9d8.tar.lz crosvm-773c70740e98c1aaf73a7b02e65eadaeab33c9d8.tar.xz crosvm-773c70740e98c1aaf73a7b02e65eadaeab33c9d8.tar.zst crosvm-773c70740e98c1aaf73a7b02e65eadaeab33c9d8.zip |
Virtio-net: Let queue-num could configurable
Virtio-net multi queue feature need multi queue pairs, this patch change queue-num configurable instead of static. --net-vq-pairs parameter could config virtio net device virtual queue pairs. BUG=chromium:1064482 TEST=Test virtio net function in guest with --net-vq-pairs=1 and --net-vq-pairs=2 Change-Id: I75202c8ae52a83b8087b52149ec6d2138d8831cb Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2120312 Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Xiong Zhang <xiong.y.zhang@intel.corp-partner.google.com> Reviewed-by: Stephen Barber <smbarber@chromium.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/crosvm.rs | 2 | ||||
-rw-r--r-- | src/linux.rs | 19 | ||||
-rw-r--r-- | src/main.rs | 21 |
3 files changed, 39 insertions, 3 deletions
diff --git a/src/crosvm.rs b/src/crosvm.rs index 81344c3..a55d2e4 100644 --- a/src/crosvm.rs +++ b/src/crosvm.rs @@ -176,6 +176,7 @@ pub struct Config { pub host_ip: Option<net::Ipv4Addr>, pub netmask: Option<net::Ipv4Addr>, pub mac_address: Option<net_util::MacAddress>, + pub net_vq_pairs: Option<u16>, pub vhost_net: bool, pub tap_fd: Vec<RawFd>, pub cid: Option<u64>, @@ -223,6 +224,7 @@ impl Default for Config { host_ip: None, netmask: None, mac_address: None, + net_vq_pairs: None, vhost_net: false, tap_fd: Vec::new(), cid: None, diff --git a/src/linux.rs b/src/linux.rs index 6eb1ef7..0baf5ea 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -593,7 +593,13 @@ fn create_tap_net_device(cfg: &Config, tap_fd: RawFd) -> DeviceResult { .map_err(Error::CreateTapDevice)? }; - let dev = virtio::Net::from(tap, 1).map_err(Error::NetDeviceNew)?; + let mut vq_pairs = cfg.net_vq_pairs.unwrap_or(1); + let vcpu_count = cfg.vcpu_count.unwrap_or(1); + if vcpu_count < vq_pairs as u32 { + error!("net vq pairs must be smaller than vcpu count, fall back to single queue mode"); + vq_pairs = 1; + } + let dev = virtio::Net::from(tap, vq_pairs).map_err(Error::NetDeviceNew)?; Ok(VirtioDeviceStub { dev: Box::new(dev), @@ -608,14 +614,21 @@ fn create_net_device( mac_address: MacAddress, mem: &GuestMemory, ) -> DeviceResult { + let mut vq_pairs = cfg.net_vq_pairs.unwrap_or(1); + let vcpu_count = cfg.vcpu_count.unwrap_or(1); + if vcpu_count < vq_pairs as u32 { + error!("net vq pairs must be smaller than vcpu count, fall back to single queue mode"); + vq_pairs = 1; + } + let dev = if cfg.vhost_net { let dev = virtio::vhost::Net::<Tap, vhost::Net<Tap>>::new(host_ip, netmask, mac_address, mem) .map_err(Error::VhostNetDeviceNew)?; Box::new(dev) as Box<dyn VirtioDevice> } else { - let dev = - virtio::Net::<Tap>::new(host_ip, netmask, mac_address).map_err(Error::NetDeviceNew)?; + let dev = virtio::Net::<Tap>::new(host_ip, netmask, mac_address, vq_pairs) + .map_err(Error::NetDeviceNew)?; Box::new(dev) as Box<dyn VirtioDevice> }; diff --git a/src/main.rs b/src/main.rs index 3afca8e..241334d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -762,6 +762,26 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument:: })?, ) } + "net-vq-pairs" => { + if cfg.net_vq_pairs.is_some() { + return Err(argument::Error::TooManyArguments( + "`net-vq-pairs` already given".to_owned(), + )); + } + cfg.net_vq_pairs = + Some( + value + .unwrap() + .parse() + .map_err(|_| argument::Error::InvalidValue { + value: value.unwrap().to_owned(), + expected: String::from( + "this value for `net-vq-pairs` needs to be integer", + ), + })?, + ) + } + "wayland-sock" => { let mut components = value.unwrap().split(','); let path = @@ -1237,6 +1257,7 @@ fn run_vm(args: std::env::Args) -> std::result::Result<(), ()> { "IP address to assign to host tap interface."), Argument::value("netmask", "NETMASK", "Netmask for VM subnet."), Argument::value("mac", "MAC", "MAC address for VM."), + Argument::value("net-vq-pairs", "N", "virtio net virtual queue paris. (default: 1)"), Argument::value("ac97", "[backend=BACKEND,capture=true,capture_effect=EFFECT]", "Comma separated key=value pairs for setting up Ac97 devices. Can be given more than once . |