From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90D5BD2F7FC for ; Thu, 17 Oct 2024 08:06:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E8766B0082; Thu, 17 Oct 2024 04:06:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 099DF6B0083; Thu, 17 Oct 2024 04:06:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E7B4B6B0088; Thu, 17 Oct 2024 04:06:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C2C976B0082 for ; Thu, 17 Oct 2024 04:06:09 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B05ED12113E for ; Thu, 17 Oct 2024 08:05:59 +0000 (UTC) X-FDA: 82682361174.29.FC02EAA Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf11.hostedemail.com (Postfix) with ESMTP id 8CF1040011 for ; Thu, 17 Oct 2024 08:05:56 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=W7b8fumq; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of namhyung@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=namhyung@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729152320; a=rsa-sha256; cv=none; b=RvQ2YXVyxgWDN5RCFAKOTDReKmky9A78umnADMZRHXlfCyh5u5bjJZsAe0WWFUJ9mxOsbe xChZ+NWCYyAWRw/0cz8QDRTTR/supP303Jc3jiYLSYMomS9endFXW2wxRSKzYXmvybrp51 I733mG40JR9iUAZvUk9PDgSMgTnqrcw= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=W7b8fumq; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of namhyung@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=namhyung@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729152320; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Pe2f9OYh4G5DNUIrEyBBFtuXb8kicNEHApn0/T33CYs=; b=hCWyeYjc3MkVXzqPWMUsPqN2AAV253gLxnqJt7bI/xew+DHO/+fEsmRM7SUjaieHy1wPfx zfBUsmum8/ZKgOZ7ixaEnQBXGtCpNUV5VyS6R4iwE1asp33XdZKiw1tt92nV4XcvZNzZQg UhtVaf2xqO0WFn+UOIqbycQfRGe0vLg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id DF901A4384F; Thu, 17 Oct 2024 08:05:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B419DC4CECD; Thu, 17 Oct 2024 08:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729152366; bh=yT8+3HibLytUwdjsKhrLp1hPXDVTvisDL7LIxziLei0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W7b8fumqVoqSkV7fsBqyP+/nbc0CsubJ4ryJu0S1h6SxTMOTt6thxyqZJnMt1bPCl +BGpQsGcCHm5sajQSMrVzZ/UFM/K+IDRS6QMBh4mlB9uIhVSkEFgDxdUtDwRrejHgB ZOpwBdP8TaR7z3tJ9fLZtn+rXMVolW/aSmyQmf2k7O36peSRsB7zBQdXYHx84g5ENh EOWx+hmxShGFDwm6Ougmx8zwVGqXca1yjW4feQC1i+jLmgALSmeA92gXEUKSor8rjH bS+JeVGYvPFMWXWSqPEUaOOqvzo5/SveIa9K8QCEEwS3iPYl1ImIHKlvNIDcR4zdaG hqxIczeyKBw0Q== From: Namhyung Kim To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , LKML , bpf@vger.kernel.org, Andrew Morton , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, Arnaldo Carvalho de Melo , Kees Cook Subject: [PATCH bpf-next 2/2] selftests/bpf: Add a test for open coded kmem_cache iter Date: Thu, 17 Oct 2024 01:06:04 -0700 Message-ID: <20241017080604.541872-2-namhyung@kernel.org> X-Mailer: git-send-email 2.47.0.rc1.288.g06298d1525-goog In-Reply-To: <20241017080604.541872-1-namhyung@kernel.org> References: <20241017080604.541872-1-namhyung@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 8CF1040011 X-Rspamd-Server: rspam01 X-Stat-Signature: 5icsarzp79jgeasp3ygsw7ra171xwzqh X-HE-Tag: 1729152356-810970 X-HE-Meta: U2FsdGVkX1+gAqlJ55eT934XaEyU+oQl/k+0sa9zEK8WTZ25v/MWQH9IpFU2KzA/GHrKjNRuWoSFwrY1XvEUGPh2ws20bRD8QWKwjj1/hnd9V5L36IulYCj0xDBb0e/O0ulkP7Q6s7akz/0b459hLFeKCQW27fZPz/jJN8Dwcg8ZsvIHzA7O62k96aubEbboB9fqXWETLWWwPGfiQhSxxcX8mcLgez+aiKTNczhTmQK0G340LoG5mCzb+c7RJNYMG+ziy+jUdYSqXc/ZU/iTdLFyDylq1V2K92lAa6dbnTo/YWJeUwaIsjpUSVt0QBlFXXqY/GtDyFayzrzCLiATneTEJl5mDTDKtMlG/t+pMjbIIRiVsSBi6M4lQahnRSAe7M0G1dCg4TKI+AWWv4lIPEsMUhB6he1n6yBCzI0p/xPI0+MrQpCf1VG9lRTE0tT9iDrG8C2EF9sL4iAyucnxvfqYcO/Is8QEQa2+J7EVrvA/qQxY3tvV+oW3hSNgXjrEW8lhmMmlYJx8aDsSmkOOHaXBGsOVmfG28fU+MTRiSyM/5erXNE6DMWMtBDnf0c/eCaSMys7Czz1fEIRpqtwHS6UvtVBXgqabFMqqL98tMVfx39X9a7D0lZ7DC6gCLLrHFiQ87yDmgZYlEFvDbVur7klmEVJz/vHJKSTk6bZQRByLmHPV50flk23qNqQ5siR0SNYaopVFc2O92ulES8Bl8XkJfe7P10DBLieyJJSA3WMBL5G+ywPwzQ88B6Z0YX453T4m6B2rebTmbQWWD/iCh8+rSOI8FPBm3pXW9qp/Hdzod0KEwrWWZ3GhtCTwPkVuuTN4CDx0735qWSMDBEHLJh9v2kVaNQOPeG48JpGFC1ooSot9QWQUrxDbA7zFmr0rsUx2B0tSBXZhWrUip1J0EKpsWd7EWZYXmEUoAgA/jZ5E0I5R9kFbNghNrUbzyhc+B3cDqLHg/3a4CYOMrkS LItYkbAW gYi3eE/Hdx7p7AMXBYDU3K6NDWHiKGwhldn71wJtcO+yShdY+XSXVKZsrkEQhurkMAbjnXRM1cYpOynyE4XC71VD03c6navat6g5dsE8Y3nR5rFe64ZOjkVbPwSKWdp5EGtQpFOjcgKy920r62fOpiEaLux9JvFRFv0UENM1+/8cLo5I+IQvJ/rpPKC0LD5FR7VjZ4fSryV3Il9Lxz1WawmaxN2PN+K7EAVStW9B3l0nBNWMHAi+vMPjfjv0cxHJ8vcUR9rsA7gNavqA7XWGb5XmQERVWbuROMUfDUxkdKi0KWRFpbTm2kvBOBe3b+Khf0MHjfkICVCT3K3v8dodIWDEsohz50tpQhhpQ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The new subtest is attached to sleepable fentry of syncfs() syscall. It iterates the kmem_cache using bpf_for_each loop and count the number of entries. Finally it checks it with the number of entries from the regular iterator. $ ./vmtest.sh -- ./test_progs -t kmem_cache_iter ... #130/1 kmem_cache_iter/check_task_struct:OK #130/2 kmem_cache_iter/check_slabinfo:OK #130/3 kmem_cache_iter/open_coded_iter:OK #130 kmem_cache_iter:OK Summary: 1/3 PASSED, 0 SKIPPED, 0 FAILED Also simplify the code by using attach routine of the skeleton. Signed-off-by: Namhyung Kim --- .../testing/selftests/bpf/bpf_experimental.h | 6 ++++ .../bpf/prog_tests/kmem_cache_iter.c | 28 +++++++++++-------- .../selftests/bpf/progs/kmem_cache_iter.c | 24 ++++++++++++++++ 3 files changed, 46 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing/selftests/bpf/bpf_experimental.h index b0668f29f7b394eb..cd8ecd39c3f3c68d 100644 --- a/tools/testing/selftests/bpf/bpf_experimental.h +++ b/tools/testing/selftests/bpf/bpf_experimental.h @@ -582,4 +582,10 @@ extern int bpf_wq_set_callback_impl(struct bpf_wq *wq, unsigned int flags__k, void *aux__ign) __ksym; #define bpf_wq_set_callback(timer, cb, flags) \ bpf_wq_set_callback_impl(timer, cb, flags, NULL) + +struct bpf_iter_kmem_cache; +extern int bpf_iter_kmem_cache_new(struct bpf_iter_kmem_cache *it) __weak __ksym; +extern struct kmem_cache *bpf_iter_kmem_cache_next(struct bpf_iter_kmem_cache *it) __weak __ksym; +extern void bpf_iter_kmem_cache_destroy(struct bpf_iter_kmem_cache *it) __weak __ksym; + #endif diff --git a/tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c b/tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c index 848d8fc9171fae45..a1fd3bc57c0b21bb 100644 --- a/tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c +++ b/tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c @@ -68,12 +68,18 @@ static void subtest_kmem_cache_iter_check_slabinfo(struct kmem_cache_iter *skel) fclose(fp); } +static void subtest_kmem_cache_iter_open_coded(struct kmem_cache_iter *skel) +{ + /* To trigger the open coded iterator attached to the syscall */ + syncfs(0); + + /* It should be same as we've seen from the explicit iterator */ + ASSERT_EQ(skel->bss->open_coded_seen, skel->bss->kmem_cache_seen, "open_code_seen_eq"); +} + void test_kmem_cache_iter(void) { - DECLARE_LIBBPF_OPTS(bpf_iter_attach_opts, opts); struct kmem_cache_iter *skel = NULL; - union bpf_iter_link_info linfo = {}; - struct bpf_link *link; char buf[256]; int iter_fd; @@ -81,16 +87,12 @@ void test_kmem_cache_iter(void) if (!ASSERT_OK_PTR(skel, "kmem_cache_iter__open_and_load")) return; - opts.link_info = &linfo; - opts.link_info_len = sizeof(linfo); - - link = bpf_program__attach_iter(skel->progs.slab_info_collector, &opts); - if (!ASSERT_OK_PTR(link, "attach_iter")) + if (!ASSERT_OK(kmem_cache_iter__attach(skel), "skel_attach")) goto destroy; - iter_fd = bpf_iter_create(bpf_link__fd(link)); + iter_fd = bpf_iter_create(bpf_link__fd(skel->links.slab_info_collector)); if (!ASSERT_GE(iter_fd, 0, "iter_create")) - goto free_link; + goto detach; memset(buf, 0, sizeof(buf)); while (read(iter_fd, buf, sizeof(buf) > 0)) { @@ -105,11 +107,13 @@ void test_kmem_cache_iter(void) subtest_kmem_cache_iter_check_task_struct(skel); if (test__start_subtest("check_slabinfo")) subtest_kmem_cache_iter_check_slabinfo(skel); + if (test__start_subtest("open_coded_iter")) + subtest_kmem_cache_iter_open_coded(skel); close(iter_fd); -free_link: - bpf_link__destroy(link); +detach: + kmem_cache_iter__detach(skel); destroy: kmem_cache_iter__destroy(skel); } diff --git a/tools/testing/selftests/bpf/progs/kmem_cache_iter.c b/tools/testing/selftests/bpf/progs/kmem_cache_iter.c index 72c9dafecd98406b..4c44aa279a5328fe 100644 --- a/tools/testing/selftests/bpf/progs/kmem_cache_iter.c +++ b/tools/testing/selftests/bpf/progs/kmem_cache_iter.c @@ -2,6 +2,8 @@ /* Copyright (c) 2024 Google */ #include "bpf_iter.h" +#include "bpf_experimental.h" +#include "bpf_misc.h" #include #include @@ -33,6 +35,7 @@ extern struct kmem_cache *bpf_get_kmem_cache(u64 addr) __ksym; /* Result, will be checked by userspace */ int task_struct_found; int kmem_cache_seen; +int open_coded_seen; SEC("iter/kmem_cache") int slab_info_collector(struct bpf_iter__kmem_cache *ctx) @@ -85,3 +88,24 @@ int BPF_PROG(check_task_struct) task_struct_found = -2; return 0; } + +SEC("fentry.s/" SYS_PREFIX "sys_syncfs") +int open_coded_iter(const void *ctx) +{ + struct kmem_cache *s; + + bpf_for_each(kmem_cache, s) { + struct kmem_cache_result *r; + int idx = open_coded_seen; + + r = bpf_map_lookup_elem(&slab_result, &idx); + if (r == NULL) + break; + + open_coded_seen++; + + if (r->obj_size != s->size) + break; + } + return 0; +} -- 2.47.0.rc1.288.g06298d1525-goog