plumbing for techport router advertisements via tfportd (#3372)

Author: rcgoodfellow

package-manifest.toml

@@ -300,8 +300,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "b9444d0c96ba5cb7108a6167a603dd75709441fb"
-source.sha256 = "a45a86d33e0a9da9954c5df7e3d0c335c0f2d48c4747b1c163a08b7c675650d9"
+source.commit = "b419dfb6dbcabbf9d20b4d001de59eaaed42d2e5"
+source.sha256 = "50c27f558b9820b1bf77b892c01df99924a89f6fd2114b1f01a16d5334abce3d"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -325,8 +325,8 @@ only_for_targets.image = "standard"
 # 2. Copy the output zone image from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "b9444d0c96ba5cb7108a6167a603dd75709441fb"
-source.sha256 = "e19a2acc8d6f84be5dc2a1c5e327b05c4b5551aaf803d400ea26ada9ccd68ab6"
+source.commit = "b419dfb6dbcabbf9d20b4d001de59eaaed42d2e5"
+source.sha256 = "91c0559ea00f1df38faced0b68f9231795682de55be2d91cb4b90a72e2f8093c"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -343,8 +343,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "b9444d0c96ba5cb7108a6167a603dd75709441fb"
-source.sha256 = "e54f0dc9a85b6a02985dab8d84743f8ac7576303ef8e492733c21b85afb56ad4"
+source.commit = "b419dfb6dbcabbf9d20b4d001de59eaaed42d2e5"
+source.sha256 = "1a7004ec3c4419fec5d58b0909e1cdd197a64396f1775e8b4a114682c74e5fea"
 output.type = "zone"
 output.intermediate_only = true
 

sled-agent/src/services.rs

@@ -715,6 +715,17 @@ impl ServiceManager {
         }
     }
 
+    fn bootstrap_to_techport(addr: Ipv6Addr) -> Ipv6Addr {
+        // flip the last bit of the first octet
+        // fdb0:<id>::suffix -> fdb1:<id>::<suffix>
+        Ipv6Addr::from(u128::from(addr) | (1 << 112))
+    }
+
+    fn bootstrap_addr_to_prefix(addr: Ipv6Addr) -> Ipv6Addr {
+        // mask out lower 64 bits to form /64 prefix
+        Ipv6Addr::from(u128::from(addr) & ((u64::MAX as u128) << 64))
+    }
+
     // Check the services intended to run in the zone to determine whether any
     // physical links or vnics need to be mapped into the zone when it is
     // created. Returns a list of links, plus whether or not they need link
@@ -1714,6 +1725,23 @@ impl ServiceManager {
                 ServiceType::Tfport { pkt_source } => {
                     info!(self.inner.log, "Setting up tfport service");
 
+                    let techport_prefix =
+                        match bootstrap_name_and_address.as_ref() {
+                            Some((_, addr)) => Self::bootstrap_addr_to_prefix(
+                                Self::bootstrap_to_techport(*addr),
+                            ),
+                            None => {
+                                return Err(Error::BadServiceRequest {
+                                    service: "tfport".into(),
+                                    message: "bootstrap addr missing".into(),
+                                });
+                            }
+                        };
+
+                    smfh.setprop(
+                        "config/techport_prefix",
+                        techport_prefix.to_string(),
+                    )?;
                     smfh.setprop("config/pkt_source", pkt_source)?;
                     smfh.setprop(
                         "config/host",

tools/dendrite_openapi_version

@@ -1,2 +1,2 @@
-COMMIT="b9444d0c96ba5cb7108a6167a603dd75709441fb"
+COMMIT="b419dfb6dbcabbf9d20b4d001de59eaaed42d2e5"
 SHA2="ce1c8129d0cff9dce4a52d70d23ca5d46ed604e71523fccc6ca1925e74ff5ead"

tools/dendrite_stub_checksums

@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="a45a86d33e0a9da9954c5df7e3d0c335c0f2d48c4747b1c163a08b7c675650d9"
-CIDL_SHA256_LINUX_DPD="377f5e0e0791fa839b2287c08e98ec95feaa6d6ba001b8a6ce0525e6b3da0604"
-CIDL_SHA256_LINUX_SWADM="3dd18e31a55dccfeae27bed144d61bcb1929b160dfac20f3d66ae4b2170a5f9f"
+CIDL_SHA256_ILLUMOS="50c27f558b9820b1bf77b892c01df99924a89f6fd2114b1f01a16d5334abce3d"
+CIDL_SHA256_LINUX_DPD="1192c534241e59fd9c490cdb16866136af05af900006b4c6d919615b71742e4b"
+CIDL_SHA256_LINUX_SWADM="31707218a123663890b8c7df77722a99d8153c0fd8a02dee0b45f15be4e33a3a"