From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35499317170 for ; Mon, 2 Mar 2026 18:08:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.183 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772474902; cv=none; b=SkqnUlVfROpeQArua6u0tloa3xTnrkwE8QU8yt8x2g8OA6Eqy57+KYz1mZ5wazWCzLFeHJC70TBob1bAnVdc8ZyVxUyisQVUXaDzB2Y7epVjmS0xPOKG3lIkftPA8xV+65jSi0QNu7mIwlqPNQTFDQlpZpmsZ1pb3OikAU0s/og= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772474902; c=relaxed/simple; bh=xjF4+tWkc6g+4BdqR2/enKBC0T9NxXn/WkOZX0FwG/g=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=TZkJPD+bnGQEWs4Rk91dZJ8/5tTrJOcYYibe5RNV80LbDzawBeNcZuOepXDlz5uKN/IYVfwkXjNGvf8Vp+yvvRdq9TFmqJ56mQiIeFTsEmmeCcTZbvFDwut8zIYKHapnpXGet3afA/VXtrp687SJvrNifEHsFH75PJ7lEXWb0g8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=wC6kB1yc; arc=none smtp.client-ip=91.218.175.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="wC6kB1yc" Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1772474899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dZ2gxKemZ+JeVmYdtQKayvYgyXSIJCMkNESTuRUlV9w=; b=wC6kB1ycBMVxSXz05CKopglvptXXA5N+qmVjP2lB9UHUzzGHqMuYtREfQxgEfUYRUesApr TNXO05sHEqGtvnbZscc9dL1xHym69TQqkuOnPbUQHaIdn1BgQPksflKIkai1SNVPx+cW2P qAffALo9aTFmwSnAvXCaeaf+9WOH6xA= Date: Mon, 2 Mar 2026 10:08:12 -0800 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH bpf-next v4 1/3] selftests/bpf: Remove kmem subtest from cgroup_iter_memcg To: Hui Zhu , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Shuah Khan , Roman Gushchin , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Hui Zhu References: Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: "JP Kobryn (Meta)" In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT On 2/28/26 1:25 AM, Hui Zhu wrote: > From: Hui Zhu > > When cgroup.memory=nokmem is set in the kernel command line, kmem > accounting is disabled. This causes the test_kmem subtest in > cgroup_iter_memcg to fail because it expects non-zero kmem values. > > Remove the kmem subtest altogether since the remaining subtests > (shmem, file, pgfault) already provide sufficient coverage for > the cgroup iter memcg functionality. > > Signed-off-by: Hui Zhu > --- > .../testing/selftests/bpf/cgroup_iter_memcg.h | 2 -- > .../bpf/prog_tests/cgroup_iter_memcg.c | 28 ------------------- > .../selftests/bpf/progs/cgroup_iter_memcg.c | 1 - > 3 files changed, 31 deletions(-) > > diff --git a/tools/testing/selftests/bpf/cgroup_iter_memcg.h b/tools/testing/selftests/bpf/cgroup_iter_memcg.h > index 3f59b127943b..ff20ec537164 100644 > --- a/tools/testing/selftests/bpf/cgroup_iter_memcg.h > +++ b/tools/testing/selftests/bpf/cgroup_iter_memcg.h > @@ -9,8 +9,6 @@ struct memcg_query { > unsigned long nr_shmem; > unsigned long nr_file_pages; > unsigned long nr_file_mapped; > - /* some memcg_stat_item */ > - unsigned long memcg_kmem; > /* some vm_event_item */ > unsigned long pgfault; > }; > diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c b/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c > index a5afd16705f0..88fc3e83d2b7 100644 > --- a/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c > +++ b/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c > @@ -126,32 +126,6 @@ static void test_shmem(struct bpf_link *link, struct memcg_query *memcg_query) > shm_unlink("/tmp_shmem"); > } > > -#define NR_PIPES 64 > -static void test_kmem(struct bpf_link *link, struct memcg_query *memcg_query) > -{ > - int fds[NR_PIPES][2], i; > - > - /* > - * Increase kmem value by creating pipes which will allocate some > - * kernel buffers. > - */ > - for (i = 0; i < NR_PIPES; i++) { > - if (!ASSERT_OK(pipe(fds[i]), "pipe")) > - goto cleanup; > - } > - > - if (!ASSERT_OK(read_stats(link), "read stats")) > - goto cleanup; > - > - ASSERT_GT(memcg_query->memcg_kmem, 0, "kmem value"); > - > -cleanup: > - for (i = i - 1; i >= 0; i--) { > - close(fds[i][0]); > - close(fds[i][1]); > - } > -} > - > static void test_pgfault(struct bpf_link *link, struct memcg_query *memcg_query) > { > void *map; > @@ -209,8 +183,6 @@ void test_cgroup_iter_memcg(void) > test_shmem(link, &skel->data_query->memcg_query); > if (test__start_subtest("cgroup_iter_memcg__file")) > test_file(link, &skel->data_query->memcg_query); > - if (test__start_subtest("cgroup_iter_memcg__kmem")) > - test_kmem(link, &skel->data_query->memcg_query); > if (test__start_subtest("cgroup_iter_memcg__pgfault")) > test_pgfault(link, &skel->data_query->memcg_query); > > diff --git a/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c b/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c > index 59fb70a3cc50..12f79a44133e 100644 > --- a/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c > +++ b/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c > @@ -30,7 +30,6 @@ int cgroup_memcg_query(struct bpf_iter__cgroup *ctx) > memcg_query.nr_shmem = bpf_mem_cgroup_page_state(memcg, NR_SHMEM); > memcg_query.nr_file_pages = bpf_mem_cgroup_page_state(memcg, NR_FILE_PAGES); > memcg_query.nr_file_mapped = bpf_mem_cgroup_page_state(memcg, NR_FILE_MAPPED); > - memcg_query.memcg_kmem = bpf_mem_cgroup_page_state(memcg, MEMCG_KMEM); > memcg_query.pgfault = bpf_mem_cgroup_vm_events(memcg, PGFAULT); > > bpf_put_mem_cgroup(memcg); Reviewed-by: JP Kobryn