bpf: Add getter and setter for SO_REUSEPORT through bpf_{g,s}etsockopt
Subsystems (5)
PATCH 1/1 bpf: Add getter and setter for SO_REUSEPORT through bpf_{g,s}etsockopt
Augment the current set of options that are accessible via bpf_{g,s}etsockopt to also support SO_REUSEPORT.
--- net/core/filter.c | 6 +++++ .../testing/selftests/bpf/progs/bind4_prog.c | 27 +++++++++++++++++++ .../testing/selftests/bpf/progs/bind6_prog.c | 27 +++++++++++++++++++ 3 files changed, 60 insertions(+)
net/core/filter.c +6 -0
@@ -4786,6 +4786,9 @@ static int _bpf_setsockopt(struct sock *sk, int level, int optname, sk->sk_prot->keepalive (sk, valbool);sock_valbool_flag (sk,SOCK_KEEPOPEN , valbool);break ; +case SO_REUSEPORT : + sk->sk_reuseport = valbool; +break ;default : ret = -EINVAL ; }
@@ -4955,6 +4958,9 @@ static int _bpf_getsockopt(struct sock *sk, int level, int optname,case SO_BINDTOIFINDEX : *((int *)optval) = sk->sk_bound_dev_if;break ; +case SO_REUSEPORT : + *((int *)optval) = sk->sk_reuseport; +break ;default : goto err_clear; }
tools/testing/selftests/bpf/progs/bind4_prog.c +27 -0
@@ -57,6 +57,29 @@ static __inline int bind_to_device(struct bpf_sock_addr *ctx)return 0 ; } +static __inlineint bind_reuseport (struct bpf_sock_addr *ctx) +{ + +int val =1 ; + +if (bpf_setsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val))) +return 1 ; +if (bpf_getsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val)) || !val) +return 1 ; + val =0 ; +if (bpf_setsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val))) +return 1 ; +if (bpf_getsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val)) || val) +return 1 ; + + +return 0 ; +} +static __inlineint misc_opts (struct bpf_sock_addr *ctx,int opt) {int old, tmp, new =0xeb9f ;
@@ -127,6 +150,10 @@ int bind_v4_prog(struct bpf_sock_addr *ctx)if (misc_opts (ctx,SO_MARK ) ||misc_opts (ctx,SO_PRIORITY ))return 0 ; +/* Set reuseport and unset */ +if (bind_reuseport (ctx)) +return 0 ; + ctx->user_ip4 =bpf_htonl (SERV4_REWRITE_IP ); ctx->user_port =bpf_htons (SERV4_REWRITE_PORT );
tools/testing/selftests/bpf/progs/bind6_prog.c +27 -0
@@ -63,6 +63,29 @@ static __inline int bind_to_device(struct bpf_sock_addr *ctx)return 0 ; } +static __inlineint bind_reuseport (struct bpf_sock_addr *ctx) +{ + +int val =1 ; + +if (bpf_setsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val))) +return 1 ; +if (bpf_getsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val)) || !val) +return 1 ; + val =0 ; +if (bpf_setsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val))) +return 1 ; +if (bpf_getsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val)) || val) +return 1 ; + + +return 0 ; +} +static __inlineint misc_opts (struct bpf_sock_addr *ctx,int opt) {int old, tmp, new =0xeb9f ;
@@ -141,6 +164,10 @@ int bind_v6_prog(struct bpf_sock_addr *ctx)if (misc_opts (ctx,SO_MARK ) ||misc_opts (ctx,SO_PRIORITY ))return 0 ; +/* Set reuseport and unset */ +if (bind_reuseport (ctx)) +return 0 ; + ctx->user_ip6[0 ] =bpf_htonl (SERV6_REWRITE_IP_0 ); ctx->user_ip6[1 ] =bpf_htonl (SERV6_REWRITE_IP_1 ); ctx->user_ip6[2 ] =bpf_htonl (SERV6_REWRITE_IP_2 );
Signature · 1 line
2.24.1
Quoted 2 lines · Manu Bretelle
Augment the current set of options that are accessible via bpf_{g,s}etsockopt to also support
SO_REUSEPORT.
Thanks for the patch.
It is for bpf-next. Please tag the subject line with "bpf-next" in the future. Details in Documentation/bpf/bpf_devel_QA.rst.
Quoted 4 lines · Manu Bretelle
Augment the current set of options that are accessible via bpf_{g,s}etsockopt to also support
SO_REUSEPORT.Signed-off-by Manu Bretelle <[email protected]>
Applied, thanks! I fixed up the 4 extra newlines:
tools/testing/selftests/bpf/progs/bind4_prog.c static __inline int bind_to_device(struct bpf_sock_addr *ctx) · line 62
Quoted 11 lines
tools/testing/selftests/bpf/progs/bind4_prog.c +3
-0@@ -57,6 +57,29 @@ static __inline int bind_to_device(struct bpf_sock_addr *ctx)return 0 ; } +static __inlineint bind_reuseport (struct bpf_sock_addr *ctx) +{ +
^^^ here
Quoted 7 lines
tools/testing/selftests/bpf/progs/bind4_prog.c +7
-0+int val =1 ; + +if (bpf_setsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val))) +return 1 ; +if (bpf_getsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val)) || !val)
tools/testing/selftests/bpf/progs/bind4_prog.c static __inline int bind_to_device(struct bpf_sock_addr *ctx) · line 79
Quoted 10 lines
tools/testing/selftests/bpf/progs/bind4_prog.c +10
-0+return 1 ; + val =0 ; +if (bpf_setsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val))) +return 1 ; +if (bpf_getsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val)) || val) +return 1 ; + +
^^^ here
Quoted 5 lines
tools/testing/selftests/bpf/progs/bind4_prog.c +3
-0+return 0 ; +} +static __inlineint misc_opts (struct bpf_sock_addr *ctx,int opt) {
[...]
tools/testing/selftests/bpf/progs/bind6_prog.c static __inline int bind_to_device(struct bpf_sock_addr *ctx) · line 68
Quoted 11 lines
tools/testing/selftests/bpf/progs/bind6_prog.c +3
-0@@ -63,6 +63,29 @@ static __inline int bind_to_device(struct bpf_sock_addr *ctx)return 0 ; } +static __inlineint bind_reuseport (struct bpf_sock_addr *ctx) +{ +
^^^ here
Quoted 7 lines
tools/testing/selftests/bpf/progs/bind6_prog.c +7
-0+int val =1 ; + +if (bpf_setsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val))) +return 1 ; +if (bpf_getsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val)) || !val)
tools/testing/selftests/bpf/progs/bind6_prog.c static __inline int bind_to_device(struct bpf_sock_addr *ctx) · line 85
Quoted 10 lines
tools/testing/selftests/bpf/progs/bind6_prog.c +10
-0+return 1 ; + val =0 ; +if (bpf_setsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val))) +return 1 ; +if (bpf_getsockopt (ctx,SOL_SOCKET ,SO_REUSEPORT , + &val,sizeof (val)) || val) +return 1 ; + +
^^^ here
Quoted 6 lines
tools/testing/selftests/bpf/progs/bind6_prog.c +3
-0+return 0 ; +} +static __inlineint misc_opts (struct bpf_sock_addr *ctx,int opt) {int old, tmp, new =0xeb9f ;