Skip to content

fix LPM extraction for composite keys#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolaskagami merged 2 commits into from
Aug 26, 2026
Merged

fix LPM extraction for composite keys #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2685a33
fix lpm extraction and add vrf router test
nicolaskagami Aug 21, 2026
e12ac3c
fix typo
nicolaskagami Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions codegen/rust/src/pipeline.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -719,13 +719,16 @@ impl<'a> PipelineGenerator<'a> {
});
offset += 1; // for care/dontcare indicator
}
MatchKind::LongestPrefixMatch => keys.push(quote! {
p4rs::extract_lpm_key(
keyset_data,
#offset,
#sz,
)
}),
MatchKind::LongestPrefixMatch => {
keys.push(quote! {
p4rs::extract_lpm_key(
keyset_data,
#offset,
#sz,
)
});
offset += 1; // for the prefix length byte
}
MatchKind::Range => keys.push(quote! {
p4rs::extract_range_key(
keyset_data,
Expand Down
10 changes: 5 additions & 5 deletions lang/p4rs/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -334,23 +334,23 @@ pub fn extract_ternary_key(
pub fn extract_lpm_key(
keyset_data: &[u8],
offset: usize,
_len: usize,
len: usize,
) -> table::Key {
let (addr, len) = match keyset_data.len() {
let (addr, len) = match len {
// IPv4
5 => {
4 => {
let data: [u8; 4] =
keyset_data[offset..offset + 4].try_into().unwrap();
(IpAddr::from(data), keyset_data[offset + 4])
}
// IPv6
17 => {
16 => {
let data: [u8; 16] =
keyset_data[offset..offset + 16].try_into().unwrap();
(IpAddr::from(data), keyset_data[offset + 16])
}
x => {
panic!("lpm: key must be len 5 (ipv4) or 17 (ipv6) found {}", x);
panic!("lpm: data len must be 4 (ipv4) or 16 (ipv6) found {}", x);
}
};

Expand Down
2 changes: 2 additions & 0 deletions test/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ mod range;
mod table_in_egress_and_ingress;
#[cfg(test)]
mod vlan;
#[cfg(test)]
mod vrf_router;

pub mod data;
pub mod packet;
Expand Down
68 changes: 68 additions & 0 deletions test/src/p4/vrf_router.p4
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
#include <core.p4>
#include <softnpu.p4>
#include <headers.p4>

SoftNPU(
parse(),
ingress(),
egress()
) main;

struct headers_t {
ethernet_h ethernet;
ipv4_h ipv4;
}

parser parse(
packet_in pkt,
out headers_t hdr,
inout ingress_metadata_t ingress,
){
state start {
pkt.extract(hdr.ethernet);
if (hdr.ethernet.ether_type == 16w0x0800) {
transition ipv4;
}
transition reject;
}

state ipv4 {
pkt.extract(hdr.ipv4);
transition accept;
}
}

control ingress(
inout headers_t hdr,
inout ingress_metadata_t ingress,
inout egress_metadata_t egress,
) {
action forward(bit<16> port) {
egress.port = port;
}

// VRF segregated by ingress port
table vrf_router {
key = {
hdr.ipv4.dst: lpm;
ingress.port: exact;
}
actions = {
forward;
}
default_action = NoAction;
}

apply {
if (hdr.ipv4.isValid()) {
vrf_router.apply();
}
}
}

control egress(
inout headers_t hdr,
inout ingress_metadata_t ingress,
inout egress_metadata_t egress,
) {
}
118 changes: 118 additions & 0 deletions test/src/vrf_router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
use crate::softnpu::{Interface4, RxFrame, SoftNpu};
use crate::{expect_frames, muffins};
use std::net::Ipv4Addr;

p4_macro::use_p4!(
p4 = "test/src/p4/vrf_router.p4",
pipeline_name = "vrf_router",
);

// A simple VRF router with composite (lpm, exact) key.
//
// ~~~~~~~~~~
// ~ ~ * *=======*
// ~ p4 ~ | | |
// ~ ~ |---| phy 0 | vrf a
// ~~~~~~~~~~ | | |
// | | *=======*
// | | *=======*
// *==========* | | |
// | | <-- ( rx ) --- |---| phy 1 | vrf b
// | pipeline | | | |
// | | --- ( tx ) --> | *=======*
// *==========* | *=======*
// | | |
// |---| phy 2 |
// | | |
// | *=======*
// | *=======*
// | | |
// |---| phy 3 |
// | | |
// * *=======*
//

/// Return key bytes (prefix, length, exact)
fn vrf_key(prefix: Ipv4Addr, len: u8, port: u16) -> Vec<u8> {
let mut buf = prefix.octets().to_vec();
buf.push(len);
buf.extend_from_slice(&port.to_le_bytes());

buf
}

#[test]
fn vrf_router() -> Result<(), anyhow::Error> {
let mut pipeline = main_pipeline::new(4);

//
// add table entries
//

// vrf a (port 0): 10.1.0.0/16 -> port 2
let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 0);
pipeline.add_ingress_vrf_router_entry(
"forward",
&buf,
&2u16.to_le_bytes(),
0,
);

// vrf b (port 1): 10.1.0.0/16 -> port 3
let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 1);
pipeline.add_ingress_vrf_router_entry(
"forward",
&buf,
&3u16.to_le_bytes(),
0,
);

// vrf a (port 0): 10.1.1.0/24 -> port 1
let buf = vrf_key("10.1.1.0".parse().unwrap(), 24, 0);
pipeline.add_ingress_vrf_router_entry(
"forward",
&buf,
&1u16.to_le_bytes(),
0,
);

//
// run program
//

let mut npu = SoftNpu::new(4, pipeline, false);
let phy0 = npu.phy(0);
let phy1 = npu.phy(1);
let phy2 = npu.phy(2);
let phy3 = npu.phy(3);

let if0 = Interface4::new(phy0.clone(), "1.0.0.1".parse().unwrap());
let if1 = Interface4::new(phy1.clone(), "1.0.0.2".parse().unwrap());
let if2 = Interface4::new(phy2.clone(), "1.0.0.3".parse().unwrap());

npu.run();

let et = 0x0800;
let msg = muffins!();

// Each VRF routes this destination differently
if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.0)?;
expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.0)]);
if1.send(phy3.mac, "10.1.47.1".parse().unwrap(), msg.1)?;
expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.1)]);

// More specific match for vrf a
if0.send(phy1.mac, "10.1.1.1".parse().unwrap(), msg.2)?;
expect_frames!(phy1, &[RxFrame::new(phy0.mac, et, msg.2)]);

