From nobody Thu Apr 2 18:46:11 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 B6ACA2D028A for ; Thu, 12 Feb 2026 08:23:52 +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=1770884634; cv=none; b=g8PlgcQM0OaFzTkfnU7v00qSOyVK65P95ypxVBuKMJ29PevQhFKkkQZq9525tfQcJjGuQTal+w30gSr9WpkDS0cfuNYgpRvTkXqUrrVd8dsMpWsH6mFoTWbOimk+IcHNJmu1N6XAc8xfc/6WcqufBN/dapeUCvDta+vOAs19nqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770884634; c=relaxed/simple; bh=9oiwq5b/PMLGO5TFSs8W4xMUf5GGnvMwLUvLVmePqIg=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mrqtKO0Gu3Wmv4MS8XZYmhl1rDBH2rBZUix+ZNxx4yMzQu10LqELO4ijyozSMxL1axEAJRIRo8ocUfGnHFckTF6xM6Mudww4yNO/Nxv14dOEMjJqPcYOcWVRGVi7fDacgrB2MGgxjTsGvKCKV8nRqI4jQ8yPcXHRsjHxuX4Zaww= 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=TDKuVggx; 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="TDKuVggx" 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=1770884630; 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=crYbU+ThqI1KboSIh+EReNJtidB4zxhxhtyNUFlO0rY=; b=TDKuVggxscYGSctBSiDWdBR38fcvT+Z3PytbqBFCVFWT9qlg6PqmrB3xUNFaLH/XhUnQ0V /cNlB+mkcXUIsmjYfm600iLmjAGnPJAZe3pq7FPg8OY0WRq6FSaPe0IjxmUObaf1pjtqLO L5j2gXzjnb1A/e/bJWzIh5DBJ9GmIzg= 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 1/3] selftests/bpf: Check bpf_mem_cgroup_page_state return value Date: Thu, 12 Feb 2026 16:23:14 +0800 Message-ID: <042df9438d9e78bcd66f1fa0e7043b9ea8cda96c.1770883926.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 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. The problem occurs when test_progs compiled on one kernel version is executed on another kernel with different enum values for memory statistics (e.g., NR_ANON_MAPPED, NR_FILE_PAGES). In such cases, bpf_mem_cgroup_page_state() returns -1 to indicate failure, but the test didn't check for this error condition and incorrectly reported success. This patch adds explicit checks to ensure bpf_mem_cgroup_page_state() doesn't return -1 before validating the actual statistics values. This prevents false positives when running test_progs in cross-kernel environments. 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..13b299512429 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_page_state 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 18:46:11 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 D05442D6E6F for ; Thu, 12 Feb 2026 08:23:58 +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=1770884641; cv=none; b=NVs/FKbrJaG9S2uFQp21Yq8/G/7SxYbOt0w8QsCCZ/CzEiDGhl0gMJcjQLTK4qMtJvYHr3uSYBRIcb20eoZgZWYgxXEJAlg6Wx927GqxmrDnOROkurlh617F3+QntY9LANlPLYNhTlaHQKyw3NIe8mxz+dnrOa2QYHojOx4OUQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770884641; c=relaxed/simple; bh=r6OgvQEi15eLD8Z0lMy3VJnZSrA8sKhWevT7njpVbU4=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e+5MhQm1jxMOXIcGyjM/7+yZ35Zefntnin9dTpjTmw5E3y7QA09iC4yGvwROj4ecTvF54nDMbAbwRi94uWJubu6W4vsv/0ggacTcbgZzyWEKYVHgbJ67iciyjBOvb23U2WUyTPn/QbX6JMAbM8FvmvULHIvZSdp9WkNEIoBVrk4= 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=HJ0OIcoA; 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="HJ0OIcoA" 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=1770884637; 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=6JEGc5je/wM02pWehmFOl3sKJ7z0YxNGSRtnUE/RPCI=; b=HJ0OIcoA3oOP4U35yiAgKDYaQEY7TuX0qZLIDHgEFaDpBmCxjWW09jCTIjMQzH8JMX5S9F xrjh3BlaT9jvCMCDi44I3clcJ/Li+Q3ml5I/JJo7Viwh8gqwadztOu8XjVc6gL933c7r54 OCbBi0K4vo3sxio7V14h6YbB0bfqkCg= 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 2/3] mm/memcontrol: Return error when accessing kmem with nokmem Date: Thu, 12 Feb 2026 16:23:15 +0800 Message-ID: <733422f72ccbac94126ae67b9e49f4a3d460b76a.1770883926.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 running tests on hosts with cgroup.memory=3Dnokmem enabled for performance reasons, test_kmem always gets a value of 0 for kmem statistics. Since BPF programs cannot easily determine whether kmem is enabled, add a check in memcg_stat_item_valid() to return an error when attempting to access MEMCG_KMEM statistics while kmem accounting is disabled via cgroup_memory_nokmem. This prevents BPF programs from silently receiving zero values and allows them to properly handle the case where kmem accounting is unavailable. Signed-off-by: Hui Zhu --- mm/memcontrol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 129eed3ff5bb..4d8419623d1c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -667,7 +667,8 @@ unsigned long memcg_page_state(struct mem_cgroup *memcg= , int idx) =20 bool memcg_stat_item_valid(int idx) { - if ((u32)idx >=3D MEMCG_NR_STAT) + if ((u32)idx >=3D MEMCG_NR_STAT || + (cgroup_memory_nokmem && (u32)idx =3D=3D MEMCG_KMEM)) return false; =20 return !BAD_STAT_IDX(memcg_stats_index(idx)); --=20 2.43.0 From nobody Thu Apr 2 18:46:11 2026 Received: from out-183.mta1.migadu.com (out-183.mta1.migadu.com [95.215.58.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 3F1C821FF55 for ; Thu, 12 Feb 2026 08:24:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770884646; cv=none; b=UCkw+idxvdc/dgsoutDEprem1ec4DvhYawMe1Gfo8qFk1nJqkEfvGY0dP8IHtQ79VLuXGOpWOckVkYNSk7K7jJU1BJJJr4PTzztLQcTSfwEWn/VsfXsCVoA2eLBvUc/69L25G29+yMd3pD0WMypbzegYsNdR69Sa0RkKgy1jjyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770884646; c=relaxed/simple; bh=Yw/U2u1kO0ZIn9Mc2bMQ0zLjlvy7XjdcIIQ7GR3MAd4=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YlXqiaZq2HzeE+wqENaLTQXCW14H06XyLjd/GXhj2Xq8tCu8hVJyxCaD1SSC9Pc8jELuxpNgSdjn2NpgPON8hYpTu2iW0W/cC2ddTbThq48lZ3YpUuRrlGanNkyoOMqig4u+t/7N4vH6lJqnODzRv0BwPhjX0vm4AhMxU92ncKU= 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=mtLG1Cj7; arc=none smtp.client-ip=95.215.58.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="mtLG1Cj7" 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=1770884643; 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=Qa7yRxcpGL3PnKF4R1l2meMqj6ZYK13/0dyEKREpmhI=; b=mtLG1Cj7F/NN0pQvl1k5tAmMqtzQ0Q7TM4SCVi9GMjgpIDSLSvRuNgxNUBKEWiMccVbj7z K8W4rDks82e97Z8KcgkhM8a3y1wY/HTQgqGjhSAkMrndvzi66dbkI4Pxi7c8hQrM0ljZR8 mAMheL03KE5ojdB75JZXNKsapNcnw0A= 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 3/3] selftests/bpf: Skip test_kmem when cgroup.memory=nokmem Date: Thu, 12 Feb 2026 16:23:16 +0800 Message-ID: <2f6ee1db173b67a636b2caa85744cb4ce8114e64.1770883926.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 kernel command line, kmem accounting is disabled and the test_kmem subtest will fail. Add a check to skip this test when the parameter is present. Signed-off-by: Hui Zhu --- .../bpf/prog_tests/cgroup_iter_memcg.c | 28 +++++++++++++++++++ 1 file changed, 28 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 13b299512429..203e6b091a21 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,39 @@ 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")) { + test__skip(); + return; + } + /* * Increase kmem value by creating pipes which will allocate some * kernel buffers. --=20 2.43.0