Skip to content

Commit

Permalink
Exercise all new TCX APIs in the TCX integration test
Browse files Browse the repository at this point in the history 
Also removed unused code in the tcx eBPF program.

I've manually verified that all the programs get attached in the correct
order.

TODO: Add code to the integration test to automatically verify that the
programs are attached in the correct order after the API based on the
BPF_PROG_QUERY syscall has been implemented.

Signed-off-by: Andre Fredette <afredette@redhat.com>
  • Loading branch information
@anfredette
anfredette committed Sep 18, 2024
1 parent 5408f17 commit f5d4fde
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 139 deletions.
Empty file added macro.patch
View file
Empty file.
69 changes: 3 additions & 66 deletions test/integration-ebpf/src/tcx.rs
View file
Original file line number Diff line number Diff line change
@@ -1,74 +1,11 @@
#![no_std]
#![no_main]

use core::mem;

use aya_ebpf::{
bindings::tcx_action_base::{TCX_NEXT, TCX_PASS},
macros::classifier,
programs::TcContext,
};
use aya_log_ebpf::info;
use network_types::{
eth::{EthHdr, EtherType},
ip::{IpProto, Ipv4Hdr},
udp::UdpHdr,
};

#[no_mangle]
static ORDER: i32 = 0;

// Gives us raw pointers to a specific offset in the packet
unsafe fn ptr_at<T>(ctx: &TcContext, offset: usize) -> Result<*mut T, i64> {
let start = ctx.data();
let end = ctx.data_end();
let len = mem::size_of::<T>();

if start + offset + len > end {
return Err(TCX_PASS.into());
}
Ok((start + offset) as *mut T)
}
use aya_ebpf::{bindings::tcx_action_base::TCX_NEXT, macros::classifier, programs::TcContext};

#[classifier]
pub fn tcx_order(ctx: TcContext) -> i32 {
match try_tcxtest(ctx) {
Ok(ret) => ret,
Err(_ret) => TCX_PASS,
}
}

