From nobody Thu Apr 2 20:28:03 2026 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) (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 826572D7DCF for ; Fri, 13 Feb 2026 07:24:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770967454; cv=none; b=guWGma9/unhBl6F8FSHGUnLkGRx9Jcxa5Nb9AfWhJyPTLD47vH+19iTdzNX/6x2wGNfE/hs+7AxU8DO6DeqCSG+OGErEb4GIsEVZhyTYNWI9MEeOatgw7EjZ0fxjV1o2/xWte7nPSIFU0w8ZhZDWd3MDFj/i6cJtrPi/mCBxFZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770967454; c=relaxed/simple; bh=2HsD6dslEUHwTb02HytZjoVAdwwYRkGD0QIcC0gqh8E=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qWH5s8+S/de9redbsLUZv6PHnYD7Zhxzlh6BGVqc09gA1JSiyQ1LUVNUzrqi0arRQbMjNlz2TaQGB72a0aDghiWyXW1rnzA90Zh5Q3PiEkGdULUeqw0Hx8uV7F3EZwrf8Rjur2dMKrxoEqLVABNhccYcSL4JQ7wPXJPaeAOcOhs= 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=Bwmg6GyB; arc=none smtp.client-ip=95.215.58.188 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="Bwmg6GyB" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1770967450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nAgB8oFd5RIbhmI0zJ6vnRRfguX9/AUjdmRvUVXFkXc=; b=Bwmg6GyBinlCH54henK1zV60MzTL0l3tu5CSTyFpVvZxpMIPuMmzpLyguS+1lZAgtfxThx ZRYE8Z7/rCz3jQGeSoknWuAxJ+v/PGn0dILItTfznzId6qwBPYUZX05uQ5YyBcDaRfQ8Ss HMBzLtIOGY20FvjryGC6Mjg6pUishBw= From: Hui Zhu To: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , 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 , Hui Zhu , JP Kobryn , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v2 1/3] bpf: Use bpf_core_enum_value for stats in cgroup_iter_memcg Date: Fri, 13 Feb 2026 15:23:39 +0800 Message-ID: <24ac7bab25d8d2a24a35ab87a5283263eb6a4575.1770965805.git.zhuhui@kylinos.cn> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Hui Zhu Replace hardcoded enum values with bpf_core_enum_value() calls in cgroup_iter_memcg test to improve portability across different kernel versions. The change adds runtime enum value resolution for: - node_stat_item: NR_ANON_MAPPED, NR_SHMEM, NR_FILE_PAGES, NR_FILE_MAPPED - memcg_stat_item: MEMCG_KMEM - vm_event_item: PGFAULT This ensures the BPF program can adapt to enum value changes between kernel versions, returning early if any enum value is unavailable (returns 0). Signed-off-by: Hui Zhu --- .../selftests/bpf/progs/cgroup_iter_memcg.c | 41 +++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c b/tools/= testing/selftests/bpf/progs/cgroup_iter_memcg.c index 59fb70a3cc50..b020951dd7e6 100644 --- a/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c +++ b/tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c @@ -15,6 +15,8 @@ int cgroup_memcg_query(struct bpf_iter__cgroup *ctx) struct cgroup *cgrp =3D ctx->cgroup; struct cgroup_subsys_state *css; struct mem_cgroup *memcg; + int ret =3D 1; + int idx; =20 if (!cgrp) return 1; @@ -26,14 +28,39 @@ int cgroup_memcg_query(struct bpf_iter__cgroup *ctx) =20 bpf_mem_cgroup_flush_stats(memcg); =20 - memcg_query.nr_anon_mapped =3D bpf_mem_cgroup_page_state(memcg, NR_ANON_M= APPED); - memcg_query.nr_shmem =3D bpf_mem_cgroup_page_state(memcg, NR_SHMEM); - memcg_query.nr_file_pages =3D bpf_mem_cgroup_page_state(memcg, NR_FILE_PA= GES); - memcg_query.nr_file_mapped =3D bpf_mem_cgroup_page_state(memcg, NR_FILE_M= APPED); - memcg_query.memcg_kmem =3D bpf_mem_cgroup_page_state(memcg, MEMCG_KMEM); - memcg_query.pgfault =3D bpf_mem_cgroup_vm_events(memcg, PGFAULT); + idx =3D bpf_core_enum_value(enum node_stat_item, NR_ANON_MAPPED); + if (idx =3D=3D 0) + goto out; + memcg_query.nr_anon_mapped =3D bpf_mem_cgroup_page_state(memcg, idx); =20 + idx =3D bpf_core_enum_value(enum node_stat_item, NR_SHMEM); + if (idx =3D=3D 0) + goto out; + memcg_query.nr_shmem =3D bpf_mem_cgroup_page_state(memcg, idx); + + idx =3D bpf_core_enum_value(enum node_stat_item, NR_FILE_PAGES); + if (idx =3D=3D 0) + goto out; + memcg_query.nr_file_pages =3D bpf_mem_cgroup_page_state(memcg, idx); + + idx =3D bpf_core_enum_value(enum node_stat_item, NR_FILE_MAPPED); + if (idx =3D=3D 0) + goto out; + memcg_query.nr_file_mapped =3D bpf_mem_cgroup_page_state(memcg, idx); + + idx =3D bpf_core_enum_value(enum memcg_stat_item, MEMCG_KMEM); + if (idx =3D=3D 0) + goto out; + memcg_query.memcg_kmem =3D bpf_mem_cgroup_page_state(memcg, idx); + + idx =3D bpf_core_enum_value(enum vm_event_item, PGFAULT); + if (idx =3D=3D 0) + goto out; + memcg_query.pgfault =3D bpf_mem_cgroup_vm_events(memcg, idx); + + ret =3D 0; +out: bpf_put_mem_cgroup(memcg); =20 - return 0; + return ret; } --=20 2.43.0 From nobody Thu Apr 2 20:28:03 2026 Received: from out-186.mta1.migadu.com (out-186.mta1.migadu.com [95.215.58.186]) (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 139ED2D7DDC for ; Fri, 13 Feb 2026 07:24:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.186 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770967458; cv=none; b=rgvp4wWZa1fwmkp6SriR+zGgtD+ExR/RKUYFd4MKM8sR4Vl64eRiBPZR2l1qHffwmFQrZCQB7js7zmox/uHeR+L3EGrhXQiFGA+G4YMolVY/CHvDAXXOqWn70aTn0EIkq51Dq2z3d5tDhD5fkOncjnXp6HVfrUEpqRbudRr5D8k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770967458; c=relaxed/simple; bh=Iuf/jG1P1xgDjqZYNlxi2enRJMWQkBrEDPdJgXR1x88=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hx3Ewy4Q43C7nwCHEB7BVdutHm02hr/AjezI62z9NU0K4hqPVxfhHFrS9jVoXogIHpCk49fY1BFfAXd+caOrgk0ChZf00e/gKYVEMCrKjCcp8LRPIxTU4Jjo5f8Dhy4bUotrYchYY2Do7+UWt5Pc+DbiwNykNBVhkueUby8kdXY= 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=cc3fpTVf; arc=none smtp.client-ip=95.215.58.186 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="cc3fpTVf" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1770967455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HW+lAdpZxdJcNgAcGUXKCZ/ga5dHaGdja+4OcUdB4U4=; b=cc3fpTVfk4UjRwRea3SPdpj0kMzH1jIgL2ZENeZFz4l/ch+kXyBmx4iuQ6GHsvobdljBxm Zjd3mc9KkrGsTIZwIDoqz4fE63dyYV5bc5DJZFI87FljWPb7n7Gza8GpxVzbE3/jZb23Yg ia+RRy9hEvB7mBrPZqh015f4DQ+PNzQ= From: Hui Zhu To: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , 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 , Hui Zhu , JP Kobryn , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v2 2/3] selftests/bpf: Check bpf_mem_cgroup_page_state return value Date: Fri, 13 Feb 2026 15:23:40 +0800 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Hui Zhu When back-porting test_progs to different kernel versions, I encountered an issue where the test_cgroup_iter_memcg test would falsely pass even when bpf_mem_cgroup_page_state() failed. This patch adds explicit checks to ensure bpf_mem_cgroup_page_state() doesn't return -1 before validating the actual statistics values. Signed-off-by: Hui Zhu --- .../selftests/bpf/prog_tests/cgroup_iter_memcg.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c b/t= ools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c index a5afd16705f0..897b17b58df3 100644 --- a/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c +++ b/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c @@ -53,6 +53,8 @@ static void test_anon(struct bpf_link *link, struct memcg= _query *memcg_query) if (!ASSERT_OK(read_stats(link), "read stats")) goto cleanup; =20 + ASSERT_NEQ(memcg_query->nr_anon_mapped, (unsigned long)-1, + "bpf_mem_cgroup_page_state NR_ANON_MAPPED"); ASSERT_GT(memcg_query->nr_anon_mapped, 0, "final anon mapped val"); =20 cleanup: @@ -88,6 +90,10 @@ static void test_file(struct bpf_link *link, struct memc= g_query *memcg_query) if (!ASSERT_OK(read_stats(link), "read stats")) goto cleanup_map; =20 + ASSERT_NEQ(memcg_query->nr_file_pages, (unsigned long)-1, + "bpf_mem_cgroup_page_state NR_FILE_PAGES"); + ASSERT_NEQ(memcg_query->nr_file_mapped, (unsigned long)-1, + "bpf_mem_cgroup_page_state NR_FILE_MAPPED"); ASSERT_GT(memcg_query->nr_file_pages, 0, "final file value"); ASSERT_GT(memcg_query->nr_file_mapped, 0, "final file mapped value"); =20 @@ -119,6 +125,8 @@ static void test_shmem(struct bpf_link *link, struct me= mcg_query *memcg_query) if (!ASSERT_OK(read_stats(link), "read stats")) goto cleanup; =20 + ASSERT_NEQ(memcg_query->nr_shmem, (unsigned long)-1, + "bpf_mem_cgroup_page_state NR_SHMEM"); ASSERT_GT(memcg_query->nr_shmem, 0, "final shmem value"); =20 cleanup: @@ -143,6 +151,8 @@ static void test_kmem(struct bpf_link *link, struct mem= cg_query *memcg_query) if (!ASSERT_OK(read_stats(link), "read stats")) goto cleanup; =20 + ASSERT_NEQ(memcg_query->memcg_kmem, (unsigned long)-1, + "bpf_mem_cgroup_vm_events MEMCG_KMEM"); ASSERT_GT(memcg_query->memcg_kmem, 0, "kmem value"); =20 cleanup: @@ -170,6 +180,8 @@ static void test_pgfault(struct bpf_link *link, struct = memcg_query *memcg_query) if (!ASSERT_OK(read_stats(link), "read stats")) goto cleanup; =20 + ASSERT_NEQ(memcg_query->pgfault, (unsigned long)-1, + "bpf_mem_cgroup_page_state PGFAULT"); ASSERT_GT(memcg_query->pgfault, 0, "final pgfault val"); =20 cleanup: --=20 2.43.0 From nobody Thu Apr 2 20:28:03 2026 Received: from out-180.mta1.migadu.com (out-180.mta1.migadu.com [95.215.58.180]) (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 0DD70261B71 for ; Fri, 13 Feb 2026 07:24:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770967463; cv=none; b=aFP0Bfj8lyFGER5ywM+1DdKfbx5ktVUcZHN1vCEJBg2dxp6GjFztFlpO2x8cPCKh2gWuoxI3Rc/IrU159z6KKXIVcxIIa34athfkV5zgDW+VCLXt+velGSZulBzRQcB6mTOBYGoBxhkq0120glU66TSgkmgsrHWOW6Nnk/QEH3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770967463; c=relaxed/simple; bh=/y1+LlZYtoPLhLVI3OIgJxxN7FJlVk5SJJIQ0nJt5eg=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lxb0EFb8gELCIBZGrJRKY4u5R0KOS96HwSec6P4Pmh0gG53spS+dXHrLiY3d+y4uJM44y8siyajJ3EHMp/PiVkuz/AjGxA0qPTcOlRk3Ig+FZX4LzFfpKvC8NNTpfNUxvzoJGtlxljH4v0G+0IxRa01JIlEfMQ3DEnT4/ZadfpU= 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=AxOI7my/; arc=none smtp.client-ip=95.215.58.180 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="AxOI7my/" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1770967460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E55JfgQKp+ZEiIAnBu3r9GQXW9g+xnXnuS4C381ry3Y=; b=AxOI7my/78Mr4e23DAMG8qSm8RywqTJoU/wugb08PyinUbE2c+4BRDnDNkUbmTScXCCZBZ hBlp4yETtJ+NjBdDb+TczClhFhU6q1d8Ub0jqbhpQLyaIC9CxgzlOwAhiaPifXtNr33Zye CeoaKYGftGe+eQ3I9FNd48m6bPHv0Xg= From: Hui Zhu To: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , 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 , Hui Zhu , JP Kobryn , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v2 3/3] bpf: selftests: Skip kmem test when cgroup.memory=nokmem is set Date: Fri, 13 Feb 2026 15:23:41 +0800 Message-ID: <447797edc394ab8a8b2484bb6c92b56115254e27.1770965805.git.zhuhui@kylinos.cn> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Hui Zhu When cgroup.memory=3Dnokmem 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. Fix this by checking /proc/cmdline for the nokmem parameter. If found, verify that kmem value is zero and return early, skipping the pipe creation test that would otherwise fail. Signed-off-by: Hui Zhu --- .../bpf/prog_tests/cgroup_iter_memcg.c | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c b/t= ools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c index 897b17b58df3..2b9c148cebf0 100644 --- a/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c +++ b/tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c @@ -134,11 +134,41 @@ static void test_shmem(struct bpf_link *link, struct = memcg_query *memcg_query) shm_unlink("/tmp_shmem"); } =20 +static bool cmdline_has(const char *arg) +{ + char cmdline[4096]; + int fd; + ssize_t len; + bool ret =3D false; + + fd =3D open("/proc/cmdline", O_RDONLY); + if (fd < 0) + return false; + + len =3D read(fd, cmdline, sizeof(cmdline) - 1); + close(fd); + if (len < 0) + return false; + + cmdline[len] =3D '\0'; + if (strstr(cmdline, arg)) + ret =3D true; + + return ret; +} + #define NR_PIPES 64 static void test_kmem(struct bpf_link *link, struct memcg_query *memcg_que= ry) { int fds[NR_PIPES][2], i; =20 + if (cmdline_has("cgroup.memory=3Dnokmem")) { + if (!ASSERT_OK(read_stats(link), "read stats")) + return; + ASSERT_EQ(memcg_query->memcg_kmem, 0, "kmem value"); + return; + } + /* * Increase kmem value by creating pipes which will allocate some * kernel buffers. --=20 2.43.0