bpf: Add rcu ptr in btf_id_sock_common_types
PATCH 1/1 bpf: Add rcu ptr in btf_id_sock_common_types
Sometimes sk is dereferenced as an rcu ptr, such as skb->sk in tp_btf, which is a valid type of sock common. Then helpers like bpf_skc_to_*() can be used with skb->sk.
For example, the following prog will be rejected without this patch:
```
SEC("tp_btf/tcp_bad_csum")
int BPF_PROG(tcp_bad_csum, struct sk_buff* skb)
{
struct sock *sk = skb->sk;
struct tcp_sock *tp;
if (!sk)
return 0;
tp = bpf_skc_to_tcp_sock(sk);
return 0;
}
```--- kernel/bpf/verifier.c | 1 + 1 file changed, 1 insertion(+)
kernel/bpf/verifier.c +1 -0
@@ -8362,6 +8362,7 @@ static const struct bpf_reg_types btf_id_sock_common_types = { PTR_TO_XDP_SOCK,PTR_TO_BTF_ID , PTR_TO_BTF_ID | PTR_TRUSTED, + PTR_TO_BTF_ID | MEM_RCU, }, .btf_id = &btf_sock_ids[BTF_SOCK_TYPE_SOCK_COMMON], };
Signature · 1 line
2.32.0.3.g01195cf9f
Martin KaFai Lau
reviewerQuoted 8 lines · Philo Lu
Sometimes sk is dereferenced as an rcu ptr, such as
skb->skintp_btf, which is a valid type of sock common. Then helpers like bpf_skc_to_*() can be used withskb->sk.For example, the following prog will be rejected without this patch:
```SEC("tp_btf/tcp_bad_csum")
intBPF_PROG(tcp_bad_csum, struct sk_buff* skb)
Quoted 7 lines
{
struct sock *sk = skb->sk;
struct tcp_sock *tp;
if (!sk)
return 0;
tp = bpf_skc_to_tcp_sock(sk);If the use case is for reading the fields in tp, please use the bpf_core_cast from the libbpf's bpf_core_read.h. bpf_core_cast is using the bpf_rdonly_cast kfunc underneath.
pw-bot: cr
Quoted 13 lines · Martin KaFai Lau
Quoted 12 lines · Philo Lu
Sometimes sk is dereferenced as an rcu ptr, such as
skb->skintp_btf, which is a valid type of sock common. Then helpers like bpf_skc_to_*() can be used withskb->sk.For example, the following prog will be rejected without this patch:
```SEC("tp_btf/tcp_bad_csum")
intBPF_PROG(tcp_bad_csum, struct sk_buff* skb)
{
struct sock *sk =skb->sk;
structtcp_sock*tp;
Quoted 6 lines
Quoted 3 lines
if (!sk)
return 0;
tp =bpf_skc_to_tcp_sock(sk);If the use case is for reading the fields in tp, please use the
bpf_core_castfrom the libbpf'sbpf_core_read.h.bpf_core_castis using thebpf_rdonly_castkfunc underneath.
Thank you! This works for me so this patch is unnecessary then.
Just curious is there any technical issue to include rcu_ptr into btf_id_sock_common_types? AFAICT rcu_ptr should also be a valid ptr type, and then btf_id_sock_common_types will behave like (PTR_TO_BTF_ID + &btf_sock_ids[BTF_SOCK_TYPE_SOCK_COMMON]) in bpf_func_proto.
Thanks.
Signature · 1 line
Philo
Martin KaFai Lau
reviewerQuoted 20 lines · Philo Lu
Quoted 17 lines · Martin KaFai Lau
Quoted 15 lines · Philo Lu
Sometimes sk is dereferenced as an rcu ptr, such as
skb->skintp_btf, which is a valid type of sock common. Then helpers like bpf_skc_to_*() can be used withskb->sk.For example, the following prog will be rejected without this patch:
```SEC("tp_btf/tcp_bad_csum")
intBPF_PROG(tcp_bad_csum, struct sk_buff* skb)
{
struct sock *sk =skb->sk;
structtcp_sock*tp;if (!sk)
return 0;
tp =bpf_skc_to_tcp_sock(sk);
Quoted 6 lines
Quoted 2 lines
If the use case is for reading the fields in tp, please use the
bpf_core_castfrom the libbpf'sbpf_core_read.h.bpf_core_castis using thebpf_rdonly_castkfunc underneath.Thank you! This works for me so this patch is unnecessary then.
Just curious is there any technical issue to include
rcu_ptrintobtf_id_sock_common_types? AFAICTrcu_ptrshould also be a valid ptr type, and thenbtf_id_sock_common_typeswill behave like (PTR_TO_BTF_ID+ &btf_sock_ids[BTF_SOCK_TYPE_SOCK_COMMON]) inbpf_func_proto.
bpf_skc_to_*() returns a PTR_TO_BTF_ID which can be passed into other helpers that takes ARG_PTR_TO_BTF_ID_SOCK_COMMON. There are helpers that change the sk. e.g. bpf_setsockopt() changes the sk and needs sk to be locked. Other non tracing hooks do have a hold on the skb also. I did take a quick look at the bpf_setsockopt situation and looks ok. I am positive there are other helpers that need to audit first.
Tracing use case should only read the sk. bpf_core_cast() is the correct one to use. The bpf_sk_storage_{get,delete}() should be the only allowed helper that can change the sk.
Quoted 24 lines · Martin KaFai Lau
Quoted 23 lines · Philo Lu
Quoted 19 lines · Martin KaFai Lau
Quoted 12 lines · Philo Lu
Sometimes sk is dereferenced as an rcu ptr, such as
skb->skintp_btf, which is a valid type of sock common. Then helpers like bpf_skc_to_*() can be used withskb->sk.For example, the following prog will be rejected without this patch:
```SEC("tp_btf/tcp_bad_csum")
intBPF_PROG(tcp_bad_csum, struct sk_buff* skb)
{
struct sock *sk =skb->sk;
structtcp_sock*tp;Quoted 3 lines
if (!sk)
return 0;
tp =bpf_skc_to_tcp_sock(sk);If the use case is for reading the fields in tp, please use the
bpf_core_castfrom the libbpf'sbpf_core_read.h.bpf_core_castis using thebpf_rdonly_castkfunc underneath.
Quoted 7 lines
Quoted 3 lines
Thank you! This works for me so this patch is unnecessary then.
Just curious is there any technical issue to include
rcu_ptrintobtf_id_sock_common_types? AFAICTrcu_ptrshould also be a valid ptr type, and thenbtf_id_sock_common_typeswill behave like (PTR_TO_BTF_ID+ &btf_sock_ids[BTF_SOCK_TYPE_SOCK_COMMON]) inbpf_func_proto.bpf_skc_to_*() returns a
PTR_TO_BTF_IDwhich can be passed into other helpers that takesARG_PTR_TO_BTF_ID_SOCK_COMMON. There are helpers that change the sk. e.g.bpf_setsockopt()changes the sk and needs sk to be locked. Other non tracing hooks do have a hold on the skb also. I did take a quick look at thebpf_setsockoptsituation and looks ok. I am positive there are other helpers that need to audit first.Tracing use case should only read the sk.
bpf_core_cast()is the correct one to use. The bpf_sk_storage_{get,delete}() should be the only allowed helper that can change the sk.
Thank you for explanation, Martin. This helps me a lot.
Signature · 1 line
Philo