Merge fixups.

Author: FelixMcFelix

xde/src/mac/mod.rs

@@ -16,6 +16,7 @@ use alloc::string::String;
 use alloc::string::ToString;
 use alloc::sync::Arc;
 use bitflags::bitflags;
+use ingot::ip::IpProtocol;
 use core::ffi::CStr;
 use core::fmt;
 use core::mem::MaybeUninit;
@@ -616,7 +617,7 @@ impl OffloadInfo {
 pub struct MacFlowDesc {
     mask: flow_mask_t,
     ip_ver: Option<u8>,
-    proto: Option<opte_core::ip4::Protocol>,
+    proto: Option<IpProtocol>,
     local_port: Option<u16>,
 }
 
@@ -647,7 +648,7 @@ impl MacFlowDesc {
         self
     }
 
-    pub fn set_proto(&mut self, proto: opte_core::ip4::Protocol) -> &mut Self {
+    pub fn set_proto(&mut self, proto: IpProtocol) -> &mut Self {
         self.mask |= FLOW_IP_PROTOCOL;
         self.proto = Some(proto);
         self
@@ -663,18 +664,18 @@ impl MacFlowDesc {
         flow_desc_t::from(self.clone())
     }
 
-    pub fn new_flow<'a>(
+    pub fn new_flow<'a, P>(
         &'a self,
         flow_name: &'a str,
         link_id: LinkId,
-    ) -> Result<MacFlow, FlowCreateError> {
+    ) -> Result<MacFlow<P>, FlowCreateError> {
         let name = CString::new(flow_name)
             .map_err(|_| FlowCreateError::InvalidFlowName(flow_name))?;
         let desc = self.to_desc();
 
         match unsafe {
             mac_link_flow_add(
-                link_id.0,
+                link_id.into(),
                 name.as_ptr(),
                 &desc,
                 &MAC_RESOURCE_PROPS_DEF,
@@ -686,7 +687,7 @@ impl MacFlowDesc {
 
         let mut flent = ptr::null_mut();
         match unsafe { mac_flow_lookup_byname(name.as_ptr(), &mut flent) } {
-            0 => Ok(MacFlow { name, flent, cb_mch: None }),
+            0 => Ok(MacFlow { name, flent, parent: None }),
             err => Err(FlowCreateError::CreateFailed(flow_name, err)),
         }
     }
@@ -700,7 +701,7 @@ impl From<MacFlowDesc> for flow_desc_t {
         // The mac flow subsystem uses 0 as sentinel to indicate no
         // filtering on protocol.
         let fd_protocol = match mf.proto {
-            Some(p) => p as u8,
+            Some(p) => p.0,
             None => 0,
         };
 
@@ -773,7 +774,6 @@ impl<P> MacFlow<P> {
         new_fn: mac_rx_fn,
         parent: Arc<P>,
     ) {
-        let mch = cb_mch.clone();
         let parent = Arc::into_raw(parent);
         let arg = parent as *mut c_void;
 
@@ -791,12 +791,12 @@ impl<P> MacFlow<P> {
             // flow_cb_pre_srs(self.flent, new_fn);
             flow_cb_post_srs(self.flent, new_fn, arg);
         }
-        self.cb_mch = Some(mch);
+        self.parent = Some(parent);
     }
 }
 
 /// Insert a flow callback which replaces `mac_rx_srs_subflow_process`.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe fn flow_cb_pre_srs(flent: *mut flow_entry_t, new_fn: mac_rx_fn) {
     // TODO: locks, negative handling, ...
     (*flent).fe_cb_fn = new_fn;
@@ -806,7 +806,7 @@ pub unsafe fn flow_cb_pre_srs(flent: *mut flow_entry_t, new_fn: mac_rx_fn) {
 ///
 /// This will usually replace `mac_rx_deliver`, which will call into the mac_rx
 /// callback on the *parent device* (i.e., i_dls_link_rx).
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe fn flow_cb_post_srs(
     flent: *mut flow_entry_t,
     new_fn: mac_rx_fn,
@@ -834,14 +834,14 @@ unsafe fn flow_user_refrele(flent: *mut flow_entry_t) {
     mutex_exit(&mut (*flent).fe_lock);
 }
 
-impl Drop for MacFlow {
+impl<P> Drop for MacFlow<P> {
     fn drop(&mut self) {
         unsafe {
             // TODO: need to reimplement FLOW_USER_REFRELE in here...
             flow_user_refrele(self.flent);
             mac_link_flow_remove(self.name.as_ptr());
             if let Some(parent) = self.parent {
-                Arc::from_raw(self.parent); // dropped immediately
+                Arc::from_raw(parent); // dropped immediately
             }
         }
     }

xde/src/mac/sys.rs

@@ -17,7 +17,6 @@ use crate::ip::timeout_id_t;
 use illumos_sys_hdrs::boolean_t;
 use illumos_sys_hdrs::c_char;
 use illumos_sys_hdrs::c_int;
-use illumos_sys_hdrs::c_uchar;
 use illumos_sys_hdrs::c_short;
 use illumos_sys_hdrs::c_uchar;
 use illumos_sys_hdrs::c_uint;
@@ -875,9 +874,6 @@ pub enum mac_dhcpcid_form_t {
     CIDFORM_STR,
 }
 
-pub const IP_NO_ADDR: in6_addr_t =
-    in6_addr_t { _S6_un: in6_addr__bindgen_ty_1 { _S6_u16: [0u16; 8] } };
-
 // typedef mac_resource_handle_t   (*mac_resource_add_t)(void *, mac_resource_t *);
 pub type mac_resource_handle_t = *mut c_void;
 

xde/src/xde.rs

@@ -241,7 +241,7 @@ pub struct xde_underlay_port {
     pub mac: [u8; 6],
 
     /// Handles to created MacFlow instances.
-    flows: Vec<MacFlow>,
+    flows: Vec<MacFlow<DlsStream>>,
 
     /// The MTU of this link.
     pub mtu: u32,
@@ -967,8 +967,8 @@ fn clear_xde_underlay() -> Result<NoResp, OpteError> {
             // `DldStream`. We explicitly drop them in order here to ensure
             // there are no outstanding refs.
 
-            // 1. Remove promisc callback.
-            drop(u.mph);
+            // 1. Remove flow callback.
+            drop(u.flows);
 
             // Although `xde_rx` can be called into without any running ports
             // via the promisc handle, illumos guarantees that this callback won't
@@ -1091,7 +1091,6 @@ unsafe extern "C" fn xde_attach(
         ddi_report_dev(xde_dip);
     }
 
-    mac::mac_rx_set(state.u2.mch, xde_rx, ptr::null_mut());
     DDI_SUCCESS
 }
 
@@ -1128,7 +1127,7 @@ fn create_underlay_port(
     let mut flow_desc = mac::MacFlowDesc::new();
     flow_desc
         // .set_ipver(6)
-        .set_proto(opte::api::ip::Protocol::UDP)
+        .set_proto(IpProtocol::UDP)
         .set_local_port(opte::engine::geneve::GENEVE_PORT)
         .to_desc();
 
@@ -1158,16 +1157,6 @@ fn create_underlay_port(
         },
     )?;
 
-    // Get a mac client handle as well.
-    //
-    let oflags = MacOpenFlags::NO_UNICAST_ADDR; //MULTI_PRIMARY;// MacOpenFlags::NONE;
-    let mch = MacClientHandle::open(&mh, Some(mc_name), oflags, 0)
-        .map(Arc::new)
-        .map_err(|e| OpteError::System {
-            errno: EFAULT,
-            msg: format!("mac_client_open failed for {link_name}: {e}"),
-        })?;
-
     // Grab mac handle for underlying link, to retrieve its MAC address.
     let mh = MacHandle::open_by_link_name(&link_name).map(Arc::new).map_err(
         |e| OpteError::System {