[PATCH bpf-next] selftests/bpf: Close cgrp fd before calling cleanup_cgroup_environment()

[PATCH bpf-next] selftests/bpf: Close cgrp fd before calling cleanup_cgroup_environment()

[Hou Tao]

From: Hou Tao <houtao1@huawei.com>

There is error log when htab-mem benchmark completes. The error log
looks as follows:

$ ./bench htab-mem -d1
Setting up benchmark 'htab-mem'...
Benchmark 'htab-mem' started.
......
(cgroup_helpers.c:353: errno: Device or resource busy) umount cgroup2

Fix it by closing cgrp fd before invoking cleanup_cgroup_environment().

Signed-off-by: Hou Tao <houtao1@huawei.com>
---
 tools/testing/selftests/bpf/benchs/bench_htab_mem.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/bpf/benchs/bench_htab_mem.c b/tools/testing/selftests/bpf/benchs/bench_htab_mem.c
index 9146d3f414d2..926ee822143e 100644
--- a/tools/testing/selftests/bpf/benchs/bench_htab_mem.c
+++ b/tools/testing/selftests/bpf/benchs/bench_htab_mem.c
@@ -335,6 +335,7 @@ static void htab_mem_report_final(struct bench_res res[], int res_cnt)
 	       " peak memory usage %7.2lfMiB\n",
 	       loop_mean, loop_stddev, mem_mean, mem_stddev, peak_mem / 1048576.0);
 
+	close(ctx.fd);
 	cleanup_cgroup_environment();
 }
 
-- 
2.29.2

Re: [PATCH bpf-next] selftests/bpf: Close cgrp fd before calling cleanup_cgroup_environment()

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <ast@kernel.org>:

On Tue, 19 Dec 2023 21:57:27 +0800 you wrote:
> From: Hou Tao <houtao1@huawei.com>
> 
> There is error log when htab-mem benchmark completes. The error log
> looks as follows:
> 
> $ ./bench htab-mem -d1
> Setting up benchmark 'htab-mem'...
> Benchmark 'htab-mem' started.
> ......
> (cgroup_helpers.c:353: errno: Device or resource busy) umount cgroup2
> 
> [...]

Here is the summary with links:
  - [bpf-next] selftests/bpf: Close cgrp fd before calling cleanup_cgroup_environment()
    https://git.kernel.org/bpf/bpf-next/c/441c725ed592

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