summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHou Tao <houtao1@huawei.com>2023-12-19 21:57:27 +0800
committerAlexei Starovoitov <ast@kernel.org>2023-12-19 18:22:11 -0800
commit441c725ed592cb22f2a82f2827dccd045356cc81 (patch)
tree9cac0236c309a0f046fcdbcc5987e947fa2055e6
parent85dd93ac6e00adf09fc27e4d2e7f5c9aaf275d38 (diff)
downloadlinux-stable-441c725ed592cb22f2a82f2827dccd045356cc81.tar.gz
linux-stable-441c725ed592cb22f2a82f2827dccd045356cc81.tar.bz2
linux-stable-441c725ed592cb22f2a82f2827dccd045356cc81.zip
selftests/bpf: Close cgrp fd before calling cleanup_cgroup_environment()
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> Link: https://lore.kernel.org/r/20231219135727.2661527-1-houtao@huaweicloud.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-rw-r--r--tools/testing/selftests/bpf/benchs/bench_htab_mem.c1
1 files changed, 1 insertions, 0 deletions
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();
}