Skip to contentSkip to conversation

selftests/bpf: replace bpf_probe_read_kernel with direct access

PATCH In review Suchit Karunakaran 3 participants 4 messages Apr 22 – Apr 23

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests/bpf: replace bpf_probe_read_kernel with direct access

Use direct field access instead of bpf_probe_read_kernel() for nlk->groups[0] and inode->i_ino, and clean up related code.

Removes obsolete FIXME comments and unused variable.

---
 .../testing/selftests/bpf/progs/bpf_iter_netlink.c  | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +2 -11
index 00b2ceae81fb..5930bf8899d2 100644
@@ -17,7 +17,6 @@ int dump_netlink(struct bpf_iter__netlink *ctx)
 	struct seq_file *seq = ctx->meta->seq;
 	struct netlink_sock *nlk = ctx->sk;
 	unsigned long group, ino;
-	struct inode *inode;
 	struct socket *sk;
 	struct sock *s;
 
@@ -35,10 +34,7 @@ int dump_netlink(struct bpf_iter__netlink *ctx)
 	if (!nlk->groups)  {
 		group = 0;
 	} else {
-		/* FIXME: temporary use bpf_probe_read_kernel here, needs
-		 * verifier support to do direct access.
-		 */
-		bpf_probe_read_kernel(&group, sizeof(group), &nlk->groups[0]);
+		group = nlk->groups[0];
 	}
 	BPF_SEQ_PRINTF(seq, "%-10u %08x %-8d %-8d %-5d %-8d ",
 		       nlk->portid, (u32)group,
@@ -50,12 +46,7 @@ int dump_netlink(struct bpf_iter__netlink *ctx)
 	if (!sk) {
 		ino = 0;
 	} else {
-		/* FIXME: container_of inside SOCK_INODE has a forced
-		 * type conversion, and direct access cannot be used
-		 * with current verifier.
-		 */
-		inode = SOCK_INODE(sk);
-		bpf_probe_read_kernel(&ino, sizeof(ino), &inode->i_ino);
+		ino = SOCK_INODE(sk)->i_ino;
 	}
 	BPF_SEQ_PRINTF(seq, "%-8u %-8lu\n", s->sk_drops.counter, ino);
 
Signature · 1 line
2.53.0
#1 lore raw
Quoted 24 lines · Suchit Karunakaran

Use direct field access instead of bpf_probe_read_kernel() for nlk->groups[0] and inode->i_ino, and clean up related code.

Removes obsolete FIXME comments and unused variable.

---
 .../testing/selftests/bpf/progs/bpf_iter_netlink.c  | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +0 -1
index 00b2ceae81fb..5930bf8899d2 100644
@@ -17,7 +17,6 @@ int dump_netlink(struct bpf_iter__netlink *ctx)
        struct seq_file *seq = ctx->meta->seq;
        struct netlink_sock *nlk = ctx->sk;
        unsigned long group, ino;
-       struct inode *inode;
        struct socket *sk;
        struct sock *s;
 

tools/testing/selftests/bpf/progs/bpf_iter_netlink.c int dump_netlink(struct bpf_iter__netlink *ctx) · line 41

Quoted 7 lines
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +0 -4
@@ -35,10 +34,7 @@ int dump_netlink(struct bpf_iter__netlink *ctx)
        if (!nlk->groups)  {
                group = 0;
        } else {
-               /* FIXME: temporary use bpf_probe_read_kernel here, needs
-                * verifier support to do direct access.
-                */
-               bpf_probe_read_kernel(&group, sizeof(group), &nlk->groups[0]);

Please stop sending patches to remove TODO and FIXME.

pw-bot: cr

#2 lore raw
Quoted 37 lines · Alexei Starovoitov
Quoted 24 lines · Suchit Karunakaran

Use direct field access instead of bpf_probe_read_kernel() for nlk->groups[0] and inode->i_ino, and clean up related code.

Removes obsolete FIXME comments and unused variable.

---
 .../testing/selftests/bpf/progs/bpf_iter_netlink.c  | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +0 -1
index 00b2ceae81fb..5930bf8899d2 100644
@@ -17,7 +17,6 @@ int dump_netlink(struct bpf_iter__netlink *ctx)
        struct seq_file *seq = ctx->meta->seq;
        struct netlink_sock *nlk = ctx->sk;
        unsigned long group, ino;
-       struct inode *inode;
        struct socket *sk;
        struct sock *s;
 

tools/testing/selftests/bpf/progs/bpf_iter_netlink.c int dump_netlink(struct bpf_iter__netlink *ctx) · line 41

Quoted 7 lines
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +0 -4
@@ -35,10 +34,7 @@ int dump_netlink(struct bpf_iter__netlink *ctx)
        if (!nlk->groups)  {
                group = 0;
        } else {
-               /* FIXME: temporary use bpf_probe_read_kernel here, needs
-                * verifier support to do direct access.
-                */
-               bpf_probe_read_kernel(&group, sizeof(group), &nlk->groups[0]);

Please stop sending patches to remove TODO and FIXME.

Quoted 1 line

pw-bot: cr

Sorry about that. I'll test it more rigorously next time and ensure the patch is sensible.

#3 lore raw
In reply to Suchit Karunakaran
Sashiko AI review found 2 potential issue(s): - [Medium] BPF verifier will reject the program due to an out-of-bounds access on `SOCK_INODE(sk)->i_ino`. - [Medium] BPF verifier will reject the…

Sashiko AI review found 2 potential issue(s):
- [Medium] BPF verifier will reject the program due to an out-of-bounds access on SOCK_INODE(sk)->i_ino.
- [Medium] BPF verifier will reject the program due to an invalid memory access when dereferencing nlk->groups[0]. --

commit 9c46bc4644e11b2c3abf78e2ca55fa73028182f8
Author: Suchit Karunakaran <[email protected]>

selftests/bpf: replace bpf_probe_read_kernel with direct access

Use direct field access instead of bpf_probe_read_kernel() for nlk->groups[0] and inode->i_ino, and clean up related code.

tools/testing/selftests/bpf/progs/bpf_iter_netlink.c int dump_netlink(struct bpf_iter__netlink *ctx) · line 37

Quoted 13 lines
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +1 -4
index 00b2ceae81fb0..5930bf8899d21 100644
@@ -35,10 +34,7 @@ int dump_netlink(struct bpf_iter__netlink *ctx)
 	if (!nlk->groups)  {
 		group = 0;
 	} else {
-		/* FIXME: temporary use bpf_probe_read_kernel here, needs
-		 * verifier support to do direct access.
-		 */
-		bpf_probe_read_kernel(&group, sizeof(group), &nlk->groups[0]);
+		group = nlk->groups[0];

Does the verifier know the size of the memory pointed to by nlk->groups?

The groups field in struct netlink_sock is a pointer to a scalar (unsigned long *). When the BPF program reads this pointer from the struct, the verifier tracks it as a generic pointer with a known memory size of 0, because BTF does not encode the size of the dynamically allocated array.

Will the direct array access nlk->groups[0] be rejected by the verifier's bounds check?

Quoted 4 lines
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +0 -0
 	}
 	BPF_SEQ_PRINTF(seq, "%-10u %08x %-8d %-8d %-5d %-8d ",
 		       nlk->portid, (u32)group,

tools/testing/selftests/bpf/progs/bpf_iter_netlink.c int dump_netlink(struct bpf_iter__netlink *ctx) · line 49

Quoted 10 lines
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +1 -6
@@ -50,12 +46,7 @@ int dump_netlink(struct bpf_iter__netlink *ctx)
 	if (!sk) {
 		ino = 0;
 	} else {
-		/* FIXME: container_of inside SOCK_INODE has a forced
-		 * type conversion, and direct access cannot be used
-		 * with current verifier.
-		 */
-		inode = SOCK_INODE(sk);
-		bpf_probe_read_kernel(&ino, sizeof(ino), &inode->i_ino);
+		ino = SOCK_INODE(sk)->i_ino;

Will the verifier reject this as an out-of-bounds access?

The SOCK_INODE macro relies on container_of to cast a struct socket pointer to a struct socket_alloc. In BPF, standard C pointer arithmetic does not implicitly update the BTF type tracked by the verifier.

The verifier will still track sk as a struct socket, but with an added offset. Because vfs_inode sits after socket in struct socket_alloc, accessing i_ino uses an offset that exceeds sizeof(struct socket).

Should this use bpf_core_cast(sk, struct socket_alloc) to update the verifier's tracked BTF type instead?

Quoted 3 lines
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +0 -0
 	}
 	BPF_SEQ_PRINTF(seq, "%-8u %-8lu\n", s->sk_drops.counter, ino);
 
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1