macvlan: add bclim option

Expose the netlink IFLA_MACVLAN_BC_CUTOFF option as bclim like the ip command does. We still need c/common and podman patches to allow this option for podman network create. Also I created a PR[1] upstream in the netlink lib to allow setting these options directly instead of using the DefaultNla work around as I do here. TODO: Add a test but for now this option is not in a released version of iproute so there is no way to check for it right now. [1] rust-netlink/netlink-packet-route#32 This is needed for https://bugzilla.redhat.com/show_bug.cgi?id=2183896 Signed-off-by: Paul Holzinger <[email protected]>
Luap99 · May 25, 2023 · 3e47bdc · 3e47bdc
1 parent d6f588a
commit 3e47bdc
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ build = "build.rs"
 
 [package.metadata.vendor-filter]
 # This list is not exhaustive.
-platforms = ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", 
+platforms = ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu",
              "s390x-unknown-linux-gnu", "riscv64gc-unknown-linux-gnu",
              "x86_64-unknown-linux-musl", "aarch64-unknown-linux-musl",
              ]
@@ -41,11 +41,12 @@ zbus = { version = "3.8.0" }
 nix = "0.26.2"
 rand = "0.8.5"
 sha2 = "0.10.6"
+netlink-packet-utils = "0.5.2"
 netlink-packet-route = "0.13"
 netlink-packet-core = "0.4.2"
 fs2 = "0.4.3"
 netlink-sys = "0.8.3"
-netavark_proxy = { git = "https://github.com/containers/netavark-dhcp-proxy"} 
+netavark_proxy = { git = "https://github.com/containers/netavark-dhcp-proxy"}
 tokio = { version = "1.25", features = ["rt"] }
 
 [build-dependencies]

diff --git a/src/network/constants.rs b/src/network/constants.rs
@@ -16,6 +16,7 @@ pub const OPTION_ISOLATE: &str = "isolate";
 pub const OPTION_MTU: &str = "mtu";
 pub const OPTION_MODE: &str = "mode";
 pub const OPTION_METRIC: &str = "metric";
+pub const OPTION_BCLIM: &str = "bclim";
 
 /// 100 is the default metric for most Linux networking tools.
 pub const DEFAULT_METRIC: u32 = 100;

diff --git a/src/network/vlan.rs b/src/network/vlan.rs
@@ -2,6 +2,7 @@ use log::{debug, error};
 use std::{collections::HashMap, net::IpAddr, os::unix::prelude::RawFd};
 
 use netlink_packet_route::nlas::link::{InfoData, InfoIpVlan, InfoKind, InfoMacVlan, Nla};
+use netlink_packet_utils::nla::DefaultNla;
 use rand::distributions::{Alphanumeric, DistString};
 
 use crate::network::macvlan_dhcp::{get_dhcp_lease, release_dhcp_lease};
@@ -13,7 +14,9 @@ use crate::{
 };
 
 use super::{
-    constants::{NO_CONTAINER_INTERFACE_ERROR, OPTION_METRIC, OPTION_MODE, OPTION_MTU},
+    constants::{
+        NO_CONTAINER_INTERFACE_ERROR, OPTION_BCLIM, OPTION_METRIC, OPTION_MODE, OPTION_MTU,
+    },
     core_utils::{self, get_ipam_addresses, parse_option, CoreUtils},
     driver::{self, DriverInfo},
     internal_types::IPAMAddresses,
@@ -27,6 +30,9 @@ enum KindData {
         mac_address: Option<Vec<u8>>,
         /// macvlan mode
         mode: u32,
+
+        // IFLA_MACVLAN_BC_CUTOFF option if set
+        bclim: Option<i32>,
     },
     IpVlan {
         /// ipvlan mode
@@ -110,13 +116,17 @@ impl driver::NetworkDriver for Vlan<'_> {
                 super::constants::DRIVER_IPVLAN => KindData::IpVlan {
                     mode: CoreUtils::get_ipvlan_mode_from_string(mode.as_deref())?,
                 },
-                super::constants::DRIVER_MACVLAN => KindData::MacVlan {
-                    mode: CoreUtils::get_macvlan_mode_from_string(mode.as_deref())?,
-                    mac_address: match &self.info.per_network_opts.static_mac {
-                        Some(mac) => Some(CoreUtils::decode_address_from_hex(mac)?),
-                        None => None,
-                    },
-                },
+                super::constants::DRIVER_MACVLAN => {
+                    let bclim = parse_option(&self.info.network.options, OPTION_BCLIM)?;
+                    KindData::MacVlan {
+                        mode: CoreUtils::get_macvlan_mode_from_string(mode.as_deref())?,
+                        mac_address: match &self.info.per_network_opts.static_mac {
+                            Some(mac) => Some(CoreUtils::decode_address_from_hex(mac)?),
+                            None => None,
+                        },
+                        bclim,
+                    }
+                }
                 other => {
                     return Err(NetavarkError::msg(format!(
                         "unsupported VLAN type {}",
@@ -255,13 +265,30 @@ fn setup(
             opts.info_data = Some(InfoData::IpVlan(vec![InfoIpVlan::Mode(*mode)]));
             opts
         }
-        KindData::MacVlan { mode, mac_address } => {
+        KindData::MacVlan {
+            mode,
+            mac_address,
+            bclim,
+        } => {
             let mut opts = CreateLinkOptions::new(if_name.to_string(), InfoKind::MacVlan);
             opts.mac = mac_address.clone().unwrap_or_default();
             opts.mtu = data.mtu;
             opts.netns = netns_fd;
             opts.link = link.header.index;
-            opts.info_data = Some(InfoData::MacVlan(vec![InfoMacVlan::Mode(*mode)]));
+
+            let mut mv_opts = vec![InfoMacVlan::Mode(*mode)];
+            if let Some(bclim) = bclim {
+                debug!("setting macvlan bclim to {bclim}");
+                // TODO: change this to use the upstream const when available
+                // https://github.com/rust-netlink/netlink-packet-route/pull/32
+                // IFLA_MACVLAN_BC_CUTOFF const in the kernel is 9
+                mv_opts.push(InfoMacVlan::Other(DefaultNla::new(
+                    9,
+                    bclim.to_ne_bytes().to_vec(),
+                )))
+            }
+
+            opts.info_data = Some(InfoData::MacVlan(mv_opts));
             opts
         }
     };