Skip to content

Commit 50133c0

Browse files
Guopeng Zhanghtejun
authored andcommitted
selftests: cgroup: Replace sleep with cg_read_key_long_poll() for waiting on nr_dying_descendants
Replace the manual sleep-and-retry logic in test_kmem_dead_cgroups() with the new helper `cg_read_key_long_poll()`. This change improves the robustness of the test by polling the "nr_dying_descendants" counter in `cgroup.stat` until it reaches 0 or the timeout is exceeded. Additionally, increase the retry timeout to 8 seconds (from 5 seconds) based on testing results: - With 5-second timeout: 4/20 runs passed. - With 8-second timeout: 20/20 runs passed. The 8 second timeout is based on stress testing of test_kmem_dead_cgroups() under load: 5 seconds was occasionally not enough for reclaim of dying descendants to complete, whereas 8 seconds consistently covered the observed latencies. This value is intended as a generous upper bound for the asynchronous reclaim and is not tied to any specific kernel constant, so it can be adjusted in the future if reclaim behavior changes. Signed-off-by: Guopeng Zhang <zhangguopeng@kylinos.cn> Reviewed-by: Shakeel Butt <shakeel.butt@linux.dev> Acked-by: Michal Koutný <mkoutny@suse.com> Signed-off-by: Tejun Heo <tj@kernel.org>
1 parent 6360d44 commit 50133c0

1 file changed

Lines changed: 15 additions & 18 deletions

File tree

tools/testing/selftests/cgroup/test_kmem.c

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
*/
2727
#define MAX_VMSTAT_ERROR (4096 * 64 * get_nprocs())
2828

29+
#define KMEM_DEAD_WAIT_RETRIES 80
2930

3031
static int alloc_dcache(const char *cgroup, void *arg)
3132
{
@@ -306,9 +307,7 @@ static int test_kmem_dead_cgroups(const char *root)
306307
{
307308
int ret = KSFT_FAIL;
308309
char *parent;
309-
long dead;
310-
int i;
311-
int max_time = 20;
310+
long dead = -1;
312311

313312
parent = cg_name(root, "kmem_dead_cgroups_test");
314313
if (!parent)
@@ -323,21 +322,19 @@ static int test_kmem_dead_cgroups(const char *root)
323322
if (cg_run_in_subcgroups(parent, alloc_dcache, (void *)100, 30))
324323
goto cleanup;
325324

326-
for (i = 0; i < max_time; i++) {
327-
dead = cg_read_key_long(parent, "cgroup.stat",
328-
"nr_dying_descendants ");
329-
if (dead == 0) {
330-
ret = KSFT_PASS;
331-
break;
332-
}
333-
/*
334-
* Reclaiming cgroups might take some time,
335-
* let's wait a bit and repeat.
336-
*/
337-
sleep(1);
338-
if (i > 5)
339-
printf("Waiting time longer than 5s; wait: %ds (dead: %ld)\n", i, dead);
340-
}
325+
/*
326+
* Allow up to ~8s for reclaim of dying descendants to complete.
327+
* This is a generous upper bound derived from stress testing, not
328+
* from a specific kernel constant, and can be adjusted if reclaim
329+
* behavior changes in the future.
330+
*/
331+
dead = cg_read_key_long_poll(parent, "cgroup.stat",
332+
"nr_dying_descendants ", 0, KMEM_DEAD_WAIT_RETRIES,
333+
DEFAULT_WAIT_INTERVAL_US);
334+
if (dead)
335+
goto cleanup;
336+
337+
ret = KSFT_PASS;
341338

342339
cleanup:
343340
cg_destroy(parent);

0 commit comments

Comments
 (0)