Skip to content

Commit

Permalink
selftests/bpf: Add test result messages for test_task_storage_map_str…
Browse files Browse the repository at this point in the history
…ess_lookup

Add test result message when test_task_storage_map_stress_lookup()
succeeds or is skipped. The test case can be skipped due to the choose
of preemption model in kernel config, so export skips in test_maps.c and
increase it when needed.

The following is the output of test_maps when the test case succeeds or
is skipped:

  test_task_storage_map_stress_lookup:PASS
  test_maps: OK, 0 SKIPPED

  test_task_storage_map_stress_lookup SKIP (no CONFIG_PREEMPT)
  test_maps: OK, 1 SKIPPED

Fixes: 73b97bc ("selftests/bpf: Test concurrent updates on bpf_task_storage_busy")
Signed-off-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20220919035714.2195144-1-houtao@huaweicloud.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
  • Loading branch information
Hou Tao authored and Martin KaFai Lau committed Sep 19, 2022
1 parent 571f973 commit a7e8540
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 5 additions & 1 deletion tools/testing/selftests/bpf/map_tests/task_storage_map.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,11 @@ void test_task_storage_map_stress_lookup(void)
CHECK(err, "open_and_load", "error %d\n", err);

/* Only for a fully preemptible kernel */
if (!skel->kconfig->CONFIG_PREEMPT)
if (!skel->kconfig->CONFIG_PREEMPT) {
printf("%s SKIP (no CONFIG_PREEMPT)\n", __func__);
skips++;
return;
}

/* Save the old affinity setting */
sched_getaffinity(getpid(), sizeof(old), &old);
Expand Down Expand Up @@ -119,4 +122,5 @@ void test_task_storage_map_stress_lookup(void)
read_bpf_task_storage_busy__destroy(skel);
/* Restore affinity setting */
sched_setaffinity(getpid(), sizeof(old), &old);
printf("%s:PASS\n", __func__);
}
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/test_maps.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define ENOTSUPP 524
#endif

static int skips;
int skips;

static struct bpf_map_create_opts map_opts = { .sz = sizeof(map_opts) };

Expand Down
2 changes: 2 additions & 0 deletions tools/testing/selftests/bpf/test_maps.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@
} \
})

extern int skips;

#endif

0 comments on commit a7e8540

Please sign in to comment.