From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f41.google.com (mail-dl1-f41.google.com [74.125.82.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A777219A8A for ; Mon, 16 Feb 2026 18:30:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771266621; cv=none; b=VmRSgbCoTC+I5iUONMcxpFeDM2yhMmbDkYDQIkXBbRePhOZP45i89qhCkz2NSH4z2LmduOWmOrW9oEYruB4dsWCBfmz8xkCq6uGqarxxdJI/78QGeEkAtpAYBHUkzWAwptkPsi1XO7GQo8auDUwo/bfdwQkltQzBoNPOCjBp65U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771266621; c=relaxed/simple; bh=MAEs3Jddu85q70yGwvGJmRXFIyW3shtR1hg+pghMVm4=; h=Message-ID:Date:MIME-Version:Subject:To:References:From: In-Reply-To:Content-Type; b=VhwftFpEp7Me8f5xSETZtvQdn85msyjnycvQA4+lF2/Hs+3f+l7Cj4OcySvrOh9CGPI3FWiMV7vKbORvMg908L7RTNpWmk8RDw06Ac9I2qjvLRXHK6OGohjq2T4r17GbnIuRen41v5UkobW/GmQwiR2Vyc7gQ51EK8gnJbJEiYY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dMLJktL2; arc=none smtp.client-ip=74.125.82.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dMLJktL2" Received: by mail-dl1-f41.google.com with SMTP id a92af1059eb24-124a635476fso3846490c88.0 for ; Mon, 16 Feb 2026 10:30:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771266619; x=1771871419; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=EkJWUx4iz20mHMlM7dqbfruMTcGOgRj83PoFq0CJCIQ=; b=dMLJktL2qRHJHkLBftVGBt/ill/K2ExeWTvtZA/hZ1YMOwn9BPr0tXAhoCOoJDX+2E 6FaWkjwiege15sgemLCZKR4DkHPqeGqOjbxeGjC+tOtZMWY1hJx38Zw6i9Ak1+C6c4hL DKqnQtuSrUE87hEQC6F/P9X2EUZZNeXkayRwR0QgQijMKjwvKF+sjsfEbNm+bZC6CZCV Y9KPtK60qsyAOGgmDG+SJobr7u//1MTnYeRTUiVa7/hW8uy95zbT+r9CObAMa1AgGTOt HPEkquwTmfsIIM4zz2V7B4GG+chjM7KRV+mYwAiND/qKsQ9lJe03DBT1m62bEtZofAcb ChZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771266619; x=1771871419; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EkJWUx4iz20mHMlM7dqbfruMTcGOgRj83PoFq0CJCIQ=; b=EojpBAj1f19lM8FRVwJ8U2HQm/pFd0jUAisFzAA65LzyDmUnsJuDoxaTC/O+gtv+0F GQt+WKc4D/5KpzwQ1HXjwI2g33G1Zro52mZRXEYZAtdJdk45MoS/meaYP2JRI6zz4Lsd S6KAhOWiBC1JXdLcwvqPKUPEGPoCOZ2Lll2oNE3cHwJP5aQip425FOje6R6oxUdV2DpA 6GGzo2mxv60oN3yTPCY8HFD4AXy4uLWPclb0cytsw0JJP+ndf+/ZvhvOZ495fC6Ip7s4 8Am4a8j7R0X6LBY9WkPHzU7oT+/YnSs4kw+4tumrXaGnSlSie9lB/rTDe0E9RhVGCx2+ Mr7g== X-Forwarded-Encrypted: i=1; AJvYcCXdaVhwj70QyUsVcK9f65elJYoW9sywZnicxnFGpMhp/ES1m3QpBNWRvSWmyuF9+BhgGjgEXE4iESjf6LxUjQI=@vger.kernel.org X-Gm-Message-State: AOJu0YzbfV9Ru+WV0ZluR7alZsMkn1uatI0ClTh7BTjZhLSwphUCZqrz C+HfuRRk+k8G1lAHf5TwZg2xaNh6I870stbjnHlhZS5RZWdRt2+6sPeY X-Gm-Gg: AZuq6aKuKWLo03Vg/TE88ybLlGto/wLKHN1OkTuh7TSRDQ8oJZwH0wxg1B8bK7N1aVT EMMfbUBxuQYPBcgPRLlHva1Pd85bwsnMs1K3tDNV1l41BgstOQNA0AHPlAXlrY8o/OmgEs91oRg /fq588K2AXmrMbFGS4qdZUFH5vvZmD999Ooc4QikyNSAV0kCU2K5Zw/jLZGhY80DQC8L0Z1PV/N HKbSkuwdTcZZL+lpg+vmL2i7qL0KFinkt6JuDUGWrxfRFy9eF6bDbRhpqE2xqoeDdckBGWaGZjA 7uXp5L+fA9IefUTYU8wkjyH6ATWKZeGcDN91Jgu5/hcP7izxizvOKLodCIdJD4iQngS1wndiDTL 7scMBvbfHsRa/npPEhFfy/DdAUvMSD9IlJQKgWaNgWXgquJddkLL+5a3P4ve3ulJRjlQZvqYBzz g58frxPzbFsRLr975bIjz/bntMYQc7FGmW X-Received: by 2002:a05:7022:692:b0:11b:a36d:a7f7 with SMTP id a92af1059eb24-1273add4230mr3788461c88.16.1771266619112; Mon, 16 Feb 2026 10:30:19 -0800 (PST) Received: from [192.168.4.196] ([73.222.117.172]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12742cc83e6sm11517513c88.15.2026.02.16.10.30.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Feb 2026 10:30:18 -0800 (PST) Message-ID: Date: Mon, 16 Feb 2026 10:30:17 -0800 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH bpf-next v2 1/3] bpf: Use bpf_core_enum_value for stats in cgroup_iter_memcg To: Hui Zhu , 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 , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org References: <24ac7bab25d8d2a24a35ab87a5283263eb6a4575.1770965805.git.zhuhui@kylinos.cn> Content-Language: en-US From: "JP Kobryn (Meta)" In-Reply-To: <24ac7bab25d8d2a24a35ab87a5283263eb6a4575.1770965805.git.zhuhui@kylinos.cn> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/12/26 11:23 PM, Hui Zhu wrote: > 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 = ctx->cgroup; > struct cgroup_subsys_state *css; > struct mem_cgroup *memcg; > + int ret = 1; > + int idx; > > if (!cgrp) > return 1; > @@ -26,14 +28,39 @@ int cgroup_memcg_query(struct bpf_iter__cgroup *ctx) > > bpf_mem_cgroup_flush_stats(memcg); > > - memcg_query.nr_anon_mapped = bpf_mem_cgroup_page_state(memcg, NR_ANON_MAPPED); > - 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); > + idx = bpf_core_enum_value(enum node_stat_item, NR_ANON_MAPPED); > + if (idx == 0) > + goto out; > + memcg_query.nr_anon_mapped = bpf_mem_cgroup_page_state(memcg, idx); > > + idx = bpf_core_enum_value(enum node_stat_item, NR_SHMEM); > + if (idx == 0) > + goto out; > + memcg_query.nr_shmem = bpf_mem_cgroup_page_state(memcg, idx); > + > + idx = bpf_core_enum_value(enum node_stat_item, NR_FILE_PAGES); > + if (idx == 0) > + goto out; > + memcg_query.nr_file_pages = bpf_mem_cgroup_page_state(memcg, idx); > + > + idx = bpf_core_enum_value(enum node_stat_item, NR_FILE_MAPPED); > + if (idx == 0) > + goto out; > + memcg_query.nr_file_mapped = bpf_mem_cgroup_page_state(memcg, idx); > + > + idx = bpf_core_enum_value(enum memcg_stat_item, MEMCG_KMEM); > + if (idx == 0) > + goto out; > + memcg_query.memcg_kmem = bpf_mem_cgroup_page_state(memcg, idx); > + > + idx = bpf_core_enum_value(enum vm_event_item, PGFAULT); > + if (idx == 0) > + goto out; This is getting messy. Most of these values should be on any system regardless of boot-params. I was expecting you would make the call inline. Let's simplify this whole series. This selftest only needs to exercise bpf_mem_cgroup_page_state() and bpf_mem_cgroup_vm_events(). I think we can remove the kmem subtest altogether and still have the coverage we need. You could then call bpf_core_enum_value() inline as an argument to the kfuncs above and not need to check if they exist (just let them give you the host-specific co-re value).