Enable bpf_setsockopt() on ktls enabled sockets.
Subsystems (5)
cover Enable bpf_setsockopt() on ktls enabled sockets.
This patchset implements a change to bpf_setsockopt() which allows ktls enabled sockets to be used with the SOL_TCP level. This is necessary as when ktls is enabled, it changes the function pointer of setsockopt of the socket, which bpf_setsockopt() checks in order to make sure that the socket is a TCP socket. Checking sk_protocol instead of the function pointer will ensure that bpf_setsockopt() with the SOL_TCP level still works on sockets with ktls enabled.
Kui-Feng Lee (2):
bpf: Check the protocol of a sock to agree the calls to
bpf_setsockopt().
selftests/bpf: Calls bpf_setsockopt() on a ktls enabled socket.
net/core/filter.c | 2 +- .../selftests/bpf/prog_tests/setget_sockopt.c | 71 +++++++++++++++++++ .../selftests/bpf/progs/setget_sockopt.c | 8 +++ 3 files changed, 80 insertions(+), 1 deletion(-)
Signature · 1 line
2.30.2
PATCH 1/2 bpf: Check the protocol of a sock to agree the calls to bpf_setsockopt().
Resolve an issue when calling sol_tcp_sockopt() on a socket with ktls enabled. Prior to this patch, sol_tcp_sockopt() would only allow calls if the function pointer of setsockopt of the socket was set to tcp_setsockopt(). However, any socket with ktls enabled would have its function pointer set to tls_setsockopt(). To resolve this issue, the patch adds a check of the protocol of the linux socket and allows bpf_setsockopt() to be called if ktls is initialized on the linux socket. This ensures that calls to sol_tcp_sockopt() will succeed on sockets with ktls enabled.
--- net/core/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/filter.c +1 -1
@@ -5204,7 +5204,7 @@ static int sol_tcp_sockopt(struct sock *sk, int optname, char *optval, int *optlen, bool getopt) { - if (sk->sk_prot->setsockopt != tcp_setsockopt) + if (sk->sk_protocol != IPPROTO_TCP) return -EINVAL;switch (optname) {
Signature · 1 line
2.30.2
Martin KaFai Lau
reviewerRe: [PATCH bpf-next 1/2] bpf: Check the protocol of a sock to agree the calls to bpf_setsockopt().
Quoted 20 lines · Kui-Feng Lee
Resolve an issue when calling
sol_tcp_sockopt()on a socket with ktls enabled. Prior to this patch,sol_tcp_sockopt()would only allow calls if the function pointer of setsockopt of the socket was set totcp_setsockopt(). However, any socket with ktls enabled would have its function pointer set totls_setsockopt(). To resolve this issue, the patch adds a check of the protocol of the linux socket and allowsbpf_setsockopt()to be called if ktls is initialized on the linux socket. This ensures that calls tosol_tcp_sockopt()will succeed on sockets with ktls enabled.Signed-off-by Kui-Feng Lee <[email protected]>--- net/core/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/core/filter.c +0
-0
net/core/filter.c static int sol_tcp_sockopt(struct sock *sk, int optname, · line 5207
Quoted 5 lines
net/core/filter.c +1
-1@@ -5204,7 +5204,7 @@ static int sol_tcp_sockopt(struct sock *sk, int optname, char *optval, int *optlen, bool getopt) { - if (sk->sk_prot->setsockopt != tcp_setsockopt) + if (sk->sk_protocol != IPPROTO_TCP)
It is a pretty broad test but I don't see particular issue also. Let see how it goes.
PATCH 2/2 selftests/bpf: Calls bpf_setsockopt() on a ktls enabled socket.
In reply to Kui-Feng LeeEnsures that whenever bpf_setsockopt() is called with the SOL_TCP option on a ktls enabled socket, the call will be accepted by the system. The provided test makes sure of this by performing an examination when the server side socket is in the CLOSE_WAIT state. At this stage, ktls is still enabled on the server socket and can be used to test if bpf_setsockopt() works correctly with linux.
--- .../selftests/bpf/prog_tests/setget_sockopt.c | 71 +++++++++++++++++++ .../selftests/bpf/progs/setget_sockopt.c | 8 +++ 2 files changed, 79 insertions(+)
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c +71 -0
@@ -4,6 +4,7 @@#define _GNU_SOURCE#include <sched.h> #include <linux/socket.h> +#include <linux/tls.h> #include <net/if.h> #include "test_progs.h"
@@ -83,6 +84,75 @@ static void test_udp(int family)ASSERT_EQ (bss->nr_binddev,1 ,"nr_bind" ); } +static void test_ktls (void ) +{ +struct tls12_crypto_info_aes_gcm_128 aes128; +struct setget_sockopt__bss *bss = skel->bss; +int cfd =-1 , sfd =-1 , fd =-1 , ret; + +memset (bss,0 ,sizeof (*bss)); + + sfd =start_server (AF_INET ,SOCK_STREAM , addr4_str,0 ,0 ); +if (!ASSERT_GE (sfd,0 ,"start_server" )) +return ; + fd =connect_to_fd (sfd,0 ); +if (!ASSERT_GE (fd,0 ,"connect_to_fd" )) + goto err_out; + + cfd =accept (sfd,NULL ,0 ); +if (!ASSERT_GE (cfd,0 ,"accept" )) + goto err_out; + +close (sfd); + sfd =-1 ; + +/* Setup KTLS */ + ret =setsockopt (fd,IPPROTO_TCP ,TCP_ULP ,"tls" ,sizeof ("tls" )); +if (ret !=0 ) { +ASSERT_EQ (errno,ENOENT ,"setsockopt return ENOENT" ); +printf ("Failure setting TCP_ULP, testing without tls\n" ); + goto err_out; + } + ret =setsockopt (cfd,IPPROTO_TCP ,TCP_ULP ,"tls" ,sizeof ("tls" )); +if (!ASSERT_EQ (ret,0 ,"setsockopt" )) + goto err_out; + +memset (&aes128,0 ,sizeof (aes128)); + aes128.info.version =TLS_1_2_VERSION ; + aes128.info.cipher_type =TLS_CIPHER_AES_GCM_128 ; + + ret =setsockopt (fd,SOL_TLS ,TLS_TX , &aes128,sizeof (aes128)); +if (!ASSERT_EQ (ret,0 ,"setsockopt" )) + goto err_out; + + ret =setsockopt (cfd,SOL_TLS ,TLS_RX , &aes128,sizeof (aes128)); +if (!ASSERT_EQ (ret,0 ,"setsockopt" )) + goto err_out; + +/* KTLS is enabled */ + +close (fd); +/* At this point, the cfd socket is at the CLOSE_WAIT state +* and still run TLS protocol. The test for +* BPF_TCP_CLOSE_WAIT should be run at this point. +*/ +close (cfd); + +ASSERT_EQ (bss->nr_listen,1 ,"nr_listen" ); +ASSERT_EQ (bss->nr_connect,1 ,"nr_connect" ); +ASSERT_EQ (bss->nr_active,1 ,"nr_active" ); +ASSERT_EQ (bss->nr_passive,1 ,"nr_passive" ); +ASSERT_EQ (bss->nr_socket_post_create,2 ,"nr_socket_post_create" ); +ASSERT_EQ (bss->nr_binddev,2 ,"nr_bind" ); +ASSERT_EQ (bss->nr_fin_wait1,1 ,"nr_fin_wait1" ); +return ; + +err_out: +close (fd); +close (cfd); +close (sfd); +} +void test_setget_sockopt (void ) { cg_fd =test__join_cgroup (CG_NAME );
@@ -118,6 +188,7 @@ void test_setget_sockopt(void)test_tcp (AF_INET );test_udp (AF_INET6 );test_udp (AF_INET ); +test_ktls (); done:setget_sockopt__destroy (skel);
tools/testing/selftests/bpf/progs/setget_sockopt.c +8 -0
@@ -6,6 +6,8 @@#include <bpf/bpf_core_read.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> +#define BPF_PROG_TEST_TCP_HDR_OPTIONS +#include "test_tcp_hdr_options.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0]))
@@ -22,6 +24,7 @@ int nr_active;int nr_connect;int nr_binddev;int nr_socket_post_create; +int nr_fin_wait1;struct sockopt_test {int opt;
@@ -386,6 +389,11 @@ int skops_sockopt(struct bpf_sock_ops *skops) nr_passive += !(bpf_test_sockopt (skops, sk) ||test_tcp_maxseg (skops, sk) ||test_tcp_saved_syn (skops, sk)); +set_hdr_cb_flags (skops,BPF_SOCK_OPS_STATE_CB_FLAG ); +break ; +case BPF_SOCK_OPS_STATE_CB : +if (skops->args[1 ] ==BPF_TCP_CLOSE_WAIT ) + nr_fin_wait1 += !bpf_test_sockopt (skops, sk);break ; }
Signature · 1 line
2.30.2
Martin KaFai Lau
reviewerRe: [PATCH bpf-next 2/2] selftests/bpf: Calls bpf_setsockopt() on a ktls enabled socket.
Quoted 15 lines · Kui-Feng Lee
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c +15
-0+static void test_ktls (void ) +{ +struct tls12_crypto_info_aes_gcm_128 aes128; +struct setget_sockopt__bss *bss = skel->bss; +int cfd =-1 , sfd =-1 , fd =-1 , ret; + +memset (bss,0 ,sizeof (*bss)); + + sfd =start_server (AF_INET ,SOCK_STREAM , addr4_str,0 ,0 ); +if (!ASSERT_GE (sfd,0 ,"start_server" )) +return ; + fd =connect_to_fd (sfd,0 ); +if (!ASSERT_GE (fd,0 ,"connect_to_fd" )) + goto err_out; +
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c static void test_udp(int family) · line 111
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c +10
-0+ cfd =accept (sfd,NULL ,0 ); +if (!ASSERT_GE (cfd,0 ,"accept" )) + goto err_out; + +close (sfd); + sfd =-1 ; + +/* Setup KTLS */ + ret =setsockopt (fd,IPPROTO_TCP ,TCP_ULP ,"tls" ,sizeof ("tls" )); +if (ret !=0 ) {
nit. ASSERT_OK(ret, ...). It should print the errno also.
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c static void test_udp(int family) · line 113
Quoted 2 lines
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c +2
-0+ASSERT_EQ (errno,ENOENT ,"setsockopt return ENOENT" ); +printf ("Failure setting TCP_ULP, testing without tls\n" );
Then these two ASSERT_EQ and printf are not needed.
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c static void test_udp(int family) · line 117
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c +4
-0+ goto err_out; + } + ret =setsockopt (cfd,IPPROTO_TCP ,TCP_ULP ,"tls" ,sizeof ("tls" )); +if (!ASSERT_EQ (ret,0 ,"setsockopt" ))
nit. ASSERT_OK.
Quoted 42 lines
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c +38
-0+ goto err_out; + +memset (&aes128,0 ,sizeof (aes128)); + aes128.info.version =TLS_1_2_VERSION ; + aes128.info.cipher_type =TLS_CIPHER_AES_GCM_128 ; + + ret =setsockopt (fd,SOL_TLS ,TLS_TX , &aes128,sizeof (aes128)); +if (!ASSERT_EQ (ret,0 ,"setsockopt" )) + goto err_out; + + ret =setsockopt (cfd,SOL_TLS ,TLS_RX , &aes128,sizeof (aes128)); +if (!ASSERT_EQ (ret,0 ,"setsockopt" )) + goto err_out; + +/* KTLS is enabled */ + +close (fd); +/* At this point, the cfd socket is at the CLOSE_WAIT state +* and still run TLS protocol. The test for +* BPF_TCP_CLOSE_WAIT should be run at this point. +*/ +close (cfd); + +ASSERT_EQ (bss->nr_listen,1 ,"nr_listen" ); +ASSERT_EQ (bss->nr_connect,1 ,"nr_connect" ); +ASSERT_EQ (bss->nr_active,1 ,"nr_active" ); +ASSERT_EQ (bss->nr_passive,1 ,"nr_passive" ); +ASSERT_EQ (bss->nr_socket_post_create,2 ,"nr_socket_post_create" ); +ASSERT_EQ (bss->nr_binddev,2 ,"nr_bind" ); +ASSERT_EQ (bss->nr_fin_wait1,1 ,"nr_fin_wait1" ); +return ; + +err_out: +close (fd); +close (cfd); +close (sfd); +} +void test_setget_sockopt (void ) { cg_fd =test__join_cgroup (CG_NAME );
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c void test_setget_sockopt(void) · line 191
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c +1
-0@@ -118,6 +188,7 @@ void test_setget_sockopt(void)test_tcp (AF_INET );test_udp (AF_INET6 );test_udp (AF_INET ); +test_ktls ();
Although not related to the IPPROTO_IPV6 code path, it seems pretty cheap to test AF_INET6 also like the above tests?
Re: [PATCH bpf-next 2/2] selftests/bpf: Calls bpf_setsockopt() on a ktls enabled socket.
Quoted 12 lines · Martin KaFai Lau
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c void test_setget_sockopt(void) · line 191
Quoted 8 lines · Kui-Feng Lee
void
test_setget_sockopt(void)
{
cg_fd=test__join_cgroup(CG_NAME);tools/testing/selftests/bpf/prog_tests/setget_sockopt.c +1
-0@@ -118,6 +188,7 @@ void test_setget_sockopt(void) test_tcp(AF_INET); test_udp(AF_INET6); test_udp(AF_INET); + test_ktls();Although not related to the
IPPROTO_IPV6code path, it seems pretty cheap to testAF_INET6also like the above tests?
Sure