// No /24 for vrf b
if1.send(phy3.mac, "10.1.1.1".parse().unwrap(), msg.3)?;
expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.3)]);

// No match: should drop coming from port 2. Port 0 should go through.
if2.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.4)?;
if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.5)?;
expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.5)]);

Ok(())
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix LPM extraction for composite keys by nicolaskagami · Pull Request #272 · oxidecomputer/p4 · GitHub
Skip to content
fix LPM extraction for composite keys#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicolaskagami
merged 2 commits into

from

Aug 26, 2026
 Merged


fix LPM extraction for composite keys
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2685a33

fix lpm extraction and add vrf router test


nicolaskagami Aug 21, 2026
e12ac3c

fix typo


nicolaskagami Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 10 additions & 7 deletions
codegen/rust/src/pipeline.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -719,13 +719,16 @@ impl<'a> PipelineGenerator<'a> {
 });
 offset += 1; // for care/dontcare indicator
 }
 MatchKind::LongestPrefixMatch => keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 }),
 MatchKind::LongestPrefixMatch => {
 keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 });
 offset += 1; // for the prefix length byte
 }
 MatchKind::Range => keys.push(quote! {
 p4rs::extract_range_key(
 keyset_data,
Expand Down

10 changes: 5 additions & 5 deletions
lang/p4rs/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,23 +334,23 @@ pub fn extract_ternary_key(
pub fn extract_lpm_key(
 keyset_data: &[u8],
 offset: usize,
_len: usize,
len: usize,
) -> table::Key {
 let (addr, len) = match keyset_data.len() {
 let (addr, len) = match len {
 // IPv4
5 => {
4 => {
 let data: [u8; 4] =
 keyset_data[offset..offset + 4].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 4])
 }
 // IPv6
17 => {
16 => {
 let data: [u8; 16] =
 keyset_data[offset..offset + 16].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 16])
 }
 x => {
 panic!("lpm: key must be len 5 (ipv4) or 17 (ipv6) found {}", x);
 panic!("lpm: data len must be 4 (ipv4) or 16 (ipv6) found {}", x);
 }
 };

Expand Down

2 changes: 2 additions & 0 deletions
test/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ mod range;
mod table_in_egress_and_ingress;
#[cfg(test)]
mod vlan;
#[cfg(test)]
mod vrf_router;

pub mod data;
pub mod packet;
Expand Down

68 changes: 68 additions & 0 deletions
test/src/p4/vrf_router.p4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
#include <core.p4>
#include <softnpu.p4>
#include <headers.p4>

SoftNPU(
 parse(),
 ingress(),
 egress()
) main;

struct headers_t {
 ethernet_h ethernet;
 ipv4_h ipv4;
}

parser parse(
 packet_in pkt,
 out headers_t hdr,
 inout ingress_metadata_t ingress,
){
 state start {
 pkt.extract(hdr.ethernet);
 if (hdr.ethernet.ether_type == 16w0x0800) {
 transition ipv4;
 }
 transition reject;
 }

 state ipv4 {
 pkt.extract(hdr.ipv4);
 transition accept;
 }
}

control ingress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
 action forward(bit<16> port) {
 egress.port = port;
 }

 // VRF segregated by ingress port
 table vrf_router {
 key = {
 hdr.ipv4.dst: lpm;
 ingress.port: exact;
 }
 actions = {
 forward;
 }
 default_action = NoAction;
 }

 apply {
 if (hdr.ipv4.isValid()) {
 vrf_router.apply();
 }
 }
}

control egress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
}

118 changes: 118 additions & 0 deletions
test/src/vrf_router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
use crate::softnpu::{Interface4, RxFrame, SoftNpu};
use crate::{expect_frames, muffins};
use std::net::Ipv4Addr;

p4_macro::use_p4!(
 p4 = "test/src/p4/vrf_router.p4",
 pipeline_name = "vrf_router",
);

// A simple VRF router with composite (lpm, exact) key.
//
// ~~~~~~~~~~
// ~ ~ * *=======*
// ~ p4 ~ | | |
// ~ ~ |---| phy 0 | vrf a
// ~~~~~~~~~~ | | |
// | | *=======*
// | | *=======*
// *==========* | | |
// | | <-- ( rx ) --- |---| phy 1 | vrf b
// | pipeline | | | |
// | | --- ( tx ) --> | *=======*
// *==========* | *=======*
// | | |
// |---| phy 2 |
// | | |
// | *=======*
// | *=======*
// | | |
// |---| phy 3 |
// | | |
// * *=======*
//

/// Return key bytes (prefix, length, exact)
fn vrf_key(prefix: Ipv4Addr, len: u8, port: u16) -> Vec<u8> {
 let mut buf = prefix.octets().to_vec();
 buf.push(len);
 buf.extend_from_slice(&port.to_le_bytes());

 buf
}

#[test]
fn vrf_router() -> Result<(), anyhow::Error> {
 let mut pipeline = main_pipeline::new(4);

 //
 // add table entries
 //

 // vrf a (port 0): 10.1.0.0/16 -> port 2
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &2u16.to_le_bytes(),
 0,
 );

 // vrf b (port 1): 10.1.0.0/16 -> port 3
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 1);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &3u16.to_le_bytes(),
 0,
 );

 // vrf a (port 0): 10.1.1.0/24 -> port 1
 let buf = vrf_key("10.1.1.0".parse().unwrap(), 24, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &1u16.to_le_bytes(),
 0,
 );

 //
 // run program
 //

 let mut npu = SoftNpu::new(4, pipeline, false);
 let phy0 = npu.phy(0);
 let phy1 = npu.phy(1);
 let phy2 = npu.phy(2);
 let phy3 = npu.phy(3);

 let if0 = Interface4::new(phy0.clone(), "1.0.0.1".parse().unwrap());
 let if1 = Interface4::new(phy1.clone(), "1.0.0.2".parse().unwrap());
 let if2 = Interface4::new(phy2.clone(), "1.0.0.3".parse().unwrap());

 npu.run();

 let et = 0x0800;
 let msg = muffins!();

 // Each VRF routes this destination differently
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.0)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.0)]);
 if1.send(phy3.mac, "10.1.47.1".parse().unwrap(), msg.1)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.1)]);

 // More specific match for vrf a
 if0.send(phy1.mac, "10.1.1.1".parse().unwrap(), msg.2)?;
 expect_frames!(phy1, &[RxFrame::new(phy0.mac, et, msg.2)]);

 // No /24 for vrf b
 if1.send(phy3.mac, "10.1.1.1".parse().unwrap(), msg.3)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.3)]);

 // No match: should drop coming from port 2. Port 0 should go through.
 if2.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.4)?;
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.5)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.5)]);

 Ok(())
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix LPM extraction for composite keys by nicolaskagami · Pull Request #272 · oxidecomputer/p4 · GitHub
Skip to content
fix LPM extraction for composite keys#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicolaskagami
merged 2 commits into

