* [PATCH net-next v2 0/2] Add BPF numa id helper @ 2016-10-21 10:46 Daniel Borkmann 2016-10-21 10:46 ` [PATCH net-next v2 1/2] bpf: add helper for retrieving current numa node id Daniel Borkmann 2016-10-21 10:46 ` [PATCH net-next v2 2/2] reuseport, bpf: add test case for bpf_get_numa_node_id Daniel Borkmann 0 siblings, 2 replies; 6+ messages in thread From: Daniel Borkmann @ 2016-10-21 10:46 UTC (permalink / raw) To: davem; +Cc: alexei.starovoitov, edumazet, netdev, Daniel Borkmann This patch set adds a helper for retrieving current numa node id and a test case for SO_REUSEPORT. Thanks! v1 -> v2: - Missed __weak definition when bpf syscall is not enabled, sorry. - Rest as is. 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/core.c | 1 + 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 +++++++++++++++++++++++ 9 files changed, 287 insertions(+), 4 deletions(-) create mode 100644 tools/testing/selftests/net/reuseport_bpf_numa.c -- 1.9.3 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v2 1/2] bpf: add helper for retrieving current numa node id 2016-10-21 10:46 [PATCH net-next v2 0/2] Add BPF numa id helper Daniel Borkmann @ 2016-10-21 10:46 ` Daniel Borkmann 2016-10-21 11:29 ` Eric Dumazet 2016-10-21 10:46 ` [PATCH net-next v2 2/2] reuseport, bpf: add test case for bpf_get_numa_node_id Daniel Borkmann 1 sibling, 1 reply; 6+ messages in thread From: Daniel Borkmann @ 2016-10-21 10:46 UTC (permalink / raw) To: davem; +Cc: alexei.starovoitov, edumazet, netdev, Daniel Borkmann 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. Suggested-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Alexei Starovoitov <ast@kernel.org> --- include/linux/bpf.h | 1 + include/uapi/linux/bpf.h | 6 ++++++ kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 12 ++++++++++++ kernel/trace/bpf_trace.c | 2 ++ net/core/filter.c | 2 ++ 6 files changed, 24 insertions(+) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index c201017..edcd96d 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -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; diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index f09c70b..374ef58 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -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, }; diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index aa6d981..82a0414 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -1043,6 +1043,7 @@ void bpf_user_rnd_init_once(void) const struct bpf_func_proto bpf_get_prandom_u32_proto __weak; const struct bpf_func_proto bpf_get_smp_processor_id_proto __weak; +const struct bpf_func_proto bpf_get_numa_node_id_proto __weak; const struct bpf_func_proto bpf_ktime_get_ns_proto __weak; const struct bpf_func_proto bpf_get_current_pid_tgid_proto __weak; diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 3991840..045cbe6 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -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 */ diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 5dcb992..fa77311 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -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: diff --git a/net/core/filter.c b/net/core/filter.c index 00351cd..cd9e2ba 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -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: -- 1.9.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v2 1/2] bpf: add helper for retrieving current numa node id 2016-10-21 10:46 ` [PATCH net-next v2 1/2] bpf: add helper for retrieving current numa node id Daniel Borkmann @ 2016-10-21 11:29 ` Eric Dumazet 0 siblings, 0 replies; 6+ messages in thread From: Eric Dumazet @ 2016-10-21 11:29 UTC (permalink / raw) To: Daniel Borkmann; +Cc: davem, alexei.starovoitov, edumazet, netdev On Fri, 2016-10-21 at 12:46 +0200, Daniel Borkmann wrote: > 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. > > Suggested-by: Eric Dumazet <edumazet@google.com> > Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> > Acked-by: Alexei Starovoitov <ast@kernel.org> > --- Acked-by: Eric Dumazet <edumazet@google.com> Thanks Daniel ! ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v2 2/2] reuseport, bpf: add test case for bpf_get_numa_node_id 2016-10-21 10:46 [PATCH net-next v2 0/2] Add BPF numa id helper Daniel Borkmann 2016-10-21 10:46 ` [PATCH net-next v2 1/2] bpf: add helper for retrieving current numa node id Daniel Borkmann @ 2016-10-21 10:46 ` Daniel Borkmann 2016-10-21 11:08 ` Jiri Pirko 1 sibling, 1 reply; 6+ messages in thread From: Daniel Borkmann @ 2016-10-21 10:46 UTC (permalink / raw) To: davem; +Cc: alexei.starovoitov, edumazet, netdev, Daniel Borkmann The 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 Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Alexei Starovoitov <ast@kernel.org> --- 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 diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore index 0840684..afe109e 100644 --- a/tools/testing/selftests/net/.gitignore +++ b/tools/testing/selftests/net/.gitignore @@ -3,4 +3,5 @@ psock_fanout psock_tpacket reuseport_bpf reuseport_bpf_cpu +reuseport_bpf_numa reuseport_dualstack diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 0e53407..e24e4c8 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -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) diff --git a/tools/testing/selftests/net/reuseport_bpf_numa.c b/tools/testing/selftests/net/reuseport_bpf_numa.c new file mode 100644 index 0000000..6f20bc9 --- /dev/null +++ b/tools/testing/selftests/net/reuseport_bpf_numa.c @@ -0,0 +1,255 @@ +/* + * Test functionality of BPF filters with SO_REUSEPORT. Same test as + * in reuseport_bpf_cpu, only as one socket per NUMA node. + */ + +#define _GNU_SOURCE + +#include <arpa/inet.h> +#include <errno.h> +#include <error.h> +#include <linux/filter.h> +#include <linux/bpf.h> +#include <linux/in.h> +#include <linux/unistd.h> +#include <sched.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/epoll.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <unistd.h> +#include <numa.h> + +static const int PORT = 8888; + +static void build_rcv_group(int *rcv_fd, size_t len, int family, int proto) +{ + struct sockaddr_storage addr; + struct sockaddr_in *addr4; + struct sockaddr_in6 *addr6; + size_t i; + int opt; + + switch (family) { + case AF_INET: + addr4 = (struct sockaddr_in *)&addr; + addr4->sin_family = AF_INET; + addr4->sin_addr.s_addr = htonl(INADDR_ANY); + addr4->sin_port = htons(PORT); + break; + case AF_INET6: + addr6 = (struct sockaddr_in6 *)&addr; + addr6->sin6_family = AF_INET6; + addr6->sin6_addr = in6addr_any; + addr6->sin6_port = htons(PORT); + break; + default: + error(1, 0, "Unsupported family %d", family); + } + + for (i = 0; i < len; ++i) { + rcv_fd[i] = socket(family, proto, 0); + if (rcv_fd[i] < 0) + error(1, errno, "failed to create receive socket"); + + opt = 1; + if (setsockopt(rcv_fd[i], SOL_SOCKET, SO_REUSEPORT, &opt, + sizeof(opt))) + error(1, errno, "failed to set SO_REUSEPORT"); + + if (bind(rcv_fd[i], (struct sockaddr *)&addr, sizeof(addr))) + error(1, errno, "failed to bind receive socket"); + + if (proto == SOCK_STREAM && listen(rcv_fd[i], len * 10)) + error(1, errno, "failed to listen on receive port"); + } +} + +static void attach_bpf(int fd) +{ + static char bpf_log_buf[65536]; + static const char bpf_license[] = ""; + + int bpf_fd; + const struct bpf_insn prog[] = { + /* R0 = bpf_get_numa_node_id() */ + { BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_numa_node_id }, + /* return R0 */ + { BPF_JMP | BPF_EXIT, 0, 0, 0, 0 } + }; + union bpf_attr attr; + + memset(&attr, 0, sizeof(attr)); + attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER; + attr.insn_cnt = sizeof(prog) / sizeof(prog[0]); + attr.insns = (unsigned long) &prog; + attr.license = (unsigned long) &bpf_license; + attr.log_buf = (unsigned long) &bpf_log_buf; + attr.log_size = sizeof(bpf_log_buf); + attr.log_level = 1; + + bpf_fd = syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr)); + if (bpf_fd < 0) + error(1, errno, "ebpf error. log:\n%s\n", bpf_log_buf); + + if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_REUSEPORT_EBPF, &bpf_fd, + sizeof(bpf_fd))) + error(1, errno, "failed to set SO_ATTACH_REUSEPORT_EBPF"); + + close(bpf_fd); +} + +static void send_from_node(int node_id, int family, int proto) +{ + struct sockaddr_storage saddr, daddr; + struct sockaddr_in *saddr4, *daddr4; + struct sockaddr_in6 *saddr6, *daddr6; + int fd; + + switch (family) { + case AF_INET: + saddr4 = (struct sockaddr_in *)&saddr; + saddr4->sin_family = AF_INET; + saddr4->sin_addr.s_addr = htonl(INADDR_ANY); + saddr4->sin_port = 0; + + daddr4 = (struct sockaddr_in *)&daddr; + daddr4->sin_family = AF_INET; + daddr4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); + daddr4->sin_port = htons(PORT); + break; + case AF_INET6: + saddr6 = (struct sockaddr_in6 *)&saddr; + saddr6->sin6_family = AF_INET6; + saddr6->sin6_addr = in6addr_any; + saddr6->sin6_port = 0; + + daddr6 = (struct sockaddr_in6 *)&daddr; + daddr6->sin6_family = AF_INET6; + daddr6->sin6_addr = in6addr_loopback; + daddr6->sin6_port = htons(PORT); + break; + default: + error(1, 0, "Unsupported family %d", family); + } + + if (numa_run_on_node(node_id) < 0) + error(1, errno, "failed to pin to node"); + + fd = socket(family, proto, 0); + if (fd < 0) + error(1, errno, "failed to create send socket"); + + if (bind(fd, (struct sockaddr *)&saddr, sizeof(saddr))) + error(1, errno, "failed to bind send socket"); + + if (connect(fd, (struct sockaddr *)&daddr, sizeof(daddr))) + error(1, errno, "failed to connect send socket"); + + if (send(fd, "a", 1, 0) < 0) + error(1, errno, "failed to send message"); + + close(fd); +} + +static +void receive_on_node(int *rcv_fd, int len, int epfd, int node_id, int proto) +{ + struct epoll_event ev; + int i, fd; + char buf[8]; + + i = epoll_wait(epfd, &ev, 1, -1); + if (i < 0) + error(1, errno, "epoll_wait failed"); + + if (proto == SOCK_STREAM) { + fd = accept(ev.data.fd, NULL, NULL); + if (fd < 0) + error(1, errno, "failed to accept"); + i = recv(fd, buf, sizeof(buf), 0); + close(fd); + } else { + i = recv(ev.data.fd, buf, sizeof(buf), 0); + } + + if (i < 0) + error(1, errno, "failed to recv"); + + for (i = 0; i < len; ++i) + if (ev.data.fd == rcv_fd[i]) + break; + if (i == len) + error(1, 0, "failed to find socket"); + fprintf(stderr, "send node %d, receive socket %d\n", node_id, i); + if (node_id != i) + error(1, 0, "node id/receive socket mismatch"); +} + +static void test(int *rcv_fd, int len, int family, int proto) +{ + struct epoll_event ev; + int epfd, node; + + build_rcv_group(rcv_fd, len, family, proto); + attach_bpf(rcv_fd[0]); + + epfd = epoll_create(1); + if (epfd < 0) + error(1, errno, "failed to create epoll"); + for (node = 0; node < len; ++node) { + ev.events = EPOLLIN; + ev.data.fd = rcv_fd[node]; + if (epoll_ctl(epfd, EPOLL_CTL_ADD, rcv_fd[node], &ev)) + error(1, errno, "failed to register sock epoll"); + } + + /* Forward iterate */ + for (node = 0; node < len; ++node) { + send_from_node(node, family, proto); + receive_on_node(rcv_fd, len, epfd, node, proto); + } + + /* Reverse iterate */ + for (node = len - 1; node >= 0; --node) { + send_from_node(node, family, proto); + receive_on_node(rcv_fd, len, epfd, node, proto); + } + + close(epfd); + for (node = 0; node < len; ++node) + close(rcv_fd[node]); +} + +int main(void) +{ + int *rcv_fd, nodes; + + if (numa_available() < 0) + error(1, errno, "no numa api support"); + + nodes = numa_max_node() + 1; + + rcv_fd = calloc(nodes, sizeof(int)); + if (!rcv_fd) + error(1, 0, "failed to allocate array"); + + fprintf(stderr, "---- IPv4 UDP ----\n"); + test(rcv_fd, nodes, AF_INET, SOCK_DGRAM); + + fprintf(stderr, "---- IPv6 UDP ----\n"); + test(rcv_fd, nodes, AF_INET6, SOCK_DGRAM); + + fprintf(stderr, "---- IPv4 TCP ----\n"); + test(rcv_fd, nodes, AF_INET, SOCK_STREAM); + + fprintf(stderr, "---- IPv6 TCP ----\n"); + test(rcv_fd, nodes, AF_INET6, SOCK_STREAM); + + free(rcv_fd); + + fprintf(stderr, "SUCCESS\n"); + return 0; +} -- 1.9.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v2 2/2] reuseport, bpf: add test case for bpf_get_numa_node_id 2016-10-21 10:46 ` [PATCH net-next v2 2/2] reuseport, bpf: add test case for bpf_get_numa_node_id Daniel Borkmann @ 2016-10-21 11:08 ` Jiri Pirko 2016-10-21 11:22 ` Daniel Borkmann 0 siblings, 1 reply; 6+ messages in thread From: Jiri Pirko @ 2016-10-21 11:08 UTC (permalink / raw) To: Daniel Borkmann; +Cc: davem, alexei.starovoitov, edumazet, netdev Fri, Oct 21, 2016 at 12:46:34PM CEST, daniel@iogearbox.net wrote: >The 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 > >Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> >Acked-by: Alexei Starovoitov <ast@kernel.org> >--- > 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 > >diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore >index 0840684..afe109e 100644 >--- a/tools/testing/selftests/net/.gitignore >+++ b/tools/testing/selftests/net/.gitignore >@@ -3,4 +3,5 @@ psock_fanout > psock_tpacket > reuseport_bpf > reuseport_bpf_cpu >+reuseport_bpf_numa > reuseport_dualstack >diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile >index 0e53407..e24e4c8 100644 >--- a/tools/testing/selftests/net/Makefile >+++ b/tools/testing/selftests/net/Makefile >@@ -1,14 +1,17 @@ > # Makefile for net selftests > >-CFLAGS = -Wall -O2 -g >- >+CFLAGS = -Wall -Wl,--no-as-needed -O2 -g ^ why the extra space? > CFLAGS += -I../../../../usr/include/ > >-NET_PROGS = socket psock_fanout psock_tpacket reuseport_bpf reuseport_bpf_cpu reuseport_dualstack >+NET_PROGS = socket ^ yet again. Sorry for nitpicking :) >+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) >diff --git a/tools/testing/selftests/net/reuseport_bpf_numa.c b/tools/testing/selftests/net/reuseport_bpf_numa.c >new file mode 100644 >index 0000000..6f20bc9 >--- /dev/null >+++ b/tools/testing/selftests/net/reuseport_bpf_numa.c >@@ -0,0 +1,255 @@ >+/* >+ * Test functionality of BPF filters with SO_REUSEPORT. Same test as >+ * in reuseport_bpf_cpu, only as one socket per NUMA node. >+ */ >+ >+#define _GNU_SOURCE >+ >+#include <arpa/inet.h> >+#include <errno.h> >+#include <error.h> >+#include <linux/filter.h> >+#include <linux/bpf.h> >+#include <linux/in.h> >+#include <linux/unistd.h> >+#include <sched.h> >+#include <stdio.h> >+#include <stdlib.h> >+#include <string.h> >+#include <sys/epoll.h> >+#include <sys/types.h> >+#include <sys/socket.h> >+#include <unistd.h> >+#include <numa.h> >+ >+static const int PORT = 8888; >+ >+static void build_rcv_group(int *rcv_fd, size_t len, int family, int proto) >+{ >+ struct sockaddr_storage addr; >+ struct sockaddr_in *addr4; >+ struct sockaddr_in6 *addr6; >+ size_t i; >+ int opt; >+ >+ switch (family) { >+ case AF_INET: >+ addr4 = (struct sockaddr_in *)&addr; >+ addr4->sin_family = AF_INET; >+ addr4->sin_addr.s_addr = htonl(INADDR_ANY); >+ addr4->sin_port = htons(PORT); >+ break; >+ case AF_INET6: >+ addr6 = (struct sockaddr_in6 *)&addr; >+ addr6->sin6_family = AF_INET6; >+ addr6->sin6_addr = in6addr_any; >+ addr6->sin6_port = htons(PORT); >+ break; >+ default: >+ error(1, 0, "Unsupported family %d", family); >+ } >+ >+ for (i = 0; i < len; ++i) { >+ rcv_fd[i] = socket(family, proto, 0); >+ if (rcv_fd[i] < 0) >+ error(1, errno, "failed to create receive socket"); >+ >+ opt = 1; >+ if (setsockopt(rcv_fd[i], SOL_SOCKET, SO_REUSEPORT, &opt, >+ sizeof(opt))) >+ error(1, errno, "failed to set SO_REUSEPORT"); >+ >+ if (bind(rcv_fd[i], (struct sockaddr *)&addr, sizeof(addr))) >+ error(1, errno, "failed to bind receive socket"); >+ >+ if (proto == SOCK_STREAM && listen(rcv_fd[i], len * 10)) >+ error(1, errno, "failed to listen on receive port"); >+ } >+} >+ >+static void attach_bpf(int fd) >+{ >+ static char bpf_log_buf[65536]; >+ static const char bpf_license[] = ""; >+ >+ int bpf_fd; >+ const struct bpf_insn prog[] = { >+ /* R0 = bpf_get_numa_node_id() */ >+ { BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_numa_node_id }, >+ /* return R0 */ >+ { BPF_JMP | BPF_EXIT, 0, 0, 0, 0 } >+ }; >+ union bpf_attr attr; >+ >+ memset(&attr, 0, sizeof(attr)); >+ attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER; >+ attr.insn_cnt = sizeof(prog) / sizeof(prog[0]); >+ attr.insns = (unsigned long) &prog; >+ attr.license = (unsigned long) &bpf_license; >+ attr.log_buf = (unsigned long) &bpf_log_buf; >+ attr.log_size = sizeof(bpf_log_buf); >+ attr.log_level = 1; >+ >+ bpf_fd = syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr)); >+ if (bpf_fd < 0) >+ error(1, errno, "ebpf error. log:\n%s\n", bpf_log_buf); >+ >+ if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_REUSEPORT_EBPF, &bpf_fd, >+ sizeof(bpf_fd))) >+ error(1, errno, "failed to set SO_ATTACH_REUSEPORT_EBPF"); >+ >+ close(bpf_fd); >+} >+ >+static void send_from_node(int node_id, int family, int proto) >+{ >+ struct sockaddr_storage saddr, daddr; >+ struct sockaddr_in *saddr4, *daddr4; >+ struct sockaddr_in6 *saddr6, *daddr6; >+ int fd; >+ >+ switch (family) { >+ case AF_INET: >+ saddr4 = (struct sockaddr_in *)&saddr; >+ saddr4->sin_family = AF_INET; >+ saddr4->sin_addr.s_addr = htonl(INADDR_ANY); >+ saddr4->sin_port = 0; >+ >+ daddr4 = (struct sockaddr_in *)&daddr; >+ daddr4->sin_family = AF_INET; >+ daddr4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); >+ daddr4->sin_port = htons(PORT); >+ break; >+ case AF_INET6: >+ saddr6 = (struct sockaddr_in6 *)&saddr; >+ saddr6->sin6_family = AF_INET6; >+ saddr6->sin6_addr = in6addr_any; >+ saddr6->sin6_port = 0; >+ >+ daddr6 = (struct sockaddr_in6 *)&daddr; >+ daddr6->sin6_family = AF_INET6; >+ daddr6->sin6_addr = in6addr_loopback; >+ daddr6->sin6_port = htons(PORT); >+ break; >+ default: >+ error(1, 0, "Unsupported family %d", family); >+ } >+ >+ if (numa_run_on_node(node_id) < 0) >+ error(1, errno, "failed to pin to node"); >+ >+ fd = socket(family, proto, 0); >+ if (fd < 0) >+ error(1, errno, "failed to create send socket"); >+ >+ if (bind(fd, (struct sockaddr *)&saddr, sizeof(saddr))) >+ error(1, errno, "failed to bind send socket"); >+ >+ if (connect(fd, (struct sockaddr *)&daddr, sizeof(daddr))) >+ error(1, errno, "failed to connect send socket"); >+ >+ if (send(fd, "a", 1, 0) < 0) >+ error(1, errno, "failed to send message"); >+ >+ close(fd); >+} >+ >+static >+void receive_on_node(int *rcv_fd, int len, int epfd, int node_id, int proto) >+{ >+ struct epoll_event ev; >+ int i, fd; >+ char buf[8]; >+ >+ i = epoll_wait(epfd, &ev, 1, -1); >+ if (i < 0) >+ error(1, errno, "epoll_wait failed"); >+ >+ if (proto == SOCK_STREAM) { >+ fd = accept(ev.data.fd, NULL, NULL); >+ if (fd < 0) >+ error(1, errno, "failed to accept"); >+ i = recv(fd, buf, sizeof(buf), 0); >+ close(fd); >+ } else { >+ i = recv(ev.data.fd, buf, sizeof(buf), 0); >+ } >+ >+ if (i < 0) >+ error(1, errno, "failed to recv"); >+ >+ for (i = 0; i < len; ++i) >+ if (ev.data.fd == rcv_fd[i]) >+ break; >+ if (i == len) >+ error(1, 0, "failed to find socket"); >+ fprintf(stderr, "send node %d, receive socket %d\n", node_id, i); >+ if (node_id != i) >+ error(1, 0, "node id/receive socket mismatch"); >+} >+ >+static void test(int *rcv_fd, int len, int family, int proto) >+{ >+ struct epoll_event ev; >+ int epfd, node; >+ >+ build_rcv_group(rcv_fd, len, family, proto); >+ attach_bpf(rcv_fd[0]); >+ >+ epfd = epoll_create(1); >+ if (epfd < 0) >+ error(1, errno, "failed to create epoll"); >+ for (node = 0; node < len; ++node) { >+ ev.events = EPOLLIN; >+ ev.data.fd = rcv_fd[node]; >+ if (epoll_ctl(epfd, EPOLL_CTL_ADD, rcv_fd[node], &ev)) >+ error(1, errno, "failed to register sock epoll"); >+ } >+ >+ /* Forward iterate */ >+ for (node = 0; node < len; ++node) { >+ send_from_node(node, family, proto); >+ receive_on_node(rcv_fd, len, epfd, node, proto); >+ } >+ >+ /* Reverse iterate */ >+ for (node = len - 1; node >= 0; --node) { >+ send_from_node(node, family, proto); >+ receive_on_node(rcv_fd, len, epfd, node, proto); >+ } >+ >+ close(epfd); >+ for (node = 0; node < len; ++node) >+ close(rcv_fd[node]); >+} >+ >+int main(void) >+{ >+ int *rcv_fd, nodes; >+ >+ if (numa_available() < 0) >+ error(1, errno, "no numa api support"); >+ >+ nodes = numa_max_node() + 1; >+ >+ rcv_fd = calloc(nodes, sizeof(int)); >+ if (!rcv_fd) >+ error(1, 0, "failed to allocate array"); >+ >+ fprintf(stderr, "---- IPv4 UDP ----\n"); >+ test(rcv_fd, nodes, AF_INET, SOCK_DGRAM); >+ >+ fprintf(stderr, "---- IPv6 UDP ----\n"); >+ test(rcv_fd, nodes, AF_INET6, SOCK_DGRAM); >+ >+ fprintf(stderr, "---- IPv4 TCP ----\n"); >+ test(rcv_fd, nodes, AF_INET, SOCK_STREAM); >+ >+ fprintf(stderr, "---- IPv6 TCP ----\n"); >+ test(rcv_fd, nodes, AF_INET6, SOCK_STREAM); >+ >+ free(rcv_fd); >+ >+ fprintf(stderr, "SUCCESS\n"); >+ return 0; >+} >-- >1.9.3 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v2 2/2] reuseport, bpf: add test case for bpf_get_numa_node_id 2016-10-21 11:08 ` Jiri Pirko @ 2016-10-21 11:22 ` Daniel Borkmann 0 siblings, 0 replies; 6+ messages in thread From: Daniel Borkmann @ 2016-10-21 11:22 UTC (permalink / raw) To: Jiri Pirko; +Cc: davem, alexei.starovoitov, edumazet, netdev On 10/21/2016 01:08 PM, Jiri Pirko wrote: > Fri, Oct 21, 2016 at 12:46:34PM CEST, daniel@iogearbox.net wrote: >> The 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 >> >> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> >> Acked-by: Alexei Starovoitov <ast@kernel.org> >> --- >> 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 >> >> diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore >> index 0840684..afe109e 100644 >> --- a/tools/testing/selftests/net/.gitignore >> +++ b/tools/testing/selftests/net/.gitignore >> @@ -3,4 +3,5 @@ psock_fanout >> psock_tpacket >> reuseport_bpf >> reuseport_bpf_cpu >> +reuseport_bpf_numa >> reuseport_dualstack >> diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile >> index 0e53407..e24e4c8 100644 >> --- a/tools/testing/selftests/net/Makefile >> +++ b/tools/testing/selftests/net/Makefile >> @@ -1,14 +1,17 @@ >> # Makefile for net selftests >> >> -CFLAGS = -Wall -O2 -g >> - >> +CFLAGS = -Wall -Wl,--no-as-needed -O2 -g > > ^ why the extra space? > >> CFLAGS += -I../../../../usr/include/ >> >> -NET_PROGS = socket psock_fanout psock_tpacket reuseport_bpf reuseport_bpf_cpu reuseport_dualstack >> +NET_PROGS = socket > > ^ yet again. Sorry for nitpicking :) No strong opinion; did this so it aligns with the next lines: CFLAGS = -Wall -Wl,--no-as-needed -O2 -g CFLAGS += -I../../../../usr/include/ NET_PROGS = socket NET_PROGS += psock_fanout psock_tpacket NET_PROGS += reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa NET_PROGS += reuseport_dualstack ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-10-21 11:29 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-10-21 10:46 [PATCH net-next v2 0/2] Add BPF numa id helper Daniel Borkmann 2016-10-21 10:46 ` [PATCH net-next v2 1/2] bpf: add helper for retrieving current numa node id Daniel Borkmann 2016-10-21 11:29 ` Eric Dumazet 2016-10-21 10:46 ` [PATCH net-next v2 2/2] reuseport, bpf: add test case for bpf_get_numa_node_id Daniel Borkmann 2016-10-21 11:08 ` Jiri Pirko 2016-10-21 11:22 ` Daniel Borkmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).