Skip to contentSkip to conversation

selftests/bpf: Fix htab_update/reenter_update selftest failure

PATCH Superseded Saket Kumar Bhaskar 2 participants 6 messages Nov 6, 2025 – Nov 12, 2025

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests/bpf: Fix htab_update/reenter_update selftest failure

Since commit 31158ad02ddb ("rqspinlock: Add deadlock detection and recovery") the updated path on re-entrancy now reports deadlock via
-EDEADLK instead of the previous -EBUSY.

The selftest is updated to align with expected errno with the kernel’s current behavior.

---
 tools/testing/selftests/bpf/prog_tests/htab_update.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/htab_update.c +1 -1
index 2bc85f4814f4..98d52bb1446f 100644
@@ -40,7 +40,7 @@ static void test_reenter_update(void)
 	if (!ASSERT_OK(err, "add element"))
 		goto out;
 
-	ASSERT_EQ(skel->bss->update_err, -EBUSY, "no reentrancy");
+	ASSERT_EQ(skel->bss->update_err, -EDEADLK, "no reentrancy");
 out:
 	htab_update__destroy(skel);
 }
Signature · 1 line
2.51.0
#1 lore raw
Quoted 18 lines · Saket Kumar Bhaskar

Since commit 31158ad02ddb ("rqspinlock: Add deadlock detection and recovery") the updated path on re-entrancy now reports deadlock via
-EDEADLK instead of the previous -EBUSY.

The selftest is updated to align with expected errno with the kernel’s current behavior.

---
 tools/testing/selftests/bpf/prog_tests/htab_update.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/htab_update.c +0 -0
index 2bc85f4814f4..98d52bb1446f 100644

tools/testing/selftests/bpf/prog_tests/htab_update.c static void test_reenter_update(void) · line 43

Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/htab_update.c +1 -1
@@ -40,7 +40,7 @@ static void test_reenter_update(void)
        if (!ASSERT_OK(err, "add element"))
                goto out;
 
-       ASSERT_EQ(skel->bss->update_err, -EBUSY, "no reentrancy");
+       ASSERT_EQ(skel->bss->update_err, -EDEADLK, "no reentrancy");

Makes sense, but looks like the test was broken for quite some time. It fails with

        /* lookup_elem_raw() may be inlined and find_kernel_btf_id()
will return -ESRCH */
        bpf_program__set_autoload(skel->progs.lookup_elem_raw, true);
        err = htab_update__load(skel);
        if (!ASSERT_TRUE(!err || err == -ESRCH, "htab_update__load") || err)

before reaching deadlk check.
Pls make it more robust.
__pcpu_freelist_pop() might be better alternative then lookup_elem_raw().

pw-bot: cr

#2 lore raw
Quoted 33 lines · Alexei Starovoitov
Quoted 18 lines · Saket Kumar Bhaskar

Since commit 31158ad02ddb ("rqspinlock: Add deadlock detection and recovery") the updated path on re-entrancy now reports deadlock via
-EDEADLK instead of the previous -EBUSY.

The selftest is updated to align with expected errno with the kernel’s current behavior.

---
 tools/testing/selftests/bpf/prog_tests/htab_update.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/htab_update.c +0 -0
index 2bc85f4814f4..98d52bb1446f 100644

tools/testing/selftests/bpf/prog_tests/htab_update.c static void test_reenter_update(void) · line 43

Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/htab_update.c +1 -1
@@ -40,7 +40,7 @@ static void test_reenter_update(void)
        if (!ASSERT_OK(err, "add element"))
                goto out;
 
-       ASSERT_EQ(skel->bss->update_err, -EBUSY, "no reentrancy");
+       ASSERT_EQ(skel->bss->update_err, -EDEADLK, "no reentrancy");

Makes sense, but looks like the test was broken for quite some time. It fails with

        /* lookup_elem_raw() may be inlined and find_kernel_btf_id()
will return -ESRCH */
        bpf_program__set_autoload(skel->progs.lookup_elem_raw, true);
        err = htab_update__load(skel);
        if (!ASSERT_TRUE(!err || err == -ESRCH, "htab_update__load") || err)
Quoted 5 lines

before reaching deadlk check.
Pls make it more robust.
__pcpu_freelist_pop() might be better alternative then lookup_elem_raw().