from

Aug 26, 2026
 Merged


fix LPM extraction for composite keys
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2685a33

fix lpm extraction and add vrf router test


nicolaskagami Aug 21, 2026
e12ac3c

fix typo


nicolaskagami Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 10 additions & 7 deletions
codegen/rust/src/pipeline.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -719,13 +719,16 @@ impl<'a> PipelineGenerator<'a> {
 });
 offset += 1; // for care/dontcare indicator
 }
 MatchKind::LongestPrefixMatch => keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 }),
 MatchKind::LongestPrefixMatch => {
 keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 });
 offset += 1; // for the prefix length byte
 }
 MatchKind::Range => keys.push(quote! {
 p4rs::extract_range_key(
 keyset_data,
Expand Down

10 changes: 5 additions & 5 deletions
lang/p4rs/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,23 +334,23 @@ pub fn extract_ternary_key(
pub fn extract_lpm_key(
 keyset_data: &[u8],
 offset: usize,
_len: usize,
len: usize,
) -> table::Key {
 let (addr, len) = match keyset_data.len() {
 let (addr, len) = match len {
 // IPv4
5 => {
4 => {
 let data: [u8; 4] =
 keyset_data[offset..offset + 4].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 4])
 }
 // IPv6
17 => {
16 => {
 let data: [u8; 16] =
 keyset_data[offset..offset + 16].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 16])
 }
 x => {
 panic!("lpm: key must be len 5 (ipv4) or 17 (ipv6) found {}", x);
 panic!("lpm: data len must be 4 (ipv4) or 16 (ipv6) found {}", x);
 }
 };

Expand Down

2 changes: 2 additions & 0 deletions
test/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ mod range;
mod table_in_egress_and_ingress;
#[cfg(test)]
mod vlan;
#[cfg(test)]
mod vrf_router;

pub mod data;
pub mod packet;
Expand Down

68 changes: 68 additions & 0 deletions
test/src/p4/vrf_router.p4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
#include <core.p4>
#include <softnpu.p4>
#include <headers.p4>

SoftNPU(
 parse(),
 ingress(),
 egress()
) main;

struct headers_t {
 ethernet_h ethernet;
 ipv4_h ipv4;
}

parser parse(
 packet_in pkt,
 out headers_t hdr,
 inout ingress_metadata_t ingress,
){
 state start {
 pkt.extract(hdr.ethernet);
 if (hdr.ethernet.ether_type == 16w0x0800) {
 transition ipv4;
 }
 transition reject;
 }

 state ipv4 {
 pkt.extract(hdr.ipv4);
 transition accept;
 }
}

control ingress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
 action forward(bit<16> port) {
 egress.port = port;
 }

 // VRF segregated by ingress port
 table vrf_router {
 key = {
 hdr.ipv4.dst: lpm;
 ingress.port: exact;
 }
 actions = {
 forward;
 }
 default_action = NoAction;
 }

 apply {
 if (hdr.ipv4.isValid()) {
 vrf_router.apply();
 }
 }
}

control egress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
}

118 changes: 118 additions & 0 deletions
test/src/vrf_router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
use crate::softnpu::{Interface4, RxFrame, SoftNpu};
use crate::{expect_frames, muffins};
use std::net::Ipv4Addr;

p4_macro::use_p4!(
 p4 = "test/src/p4/vrf_router.p4",
 pipeline_name = "vrf_router",
);

// A simple VRF router with composite (lpm, exact) key.
//
// ~~~~~~~~~~
// ~ ~ * *=======*
// ~ p4 ~ | | |
// ~ ~ |---| phy 0 | vrf a
// ~~~~~~~~~~ | | |
// | | *=======*
// | | *=======*
// *==========* | | |
// | | <-- ( rx ) --- |---| phy 1 | vrf b
// | pipeline | | | |
// | | --- ( tx ) --> | *=======*
// *==========* | *=======*
// | | |
// |---| phy 2 |
// | | |
// | *=======*
// | *=======*
// | | |
// |---| phy 3 |
// | | |
// * *=======*
//

/// Return key bytes (prefix, length, exact)
fn vrf_key(prefix: Ipv4Addr, len: u8, port: u16) -> Vec<u8> {
 let mut buf = prefix.octets().to_vec();
 buf.push(len);
 buf.extend_from_slice(&port.to_le_bytes());

 buf
}

#[test]
fn vrf_router() -> Result<(), anyhow::Error> {
 let mut pipeline = main_pipeline::new(4);

 //
 // add table entries
 //

 // vrf a (port 0): 10.1.0.0/16 -> port 2
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &2u16.to_le_bytes(),
 0,
 );

 // vrf b (port 1): 10.1.0.0/16 -> port 3
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 1);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &3u16.to_le_bytes(),
 0,
 );

 // vrf a (port 0): 10.1.1.0/24 -> port 1
 let buf = vrf_key("10.1.1.0".parse().unwrap(), 24, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &1u16.to_le_bytes(),
 0,
 );

 //
 // run program
 //

 let mut npu = SoftNpu::new(4, pipeline, false);
 let phy0 = npu.phy(0);
 let phy1 = npu.phy(1);
 let phy2 = npu.phy(2);
 let phy3 = npu.phy(3);

 let if0 = Interface4::new(phy0.clone(), "1.0.0.1".parse().unwrap());
 let if1 = Interface4::new(phy1.clone(), "1.0.0.2".parse().unwrap());
 let if2 = Interface4::new(phy2.clone(), "1.0.0.3".parse().unwrap());

 npu.run();

 let et = 0x0800;
 let msg = muffins!();

 // Each VRF routes this destination differently
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.0)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.0)]);
 if1.send(phy3.mac, "10.1.47.1".parse().unwrap(), msg.1)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.1)]);

 // More specific match for vrf a
 if0.send(phy1.mac, "10.1.1.1".parse().unwrap(), msg.2)?;
 expect_frames!(phy1, &[RxFrame::new(phy0.mac, et, msg.2)]);

 // No /24 for vrf b
 if1.send(phy3.mac, "10.1.1.1".parse().unwrap(), msg.3)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.3)]);

 // No match: should drop coming from port 2. Port 0 should go through.
 if2.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.4)?;
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.5)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.5)]);

 Ok(())
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix LPM extraction for composite keys by nicolaskagami · Pull Request #272 · oxidecomputer/p4 · GitHub
Skip to content
fix LPM extraction for composite keys#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicolaskagami
merged 2 commits into