fn try_tcxtest(ctx: TcContext) -> Result<i32, i64> {
let eth_hdr: *const EthHdr = unsafe { ptr_at(&ctx, 0) }?;
let order = unsafe { core::ptr::read_volatile(&ORDER) };
match unsafe { *eth_hdr }.ether_type {
EtherType::Ipv4 => {
let ipv4_hdr: *const Ipv4Hdr = unsafe { ptr_at(&ctx, EthHdr::LEN)? };
let saddr = u32::from_be(unsafe { (*ipv4_hdr).src_addr });
let daddr = u32::from_be(unsafe { (*ipv4_hdr).dst_addr });
match unsafe { (*ipv4_hdr).proto } {
IpProto::Udp => {
let udphdr: *const UdpHdr =
unsafe { ptr_at(&ctx, EthHdr::LEN + Ipv4Hdr::LEN) }?;
let dport = u16::from_be(unsafe { (*udphdr).dest });
let sport = u16::from_be(unsafe { (*udphdr).source });
info!(
&ctx,
"order: {}, cookie: ({:i}, {:i}, {}, {})",
order,
daddr,
saddr,
dport,
sport
);

Ok(TCX_NEXT)
}
_ => Ok(TCX_PASS),
}
}
_ => Ok(TCX_PASS),
}
pub fn tcx_next(_ctx: TcContext) -> i32 {
TCX_NEXT
}

#[cfg(not(test))]
Expand Down
187 changes: 114 additions & 73 deletions test/integration-test/src/tests/tcx.rs
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
use std::collections::HashMap;

use aya::{
programs::{tc::TcAttachOptions, LinkOrder, SchedClassifier, TcAttachType},
programs::{
tc::{SchedClassifierLink, TcAttachOptions},
LinkOrder, ProgramId, SchedClassifier, TcAttachType,
},
util::KernelVersion,
EbpfLoader,
Ebpf, EbpfLoader,
};
use test_log::test;

use crate::utils::NetNsGuard;

#[test(tokio::test)]
async fn tcx_attach() {
async fn tcx() {
let kernel_version = KernelVersion::current().unwrap();
if kernel_version < KernelVersion::new(6, 6, 0) {
eprintln!("skipping tcx_attach test on kernel {kernel_version:?}");
Expand All @@ -17,77 +22,113 @@ async fn tcx_attach() {

let _netns = NetNsGuard::new();

let mut program0 = EbpfLoader::new()
.set_global("ORDER", &0, true)
.load(crate::TCX)
.unwrap();
let mut program1 = EbpfLoader::new()
.set_global("ORDER", &1, true)
.load(crate::TCX)
.unwrap();
let mut program2 = EbpfLoader::new()
.set_global("ORDER", &2, true)
.load(crate::TCX)
.unwrap();
let mut program3 = EbpfLoader::new()
.set_global("ORDER", &3, true)
.load(crate::TCX)
.unwrap();

let prog0: &mut SchedClassifier = program0
.program_mut("tcx_order")
.unwrap()
.try_into()
.unwrap();
prog0.load().unwrap();

let prog1: &mut SchedClassifier = program1
.program_mut("tcx_order")
.unwrap()
.try_into()
.unwrap();
prog1.load().unwrap();
// We need a dedicated `Ebpf` instance for each program that we load
// since TCX does not allow the same program ID to be attached multiple
// times to the same interface/direction.
let mut attached_programs: HashMap<&str, (Ebpf, SchedClassifierLink)> = HashMap::new();
macro_rules! attach_program_with_linkorder {
($name:literal,$link_order:expr) => {{
let mut loader = EbpfLoader::new().load(crate::TCX).unwrap();
let program: &mut SchedClassifier =
loader.program_mut("tcx_next").unwrap().try_into().unwrap();
program.load().unwrap();
let options = TcAttachOptions::TcxOrder($link_order);
let link_id = program
.attach_with_options("lo", TcAttachType::Ingress, options)
.unwrap();
let link = program.take_link(link_id).unwrap();
attached_programs.insert($name, (loader, link));
}};
}

let prog2: &mut SchedClassifier = program2
.program_mut("tcx_order")
// TODO: Assert in position 4 at the end of the test.
attach_program_with_linkorder!("default", LinkOrder::default());
// TODO: Assert in position 1 at the end of the test.
attach_program_with_linkorder!("first", LinkOrder::first());
// TODO: Assert in position 7 at the end of the test.
attach_program_with_linkorder!("last", LinkOrder::last());
// TODO: Assert in position 6 at the end of the test.
attach_program_with_linkorder!(
"before_last",
LinkOrder::before_link(&attached_programs.get("last").unwrap().1).unwrap()
);
// TODO: Assert in position 8 at the end of the test.
attach_program_with_linkorder!(
"after_last",
LinkOrder::after_link(&attached_programs.get("last").unwrap().1).unwrap()
);
// TODO: Assert in position 3 at the end of the test.
attach_program_with_linkorder!(
"before_default",
LinkOrder::before_program(
TryInto::<&SchedClassifier>::try_into(
attached_programs
.get("default")
.unwrap()
.0
.program("tcx_next")
.unwrap(),
)
.unwrap()
)
.unwrap()
.try_into()
.unwrap();
prog2.load().unwrap();

let prog3: &mut SchedClassifier = program3
.program_mut("tcx_order")
);
// TODO: Assert in position 5 at the end of the test.
attach_program_with_linkorder!(
"after_default",
LinkOrder::after_program(
TryInto::<&SchedClassifier>::try_into(
attached_programs
.get("default")
.unwrap()
.0
.program("tcx_next")
.unwrap(),
)
.unwrap()
)
.unwrap()
.try_into()
.unwrap();
prog3.load().unwrap();

// Test LinkOrder::last()
let order: LinkOrder = LinkOrder::last();
let options = TcAttachOptions::TcxOrder(order);
prog0
.attach_with_options("lo", TcAttachType::Ingress, options)
.unwrap();

// Test LinkOrder::after_program()
let order = LinkOrder::after_program(prog0).unwrap();
let options = TcAttachOptions::TcxOrder(order);
let prog1_link_id = prog1
.attach_with_options("lo", TcAttachType::Ingress, options)
.unwrap();

let prog1_link = prog1.take_link(prog1_link_id).unwrap();

// Test LinkOrder::after_link()
let order = LinkOrder::after_link(&prog1_link).unwrap();
let options = TcAttachOptions::TcxOrder(order);
prog2
.attach_with_options("lo", TcAttachType::Ingress, options)
.unwrap();

// Test LinkOrder::last()
let options = TcAttachOptions::TcxOrder(LinkOrder::last());
prog3
.attach_with_options("lo", TcAttachType::Ingress, options)
.unwrap();
);
// TODO: Assert in position 0 at the end of the test.
attach_program_with_linkorder!(
"before_first",
LinkOrder::before_program_id(unsafe {
ProgramId::new(
TryInto::<&SchedClassifier>::try_into(
attached_programs
.get("first")
.unwrap()
.0
.program("tcx_next")
.unwrap(),
)
.unwrap()
.info()
.unwrap()
.id(),
)
})
);
// TODO: Assert in position 2 at the end of the test.
attach_program_with_linkorder!(
"after_first",
LinkOrder::after_program_id(unsafe {
ProgramId::new(
TryInto::<&SchedClassifier>::try_into(
attached_programs
.get("first")
.unwrap()
.0
.program("tcx_next")
.unwrap(),
)
.unwrap()
.info()
.unwrap()
.id(),
)
})
);
// TODO: Add code here to automatically verify the order after the API based
// on the BPF_PROG_QUERY syscall is implemented.
}

0 comments on commit f5d4fde

Please sign in to comment.