Add BPF numa id helper
Subsystems (9)
Daniel Borkmann
maintainercover Add BPF numa id helper
This patch set adds a helper for retrieving current numa node id and a test case for SO_REUSEPORT.
Thanks!
Daniel Borkmann (2):
bpf: add helper for retrieving current numa node id reuseport, bpf: add test case for bpf_get_numa_node_id
include/linux/bpf.h | 1 + include/uapi/linux/bpf.h | 6 + kernel/bpf/helpers.c | 12 ++ kernel/trace/bpf_trace.c | 2 + net/core/filter.c | 2 + tools/testing/selftests/net/.gitignore | 1 + tools/testing/selftests/net/Makefile | 11 +- tools/testing/selftests/net/reuseport_bpf_numa.c | 255 +++++++++++++++++++++++ 8 files changed, 286 insertions(+), 4 deletions(-) create mode 100644 tools/testing/selftests/net/reuseport_bpf_numa.c
Signature · 1 line
1.9.3
Daniel Borkmann
maintainerPATCH 1/2 bpf: add helper for retrieving current numa node id
Use case is mainly for soreuseport to select sockets for the local numa node, but since generic, lets also add this for other networking and tracing program types.
--- include/linux/bpf.h | 1 + include/uapi/linux/bpf.h | 6 ++++++ kernel/bpf/helpers.c | 12 ++++++++++++ kernel/trace/bpf_trace.c | 2 ++ net/core/filter.c | 2 ++ 5 files changed, 23 insertions(+)
include/linux/bpf.h +1 -0
@@ -319,6 +319,7 @@ static inline struct bpf_prog *bpf_prog_inc(struct bpf_prog *prog)extern const struct bpf_func_proto bpf_get_prandom_u32_proto;extern const struct bpf_func_proto bpf_get_smp_processor_id_proto; +extern const struct bpf_func_proto bpf_get_numa_node_id_proto;extern const struct bpf_func_proto bpf_tail_call_proto;extern const struct bpf_func_proto bpf_ktime_get_ns_proto;extern const struct bpf_func_proto bpf_get_current_pid_tgid_proto;
include/uapi/linux/bpf.h +6 -0
@@ -426,6 +426,12 @@ enum bpf_func_id {*/ BPF_FUNC_set_hash_invalid, +/** +* bpf_get_numa_node_id() +* Returns the id of the current NUMA node. +*/ + BPF_FUNC_get_numa_node_id, + __BPF_FUNC_MAX_ID, };
kernel/bpf/helpers.c +12 -0
@@ -13,6 +13,7 @@#include <linux/rcupdate.h> #include <linux/random.h> #include <linux/smp.h> +#include <linux/topology.h> #include <linux/ktime.h> #include <linux/sched.h> #include <linux/uidgid.h>
@@ -92,6 +93,17 @@ .ret_type = RET_INTEGER, }; +BPF_CALL_0 (bpf_get_numa_node_id) +{ +return numa_node_id (); +} + +const struct bpf_func_proto bpf_get_numa_node_id_proto = { + .func = bpf_get_numa_node_id, + .gpl_only = false, + .ret_type =RET_INTEGER , +}; +BPF_CALL_0 (bpf_ktime_get_ns) {/* NMI safe access to clock monotonic */
kernel/trace/bpf_trace.c +2 -0
@@ -422,6 +422,8 @@ static const struct bpf_func_proto *tracing_func_proto(enum bpf_func_id func_id)return bpf_get_trace_printk_proto ();case BPF_FUNC_get_smp_processor_id:return &bpf_get_smp_processor_id_proto; +case BPF_FUNC_get_numa_node_id: +return &bpf_get_numa_node_id_proto;case BPF_FUNC_perf_event_read:return &bpf_perf_event_read_proto;case BPF_FUNC_probe_write_user:
net/core/filter.c +2 -0
@@ -2492,6 +2492,8 @@ static unsigned long bpf_xdp_copy(void *dst_buff, const void *src_buff,return &bpf_get_prandom_u32_proto;case BPF_FUNC_get_smp_processor_id:return &bpf_get_raw_smp_processor_id_proto; +case BPF_FUNC_get_numa_node_id: +return &bpf_get_numa_node_id_proto;case BPF_FUNC_tail_call:return &bpf_tail_call_proto;case BPF_FUNC_ktime_get_ns:
Signature · 1 line
1.9.3
Daniel Borkmann
maintainerPATCH 2/2 reuseport, bpf: add test case for bpf_get_numa_node_id
In reply to Daniel BorkmannThe test case is very similar to reuseport_bpf_cpu, only that here we select socket members based on current numa node id.
# numactl -H
available: 2 nodes (0-1)
node 0 cpus: 0 1 2 3 4 5 12 13 14 15 16 17
node 0 size: 128867 MB
node 0 free: 120080 MB
node 1 cpus: 6 7 8 9 10 11 18 19 20 21 22 23
node 1 size: 96765 MB
node 1 free: 87504 MB
node distances:
node 0 1
0: 10 20
1: 20 10# ./reuseport_bpf_numa ---- IPv4 UDP ---- send node 0, receive socket 0 send node 1, receive socket 1 send node 1, receive socket 1 send node 0, receive socket 0 ---- IPv6 UDP ---- send node 0, receive socket 0 send node 1, receive socket 1 send node 1, receive socket 1 send node 0, receive socket 0 ---- IPv4 TCP ---- send node 0, receive socket 0 send node 1, receive socket 1 send node 1, receive socket 1 send node 0, receive socket 0 ---- IPv6 TCP ---- send node 0, receive socket 0 send node 1, receive socket 1 send node 1, receive socket 1 send node 0, receive socket 0 SUCCESS
--- tools/testing/selftests/net/.gitignore | 1 + tools/testing/selftests/net/Makefile | 11 +- tools/testing/selftests/net/reuseport_bpf_numa.c | 255 +++++++++++++++++++++++ 3 files changed, 263 insertions(+), 4 deletions(-) create mode 100644 tools/testing/selftests/net/reuseport_bpf_numa.c
tools/testing/selftests/net/.gitignore +1 -0
@@ -3,4 +3,5 @@ psock_fanout psock_tpacket reuseport_bpf reuseport_bpf_cpu +reuseport_bpf_numa reuseport_dualstack
tools/testing/selftests/net/Makefile +7 -4
@@ -1,14 +1,17 @@ # Makefile for net selftests -CFLAGS = -Wall -O2 -g - +CFLAGS = -Wall -Wl,--no-as-needed -O2 -g CFLAGS += -I../../../../usr/include/ -NET_PROGS = socket psock_fanout psock_tpacket reuseport_bpf reuseport_bpf_cpu reuseport_dualstack +NET_PROGS = socket +NET_PROGS += psock_fanout psock_tpacket +NET_PROGS += reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa +NET_PROGS += reuseport_dualstack all: $(NET_PROGS) +reuseport_bpf_numa: LDFLAGS += -lnuma %: %.c - $(CC) $(CFLAGS) -o $@ $^ + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh TEST_FILES := $(NET_PROGS)
tools/testing/selftests/net/reuseport_bpf_numa.c new file +255 -0
255 lines not on this page · raw message
Signature · 1 line
1.9.3
David Miller
maintainerFrom: Daniel Borkmann <[email protected]>
Date: Fri, 21 Oct 2016 00:30:25 +0200
Quoted 2 lines
This patch set adds a helper for retrieving current numa node id and a test case for
SO_REUSEPORT.
Series applied.