from

Aug 26, 2026
 Merged


fix LPM extraction for composite keys
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2685a33

fix lpm extraction and add vrf router test


nicolaskagami Aug 21, 2026
e12ac3c

fix typo


nicolaskagami Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 10 additions & 7 deletions
codegen/rust/src/pipeline.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -719,13 +719,16 @@ impl<'a> PipelineGenerator<'a> {
 });
 offset += 1; // for care/dontcare indicator
 }
 MatchKind::LongestPrefixMatch => keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 }),
 MatchKind::LongestPrefixMatch => {
 keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 });
 offset += 1; // for the prefix length byte
 }
 MatchKind::Range => keys.push(quote! {
 p4rs::extract_range_key(
 keyset_data,
Expand Down

10 changes: 5 additions & 5 deletions
lang/p4rs/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,23 +334,23 @@ pub fn extract_ternary_key(
pub fn extract_lpm_key(
 keyset_data: &[u8],
 offset: usize,
_len: usize,
len: usize,
) -> table::Key {
 let (addr, len) = match keyset_data.len() {
 let (addr, len) = match len {
 // IPv4
5 => {
4 => {
 let data: [u8; 4] =
 keyset_data[offset..offset + 4].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 4])
 }
 // IPv6
17 => {
16 => {
 let data: [u8; 16] =
 keyset_data[offset..offset + 16].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 16])
 }
 x => {
 panic!("lpm: key must be len 5 (ipv4) or 17 (ipv6) found {}", x);
 panic!("lpm: data len must be 4 (ipv4) or 16 (ipv6) found {}", x);
 }
 };

Expand Down

2 changes: 2 additions & 0 deletions
test/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ mod range;
mod table_in_egress_and_ingress;
#[cfg(test)]
mod vlan;
#[cfg(test)]
mod vrf_router;

pub mod data;
pub mod packet;
Expand Down

68 changes: 68 additions & 0 deletions
test/src/p4/vrf_router.p4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
#include <core.p4>
#include <softnpu.p4>
#include <headers.p4>

SoftNPU(
 parse(),
 ingress(),
 egress()
) main;

struct headers_t {
 ethernet_h ethernet;
 ipv4_h ipv4;
}

parser parse(
 packet_in pkt,
 out headers_t hdr,
 inout ingress_metadata_t ingress,
){
 state start {
 pkt.extract(hdr.ethernet);
 if (hdr.ethernet.ether_type == 16w0x0800) {
 transition ipv4;
 }
 transition reject;
 }

 state ipv4 {
 pkt.extract(hdr.ipv4);
 transition accept;
 }
}

control ingress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
 action forward(bit<16> port) {
 egress.port = port;
 }

 // VRF segregated by ingress port
 table vrf_router {
 key = {
 hdr.ipv4.dst: lpm;
 ingress.port: exact;
 }
 actions = {
 forward;
 }
 default_action = NoAction;
 }

 apply {
 if (hdr.ipv4.isValid()) {
 vrf_router.apply();
 }
 }
}

control egress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
}

118 changes: 118 additions & 0 deletions
test/src/vrf_router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
use crate::softnpu::{Interface4, RxFrame, SoftNpu};
use crate::{expect_frames, muffins};
use std::net::Ipv4Addr;

p4_macro::use_p4!(
 p4 = "test/src/p4/vrf_router.p4",
 pipeline_name = "vrf_router",
);

// A simple VRF router with composite (lpm, exact) key.
//
// ~~~~~~~~~~
// ~ ~ * *=======*
// ~ p4 ~ | | |
// ~ ~ |---| phy 0 | vrf a
// ~~~~~~~~~~ | | |
// | | *=======*
// | | *=======*
// *==========* | | |
// | | <-- ( rx ) --- |---| phy 1 | vrf b
// | pipeline | | | |
// | | --- ( tx ) --> | *=======*
// *==========* | *=======*
// | | |
// |---| phy 2 |
// | | |
// | *=======*
// | *=======*
// | | |
// |---| phy 3 |
// | | |
// * *=======*
//

/// Return key bytes (prefix, length, exact)
fn vrf_key(prefix: Ipv4Addr, len: u8, port: u16) -> Vec<u8> {
 let mut buf = prefix.octets().to_vec();
 buf.push(len);
 buf.extend_from_slice(&port.to_le_bytes());

 buf
}

#[test]
fn vrf_router() -> Result<(), anyhow::Error> {
 let mut pipeline = main_pipeline::new(4);

 //
 // add table entries
 //

 // vrf a (port 0): 10.1.0.0/16 -> port 2
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &2u16.to_le_bytes(),
 0,
 );

 // vrf b (port 1): 10.1.0.0/16 -> port 3
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 1);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &3u16.to_le_bytes(),
 0,
 );

 // vrf a (port 0): 10.1.1.0/24 -> port 1
 let buf = vrf_key("10.1.1.0".parse().unwrap(), 24, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &1u16.to_le_bytes(),
 0,
 );

 //
 // run program
 //

 let mut npu = SoftNpu::new(4, pipeline, false);
 let phy0 = npu.phy(0);
 let phy1 = npu.phy(1);
 let phy2 = npu.phy(2);
 let phy3 = npu.phy(3);

 let if0 = Interface4::new(phy0.clone(), "1.0.0.1".parse().unwrap());
 let if1 = Interface4::new(phy1.clone(), "1.0.0.2".parse().unwrap());
 let if2 = Interface4::new(phy2.clone(), "1.0.0.3".parse().unwrap());

 npu.run();

 let et = 0x0800;
 let msg = muffins!();

 // Each VRF routes this destination differently
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.0)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.0)]);
 if1.send(phy3.mac, "10.1.47.1".parse().unwrap(), msg.1)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.1)]);

 // More specific match for vrf a
 if0.send(phy1.mac, "10.1.1.1".parse().unwrap(), msg.2)?;
 expect_frames!(phy1, &[RxFrame::new(phy0.mac, et, msg.2)]);

 // No /24 for vrf b
 if1.send(phy3.mac, "10.1.1.1".parse().unwrap(), msg.3)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.3)]);

 // No match: should drop coming from port 2. Port 0 should go through.
 if2.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.4)?;
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.5)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.5)]);

 Ok(())
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix LPM extraction for composite keys by nicolaskagami · Pull Request #272 · oxidecomputer/p4 · GitHub
Skip to content
fix LPM extraction for composite keys#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicolaskagami
merged 2 commits into