pw-bot: cr

Hi Alexei,

I tried for __pcpu_freelist_pop, looks like it is not good candidate to attach fentry for, as it is non traceable:

trace_kprobe: Could not probe notrace function __pcpu_freelist_pop

I wasn't able to find any other function for this.

Thanks
Saket

#3 lore raw
Quoted 41 lines · Saket Kumar Bhaskar
Quoted 33 lines · Alexei Starovoitov
Quoted 18 lines · Saket Kumar Bhaskar

Since commit 31158ad02ddb ("rqspinlock: Add deadlock detection and recovery") the updated path on re-entrancy now reports deadlock via
-EDEADLK instead of the previous -EBUSY.

The selftest is updated to align with expected errno with the kernel’s current behavior.

---
 tools/testing/selftests/bpf/prog_tests/htab_update.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/htab_update.c +0 -0
index 2bc85f4814f4..98d52bb1446f 100644

tools/testing/selftests/bpf/prog_tests/htab_update.c static void test_reenter_update(void) · line 43

Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/htab_update.c +1 -1
@@ -40,7 +40,7 @@ static void test_reenter_update(void)
        if (!ASSERT_OK(err, "add element"))
                goto out;
 
-       ASSERT_EQ(skel->bss->update_err, -EBUSY, "no reentrancy");
+       ASSERT_EQ(skel->bss->update_err, -EDEADLK, "no reentrancy");

Makes sense, but looks like the test was broken for quite some time. It fails with

        /* lookup_elem_raw() may be inlined and find_kernel_btf_id()
will return -ESRCH */
        bpf_program__set_autoload(skel->progs.lookup_elem_raw, true);
        err = htab_update__load(skel);
        if (!ASSERT_TRUE(!err || err == -ESRCH, "htab_update__load") || err)
Quoted 5 lines

before reaching deadlk check.
Pls make it more robust.
__pcpu_freelist_pop() might be better alternative then lookup_elem_raw().

pw-bot: cr

Quoted 8 lines

Hi Alexei,

I tried for __pcpu_freelist_pop, looks like it is not good candidate to attach fentry for, as it is non traceable:

trace_kprobe: Could not probe notrace function __pcpu_freelist_pop

I wasn't able to find any other function for this.

alloc_htab_elem() is not inlined for me.
bpf_obj_free_fields() would be another option.

#4 lore raw
Quoted 47 lines · Alexei Starovoitov
Quoted 46 lines · Saket Kumar Bhaskar
Quoted 33 lines · Alexei Starovoitov
Quoted 18 lines · Saket Kumar Bhaskar

Since commit 31158ad02ddb ("rqspinlock: Add deadlock detection and recovery") the updated path on re-entrancy now reports deadlock via
-EDEADLK instead of the previous -EBUSY.

The selftest is updated to align with expected errno with the kernel’s current behavior.

---
 tools/testing/selftests/bpf/prog_tests/htab_update.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/htab_update.c +0 -0
index 2bc85f4814f4..98d52bb1446f 100644

tools/testing/selftests/bpf/prog_tests/htab_update.c static void test_reenter_update(void) · line 43

Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/htab_update.c +1 -1
@@ -40,7 +40,7 @@ static void test_reenter_update(void)
        if (!ASSERT_OK(err, "add element"))
                goto out;
 
-       ASSERT_EQ(skel->bss->update_err, -EBUSY, "no reentrancy");
+       ASSERT_EQ(skel->bss->update_err, -EDEADLK, "no reentrancy");

Makes sense, but looks like the test was broken for quite some time. It fails with

        /* lookup_elem_raw() may be inlined and find_kernel_btf_id()
will return -ESRCH */
        bpf_program__set_autoload(skel->progs.lookup_elem_raw, true);
        err = htab_update__load(skel);
        if (!ASSERT_TRUE(!err || err == -ESRCH, "htab_update__load") || err)
Quoted 5 lines

before reaching deadlk check.
Pls make it more robust.
__pcpu_freelist_pop() might be better alternative then lookup_elem_raw().

pw-bot: cr

Hi Alexei,

I tried for __pcpu_freelist_pop, looks like it is not good candidate to attach fentry for, as it is non traceable:

