bpf: Add array support to btf_struct_access
Subsystems (6)
v3 cover bpf: Add array support to btf_struct_access
This series adds array support to btf_struct_access(). Please see individual patch for details.
v3:
- Fixed an interpreter issue that missed accounting for insn->off
v2:
- Fix a divide-by-zero when there is empty array in a struct (e.g. "__u8 __cloned_offset[0];" in skbuff)
- Add 'static' to a global var in prog_tests/kfree_skb.c
Martin KaFai Lau (3):
bpf: Account for insn->off when doing bpf_probe_read_kernel
bpf: Add array support to btf_struct_access
bpf: Add cb access in kfree_skb test
kernel/bpf/btf.c | 187 +++++++++++++++--- kernel/bpf/core.c | 2 +- .../selftests/bpf/prog_tests/kfree_skb.c | 54 +++-- tools/testing/selftests/bpf/progs/kfree_skb.c | 25 ++- 4 files changed, 221 insertions(+), 47 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/3 bpf: Account for insn->off when doing bpf_probe_read_kernel
In the bpf interpreter mode, bpf_probe_read_kernel is used to read from PTR_TO_BTF_ID's kernel object. It currently missed considering the insn->off. This patch fixes it.
--- kernel/bpf/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/core.c +1 -1
@@ -1569,7 +1569,7 @@ static u64 __no_fgcse ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, u6#undef LDST#define LDX_PROBE (SIZEOP ,SIZE ) \ LDX_PROBE_MEM_##SIZEOP: \ - bpf_probe_read_kernel(&DST, SIZE, (const void *)(long) SRC); \ + bpf_probe_read_kernel(&DST, SIZE, (const void *)(long) (SRC + insn->off)); \ CONT; LDX_PROBE(B, 1)LDX_PROBE (H ,2 )
Signature · 1 line
2.17.1
Re: [PATCH v3 bpf-next 1/3] bpf: Account for insn->off when doing bpf_probe_read_kernel
Quoted 8 lines · Martin KaFai Lau
In the bpf interpreter mode,
bpf_probe_read_kernelis used to read from PTR_TO_BTF_ID's kernel object. It currently missed considering theinsn->off. This patch fixes it.Fixes 2a02759ef5f8 ("bpf: Add support for BTF pointers to interpreter")Signed-off-by Martin KaFai Lau <[email protected]>---
Heh :)
[...]
Re: [PATCH v3 bpf-next 1/3] bpf: Account for insn->off when doing bpf_probe_read_kernel
In reply to Martin KaFai LauQuoted 7 lines · Martin KaFai Lau
In the bpf interpreter mode,
bpf_probe_read_kernelis used to read from PTR_TO_BTF_ID's kernel object. It currently missed considering theinsn->off. This patch fixes it.Fixes 2a02759ef5f8 ("bpf: Add support for BTF pointers to interpreter")Signed-off-by Martin KaFai Lau <[email protected]>
Applied the 1st patch.
2nd and 3rd will go for 'nit' respin?
PATCH v3 2/3 bpf: Add array support to btf_struct_access
In reply to Martin KaFai LauThis patch adds array support to btf_struct_access(). It supports array of int, array of struct and multidimensional array.
It also allows using u8[] as a scratch space. For example, it allows access the "char cb[48]" with size larger than the array's element "char". Another potential use case is "u64 icsk_ca_priv[]" in the tcp congestion control.
btf_resolve_size() is added to resolve the size of any type. It will follow the modifier if there is any. Please see the function comment for details.
This patch also adds the "off < moff" check at the beginning of the for loop. It is to reject cases when "off" is pointing to a "hole" in a struct.
--- kernel/bpf/btf.c | 187 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 157 insertions(+), 30 deletions(-)
kernel/bpf/btf.c +157 -30
@@ -1036,6 +1036,82 @@ static const struct resolve_vertex *env_stack_peak(struct btf_verifier_env *env)return env->top_stack ? &env->stack[env->top_stack -1 ] :NULL ; } +/* Resolve the size of a passed-in "type" +* +* type: is an array (e.g. u32 array[x][y]) +* return type: type "u32[x][y]", i.e. BTF_KIND_ARRAY, +* *type_size: (x * y * sizeof(u32)). Hence, *type_size always +* corresponds to the return type. +* *elem_type: u32 +* *total_nelems: (x * y). Hence, individual elem size is +* (*type_size / *total_nelems) +* +* type: is not an array (e.g. const struct X) +* return type: type "struct X" +* *type_size: sizeof(struct X) +* *elem_type: same as return type ("struct X") +* *total_nelems: 1 +*/ +static const struct btf_type * +btf_resolve_size (const struct btf *btf,const struct btf_type *type, +u32 *type_size,const struct btf_type **elem_type, +u32 *total_nelems) +{ +const struct btf_type *array_type =NULL ; +const struct btf_array *array; +u32 i, size, nelems =1 ; + +for (i =0 ; i <MAX_RESOLVE_DEPTH ; i++) { +switch (BTF_INFO_KIND (type->info)) { +/* type->size can be used */ +case BTF_KIND_INT : +case BTF_KIND_STRUCT : +case BTF_KIND_UNION : +case BTF_KIND_ENUM : + size = type->size; + goto resolved; + +case BTF_KIND_PTR : + size =sizeof (void *); + goto resolved; + +/* Modifiers */ +case BTF_KIND_TYPEDEF : +case BTF_KIND_VOLATILE : +case BTF_KIND_CONST : +case BTF_KIND_RESTRICT : + type =btf_type_by_id (btf, type->type); +break ; + +case BTF_KIND_ARRAY : +if (!array_type) + array_type = type; + array =btf_type_array (type); +if (nelems && array->nelems >U32_MAX / nelems) +return ERR_PTR (-EINVAL ); + nelems *= array->nelems; + type =btf_type_by_id (btf, array->type); +break ; + +/* type without size */ +default : +return ERR_PTR (-EINVAL ); + } + } + +return ERR_PTR (-EINVAL ); + +resolved: +if (nelems && size >U32_MAX / nelems) +return ERR_PTR (-EINVAL ); + + *type_size = nelems * size; + *total_nelems = nelems; + *elem_type = type; + +return array_type ? : type; +} +/* The input param "type_id" must point to a needs_resolve type */ static const struct btf_type *btf_type_id_resolve (const struct btf *btf,u32 *type_id)
@@ -3494,10 +3570,10 @@ int btf_struct_access(struct bpf_verifier_log *log,enum bpf_access_type atype, u32 *next_btf_id) { + u32 i, moff, mtrue_end, msize = 0, total_nelems = 0; +const struct btf_type *mtype, *elem_type =NULL ;const struct btf_member *member; -const struct btf_type *mtype;const char *tname, *mname; -int i, moff =0 , msize; again: tname =__btf_name_by_offset (btf_vmlinux, t->name_off);
@@ -3507,40 +3583,78 @@ int btf_struct_access(struct bpf_verifier_log *log, }for_each_member (i, t, member) { -/* offset of the field in bits */ - moff =btf_member_bit_offset (t, member); -if (btf_member_bitfield_size (t, member))/* bitfields are not supported yet */ continue ; -if (off + size <= moff /8 ) -/* won't find anything, field is already too far */ +/* offset of the field in bytes */ + moff =btf_member_bit_offset (t, member) /8 ; +if (off + size <= moff)break ; +/* In case of "off" is pointing to holes of a struct */ +if (off < moff) +continue ;/* type of the field */ mtype =btf_type_by_id (btf_vmlinux, member->type); mname =__btf_name_by_offset (btf_vmlinux, member->name_off); -/* skip modifiers */ -while (btf_type_is_modifier (mtype)) - mtype =btf_type_by_id (btf_vmlinux, mtype->type); - -if (btf_type_is_array (mtype)) -/* array deref is not supported yet */ -continue ; - -if (!btf_type_has_size (mtype) && !btf_type_is_ptr (mtype)) { + mtype =btf_resolve_size (btf_vmlinux, mtype, &msize, + &elem_type, &total_nelems); +if (IS_ERR (mtype)) {bpf_log (log,"field %s doesn't have size\n" , mname);return -EFAULT ; } -if (btf_type_is_ptr (mtype)) - msize =8 ; -else - msize = mtype->size; -if (off >= moff /8 + msize) + + mtrue_end = moff + msize; +if (off >= mtrue_end)/* no overlap with member, keep iterating */ continue ; + +if (btf_type_is_array (mtype)) { +u32 elem_idx; + +/* btf_resolve_size() above helps to +* linearize a multi-dimensional array. +* +* The logic here is treating an array +* in a struct as the following way: +* +* struct outer { +* struct inner array[2][2]; +* }; +* +* looks like: +* +* struct outer { +* struct inner array_elem0; +* struct inner array_elem1; +* struct inner array_elem2; +* struct inner array_elem3; +* }; +* +* When accessing outer->array[1][0], it moves +* moff to "array_elem2" and set mtype to +* "struct inner", then most of the remaining +* logic will fall through without caring +* the current member is an array or not. +* +* Note that the mtrue_end still +* points to the end of the array +* instead of pointing to the end of +* the array_elem2. +*/ + +/* skip empty array */ +if (moff == mtrue_end) +continue ; + + msize /= total_nelems; + elem_idx = (off - moff) / msize; + moff += elem_idx * msize; + mtype = elem_type; + } +/* the 'off' we're looking for is either equal to start * of this field or inside of this struct */
@@ -3549,20 +3663,20 @@ int btf_struct_access(struct bpf_verifier_log *log, t = mtype;/* adjust offset we're looking for */ - off -= moff /8 ; + off -= moff; goto again; } -if (msize != size) { -/* field access size doesn't match */ -bpf_log (log, -"cannot access %d bytes in struct %s field %s that has size %d\n" , - size, tname, mname, msize); -return -EACCES ; - }if (btf_type_is_ptr (mtype)) {const struct btf_type *stype; +if (msize != size || off != moff) { +bpf_log (log, +"cannot access ptr member %s with moff %u in struct %s with off %u size %u\n" , + mname, moff, tname, off, size); +return -EACCES ; + } + stype =btf_type_by_id (btf_vmlinux, mtype->type);/* skip modifiers */ while (btf_type_is_modifier (stype))
@@ -3572,7 +3686,20 @@ int btf_struct_access(struct bpf_verifier_log *log,return PTR_TO_BTF_ID ; } } -/* all other fields are treated as scalars */ + +/* Allow more flexible access within an int as long as +* it is within mtrue_end. +* Since mtrue_end could be the end of an array, +* that also allows using an array of int as a scratch +* space. e.g. skb->cb[]. +*/ +if (off + size > mtrue_end) { +bpf_log (log, +"access beyond the end of member %s (mend:%u) in struct %s with off %u size %u\n" , + mname, mtrue_end, tname, off, size); +return -EACCES ; + } +return SCALAR_VALUE ; }bpf_log (log,"struct %s doesn't have field at offset %d\n" , tname, off);
Signature · 1 line
2.17.1
Quoted 14 lines · Martin KaFai Lau
This patch adds array support to
btf_struct_access(). It supports array of int, array of struct and multidimensional array.It also allows using u8[] as a scratch space. For example, it allows access the "char cb[48]" with size larger than the array's element "char". Another potential use case is "u64 icsk_ca_priv[]" in the tcp congestion control.
btf_resolve_size()is added to resolve the size of any type. It will follow the modifier if there is any. Please see the function comment for details.
Quoted 6 lines
This patch also adds the "off < moff" check at the beginning of the for loop. It is to reject cases when "off" is pointing to a "hole" in a struct.
Signed-off-by Martin KaFai Lau <[email protected]>---
Looks good, just two small nits.
Quoted 11 lines
kernel/bpf/btf.c | 187 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 157 insertions(+), 30 deletions(-)kernel/bpf/btf.c +0
-0@@ -1036,6 +1036,82 @@ static const struct resolve_vertex *env_stack_peak(struct btf_verifier_env *env)return env->top_stack ? &env->stack[env->top_stack -1 ] :NULL ; }
[...]
kernel/bpf/btf.c int btf_struct_access(struct bpf_verifier_log *log, · line 3592
Quoted 5 lines
kernel/bpf/btf.c +3
-2-if (off + size <= moff /8 ) -/* won't find anything, field is already too far */ +/* offset of the field in bytes */ + moff =btf_member_bit_offset (t, member) /8 ; +if (off + size <= moff)
you dropped useful comment :(
Quoted 5 lines
break;kernel/bpf/btf.c +3
-0+/* In case of "off" is pointing to holes of a struct */ +if (off < moff) +continue ;
[...]
kernel/bpf/btf.c int btf_struct_access(struct bpf_verifier_log *log, · line 3609
Quoted 2 lines
kernel/bpf/btf.c +2
-0+ + mtrue_end = moff + msize;
nit: there is no other _end, so might be just mend (in line with moff)
Quoted 4 lines
kernel/bpf/btf.c +2
-0+if (off >= mtrue_end)/* no overlap with member, keep iterating */ continue ; +
[...]
Quoted 40 lines · Andrii Nakryiko
Quoted 14 lines · Martin KaFai Lau
This patch adds array support to
btf_struct_access(). It supports array of int, array of struct and multidimensional array.It also allows using u8[] as a scratch space. For example, it allows access the "char cb[48]" with size larger than the array's element "char". Another potential use case is "u64 icsk_ca_priv[]" in the tcp congestion control.
btf_resolve_size()is added to resolve the size of any type. It will follow the modifier if there is any. Please see the function comment for details.Quoted 6 lines
This patch also adds the "off < moff" check at the beginning of the for loop. It is to reject cases when "off" is pointing to a "hole" in a struct.
Signed-off-by Martin KaFai Lau <[email protected]>---
Looks good, just two small nits.
Acked-by Andrii Nakryiko <[email protected]>Quoted 11 lines
kernel/bpf/btf.c | 187 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 157 insertions(+), 30 deletions(-)kernel/bpf/btf.c +0
-0@@ -1036,6 +1036,82 @@ static const struct resolve_vertex *env_stack_peak(struct btf_verifier_env *env)return env->top_stack ? &env->stack[env->top_stack -1 ] :NULL ; }[...]
Quoted 7 lines
kernel/bpf/btf.c int btf_struct_access(struct bpf_verifier_log *log, · line 3592
Quoted 5 lines
kernel/bpf/btf.c +3
-2-if (off + size <= moff /8 ) -/* won't find anything, field is already too far */ +/* offset of the field in bytes */ + moff =btf_member_bit_offset (t, member) /8 ; +if (off + size <= moff)you dropped useful comment :(
good catch. will undo.
Quoted 7 lines
kernel/bpf/btf.c int btf_struct_access(struct bpf_verifier_log *log, · line 3596
Quoted 6 lines
break;kernel/bpf/btf.c +3
-0+/* In case of "off" is pointing to holes of a struct */ +if (off < moff) +continue ;
Quoted 6 lines
[...]
kernel/bpf/btf.c int btf_struct_access(struct bpf_verifier_log *log, · line 3609
Quoted 2 lines
kernel/bpf/btf.c +2
-0+ + mtrue_end = moff + msize;nit: there is no other
_end, so might be just mend (in line with moff)
I prefer to keep it. For array, this _end is not the end of mtype. The intention is to distinguish it from the mtype/msize convention such that it is the true_end of the current struct's member. I will add some comments to clarify.
Quoted 7 lines
Quoted 5 lines
kernel/bpf/btf.c +2
-0+if (off >= mtrue_end)/* no overlap with member, keep iterating */ continue ; +[...]
Quoted 42 lines · Martin Lau
Quoted 40 lines · Andrii Nakryiko
Quoted 14 lines · Martin KaFai Lau
This patch adds array support to
btf_struct_access(). It supports array of int, array of struct and multidimensional array.It also allows using u8[] as a scratch space. For example, it allows access the "char cb[48]" with size larger than the array's element "char". Another potential use case is "u64 icsk_ca_priv[]" in the tcp congestion control.
btf_resolve_size()is added to resolve the size of any type. It will follow the modifier if there is any. Please see the function comment for details.Quoted 6 lines
This patch also adds the "off < moff" check at the beginning of the for loop. It is to reject cases when "off" is pointing to a "hole" in a struct.
Signed-off-by Martin KaFai Lau <[email protected]>---
Looks good, just two small nits.
Acked-by Andrii Nakryiko <[email protected]>Quoted 11 lines
kernel/bpf/btf.c | 187 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 157 insertions(+), 30 deletions(-)kernel/bpf/btf.c +0
-0@@ -1036,6 +1036,82 @@ static const struct resolve_vertex *env_stack_peak(struct btf_verifier_env *env)return env->top_stack ? &env->stack[env->top_stack -1 ] :NULL ; }[...]
Quoted 8 lines
Quoted 7 lines
kernel/bpf/btf.c int btf_struct_access(struct bpf_verifier_log *log, · line 3592
Quoted 5 lines
kernel/bpf/btf.c +3
-2-if (off + size <= moff /8 ) -/* won't find anything, field is already too far */ +/* offset of the field in bytes */ + moff =btf_member_bit_offset (t, member) /8 ; +if (off + size <= moff)you dropped useful comment :(
good catch. will undo.
thanks!
Quoted 10 lines
Quoted 10 lines
Quoted 7 lines
break;kernel/bpf/btf.c +3
-0+/* In case of "off" is pointing to holes of a struct */ +if (off < moff) +continue ;[...]
Quoted 8 lines
Quoted 4 lines
kernel/bpf/btf.c int btf_struct_access(struct bpf_verifier_log *log, · line 3609
Quoted 2 lines
kernel/bpf/btf.c +2
-0+ + mtrue_end = moff + msize;nit: there is no other
_end, so might be just mend (in line with moff)I prefer to keep it. For array, this
_endis not the end of mtype. The intention is to distinguish it from the mtype/msize convention such that it is thetrue_endof the current struct's member. I will add some comments to clarify.
Ok, sure, no problem.
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
kernel/bpf/btf.c +2
-0+if (off >= mtrue_end)/* no overlap with member, keep iterating */ continue ; +[...]
PATCH v3 3/3 bpf: Add cb access in kfree_skb test
In reply to Martin KaFai LauAccess the skb->cb[] in the kfree_skb test.
--- .../selftests/bpf/prog_tests/kfree_skb.c | 54 +++++++++++++++---- tools/testing/selftests/bpf/progs/kfree_skb.c | 25 +++++++-- 2 files changed, 63 insertions(+), 16 deletions(-)
tools/testing/selftests/bpf/prog_tests/kfree_skb.c +43 -11
@@ -1,15 +1,38 @@// SPDX-License-Identifier: GPL-2.0 #include <test_progs.h> +struct meta { +int ifindex; +__u32 cb32_0; +__u8 cb8_0; +}; + +static union { +__u32 cb32[5 ]; +__u8 cb8[20 ]; +} cb = { + .cb32[0 ] =0x81828384 , +}; +static void on_sample (void *ctx,int cpu,void *data,__u32 size) { -int ifindex = *(int *)data, duration =0 ; -struct ipv6_packet *pkt_v6 = data +4 ; +struct meta *meta = (struct meta *)data; +struct ipv6_packet *pkt_v6 = data +sizeof (*meta); +int duration =0 ; -if (ifindex !=1 ) +if (CHECK (size !=72 +sizeof (*meta),"check_size" ,"size %u != %zu\n" , + size,72 +sizeof (*meta))) +return ; +if (CHECK (meta->ifindex !=1 ,"check_meta_ifindex" , +"meta->ifindex = %d\n" , meta->ifindex))/* spurious kfree_skb not on loopback device */ return ; -if (CHECK (size !=76 ,"check_size" ,"size %u != 76\n" , size)) +if (CHECK (meta->cb8_0 != cb.cb8[0 ],"check_cb8_0" ,"cb8_0 %x != %x\n" , + meta->cb8_0, cb.cb8[0 ])) +return ; +if (CHECK (meta->cb32_0 != cb.cb32[0 ],"check_cb32_0" , +"cb32_0 %x != %x\n" , + meta->cb32_0, cb.cb32[0 ]))return ;if (CHECK (pkt_v6->eth.h_proto !=0xdd86 ,"check_eth" ,"h_proto %x\n" , pkt_v6->eth.h_proto))
@@ -26,6 +49,13 @@ static void on_sample(void *ctx, int cpu, void *data, __u32 size)void test_kfree_skb (void ) { +struct __sk_buff skb = {}; +struct bpf_prog_test_run_attr tattr = { + .data_in = &pkt_v6, + .data_size_in =sizeof (pkt_v6), + .ctx_in = &skb, + .ctx_size_in =sizeof (skb), + };struct bpf_prog_load_attr attr = { .file ="./kfree_skb.o" , };
@@ -36,11 +66,12 @@ void test_kfree_skb(void)struct bpf_link *link =NULL ;struct bpf_map *perf_buf_map;struct bpf_program *prog; -__u32 duration, retval; -int err, pkt_fd, kfree_skb_fd; +int err, kfree_skb_fd;bool passed = false; +__u32 duration =0 ; - err =bpf_prog_load ("./test_pkt_access.o" ,BPF_PROG_TYPE_SCHED_CLS , &obj, &pkt_fd); + err =bpf_prog_load ("./test_pkt_access.o" ,BPF_PROG_TYPE_SCHED_CLS , + &obj, &tattr.prog_fd);if (CHECK (err,"prog_load sched cls" ,"err %d errno %d\n" , err, errno))return ;
@@ -66,11 +97,12 @@ void test_kfree_skb(void)if (CHECK (IS_ERR (pb),"perf_buf__new" ,"err %ld\n" ,PTR_ERR (pb))) goto close_prog; - err =bpf_prog_test_run (pkt_fd,1 , &pkt_v6,sizeof (pkt_v6), -NULL ,NULL , &retval, &duration); -CHECK (err || retval,"ipv6" , +memcpy (skb.cb, &cb,sizeof (cb)); + err =bpf_prog_test_run_xattr (&tattr); + duration = tattr.duration; +CHECK (err || tattr.retval,"ipv6" ,"err %d errno %d retval %d duration %d\n" , - err, errno, retval, duration); + err, errno, tattr.retval, duration);/* read perf buffer */ err =perf_buffer__poll (pb,100 );
tools/testing/selftests/bpf/progs/kfree_skb.c +20 -5
@@ -43,6 +43,7 @@ struct sk_buff {refcount_t users;unsigned char *data;char __pkt_type_offset[0 ]; +char cb[48 ]; };/* copy arguments from
@@ -57,28 +58,41 @@ struct trace_kfree_skb {void *location; }; +struct meta { +int ifindex; +__u32 cb32_0; +__u8 cb8_0; +}; + SEC("tp_btf/kfree_skb")int trace_kfree_skb (struct trace_kfree_skb *ctx) {struct sk_buff *skb = ctx->skb;struct net_device *dev; -int ifindex;struct callback_head *ptr;void *func;int users;unsigned char *data;unsigned short pkt_data; +struct meta meta = {};char pkt_type; +__u32 *cb32; +__u8 *cb8;__builtin_preserve_access_index (({ users = skb->users.refs.counter; data = skb->data; dev = skb->dev; - ifindex = dev->ifindex; ptr = dev->ifalias->rcuhead.next; func = ptr->func; + cb8 = (__u8 *)&skb->cb; + cb32 = (__u32 *)&skb->cb; })); + meta.ifindex =_ (dev->ifindex); + meta.cb8_0 = cb8[8 ]; + meta.cb32_0 = cb32[2 ]; +bpf_probe_read_kernel (&pkt_type,sizeof (pkt_type),_ (&skb->__pkt_type_offset)); pkt_type &=7 ;
@@ -90,14 +104,15 @@ int trace_kfree_skb(struct trace_kfree_skb *ctx) _(skb->len), users, pkt_type);bpf_printk ("skb->queue_mapping %d\n" ,_ (skb->queue_mapping));bpf_printk ("dev->ifindex %d data %llx pkt_data %x\n" , - ifindex, data, pkt_data); + meta.ifindex, data, pkt_data); +bpf_printk ("cb8_0:%x cb32_0:%x\n" , meta.cb8_0, meta.cb32_0); -if (users !=1 || pkt_data !=bpf_htons (0x86dd ) || ifindex !=1 ) +if (users !=1 || pkt_data !=bpf_htons (0x86dd ) || meta.ifindex !=1 )/* raw tp ignores return value */ return 0 ;/* send first 72 byte of the packet to user space */ bpf_skb_output (skb, &perf_buf_map, (72ull <<32 ) |BPF_F_CURRENT_CPU , - &ifindex,sizeof (ifindex)); + &meta,sizeof (meta));return 0 ; }
Signature · 1 line
2.17.1
Re: [PATCH v3 bpf-next 3/3] bpf: Add cb access in kfree_skb test
Quoted 5 lines · Martin KaFai Lau
Access the skb->cb[] in the
kfree_skbtest.Signed-off-by Martin KaFai Lau <[email protected]>---
Quoted 4 lines
.../selftests/bpf/prog_tests/kfree_skb.c | 54 +++++++++++++++---- tools/testing/selftests/bpf/progs/kfree_skb.c | 25 +++++++-- 2 files changed, 63 insertions(+), 16 deletions(-)
[...]
tools/testing/selftests/bpf/progs/kfree_skb.c struct trace_kfree_skb { · line 94
Quoted 4 lines
tools/testing/selftests/bpf/progs/kfree_skb.c +3
-0+ meta.ifindex =_ (dev->ifindex); + meta.cb8_0 = cb8[8 ]; + meta.cb32_0 = cb32[2 ];
Have you tried doing it inside __builtin_preserve_access_index region? Does it fail because of extra allocations against meta?
Quoted 4 lines
+
bpf_probe_read_kernel(&pkt_type, sizeof(pkt_type), _(&skb->__pkt_type_offset)); pkt_type &= 7;
[...]
Re: [PATCH v3 bpf-next 3/3] bpf: Add cb access in kfree_skb test
Quoted 7 lines · Andrii Nakryiko
Quoted 5 lines · Martin KaFai Lau
Access the skb->cb[] in the
kfree_skbtest.Signed-off-by Martin KaFai Lau <[email protected]>---
Quoted 11 lines
Acked-by Andrii Nakryiko <[email protected]>Quoted 4 lines
.../selftests/bpf/prog_tests/kfree_skb.c | 54 +++++++++++++++---- tools/testing/selftests/bpf/progs/kfree_skb.c | 25 +++++++-- 2 files changed, 63 insertions(+), 16 deletions(-)[...]
Quoted 2 lines
+ meta.ifindex =
_(dev->ifindex);
I hit this when I put "meta.ifindex = dev->ifindex;" inside __builtin_preserve_access_index:
libbpf: prog 'tp_btf/kfree_skb': relo #0: no matching targets found for [13] meta + 0:0
libbpf: prog 'tp_btf/kfree_skb': relo #0: failed to relocate: -3
libbpf: failed to perform CO-RE relocations: -3
My blind guess was it thought meta has to be relocated too. Hence, I moved it out such that I can put __builtin_preserve_access_index only to "dev->ifindex".
Quoted 2 lines
tools/testing/selftests/bpf/progs/kfree_skb.c struct trace_kfree_skb { · line 94
Quoted 2 lines
tools/testing/selftests/bpf/progs/kfree_skb.c +2
-0+ meta.cb8_0 = cb8[8 ]; + meta.cb32_0 = cb32[2 ];
These two do not need relo.
Quoted 10 lines
Have you tried doing it inside
__builtin_preserve_access_indexregion? Does it fail because of extra allocations against meta?Quoted 4 lines
+
bpf_probe_read_kernel(&pkt_type, sizeof(pkt_type), _(&skb->__pkt_type_offset)); pkt_type &= 7;[...]