from

Aug 26, 2026
 Merged


fix LPM extraction for composite keys
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2685a33

fix lpm extraction and add vrf router test


nicolaskagami Aug 21, 2026
e12ac3c

fix typo


nicolaskagami Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 10 additions & 7 deletions
codegen/rust/src/pipeline.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -719,13 +719,16 @@ impl<'a> PipelineGenerator<'a> {
 });
 offset += 1; // for care/dontcare indicator
 }
 MatchKind::LongestPrefixMatch => keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 }),
 MatchKind::LongestPrefixMatch => {
 keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 });
 offset += 1; // for the prefix length byte
 }
 MatchKind::Range => keys.push(quote! {
 p4rs::extract_range_key(
 keyset_data,
Expand Down

10 changes: 5 additions & 5 deletions
lang/p4rs/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,23 +334,23 @@ pub fn extract_ternary_key(
pub fn extract_lpm_key(
 keyset_data: &[u8],
 offset: usize,
_len: usize,
len: usize,
) -> table::Key {
 let (addr, len) = match keyset_data.len() {
 let (addr, len) = match len {
 // IPv4
5 => {
4 => {
 let data: [u8; 4] =
 keyset_data[offset..offset + 4].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 4])
 }
 // IPv6
17 => {
16 => {
 let data: [u8; 16] =
 keyset_data[offset..offset + 16].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 16])
 }
 x => {
 panic!("lpm: key must be len 5 (ipv4) or 17 (ipv6) found {}", x);
 panic!("lpm: data len must be 4 (ipv4) or 16 (ipv6) found {}", x);
 }
 };

Expand Down

2 changes: 2 additions & 0 deletions
test/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ mod range;
mod table_in_egress_and_ingress;
#[cfg(test)]
mod vlan;
#[cfg(test)]
mod vrf_router;

pub mod data;
pub mod packet;
Expand Down

68 changes: 68 additions & 0 deletions
test/src/p4/vrf_router.p4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
#include <core.p4>
#include <softnpu.p4>
#include <headers.p4>

SoftNPU(
 parse(),
 ingress(),
 egress()
) main;

struct headers_t {
 ethernet_h ethernet;
 ipv4_h ipv4;
}

parser parse(
 packet_in pkt,
 out headers_t hdr,
 inout ingress_metadata_t ingress,
){
 state start {
 pkt.extract(hdr.ethernet);
 if (hdr.ethernet.ether_type == 16w0x0800) {
 transition ipv4;
 }
 transition reject;
 }

 state ipv4 {
 pkt.extract(hdr.ipv4);
 transition accept;
 }
}

control ingress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
 action forward(bit<16> port) {
 egress.port = port;
 }

 // VRF segregated by ingress port
 table vrf_router {
 key = {
 hdr.ipv4.dst: lpm;
 ingress.port: exact;
 }
 actions = {
 forward;
 }
 default_action = NoAction;
 }

 apply {
 if (hdr.ipv4.isValid()) {
 vrf_router.apply();
 }
 }
}

control egress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
}

118 changes: 118 additions & 0 deletions
test/src/vrf_router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
use crate::softnpu::{Interface4, RxFrame, SoftNpu};
use crate::{expect_frames, muffins};
use std::net::Ipv4Addr;

p4_macro::use_p4!(
 p4 = "test/src/p4/vrf_router.p4",
 pipeline_name = "vrf_router",
);

// A simple VRF router with composite (lpm, exact) key.
//
// ~~~~~~~~~~
// ~ ~ * *=======*
// ~ p4 ~ | | |
// ~ ~ |---| phy 0 | vrf a
// ~~~~~~~~~~ | | |
// | | *=======*
// | | *=======*
// *==========* | | |
// | | <-- ( rx ) --- |---| phy 1 | vrf b
// | pipeline | | | |
// | | --- ( tx ) --> | *=======*
// *==========* | *=======*
// | | |
// |---| phy 2 |
// | | |
// | *=======*
// | *=======*
// | | |
// |---| phy 3 |
// | | |
// * *=======*
//

/// Return key bytes (prefix, length, exact)
fn vrf_key(prefix: Ipv4Addr, len: u8, port: u16) -> Vec<u8> {
 let mut buf = prefix.octets().to_vec();
 buf.push(len);
 buf.extend_from_slice(&port.to_le_bytes());

 buf
}

#[test]
fn vrf_router() -> Result<(), anyhow::Error> {
 let mut pipeline = main_pipeline::new(4);

 //
 // add table entries
 //

 // vrf a (port 0): 10.1.0.0/16 -> port 2
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &2u16.to_le_bytes(),
 0,
 );

 // vrf b (port 1): 10.1.0.0/16 -> port 3
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 1);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &3u16.to_le_bytes(),
 0,
 );

 // vrf a (port 0): 10.1.1.0/24 -> port 1
 let buf = vrf_key("10.1.1.0".parse().unwrap(), 24, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &1u16.to_le_bytes(),
 0,
 );

 //
 // run program
 //

 let mut npu = SoftNpu::new(4, pipeline, false);
 let phy0 = npu.phy(0);
 let phy1 = npu.phy(1);
 let phy2 = npu.phy(2);
 let phy3 = npu.phy(3);

 let if0 = Interface4::new(phy0.clone(), "1.0.0.1".parse().unwrap());
 let if1 = Interface4::new(phy1.clone(), "1.0.0.2".parse().unwrap());
 let if2 = Interface4::new(phy2.clone(), "1.0.0.3".parse().unwrap());

 npu.run();

 let et = 0x0800;
 let msg = muffins!();

 // Each VRF routes this destination differently
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.0)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.0)]);
 if1.send(phy3.mac, "10.1.47.1".parse().unwrap(), msg.1)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.1)]);

 // More specific match for vrf a
 if0.send(phy1.mac, "10.1.1.1".parse().unwrap(), msg.2)?;
 expect_frames!(phy1, &[RxFrame::new(phy0.mac, et, msg.2)]);

 // No /24 for vrf b
 if1.send(phy3.mac, "10.1.1.1".parse().unwrap(), msg.3)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.3)]);

 // No match: should drop coming from port 2. Port 0 should go through.
 if2.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.4)?;
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.5)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.5)]);

 Ok(())
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix LPM extraction for composite keys by nicolaskagami · Pull Request #272 · oxidecomputer/p4 · GitHub
Skip to content
fix LPM extraction for composite keys#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicolaskagami
merged 2 commits into

from

Aug 26, 2026
 Merged


fix LPM extraction for composite keys
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2685a33

