Skip to content

Commit

Permalink
samples/bpf: fixup some tools to be able to support xdp multibuffer
Browse files Browse the repository at this point in the history
This changes the section name for the bpf program embedded in these
files to "xdp.frags" to allow the programs to be loaded on drivers that
are using an MTU greater than PAGE_SIZE.  Rather than directly accessing
the buffers, the packet data is now accessed via xdp helper functions to
provide an example for those who may need to write more complex
programs.

v2: remove new unnecessary variable

Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/r/20220621175402.35327-1-gospo@broadcom.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  • Loading branch information
Andy Gospodarek authored and Alexei Starovoitov committed Jun 22, 2022
1 parent d4609a5 commit 7722517
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
11 changes: 8 additions & 3 deletions samples/bpf/xdp1_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,23 @@ static int parse_ipv6(void *data, u64 nh_off, void *data_end)
return ip6h->nexthdr;
}

SEC("xdp1")
#define XDPBUFSIZE 64
SEC("xdp.frags")
int xdp_prog1(struct xdp_md *ctx)
{
void *data_end = (void *)(long)ctx->data_end;
void *data = (void *)(long)ctx->data;
__u8 pkt[XDPBUFSIZE] = {};
void *data_end = &pkt[XDPBUFSIZE-1];
void *data = pkt;
struct ethhdr *eth = data;
int rc = XDP_DROP;
long *value;
u16 h_proto;
u64 nh_off;
u32 ipproto;

if (bpf_xdp_load_bytes(ctx, 0, pkt, sizeof(pkt)))
return rc;

nh_off = sizeof(*eth);
if (data + nh_off > data_end)
return rc;
Expand Down
11 changes: 8 additions & 3 deletions samples/bpf/xdp2_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,23 @@ static int parse_ipv6(void *data, u64 nh_off, void *data_end)
return ip6h->nexthdr;
}

SEC("xdp1")
#define XDPBUFSIZE 64
SEC("xdp.frags")
int xdp_prog1(struct xdp_md *ctx)
{
void *data_end = (void *)(long)ctx->data_end;
void *data = (void *)(long)ctx->data;
__u8 pkt[XDPBUFSIZE] = {};
void *data_end = &pkt[XDPBUFSIZE-1];
void *data = pkt;
struct ethhdr *eth = data;
int rc = XDP_DROP;
long *value;
u16 h_proto;
u64 nh_off;
u32 ipproto;

if (bpf_xdp_load_bytes(ctx, 0, pkt, sizeof(pkt)))
return rc;

nh_off = sizeof(*eth);
if (data + nh_off > data_end)
return rc;
Expand Down
2 changes: 1 addition & 1 deletion samples/bpf/xdp_tx_iptunnel_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static __always_inline int handle_ipv6(struct xdp_md *xdp)
return XDP_TX;
}

SEC("xdp_tx_iptunnel")
SEC("xdp.frags")
int _xdp_tx_iptunnel(struct xdp_md *xdp)
{
void *data_end = (void *)(long)xdp->data_end;
Expand Down

0 comments on commit 7722517

Please sign in to comment.