bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_SOCK_OPS
Subsystems (6)
v2 cover bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_SOCK_OPS
v2: Added selftests
Xu Liu (2):
bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_SOCK_OPS selftests/bpf: Test for get_netns_cookie
net/core/filter.c | 14 +++++ .../selftests/bpf/prog_tests/netns_cookie.c | 61 +++++++++++++++++++ .../selftests/bpf/progs/netns_cookie_prog.c | 39 ++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/netns_cookie.c create mode 100644 tools/testing/selftests/bpf/progs/netns_cookie_prog.c
Signature · 1 line
2.28.0
PATCH v2 1/2 bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_SOCK_OPS
We'd like to be able to identify netns from sockops hooks to accelerate local process communication form different netns.
--- net/core/filter.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
net/core/filter.c +14 -0
@@ -4664,6 +4664,18 @@ static const struct bpf_func_proto bpf_get_netns_cookie_sock_addr_proto = { .arg1_type = ARG_PTR_TO_CTX_OR_NULL, }; +BPF_CALL_1(bpf_get_netns_cookie_sock_ops, struct bpf_sock_ops_kern *, ctx) +{ +return __bpf_get_netns_cookie (ctx ? ctx->sk :NULL ); +} + +static const struct bpf_func_proto bpf_get_netns_cookie_sock_ops_proto = { + .func = bpf_get_netns_cookie_sock_ops, + .gpl_only = false, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_CTX_OR_NULL , +}; + BPF_CALL_1(bpf_get_socket_uid, struct sk_buff *, skb) {struct sock *sk =sk_to_full_sk (skb->sk);
@@ -7445,6 +7457,8 @@ sock_ops_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)return &bpf_sk_storage_get_proto;case BPF_FUNC_sk_storage_delete:return &bpf_sk_storage_delete_proto; +case BPF_FUNC_get_netns_cookie: +return &bpf_get_netns_cookie_sock_ops_proto;#ifdef CONFIG_INET case BPF_FUNC_load_hdr_opt:return &bpf_sock_ops_load_hdr_opt_proto;
Signature · 1 line
2.28.0
Quoted 5 lines · Xu Liu
We'd like to be able to identify netns from sockops hooks to accelerate local process communication form different netns.
Signed-off-by Xu Liu <[email protected]>
Quoted 39 lines
--- net/core/filter.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)net/core/filter.c +14
-1@@ -4664,6 +4664,18 @@ static const struct bpf_func_proto bpf_get_netns_cookie_sock_addr_proto = { .arg1_type = ARG_PTR_TO_CTX_OR_NULL, }; +BPF_CALL_1(bpf_get_netns_cookie_sock_ops, struct bpf_sock_ops_kern *, ctx) +{ +return __bpf_get_netns_cookie (ctx ? ctx->sk :NULL ); +} + +static const struct bpf_func_proto bpf_get_netns_cookie_sock_ops_proto = { + .func = bpf_get_netns_cookie_sock_ops, + .gpl_only = false, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_CTX_OR_NULL , +}; + BPF_CALL_1(bpf_get_socket_uid, struct sk_buff *, skb) {struct sock *sk =sk_to_full_sk (skb->sk);@@ -7445,6 +7457,8 @@ sock_ops_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)return &bpf_sk_storage_get_proto;case BPF_FUNC_sk_storage_delete:return &bpf_sk_storage_delete_proto; +case BPF_FUNC_get_netns_cookie: +return &bpf_get_netns_cookie_sock_ops_proto;#ifdef CONFIG_INET case BPF_FUNC_load_hdr_opt:return &bpf_sock_ops_load_hdr_opt_proto; --2.28.0
PATCH v2 2/2 selftests/bpf: Test for get_netns_cookie
In reply to Xu LiuAdd test to use get_netns_cookie() from BPF_PROG_TYPE_SOCK_OPS.
--- .../selftests/bpf/prog_tests/netns_cookie.c | 61 +++++++++++++++++++ .../selftests/bpf/progs/netns_cookie_prog.c | 39 ++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/netns_cookie.c create mode 100644 tools/testing/selftests/bpf/progs/netns_cookie_prog.c
tools/testing/selftests/bpf/prog_tests/netns_cookie.c new file +61 -0
@@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <test_progs.h> +#include "netns_cookie_prog.skel.h" +#include "network_helpers.h" + +#ifndef SO_NETNS_COOKIE +#define SO_NETNS_COOKIE 71 +#endif + +static int duration; + +void test_netns_cookie (void ) +{ +int server_fd =0 , client_fd =0 , cgroup_fd =0 , err =0 , val =0 ; +struct netns_cookie_prog *skel; +uint64_t cookie_expected_value; +socklen_t vallen =sizeof (cookie_expected_value); + + skel =netns_cookie_prog__open_and_load (); +if (!ASSERT_OK_PTR (skel,"skel_open" )) +return ; + + cgroup_fd =test__join_cgroup ("/netns_cookie" ); +if (CHECK (cgroup_fd <0 ,"join_cgroup" ,"cgroup creation failed\n" )) + goto out; + + skel->links.get_netns_cookie_sockops =bpf_program__attach_cgroup ( + skel->progs.get_netns_cookie_sockops, cgroup_fd); +if (!ASSERT_OK_PTR (skel->links.get_netns_cookie_sockops,"prog_attach" )) + goto close_cgroup_fd; + + server_fd =start_server (AF_INET6 ,SOCK_STREAM ,"::1" ,0 ,0 ); +if (CHECK (server_fd <0 ,"start_server" ,"errno %d\n" , errno)) + goto close_cgroup_fd; + + client_fd =connect_to_fd (server_fd,0 ); +if (CHECK (client_fd <0 ,"connect_to_fd" ,"errno %d\n" , errno)) + goto close_server_fd; + + err =bpf_map_lookup_elem (bpf_map__fd (skel->maps.netns_cookies), + &client_fd, &val); +if (!ASSERT_OK (err,"map_lookup(socket_cookies)" )) + goto close_client_fd; + + err =getsockopt (client_fd,SOL_SOCKET ,SO_NETNS_COOKIE , + &cookie_expected_value, &vallen); +if (!ASSERT_OK (err,"getsockopt)" )) + goto close_client_fd; + +ASSERT_EQ (val, cookie_expected_value,"cookie_value" ); + +close_client_fd: +close (client_fd); +close_server_fd: +close (server_fd); +close_cgroup_fd: +close (cgroup_fd); +out: +netns_cookie_prog__destroy (skel); +}
tools/testing/selftests/bpf/progs/netns_cookie_prog.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "vmlinux.h" + +#include <bpf/bpf_helpers.h> + +#define AF_INET6 10 + +struct { + __uint(type, BPF_MAP_TYPE_SK_STORAGE); + __uint(map_flags, BPF_F_NO_PREALLOC); + __type(key, int); + __type(value, int); +} netns_cookies SEC(".maps"); + +SEC("sockops") +int get_netns_cookie_sockops (struct bpf_sock_ops *ctx) +{ +struct bpf_sock *sk = ctx->sk; +int *cookie; + +if (ctx->family !=AF_INET6 ) +return 1 ; + +if (ctx->op !=BPF_SOCK_OPS_TCP_CONNECT_CB ) +return 1 ; + +if (!sk) +return 1 ; + + cookie =bpf_sk_storage_get (&netns_cookies, sk,0 , +BPF_SK_STORAGE_GET_F_CREATE ); +if (!cookie) +return 1 ; + + *cookie =bpf_get_netns_cookie (ctx); + +return 1 ; +}
Signature · 1 line
2.28.0
Re: [PATCH bpf-next v2 2/2] selftests/bpf: Test for get_netns_cookie
Quoted 4 lines · Xu Liu
Add test to use
get_netns_cookie()fromBPF_PROG_TYPE_SOCK_OPS.Signed-off-by Xu Liu <[email protected]>
Quoted 122 lines
--- .../selftests/bpf/prog_tests/netns_cookie.c | 61 +++++++++++++++++++ .../selftests/bpf/progs/netns_cookie_prog.c | 39 ++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/netns_cookie.c create mode 100644 tools/testing/selftests/bpf/progs/netns_cookie_prog.ctools/testing/selftests/bpf/prog_tests/netns_cookie.c new file +61
-0@@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <test_progs.h> +#include "netns_cookie_prog.skel.h" +#include "network_helpers.h" + +#ifndef SO_NETNS_COOKIE +#define SO_NETNS_COOKIE 71 +#endif + +static int duration; + +void test_netns_cookie (void ) +{ +int server_fd =0 , client_fd =0 , cgroup_fd =0 , err =0 , val =0 ; +struct netns_cookie_prog *skel; +uint64_t cookie_expected_value; +socklen_t vallen =sizeof (cookie_expected_value); + + skel =netns_cookie_prog__open_and_load (); +if (!ASSERT_OK_PTR (skel,"skel_open" )) +return ; + + cgroup_fd =test__join_cgroup ("/netns_cookie" ); +if (CHECK (cgroup_fd <0 ,"join_cgroup" ,"cgroup creation failed\n" )) + goto out; + + skel->links.get_netns_cookie_sockops =bpf_program__attach_cgroup ( + skel->progs.get_netns_cookie_sockops, cgroup_fd); +if (!ASSERT_OK_PTR (skel->links.get_netns_cookie_sockops,"prog_attach" )) + goto close_cgroup_fd; + + server_fd =start_server (AF_INET6 ,SOCK_STREAM ,"::1" ,0 ,0 ); +if (CHECK (server_fd <0 ,"start_server" ,"errno %d\n" , errno)) + goto close_cgroup_fd; + + client_fd =connect_to_fd (server_fd,0 ); +if (CHECK (client_fd <0 ,"connect_to_fd" ,"errno %d\n" , errno)) + goto close_server_fd; + + err =bpf_map_lookup_elem (bpf_map__fd (skel->maps.netns_cookies), + &client_fd, &val); +if (!ASSERT_OK (err,"map_lookup(socket_cookies)" )) + goto close_client_fd; + + err =getsockopt (client_fd,SOL_SOCKET ,SO_NETNS_COOKIE , + &cookie_expected_value, &vallen); +if (!ASSERT_OK (err,"getsockopt)" )) + goto close_client_fd; + +ASSERT_EQ (val, cookie_expected_value,"cookie_value" ); + +close_client_fd: +close (client_fd); +close_server_fd: +close (server_fd); +close_cgroup_fd: +close (cgroup_fd); +out: +netns_cookie_prog__destroy (skel); +}tools/testing/selftests/bpf/progs/netns_cookie_prog.c new file +39
-1@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "vmlinux.h" + +#include <bpf/bpf_helpers.h> + +#define AF_INET6 10 + +struct { + __uint(type, BPF_MAP_TYPE_SK_STORAGE); + __uint(map_flags, BPF_F_NO_PREALLOC); + __type(key, int); + __type(value, int); +} netns_cookies SEC(".maps"); + +SEC("sockops") +int get_netns_cookie_sockops (struct bpf_sock_ops *ctx) +{ +struct bpf_sock *sk = ctx->sk; +int *cookie; + +if (ctx->family !=AF_INET6 ) +return 1 ; + +if (ctx->op !=BPF_SOCK_OPS_TCP_CONNECT_CB ) +return 1 ; + +if (!sk) +return 1 ; + + cookie =bpf_sk_storage_get (&netns_cookies, sk,0 , +BPF_SK_STORAGE_GET_F_CREATE ); +if (!cookie) +return 1 ; + + *cookie =bpf_get_netns_cookie (ctx); + +return 1 ; +} --2.28.0
This series was applied to bpf/bpf-next.git (refs/heads/master):
Hello:
This series was applied to bpf/bpf-next.git (refs/heads/master):
Quoted 6 lines · On Wed, 18 Aug 2021 18:58:18 +0800 you wrote:
v2: Added selftests
Xu Liu (2):
bpf: Allowbpf_get_netns_cookieinBPF_PROG_TYPE_SOCK_OPSselftests/bpf: Test forget_netns_cookie
Quoted 6 lines
net/core/filter.c | 14 +++++ .../selftests/bpf/prog_tests/netns_cookie.c | 61 +++++++++++++++++++ .../selftests/bpf/progs/netns_cookie_prog.c | 39 ++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/netns_cookie.c create mode 100644 tools/testing/selftests/bpf/progs/netns_cookie_prog.c
Here is the summary with links:
- [bpf-next,v2,1/2] bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_SOCK_OPS
https://git.kernel.org/bpf/bpf-next/c/6cf1770d63dd - [bpf-next,v2,2/2] selftests/bpf: Test for get_netns_cookie https://git.kernel.org/bpf/bpf-next/c/374e74de9631
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html