fix lpm extraction and add vrf router test


nicolaskagami Aug 21, 2026
e12ac3c

fix typo


nicolaskagami Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 10 additions & 7 deletions
codegen/rust/src/pipeline.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -719,13 +719,16 @@ impl<'a> PipelineGenerator<'a> {
 });
 offset += 1; // for care/dontcare indicator
 }
 MatchKind::LongestPrefixMatch => keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 }),
 MatchKind::LongestPrefixMatch => {
 keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 });
 offset += 1; // for the prefix length byte
 }
 MatchKind::Range => keys.push(quote! {
 p4rs::extract_range_key(
 keyset_data,
Expand Down

10 changes: 5 additions & 5 deletions
lang/p4rs/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,23 +334,23 @@ pub fn extract_ternary_key(
pub fn extract_lpm_key(
 keyset_data: &[u8],
 offset: usize,
_len: usize,
len: usize,
) -> table::Key {
 let (addr, len) = match keyset_data.len() {
 let (addr, len) = match len {
 // IPv4
5 => {
4 => {
 let data: [u8; 4] =
 keyset_data[offset..offset + 4].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 4])
 }
 // IPv6
17 => {
16 => {
 let data: [u8; 16] =
 keyset_data[offset..offset + 16].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 16])
 }
 x => {
 panic!("lpm: key must be len 5 (ipv4) or 17 (ipv6) found {}", x);
 panic!("lpm: data len must be 4 (ipv4) or 16 (ipv6) found {}", x);
 }
 };

Expand Down

2 changes: 2 additions & 0 deletions
test/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ mod range;
mod table_in_egress_and_ingress;
#[cfg(test)]
mod vlan;
#[cfg(test)]
mod vrf_router;

pub mod data;
pub mod packet;
Expand Down

68 changes: 68 additions & 0 deletions
test/src/p4/vrf_router.p4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
#include <core.p4>
#include <softnpu.p4>
#include <headers.p4>

SoftNPU(
 parse(),
 ingress(),
 egress()
) main;

struct headers_t {
 ethernet_h ethernet;
 ipv4_h ipv4;
}

parser parse(
 packet_in pkt,
 out headers_t hdr,
 inout ingress_metadata_t ingress,
){
 state start {
 pkt.extract(hdr.ethernet);
 if (hdr.ethernet.ether_type == 16w0x0800) {
 transition ipv4;
 }
 transition reject;
 }

 state ipv4 {
 pkt.extract(hdr.ipv4);
 transition accept;
 }
}

control ingress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
 action forward(bit<16> port) {
 egress.port = port;
 }

 // VRF segregated by ingress port
 table vrf_router {
 key = {
 hdr.ipv4.dst: lpm;
 ingress.port: exact;
 }
 actions = {
 forward;
 }
 default_action = NoAction;
 }

 apply {
 if (hdr.ipv4.isValid()) {
 vrf_router.apply();
 }
 }
}

control egress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
}

118 changes: 118 additions & 0 deletions
test/src/vrf_router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
use crate::softnpu::{Interface4, RxFrame, SoftNpu};
use crate::{expect_frames, muffins};
use std::net::Ipv4Addr;

p4_macro::use_p4!(
 p4 = "test/src/p4/vrf_router.p4",
 pipeline_name = "vrf_router",
);

// A simple VRF router with composite (lpm, exact) key.
//
// ~~~~~~~~~~
// ~ ~ * *=======*
// ~ p4 ~ | | |
// ~ ~ |---| phy 0 | vrf a
// ~~~~~~~~~~ | | |
// | | *=======*
// | | *=======*
// *==========* | | |
// | | <-- ( rx ) --- |---| phy 1 | vrf b
// | pipeline | | | |
// | | --- ( tx ) --> | *=======*
// *==========* | *=======*
// | | |
// |---| phy 2 |
// | | |
// | *=======*
// | *=======*
// | | |
// |---| phy 3 |
// | | |
// * *=======*
//

/// Return key bytes (prefix, length, exact)
fn vrf_key(prefix: Ipv4Addr, len: u8, port: u16) -> Vec<u8> {
 let mut buf = prefix.octets().to_vec();
 buf.push(len);
 buf.extend_from_slice(&port.to_le_bytes());

 buf
}

#[test]
fn vrf_router() -> Result<(), anyhow::Error> {
 let mut pipeline = main_pipeline::new(4);

 //
 // add table entries
 //

 // vrf a (port 0): 10.1.0.0/16 -> port 2
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &2u16.to_le_bytes(),
 0,
 );

 // vrf b (port 1): 10.1.0.0/16 -> port 3
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 1);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &3u16.to_le_bytes(),
 0,
 );

 // vrf a (port 0): 10.1.1.0/24 -> port 1
 let buf = vrf_key("10.1.1.0".parse().unwrap(), 24, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &1u16.to_le_bytes(),
 0,
 );

 //
 // run program
 //

 let mut npu = SoftNpu::new(4, pipeline, false);
 let phy0 = npu.phy(0);
 let phy1 = npu.phy(1);
 let phy2 = npu.phy(2);
 let phy3 = npu.phy(3);

 let if0 = Interface4::new(phy0.clone(), "1.0.0.1".parse().unwrap());
 let if1 = Interface4::new(phy1.clone(), "1.0.0.2".parse().unwrap());
 let if2 = Interface4::new(phy2.clone(), "1.0.0.3".parse().unwrap());

 npu.run();

 let et = 0x0800;
 let msg = muffins!();

 // Each VRF routes this destination differently
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.0)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.0)]);
 if1.send(phy3.mac, "10.1.47.1".parse().unwrap(), msg.1)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.1)]);

 // More specific match for vrf a
 if0.send(phy1.mac, "10.1.1.1".parse().unwrap(), msg.2)?;
 expect_frames!(phy1, &[RxFrame::new(phy0.mac, et, msg.2)]);

 // No /24 for vrf b
 if1.send(phy3.mac, "10.1.1.1".parse().unwrap(), msg.3)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.3)]);

 // No match: should drop coming from port 2. Port 0 should go through.
 if2.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.4)?;
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.5)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.5)]);

 Ok(())
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix LPM extraction for composite keys by nicolaskagami · Pull Request #272 · oxidecomputer/p4 · GitHub
Skip to content
fix LPM extraction for composite keys#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicolaskagami
merged 2 commits into

from

Aug 26, 2026
 Merged


fix LPM extraction for composite keys
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2685a33

fix lpm extraction and add vrf router test


nicolaskagami Aug 21, 2026
e12ac3c

fix typo


