Commit 248c7f9c authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Daniel Borkmann
Browse files

samples/bpf: convert xdpsock to use libbpf for AF_XDP access 



This commit converts the xdpsock sample application to use the AF_XDP
functions present in libbpf. This cuts down the size of it by nearly
300 lines of code.

The default ring sizes plus the batch size has been increased and the
size of the umem area has decreased. This so that the sample application
will provide higher throughput. Note also that the shared umem code
has been removed from the sample as this is not supported by libbpf
at this point in time.

Tested-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 1cad0788

samples/bpf/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ always += xdp2skb_meta_kern.o 
always += syscall_tp_kern.o

always += cpustat_kern.o

always += xdp_adjust_tail_kern.o

always += xdpsock_kern.o

always += xdp_fwd_kern.o

always += task_fd_query_kern.o

always += xdp_sample_pkts_kern.o

samples/bpf/xdpsock.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef XDPSOCK_H_

#define XDPSOCK_H_



/* Power-of-2 number of sockets */

#define MAX_SOCKS 4



/* Round-robin receive */

#define RR_LB 0



#endif /* XDPSOCK_H_ */

samples/bpf/xdpsock_kern.c

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#define KBUILD_MODNAME "foo"

#include <uapi/linux/bpf.h>

#include "bpf_helpers.h"



#include "xdpsock.h"



struct bpf_map_def SEC("maps") qidconf_map = {

	.type		= BPF_MAP_TYPE_ARRAY,

	.key_size	= sizeof(int),

	.value_size	= sizeof(int),

	.max_entries	= 1,

};



struct bpf_map_def SEC("maps") xsks_map = {

	.type = BPF_MAP_TYPE_XSKMAP,

	.key_size = sizeof(int),

	.value_size = sizeof(int),

	.max_entries = MAX_SOCKS,

};



struct bpf_map_def SEC("maps") rr_map = {

	.type = BPF_MAP_TYPE_PERCPU_ARRAY,

	.key_size = sizeof(int),

	.value_size = sizeof(unsigned int),

	.max_entries = 1,

};



SEC("xdp_sock")

int xdp_sock_prog(struct xdp_md *ctx)

{

	int *qidconf, key = 0, idx;

	unsigned int *rr;



	qidconf = bpf_map_lookup_elem(&qidconf_map, &key);

	if (!qidconf)

		return XDP_ABORTED;



	if (*qidconf != ctx->rx_queue_index)

		return XDP_PASS;



#if RR_LB /* NB! RR_LB is configured in xdpsock.h */

	rr = bpf_map_lookup_elem(&rr_map, &key);

	if (!rr)

		return XDP_ABORTED;



	*rr = (*rr + 1) & (MAX_SOCKS - 1);

	idx = *rr;

#else

	idx = 0;

#endif



	return bpf_redirect_map(&xsks_map, idx, 0);

}



char _license[] SEC("license") = "GPL";

samples/bpf/xdpsock_user.c

+261 −580

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE