[PATCH bpf-next] selftests/bpf: Add test result messages for test_task_storage_map_stress_lookup

[PATCH bpf-next] selftests/bpf: Add test result messages for test_task_storage_map_stress_lookup

[Hou Tao]

From: Hou Tao <houtao1@huawei.com>

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

Signed-off-by: Hou Tao <houtao1@huawei.com>
---
 tools/testing/selftests/bpf/map_tests/task_storage_map.c | 6 +++++-
 tools/testing/selftests/bpf/test_maps.c                  | 2 +-
 tools/testing/selftests/bpf/test_maps.h                  | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/bpf/map_tests/task_storage_map.c b/tools/testing/selftests/bpf/map_tests/task_storage_map.c
index 1adc9c292eb2..aac08c85240b 100644
--- a/tools/testing/selftests/bpf/map_tests/task_storage_map.c
+++ b/tools/testing/selftests/bpf/map_tests/task_storage_map.c
@@ -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);
@@ -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__);
 }
diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c
index 1581a33b3f70..127c5c438a16 100644
--- a/tools/testing/selftests/bpf/test_maps.c
+++ b/tools/testing/selftests/bpf/test_maps.c
@@ -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) };
 
diff --git a/tools/testing/selftests/bpf/test_maps.h b/tools/testing/selftests/bpf/test_maps.h
index 77d8587ac4ed..f6fbca761732 100644
--- a/tools/testing/selftests/bpf/test_maps.h
+++ b/tools/testing/selftests/bpf/test_maps.h
@@ -14,4 +14,6 @@
 	}								\
 })
 
+extern int skips;
+
 #endif
-- 
2.29.2

Re: [PATCH bpf-next] selftests/bpf: Add test result messages for test_task_storage_map_stress_lookup

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Martin KaFai Lau <martin.lau@kernel.org>:

On Mon, 19 Sep 2022 11:57:14 +0800 you wrote:
> From: Hou Tao <houtao1@huawei.com>
> 
> 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.
> 
> [...]

Here is the summary with links:
  - [bpf-next] selftests/bpf: Add test result messages for test_task_storage_map_stress_lookup
    https://git.kernel.org/bpf/bpf-next/c/fe8152a0f964

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH bpf-next] selftests/bpf: Add test result messages for test_task_storage_map_stress_lookup

[Martin KaFai Lau]

On 9/18/22 8:57 PM, Hou Tao wrote:
> From: Hou Tao <houtao1@huawei.com>
> 
> 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
> 
> Signed-off-by: Hou Tao <houtao1@huawei.com>

Applied with a Fixes tag,
Fixes: 73b97bc78b32 ("selftests/bpf: ......

Please remember to add it next time for fixes.

Also, ...


> ---
>   tools/testing/selftests/bpf/map_tests/task_storage_map.c | 6 +++++-
>   tools/testing/selftests/bpf/test_maps.c                  | 2 +-
>   tools/testing/selftests/bpf/test_maps.h                  | 2 ++
>   3 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/map_tests/task_storage_map.c b/tools/testing/selftests/bpf/map_tests/task_storage_map.c
> index 1adc9c292eb2..aac08c85240b 100644
> --- a/tools/testing/selftests/bpf/map_tests/task_storage_map.c
> +++ b/tools/testing/selftests/bpf/map_tests/task_storage_map.c
> @@ -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++;

I noticed it is missing a read_bpf_task_storage_busy__destroy() here. 
Please fix.

Re: [PATCH bpf-next] selftests/bpf: Add test result messages for test_task_storage_map_stress_lookup

[Hou Tao]

Hi,

On 9/20/2022 2:25 AM, Martin KaFai Lau wrote:
> On 9/18/22 8:57 PM, Hou Tao wrote:
>> From: Hou Tao <houtao1@huawei.com>
>>
>> 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
>>
>> Signed-off-by: Hou Tao <houtao1@huawei.com>
>
> Applied with a Fixes tag,
> Fixes: 73b97bc78b32 ("selftests/bpf: ......
>
> Please remember to add it next time for fixes.
>
> Also, ...
>
>
>> ---
>>   tools/testing/selftests/bpf/map_tests/task_storage_map.c | 6 +++++-
>>   tools/testing/selftests/bpf/test_maps.c                  | 2 +-
>>   tools/testing/selftests/bpf/test_maps.h                  | 2 ++
>>   3 files changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/tools/testing/selftests/bpf/map_tests/task_storage_map.c
>> b/tools/testing/selftests/bpf/map_tests/task_storage_map.c
>> index 1adc9c292eb2..aac08c85240b 100644
>> --- a/tools/testing/selftests/bpf/map_tests/task_storage_map.c
>> +++ b/tools/testing/selftests/bpf/map_tests/task_storage_map.c
>> @@ -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++;
>
> I noticed it is missing a read_bpf_task_storage_busy__destroy() here. Please fix.
Oops. Sorry for missing that. Will send a v2.
>
> .