nicolaskagami Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 10 additions & 7 deletions
codegen/rust/src/pipeline.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -719,13 +719,16 @@ impl<'a> PipelineGenerator<'a> {
 });
 offset += 1; // for care/dontcare indicator
 }
 MatchKind::LongestPrefixMatch => keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 }),
 MatchKind::LongestPrefixMatch => {
 keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 });
 offset += 1; // for the prefix length byte
 }
 MatchKind::Range => keys.push(quote! {
 p4rs::extract_range_key(
 keyset_data,
Expand Down

10 changes: 5 additions & 5 deletions
lang/p4rs/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,23 +334,23 @@ pub fn extract_ternary_key(
pub fn extract_lpm_key(
 keyset_data: &[u8],
 offset: usize,
_len: usize,
len: usize,
) -> table::Key {
 let (addr, len) = match keyset_data.len() {
 let (addr, len) = match len {
 // IPv4
5 => {
4 => {
 let data: [u8; 4] =
 keyset_data[offset..offset + 4].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 4])
 }
 // IPv6
17 => {
16 => {
 let data: [u8; 16] =
 keyset_data[offset..offset + 16].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 16])
 }
 x => {
 panic!("lpm: key must be len 5 (ipv4) or 17 (ipv6) found {}", x);
 panic!("lpm: data len must be 4 (ipv4) or 16 (ipv6) found {}", x);
 }
 };

Expand Down

2 changes: 2 additions & 0 deletions
test/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ mod range;
mod table_in_egress_and_ingress;
#[cfg(test)]
mod vlan;
#[cfg(test)]
mod vrf_router;

pub mod data;
pub mod packet;
Expand Down

68 changes: 68 additions & 0 deletions
test/src/p4/vrf_router.p4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
#include <core.p4>
#include <softnpu.p4>
#include <headers.p4>

SoftNPU(
 parse(),
 ingress(),
 egress()
) main;

struct headers_t {
 ethernet_h ethernet;
 ipv4_h ipv4;
}

parser parse(
 packet_in pkt,
 out headers_t hdr,
 inout ingress_metadata_t ingress,
){
 state start {
 pkt.extract(hdr.ethernet);
 if (hdr.ethernet.ether_type == 16w0x0800) {
 transition ipv4;
 }
 transition reject;
 }

 state ipv4 {
 pkt.extract(hdr.ipv4);
 transition accept;
 }
}

control ingress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
 action forward(bit<16> port) {
 egress.port = port;
 }

 // VRF segregated by ingress port
 table vrf_router {
 key = {
 hdr.ipv4.dst: lpm;
 ingress.port: exact;
 }
 actions = {
 forward;
 }
 default_action = NoAction;
 }

 apply {
 if (hdr.ipv4.isValid()) {
 vrf_router.apply();
 }
 }
}

control egress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
}

118 changes: 118 additions & 0 deletions
test/src/vrf_router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
use crate::softnpu::{Interface4, RxFrame, SoftNpu};
use crate::{expect_frames, muffins};
use std::net::Ipv4Addr;

p4_macro::use_p4!(
 p4 = "test/src/p4/vrf_router.p4",
 pipeline_name = "vrf_router",
);

// A simple VRF router with composite (lpm, exact) key.
//
// ~~~~~~~~~~
// ~ ~ * *=======*
// ~ p4 ~ | | |
// ~ ~ |---| phy 0 | vrf a
// ~~~~~~~~~~ | | |
// | | *=======*
// | | *=======*
// *==========* | | |
// | | <-- ( rx ) --- |---| phy 1 | vrf b
// | pipeline | | | |
// | | --- ( tx ) --> | *=======*
// *==========* | *=======*
// | | |
// |---| phy 2 |
// | | |
// | *=======*
// | *=======*
// | | |
// |---| phy 3 |
// | | |
// * *=======*
//

/// Return key bytes (prefix, length, exact)
fn vrf_key(prefix: Ipv4Addr, len: u8, port: u16) -> Vec<u8> {
 let mut buf = prefix.octets().to_vec();
 buf.push(len);
 buf.extend_from_slice(&port.to_le_bytes());

 buf
}

#[test]
fn vrf_router() -> Result<(), anyhow::Error> {
 let mut pipeline = main_pipeline::new(4);

 //
 // add table entries
 //

 // vrf a (port 0): 10.1.0.0/16 -> port 2
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &2u16.to_le_bytes(),
 0,
 );

 // vrf b (port 1): 10.1.0.0/16 -> port 3
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 1);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &3u16.to_le_bytes(),
 0,
 );

 // vrf a (port 0): 10.1.1.0/24 -> port 1
 let buf = vrf_key("10.1.1.0".parse().unwrap(), 24, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &1u16.to_le_bytes(),
 0,
 );

 //
 // run program
 //

 let mut npu = SoftNpu::new(4, pipeline, false);
 let phy0 = npu.phy(0);
 let phy1 = npu.phy(1);
 let phy2 = npu.phy(2);
 let phy3 = npu.phy(3);

 let if0 = Interface4::new(phy0.clone(), "1.0.0.1".parse().unwrap());
 let if1 = Interface4::new(phy1.clone(), "1.0.0.2".parse().unwrap());
 let if2 = Interface4::new(phy2.clone(), "1.0.0.3".parse().unwrap());

 npu.run();

 let et = 0x0800;
 let msg = muffins!();

 // Each VRF routes this destination differently
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.0)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.0)]);
 if1.send(phy3.mac, "10.1.47.1".parse().unwrap(), msg.1)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.1)]);

 // More specific match for vrf a
 if0.send(phy1.mac, "10.1.1.1".parse().unwrap(), msg.2)?;
 expect_frames!(phy1, &[RxFrame::new(phy0.mac, et, msg.2)]);

 // No /24 for vrf b
 if1.send(phy3.mac, "10.1.1.1".parse().unwrap(), msg.3)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.3)]);

 // No match: should drop coming from port 2. Port 0 should go through.
 if2.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.4)?;
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.5)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.5)]);

 Ok(())
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix LPM extraction for composite keys by nicolaskagami · Pull Request #272 · oxidecomputer/p4 · GitHub
Skip to content
fix LPM extraction for composite keys#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicolaskagami
merged 2 commits into

from

Aug 26, 2026
 Merged


fix LPM extraction for composite keys
#272
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2685a33

fix lpm extraction and add vrf router test


nicolaskagami Aug 21, 2026
e12ac3c

fix typo