Quoted 6 lines
Quoted 3 lines

trace_kprobe: Could not probe notrace function __pcpu_freelist_pop

I wasn't able to find any other function for this.

alloc_htab_elem() is not inlined for me.
bpf_obj_free_fields() would be another option.

Since alloc_htab_elem() is a static function, wouldn’t its inlining behavior be compiler-dependent?

static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key,
void *value, u32 key_size, u32 hash, bool percpu, bool onallcpus, struct htab_elem *old_elem)

When the fentry program is instead attached to bpf_obj_free_fields(), the bpf_map_update_elem() call returns 0 rather than -EDEADLK, because bpf_obj_free_fields() is not invoked in the bpf_map_update_elem() re-entrancy path:

./test_progs -t htab_update/reenter_update -v
bpf_testmod.ko is already unloaded.
Loading bpf_testmod.ko...
Successfully loaded bpf_testmod.ko. test_reenter_update:PASS:htab_update__open 0 nsec test_reenter_update:PASS:htab_update__load 0 nsec test_reenter_update:PASS:htab_update__attach 0 nsec test_reenter_update:PASS:add element 0 nsec
test_reenter_update:FAIL:no reentrancy unexpected no reentrancy: actual 0 != expected -35
#143/1 htab_update/reenter_update:FAIL
#143 htab_update:FAIL
Summary: 0/0 PASSED, 0 SKIPPED, 1 FAILED
Successfully unloaded bpf_testmod.ko.

#5 lore raw
Quoted 49 lines · Saket Kumar Bhaskar
Quoted 47 lines · Alexei Starovoitov
Quoted 46 lines · Saket Kumar Bhaskar
Quoted 33 lines · Alexei Starovoitov
Quoted 18 lines · Saket Kumar Bhaskar

Since commit 31158ad02ddb ("rqspinlock: Add deadlock detection and recovery") the updated path on re-entrancy now reports deadlock via
-EDEADLK instead of the previous -EBUSY.

The selftest is updated to align with expected errno with the kernel’s current behavior.

---
 tools/testing/selftests/bpf/prog_tests/htab_update.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/htab_update.c +0 -0
index 2bc85f4814f4..98d52bb1446f 100644

tools/testing/selftests/bpf/prog_tests/htab_update.c static void test_reenter_update(void) · line 43

Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/htab_update.c +1 -1
@@ -40,7 +40,7 @@ static void test_reenter_update(void)
        if (!ASSERT_OK(err, "add element"))
                goto out;
 
-       ASSERT_EQ(skel->bss->update_err, -EBUSY, "no reentrancy");
+       ASSERT_EQ(skel->bss->update_err, -EDEADLK, "no reentrancy");

Makes sense, but looks like the test was broken for quite some time. It fails with

        /* lookup_elem_raw() may be inlined and find_kernel_btf_id()
will return -ESRCH */
        bpf_program__set_autoload(skel->progs.lookup_elem_raw, true);
        err = htab_update__load(skel);
        if (!ASSERT_TRUE(!err || err == -ESRCH, "htab_update__load") || err)
Quoted 5 lines

before reaching deadlk check.
Pls make it more robust.
__pcpu_freelist_pop() might be better alternative then lookup_elem_raw().

pw-bot: cr

Hi Alexei,

I tried for __pcpu_freelist_pop, looks like it is not good candidate to attach fentry for, as it is non traceable:

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

trace_kprobe: Could not probe notrace function __pcpu_freelist_pop

I wasn't able to find any other function for this.

alloc_htab_elem() is not inlined for me.
bpf_obj_free_fields() would be another option.

Since alloc_htab_elem() is a static function, wouldn’t its inlining behavior be compiler-dependent?

of course. Just like lookup_elem_raw(), but alloc is much bigger and less likely to be inlined.

Quoted 9 lines

static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key,
void *value, u32 key_size, u32 hash, bool percpu, bool onallcpus, struct htab_elem *old_elem)

When the fentry program is instead attached to bpf_obj_free_fields(), the bpf_map_update_elem() call returns 0 rather than -EDEADLK, because bpf_obj_free_fields() is not invoked in the bpf_map_update_elem() re-entrancy path:

Then make it so. Think what you need to do to make check_and_free_fields() call it.