Move underlay NICs back into H/W Classification

crates/ctf/src/lib.rs

@@ -231,8 +231,6 @@ impl Ctf {
             type_id.checked_sub(1)
         }? as usize;
 
-        println!("idx {type_id} -> {true_idx}");
-
         self.sections.types.get(true_idx)
     }
 
@@ -400,7 +398,7 @@ impl TypeEncoding {
 
     /// Length of the associated type data.
     pub fn vlen(&self) -> u16 {
-        (self.0 & 0x3ff) as u16
+        self.0 & 0x3ff
     }
 }
 

crates/opte-api/src/lib.rs

@@ -111,7 +111,7 @@ pub struct StructField {
     //       for, which is reading four pointers from a struct defn.
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
 pub enum FieldType {
     Pointer,
     Other(Option<String>),

lib/opte-ioctl/src/lib.rs

@@ -396,7 +396,7 @@ where
 }
 
 pub fn fetch_fragile_types() -> Result<FragileInternals, Error> {
-    let dld_ctf = Ctf::from_file("/kernel/drv/amd64/dld")
+    let dld_ctf = Ctf::from_file("/system/object/dld/object")
         .map_err(|e| Error::CtfError(e.to_string()))?;
 
     let Some(dld) = dld_ctf.find_type_by_name("dld_str_s") else {

xde/src/dls/mod.rs

@@ -15,7 +15,6 @@ use crate::mac::MacClient;
 use crate::mac::MacPerimeterHandle;
 use crate::mac::MacTxFlags;
 use crate::mac::MAC_DROP_ON_NO_DESC;
-use crate::warn;
 use alloc::string::String;
 use core::ffi::CStr;
 use core::fmt::Display;
@@ -26,6 +25,7 @@ use illumos_sys_hdrs::datalink_id_t;
 use illumos_sys_hdrs::uintptr_t;
 use illumos_sys_hdrs::ENOENT;
 use illumos_sys_hdrs::KM_SLEEP;
+use opte::api::FieldType;
 use opte::api::StructDef;
 use opte::engine::packet::Packet;
 use opte::engine::packet::PacketState;
@@ -187,20 +187,45 @@ struct DlsStreamInner {
 impl DlsStream {
     pub fn verify_bindings(bindings: &StructDef) -> Result<(), String> {
         let expt = [
-            ("ds_ddh", core::mem::offset_of!(dld_str_s, ds_ddh)),
-            ("ds_mch", core::mem::offset_of!(dld_str_s, ds_mch)),
-            ("ds_mh", core::mem::offset_of!(dld_str_s, ds_mh)),
-            ("ds_mip", core::mem::offset_of!(dld_str_s, ds_mip)),
+            (
+                "ds_ddh",
+                core::mem::offset_of!(dld_str_s, ds_ddh),
+                FieldType::Pointer,
+            ),
+            (
+                "ds_mch",
+                core::mem::offset_of!(dld_str_s, ds_mch),
+                FieldType::Pointer,
+            ),
+            (
+                "ds_mip",
+                core::mem::offset_of!(dld_str_s, ds_mip),
+                FieldType::Pointer,
+            ),
+            // This is a pointer, but uniquification puts its def in the parent (genunix).
+            // We don't yet support resolution via parents.
+            (
+                "ds_mh",
+                core::mem::offset_of!(dld_str_s, ds_mh),
+                FieldType::Other(None),
+            ),
         ];
 
         let mut errs = vec![];
-        for (field_name, byte_offset) in expt {
+        for (field_name, byte_offset, ty) in expt {
             let bit_offset = 8 * byte_offset;
             let Some(field) = bindings.fields.get(field_name) else {
                 errs.push(format!("missing field {field_name}"));
                 continue;
             };
 
+            if field.ty != ty {
+                errs.push(format!(
+                    "field {field_name} has type {:?} (wanted {:?})",
+                    field.ty, ty,
+                ));
+            }
+
             if field.bit_offset != bit_offset as u64 {
                 errs.push(format!(
                     "field {field_name} at bit {} (wanted {})",
@@ -212,7 +237,7 @@ impl DlsStream {
         if errs.is_empty() {
             Ok(())
         } else {
-            Err(errs.join(", "))
+            Err(format!("dls_str_s: [{}]", errs.join(", ")))
         }
     }