bpf: Add bpf_sk_storage support to bpf_tcp_ca
Subsystems (5)
v2 cover bpf: Add bpf_sk_storage support to bpf_tcp_ca
This set adds bpf_sk_storage support to bpf_tcp_ca. That will allow bpf-tcp-cc to share sk's private data with other bpf_progs and also allow bpf-tcp-cc to use extra private storage if the existing icsk_ca_priv is not enough.
v2:
- Move the sk_stg_map test immediately after connect() (Yonghong)
- Use global linkage var in bpf_dctcp.c (Yonghong)
Martin KaFai Lau (2):
bpf: Add bpf_sk_storage support to bpf_tcp_ca
bpf: Add tests for bpf_sk_storage to bpf_tcp_ca
net/ipv4/bpf_tcp_ca.c | 33 ++++++++++++++++ .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 39 +++++++++++++++---- tools/testing/selftests/bpf/progs/bpf_dctcp.c | 16 ++++++++ 3 files changed, 80 insertions(+), 8 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 bpf: Add bpf_sk_storage support to bpf_tcp_ca
This patch adds bpf_sk_storage_get() and bpf_sk_storage_delete() helper to the bpf_tcp_ca's struct_ops. That would allow bpf-tcp-cc to:
1) share sk private data with other bpf progs.
2) use bpf_sk_storage as a private storage for a bpf-tcp-cc if the existing icsk_ca_priv is not big enough.
--- net/ipv4/bpf_tcp_ca.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
net/ipv4/bpf_tcp_ca.c +33 -0
@@ -7,6 +7,7 @@#include <linux/btf.h> #include <linux/filter.h> #include <net/tcp.h> +#include <net/bpf_sk_storage.h> static u32 optional_ops[] = { offsetof(struct tcp_congestion_ops , init),
@@ -27,6 +28,27 @@ static u32 unsupported_ops[] = {static const struct btf_type *tcp_sock_type;static u32 tcp_sock_id, sock_id; +static int btf_sk_storage_get_ids[5 ]; +static struct bpf_func_proto btf_sk_storage_get_proto__read_mostly ; + +static int btf_sk_storage_delete_ids[5 ]; +static struct bpf_func_proto btf_sk_storage_delete_proto__read_mostly ; + +static void convert_sk_func_proto (struct bpf_func_proto *to,int *to_btf_ids, +const struct bpf_func_proto *from) +{ +int i; + + *to = *from; + to->btf_id = to_btf_ids; +for (i =0 ; i <ARRAY_SIZE (to->arg_type); i++) { +if (to->arg_type[i] ==ARG_PTR_TO_SOCKET ) { + to->arg_type[i] =ARG_PTR_TO_BTF_ID ; + to->btf_id[i] = tcp_sock_id; + } + } +} +static int bpf_tcp_ca_init (struct btf *btf) {s32 type_id;
@@ -42,6 +64,13 @@ static int bpf_tcp_ca_init(struct btf *btf) tcp_sock_id = type_id; tcp_sock_type =btf_type_by_id (btf, tcp_sock_id); +convert_sk_func_proto (&btf_sk_storage_get_proto, + btf_sk_storage_get_ids, + &bpf_sk_storage_get_proto); +convert_sk_func_proto (&btf_sk_storage_delete_proto, + btf_sk_storage_delete_ids, + &bpf_sk_storage_delete_proto); +return 0 ; }
@@ -167,6 +196,10 @@ bpf_tcp_ca_get_func_proto(enum bpf_func_id func_id,switch (func_id) {case BPF_FUNC_tcp_send_ack:return &bpf_tcp_send_ack_proto; +case BPF_FUNC_sk_storage_get: +return &btf_sk_storage_get_proto; +case BPF_FUNC_sk_storage_delete: +return &btf_sk_storage_delete_proto;default :return bpf_base_func_proto (func_id); }
Signature · 1 line
2.17.1
PATCH v2 2/2 bpf: Add tests for bpf_sk_storage to bpf_tcp_ca
In reply to Martin KaFai LauThis patch adds test to exercise the bpf_sk_storage_get() and bpf_sk_storage_delete() helper from the bpf_dctcp.c.
The setup and check on the sk_storage is done immediately before and after the connect().
This patch also takes this chance to move the pthread_create() after the connect() has been done. That will remove the need of the "wait_thread" label.
--- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 39 +++++++++++++++---- tools/testing/selftests/bpf/progs/bpf_dctcp.c | 16 ++++++++ 2 files changed, 47 insertions(+), 8 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +31 -8
@@ -11,6 +11,7 @@static const unsigned int total_bytes =10 *1024 *1024 ;static const struct timeval timeo_sec = { .tv_sec =10 };static const size_t timeo_optlen =sizeof (timeo_sec); +static int expected_stg =0xeB9F ;static int stop, duration;static int settimeo (int fd)
@@ -88,7 +89,7 @@ static void *server(void *arg)return NULL ; } -static void do_test (const char *tcp_ca) +static void do_test (const char *tcp_ca,const struct bpf_map *sk_stg_map) {struct sockaddr_in6 sa6 = {};ssize_t nr_recv =0 , bytes =0 ;
@@ -126,14 +127,34 @@ static void do_test(const char *tcp_ca) err =listen (lfd,1 );if (CHECK (err ==-1 ,"listen" ,"errno:%d\n" , errno)) goto done; - err =pthread_create (&srv_thread,NULL , server, (void *)(long )lfd); -if (CHECK (err !=0 ,"pthread_create" ,"err:%d\n" , err)) - goto done; + +if (sk_stg_map) { + err =bpf_map_update_elem (bpf_map__fd (sk_stg_map), &fd, + &expected_stg,BPF_NOEXIST ); +if (CHECK (err,"bpf_map_update_elem(sk_stg_map)" , +"err:%d errno:%d\n" , err, errno)) + goto done; + }/* connect to server */ err =connect (fd, (struct sockaddr *)&sa6, addrlen);if (CHECK (err ==-1 ,"connect" ,"errno:%d\n" , errno)) - goto wait_thread; + goto done; + +if (sk_stg_map) { +int tmp_stg; + + err =bpf_map_lookup_elem (bpf_map__fd (sk_stg_map), &fd, + &tmp_stg); +if (CHECK (!err || errno !=ENOENT , +"bpf_map_lookup_elem(sk_stg_map)" , +"err:%d errno:%d\n" , err, errno)) + goto done; + } + + err =pthread_create (&srv_thread,NULL , server, (void *)(long )lfd); +if (CHECK (err !=0 ,"pthread_create" ,"err:%d errno:%d\n" , err, errno)) + goto done;/* recv total_bytes */ while (bytes < total_bytes && !READ_ONCE (stop)) {
@@ -149,7 +170,6 @@ static void do_test(const char *tcp_ca)CHECK (bytes != total_bytes,"recv" ,"%zd != %u nr_recv:%zd errno:%d\n" , bytes, total_bytes, nr_recv, errno); -wait_thread:WRITE_ONCE (stop,1 );pthread_join (srv_thread, &thread_ret); CHECK(IS_ERR(thread_ret), "pthread_join", "thread_ret:%ld",
@@ -175,7 +195,7 @@ static void test_cubic(void)return ; } -do_test ("bpf_cubic" ); +do_test ("bpf_cubic" ,NULL );bpf_link__destroy (link);bpf_cubic__destroy (cubic_skel);
@@ -197,7 +217,10 @@ static void test_dctcp(void)return ; } -do_test ("bpf_dctcp" ); +do_test ("bpf_dctcp" , dctcp_skel->maps.sk_stg_map); +CHECK (dctcp_skel->bss->stg_result != expected_stg, +"Unexpected stg_result" ,"stg_result (%x) != expected_stg (%x)\n" , + dctcp_skel->bss->stg_result, expected_stg);bpf_link__destroy (link);bpf_dctcp__destroy (dctcp_skel);
tools/testing/selftests/bpf/progs/bpf_dctcp.c +16 -0
@@ -6,6 +6,7 @@* the kernel BPF logic. */ +#include <stddef.h> #include <linux/bpf.h> #include <linux/types.h> #include <bpf/bpf_helpers.h>
@@ -14,6 +15,15 @@ char _license[] SEC("license") = "GPL"; +int stg_result =0 ; + +struct { + __uint(type, BPF_MAP_TYPE_SK_STORAGE); + __uint(map_flags, BPF_F_NO_PREALLOC); + __type(key, int); + __type(value, int); +} sk_stg_map SEC(".maps"); +#define DCTCP_MAX_ALPHA 1024Ustruct dctcp {
@@ -43,12 +53,18 @@ void BPF_PROG(dctcp_init, struct sock *sk) {const struct tcp_sock *tp =tcp_sk (sk);struct dctcp *ca =inet_csk_ca (sk); +int *stg; ca->prior_rcv_nxt = tp->rcv_nxt; ca->dctcp_alpha =min (dctcp_alpha_on_init,DCTCP_MAX_ALPHA ); ca->loss_cwnd =0 ; ca->ce_state =0 ; + stg =bpf_sk_storage_get (&sk_stg_map, (void *)tp,NULL ,0 ); +if (stg) { + stg_result = *stg; +bpf_sk_storage_delete (&sk_stg_map, (void *)tp); + }dctcp_reset (tp, ca); }
Signature · 1 line
2.17.1
Re: [PATCH v2 bpf-next 2/2] bpf: Add tests for bpf_sk_storage to bpf_tcp_ca
Quoted 11 lines · Martin KaFai Lau
This patch adds test to exercise the
bpf_sk_storage_get()andbpf_sk_storage_delete()helper from thebpf_dctcp.c.The setup and check on the
sk_storageis done immediately before and after theconnect().This patch also takes this chance to move the
pthread_create()after theconnect()has been done. That will remove the need of the "wait_thread" label.Signed-off-by Martin KaFai Lau <[email protected]>
Quoted 9 lines · Martin KaFai Lau
This set adds
bpf_sk_storagesupport tobpf_tcp_ca. That will allow bpf-tcp-cc to share sk's private data with otherbpf_progsand also allow bpf-tcp-cc to use extra private storage if the existingicsk_ca_privis not enough.v2:
- Move thesk_stg_maptest immediately afterconnect()(Yonghong)
- Use global linkage var inbpf_dctcp.c(Yonghong)
Quoted 9 lines
Martin KaFai Lau (2):
bpf: Addbpf_sk_storagesupport tobpf_tcp_ca
bpf: Add tests forbpf_sk_storagetobpf_tcp_canet/ipv4/bpf_tcp_ca.c | 33 ++++++++++++++++ .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 39 +++++++++++++++---- tools/testing/selftests/bpf/progs/bpf_dctcp.c | 16 ++++++++ 3 files changed, 80 insertions(+), 8 deletions(-)
Applied, thanks!