nicolaskagami Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 10 additions & 7 deletions
codegen/rust/src/pipeline.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -719,13 +719,16 @@ impl<'a> PipelineGenerator<'a> {
 });
 offset += 1; // for care/dontcare indicator
 }
 MatchKind::LongestPrefixMatch => keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 }),
 MatchKind::LongestPrefixMatch => {
 keys.push(quote! {
 p4rs::extract_lpm_key(
 keyset_data,
 #offset,
 #sz,
 )
 });
 offset += 1; // for the prefix length byte
 }
 MatchKind::Range => keys.push(quote! {
 p4rs::extract_range_key(
 keyset_data,
Expand Down

10 changes: 5 additions & 5 deletions
lang/p4rs/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,23 +334,23 @@ pub fn extract_ternary_key(
pub fn extract_lpm_key(
 keyset_data: &[u8],
 offset: usize,
_len: usize,
len: usize,
) -> table::Key {
 let (addr, len) = match keyset_data.len() {
 let (addr, len) = match len {
 // IPv4
5 => {
4 => {
 let data: [u8; 4] =
 keyset_data[offset..offset + 4].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 4])
 }
 // IPv6
17 => {
16 => {
 let data: [u8; 16] =
 keyset_data[offset..offset + 16].try_into().unwrap();
 (IpAddr::from(data), keyset_data[offset + 16])
 }
 x => {
 panic!("lpm: key must be len 5 (ipv4) or 17 (ipv6) found {}", x);
 panic!("lpm: data len must be 4 (ipv4) or 16 (ipv6) found {}", x);
 }
 };

Expand Down

2 changes: 2 additions & 0 deletions
test/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ mod range;
mod table_in_egress_and_ingress;
#[cfg(test)]
mod vlan;
#[cfg(test)]
mod vrf_router;

pub mod data;
pub mod packet;
Expand Down

68 changes: 68 additions & 0 deletions
test/src/p4/vrf_router.p4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
#include <core.p4>
#include <softnpu.p4>
#include <headers.p4>

SoftNPU(
 parse(),
 ingress(),
 egress()
) main;

struct headers_t {
 ethernet_h ethernet;
 ipv4_h ipv4;
}

parser parse(
 packet_in pkt,
 out headers_t hdr,
 inout ingress_metadata_t ingress,
){
 state start {
 pkt.extract(hdr.ethernet);
 if (hdr.ethernet.ether_type == 16w0x0800) {
 transition ipv4;
 }
 transition reject;
 }

 state ipv4 {
 pkt.extract(hdr.ipv4);
 transition accept;
 }
}

control ingress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
 action forward(bit<16> port) {
 egress.port = port;
 }

 // VRF segregated by ingress port
 table vrf_router {
 key = {
 hdr.ipv4.dst: lpm;
 ingress.port: exact;
 }
 actions = {
 forward;
 }
 default_action = NoAction;
 }

 apply {
 if (hdr.ipv4.isValid()) {
 vrf_router.apply();
 }
 }
}

control egress(
 inout headers_t hdr,
 inout ingress_metadata_t ingress,
 inout egress_metadata_t egress,
) {
}

118 changes: 118 additions & 0 deletions
test/src/vrf_router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
use crate::softnpu::{Interface4, RxFrame, SoftNpu};
use crate::{expect_frames, muffins};
use std::net::Ipv4Addr;

p4_macro::use_p4!(
 p4 = "test/src/p4/vrf_router.p4",
 pipeline_name = "vrf_router",
);

// A simple VRF router with composite (lpm, exact) key.
//
// ~~~~~~~~~~
// ~ ~ * *=======*
// ~ p4 ~ | | |
// ~ ~ |---| phy 0 | vrf a
// ~~~~~~~~~~ | | |
// | | *=======*
// | | *=======*
// *==========* | | |
// | | <-- ( rx ) --- |---| phy 1 | vrf b
// | pipeline | | | |
// | | --- ( tx ) --> | *=======*
// *==========* | *=======*
// | | |
// |---| phy 2 |
// | | |
// | *=======*
// | *=======*
// | | |
// |---| phy 3 |
// | | |
// * *=======*
//

/// Return key bytes (prefix, length, exact)
fn vrf_key(prefix: Ipv4Addr, len: u8, port: u16) -> Vec<u8> {
 let mut buf = prefix.octets().to_vec();
 buf.push(len);
 buf.extend_from_slice(&port.to_le_bytes());

 buf
}

#[test]
fn vrf_router() -> Result<(), anyhow::Error> {
 let mut pipeline = main_pipeline::new(4);

 //
 // add table entries
 //

 // vrf a (port 0): 10.1.0.0/16 -> port 2
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &2u16.to_le_bytes(),
 0,
 );

 // vrf b (port 1): 10.1.0.0/16 -> port 3
 let buf = vrf_key("10.1.0.0".parse().unwrap(), 16, 1);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &3u16.to_le_bytes(),
 0,
 );

 // vrf a (port 0): 10.1.1.0/24 -> port 1
 let buf = vrf_key("10.1.1.0".parse().unwrap(), 24, 0);
 pipeline.add_ingress_vrf_router_entry(
 "forward",
 &buf,
 &1u16.to_le_bytes(),
 0,
 );

 //
 // run program
 //

 let mut npu = SoftNpu::new(4, pipeline, false);
 let phy0 = npu.phy(0);
 let phy1 = npu.phy(1);
 let phy2 = npu.phy(2);
 let phy3 = npu.phy(3);

 let if0 = Interface4::new(phy0.clone(), "1.0.0.1".parse().unwrap());
 let if1 = Interface4::new(phy1.clone(), "1.0.0.2".parse().unwrap());
 let if2 = Interface4::new(phy2.clone(), "1.0.0.3".parse().unwrap());

 npu.run();

 let et = 0x0800;
 let msg = muffins!();

 // Each VRF routes this destination differently
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.0)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.0)]);
 if1.send(phy3.mac, "10.1.47.1".parse().unwrap(), msg.1)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.1)]);

 // More specific match for vrf a
 if0.send(phy1.mac, "10.1.1.1".parse().unwrap(), msg.2)?;
 expect_frames!(phy1, &[RxFrame::new(phy0.mac, et, msg.2)]);

 // No /24 for vrf b
 if1.send(phy3.mac, "10.1.1.1".parse().unwrap(), msg.3)?;
 expect_frames!(phy3, &[RxFrame::new(phy1.mac, et, msg.3)]);

 // No match: should drop coming from port 2. Port 0 should go through.
 if2.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.4)?;
 if0.send(phy2.mac, "10.1.47.1".parse().unwrap(), msg.5)?;
 expect_frames!(phy2, &[RxFrame::new(phy0.mac, et, msg.5)]);

 Ok(())
}