mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-11 04:26:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

vhost_user_devices: net: Change format of command line argument

Browse source 
Make the net device take all of socket, IP address, net mask and MAC
address in one flag so that we can easily update it to support multiple
devices.

Also, this commit includes miscellaneous refactoring for future changes.

BUG=b:179755448
TEST=run curl on VM

Change-Id: I4d2b8361a8ba0c2586429078669afbed95dd6afd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2921972
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
Reviewed-by: Chirantan Ekbote <chirantan@chromium.org>
This commit is contained in:
Keiichi Watanabe 2021-05-27 21:39:53 +09:00 committed by Commit Bot
parent ecd3a42fb4
commit 468f8fc59a
1 changed files with 64 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
vhost_user_devices/src/net.rs
View file

@ -72,6 +72,39 @@ async fn run_rx_queue(
}
}
struct TapConfig {
host_ip: Ipv4Addr,
netmask: Ipv4Addr,
mac: MacAddress,
}
impl FromStr for TapConfig {
type Err = anyhow::Error;
fn from_str(arg: &str) -> Result<Self, Self::Err> {
let args: Vec<&str> = arg.split(',').collect();
if args.len() != 3 {
bail!("TAP config must consist of 3 parts but {}", args.len());
}
let host_ip: Ipv4Addr = args[0]
.parse()
.map_err(|e| anyhow!("invalid IP address: {}", e))?;
let netmask: Ipv4Addr = args[1]
.parse()
.map_err(|e| anyhow!("invalid net mask: {}", e))?;
let mac: MacAddress = args[2]
.parse()
.map_err(|e| anyhow!("invalid MAC address: {}", e))?;
Ok(Self {
host_ip,
netmask,
mac,
})
}
}
struct NetBackend {
tap: Tap,
avail_features: u64,
@ -81,11 +114,22 @@ struct NetBackend {
}
impl NetBackend {
pub fn new(
host_ip: Ipv4Addr,
netmask: Ipv4Addr,
mac_address: MacAddress,
) -> anyhow::Result<Self> {
pub fn new(config: &TapConfig) -> anyhow::Result<Self> {
// Create a tap device.
let tap = Tap::new(true /* vnet_hdr */, false /* multi_queue */)
.context("failed to create tap device")?;
tap.set_ip_addr(config.host_ip)
.context("failed to set IP address")?;
tap.set_netmask(config.netmask)
.context("failed to set netmask")?;
tap.set_mac_address(config.mac)
.context("failed to set MAC address")?;
let vq_pairs = Self::max_vq_pairs();
tap.enable().context("failed to enable tap")?;
validate_and_configure_tap(&tap, vq_pairs as u16)
.context("failed to validate and configure tap")?;
// TODO(keiichiw): Support CTRL_VQ and MQ.
// Note that MQ cannot be enabled without CTRL_VQ.
let avail_features = virtio::base_features(ProtectionType::Unprotected)
@ -98,20 +142,6 @@ impl NetBackend {
| 1 << virtio_net::VIRTIO_NET_F_HOST_UFO
| VhostUserVirtioFeatures::PROTOCOL_FEATURES.bits();
let vq_pairs = Self::max_vq_pairs();
// Create a tap device.
let tap = Tap::new(true /* vnet_hdr */, true /* multi_queue */)
.context("failed to create tap device")?;
tap.set_ip_addr(host_ip)
.context("failed to set IP address")?;
tap.set_netmask(netmask).context("failed to set netmask")?;
tap.set_mac_address(mac_address)
.context("failed to set MAC address")?;
tap.enable().context("failed to enable tap")?;
validate_and_configure_tap(&tap, vq_pairs as u16)
.context("failed to validate and configure tap")?;
Ok(Self {
tap,
avail_features,
@ -233,52 +263,16 @@ impl VhostUserBackend for NetBackend {
}
}
struct TapConfig {
host_ip: Ipv4Addr,
netmask: Ipv4Addr,
mac: MacAddress,
}
impl FromStr for TapConfig {
type Err = String;
fn from_str(arg: &str) -> Result<Self, Self::Err> {
let args: Vec<&str> = arg.split(',').collect();
if args.len() != 3 {
return Err(format!(
"TAP config must consist of 3 parts but {}",
args.len()
));
}
let host_ip: Ipv4Addr = args[0]
.parse()
.map_err(|e| format!("invalid IP address: {}", e))?;
let netmask: Ipv4Addr = args[1]
.parse()
.map_err(|e| format!("invalid net mask: {}", e))?;
let mac: MacAddress = args[2]
.parse()
.map_err(|e| format!("invalid MAC address: {}", e))?;
Ok(Self {
host_ip,
netmask,
mac,
})
}
}
fn main() -> anyhow::Result<()> {
let mut opts = Options::new();
opts.optflag("h", "help", "print this help menu");
opts.reqopt("", "socket", "path to a socket", "PATH");
// TODO(keiichiw): Support tap-fd option.
// TODO(keiichiw): Support multiple TAP devices.
opts.reqopt(
"",
"tap",
"TAP device config. (e.g. \"10.0.2.2,255.255.255.0,12:34:56:78:9a:bc\")",
"IP_ADDR,NET_MASK,MAC_ADDR",
"device",
"TAP device config. (e.g. \"/path/to/sock,10.0.2.2,255.255.255.0,12:34:56:78:9a:bc\")",
"SOCKET_PATH,IP_ADDR,NET_MASK,MAC_ADDR",
);
let mut args = std::env::args();
@ -299,23 +293,23 @@ fn main() -> anyhow::Result<()> {
base::syslog::init().context("failed to initialize syslog")?;
// We can unwrap after `opt_str()` safely because they are required options.
let socket = matches.opt_str("socket").unwrap();
let tap_cfg: TapConfig = match matches.opt_str("tap").unwrap().parse() {
Ok(cfg) => cfg,
Err(e) => {
println!("invalid TAP config: {}", e);
return Ok(());
// We can unwrap after `opt_str()` safely because it's a required option.
let arg = matches.opt_str("device").unwrap();
let pos = match arg.find(',') {
Some(p) => p,
None => {
bail!("device must take comma-separated argument");
}
};
let socket = &arg[0..pos];
let cfg = &arg[pos + 1..]
.parse::<TapConfig>()
.context("failed to parse tap config")?;
let backend = NetBackend::new(&cfg).context("failed to create NetBackend")?;
let handler = DeviceRequestHandler::new(backend);
let ex = Executor::new().context("failed to create executor")?;
let _ = NET_EXECUTOR.set(ex.clone());
let net = NetBackend::new(tap_cfg.host_ip, tap_cfg.netmask, tap_cfg.mac)
.context("failed to create NetBackend")?;
let handler = DeviceRequestHandler::new(net);
if let Err(e) = ex.run_until(handler.run(socket, &ex)) {
error!("error occurred: {}", e);
}