From patchwork Wed Oct 30 22:28:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 13857271 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 52E54D6B6DD for ; Wed, 30 Oct 2024 22:28:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 116106B0095; Wed, 30 Oct 2024 18:28:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A06E6B0096; Wed, 30 Oct 2024 18:28:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E34106B0098; Wed, 30 Oct 2024 18:28:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C0E796B0095 for ; Wed, 30 Oct 2024 18:28:25 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 75180C1056 for ; Wed, 30 Oct 2024 22:28:25 +0000 (UTC) X-FDA: 82731708066.04.5F7339F Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf19.hostedemail.com (Postfix) with ESMTP id 0460D1A0005 for ; Wed, 30 Oct 2024 22:27:50 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hcl9FquJ; spf=pass (imf19.hostedemail.com: domain of namhyung@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=namhyung@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730327173; 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=C0WXGxi8XjLMLTApo8g4+wWBbpIdVV4/dCKaSvCGJMI=; b=0gzje41rPzx93hUBVA7NIG9vaIIP2AcjQB8sCNm582s8PDxTc8ppWsV5hokMFRWZOuAxUv ET4HYGralG7jrCZ+S1uNKiMOQ8SOeW1Kr08I2GEvhC3UcA6p7yRCf+LfODF1mZqpRoxmSF G6XTW6G8D2rlUg09iNrwHbWWOQQfLA4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730327173; a=rsa-sha256; cv=none; b=tgX82ecSgnPznfXuXGQkUZlMmQY0hV75/5jj9lZnAD/rvFKl6xLkfiYc4xLgyn494xatF1 XrNP7t5uNFEPXRl80Rh96/6bBwD9jvi4ADpL2+1YcKHoJN6aixCt6yNR9cZ6QJ7MGcGlGi 4LjHxWkibzjDFx9mbAOqY8/5wK3vxMk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hcl9FquJ; spf=pass (imf19.hostedemail.com: domain of namhyung@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=namhyung@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id E14795C598B; Wed, 30 Oct 2024 22:27:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC595C4CED3; Wed, 30 Oct 2024 22:28:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730327302; bh=A/2av0Pr/WuyCSRAw3QjLR+gEsZ3d3mzZRpBnlCCgnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hcl9FquJW+B+A0O6lhbUfkrFUnBcfaGcZsOa+a3qThQP6avACEPtVFwAKyuoEX2lL fgRzX9u8TK8WufNXi2dIHksZS+vRKEqsH0YV21T+MKqCU9eFtAqWg1o/qCGkJspBzP 8MGl0UMdvAHjtbiKUPH7Amm9QGHWJ30bcYyROBiI218afaJyT/FmTkF7rbjUrNqTeZ tjnxK9qa/Q4/JKihMiB+kSAZLHCbRA99Xw5ZJOQ7FWttFquXkuvojcf9RBxCYLf6E0 Epy+H3Vvhri6PdstdTSIMkkVqPTnI4gcasjzDmTwflammKEu3ApQBZO3KU3yYNC1qj kgKG6kf4H58yA== 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 v3 2/2] selftests/bpf: Add a test for open coded kmem_cache iter Date: Wed, 30 Oct 2024 15:28:19 -0700 Message-ID: <20241030222819.1800667-2-namhyung@kernel.org> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog In-Reply-To: <20241030222819.1800667-1-namhyung@kernel.org> References: <20241030222819.1800667-1-namhyung@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0460D1A0005 X-Stat-Signature: ncu49pjhaf73rugzht1ijr9we5nseq56 X-HE-Tag: 1730327270-536139 X-HE-Meta: U2FsdGVkX1+3R1ke+zTu7NxwQwFt+zrrcOUypDVl1GdpVHKoU4qLjQblK0ztCfP/zrwmDcAVhwoFPNWTUzGE6bmJUfecVU7v2wT+gPuwygmi334yNqHOSsqYz+YKEJq8zNth9mStOr+V3z9d8r9x5rKU3ojzsulMCecmVLXlnSByIgeo2Kzn+u9SXOU+/p+9othCrXtw4Xc2mZRsB3NwuwT88VEzggG0q2q2Ak+Nf6qGUexo4idE3aMuaHB+Hl3tdJJ3DBHYWEx027gQQ5i76e8FNhcJZhqoCQi9nnMVe0Gf9mno4iIcKGPdxtwnTdoSb+6Q+pgh/1lbCf6On0XQ8ckpPGIPG4z9Lb0PKbOO2Iu7stIgJx3kG+RxWToMZxgYJIy23Pj6jF+iTxw0OhfQBoGvbITqiv+QlzB247txMtGrl+bTMuU6uAA6s3Eu/RU03LFbWQVpHxHm8EZk+71E9cBwjqkteP/KiPlgS4uAHpQeqVcz4pI6DWlDeFiibfqbyqUyBOGmMQWrcTsM0xyEW0FuAzKrWef/Dv5Rn2JY5TzEgzEd8vTPRDwAVhj3R+UDBHm4jdk9EDXJUBOaV8hFhqKzYVLvApQ1hy4xkzyRv7IOoyHmEELVzSEVPKYH08tXokju7zCzIjucVoe5/gcDqTcIv/fbhD1GvcTFBHUefCfk8OqSertPiztHoEhCaIff+Oc7ku9uLEdR3qvedVnoejDMRiswX3qY6Dyd0Vr/vqR2zwbr3LWoT1liv+Rz9AB7zeUVR/l8a0piXMeB0KUhObLum00XvvBlu+rNZsaDUmbW5kAbd6qKcxrtipw4tN8Z7X5TLWVo27GzhcXmM99IBHQ5rj5uA9e4gyHToP9FWuFwKavmH7FOv/Qou3zw/QIrVFB+o1eK/T17PEQgqszDTxrDreN9KvOqyTDfk3zCcPQ/pp0zNmjh8nFLF21z+waBtD6Q2jcDIo7cZf9dMGJ owx4/dY2 c+MVbF2OxoAdmULM3zCXm8AzITYYDl0w4wasoOk8z0NNwWcm5BliG8Y4T0L6PimYsJqMgrwW3c8y/uN40yJSheeOzBZRrVSBaNZbRFEhdHELd7DaGBGbuEnIwlF0quD5qyhK5saiNVfHokOPvdG7Q49MHfWkbXiPOIGsdREjj9oFvGZ7EwMYcAngi+T/nQLsRQPN7TzgNNaZWFIByxduhephIVbOG+Yk6TNNosOIXzx+rp2RepVyzaXdaSpTfg0dmPbwrn3ooxEink0lYBxinGfscorvcFeXddbD5xY4ENPbs0v8kmRYAzMSF+9vujLv5bslaRo+aQ2XpBGY1cmJTCjnHMVxKbSHI7ZaZ 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 runs with bpf_prog_test_run_opts() as a syscall prog. 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 --- v3) * use syscall prog type and bpf_prog_test_run_opts() (Alexei) * increase open_coded_seen count after checking size (Alexei) v2) * remove unnecessary detach (Martin) * check pid in syncfs to prevent surprise (Martin) * remove unnecessary local variable (Andrii) .../testing/selftests/bpf/bpf_experimental.h | 6 ++++ .../bpf/prog_tests/kmem_cache_iter.c | 35 ++++++++++++------- .../selftests/bpf/progs/kmem_cache_iter.c | 22 ++++++++++++ 3 files changed, 51 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..8e13a3416a21d2e9 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,27 @@ 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) +{ + LIBBPF_OPTS(bpf_test_run_opts, topts); + int err, fd; + + /* No need to attach it, just run it directly */ + fd = bpf_program__fd(skel->progs.open_coded_iter); + + err = bpf_prog_test_run_opts(fd, &topts); + if (!ASSERT_OK(err, "test_run_opts err")) + return; + if (!ASSERT_OK(topts.retval, "test_run_opts retval")) + return; + + /* 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 +96,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 destroy; memset(buf, 0, sizeof(buf)); while (read(iter_fd, buf, sizeof(buf) > 0)) { @@ -105,11 +116,11 @@ 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); 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 e775d5cd99fca579..b9c8f94574922099 100644 --- a/tools/testing/selftests/bpf/progs/kmem_cache_iter.c +++ b/tools/testing/selftests/bpf/progs/kmem_cache_iter.c @@ -3,6 +3,7 @@ #include #include #include +#include "bpf_experimental.h" char _license[] SEC("license") = "GPL"; @@ -32,6 +33,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) @@ -84,3 +86,23 @@ int BPF_PROG(check_task_struct) task_struct_found = -2; return 0; } + +SEC("syscall") +int open_coded_iter(const void *ctx) +{ + struct kmem_cache *s; + + bpf_for_each(kmem_cache, s) { + struct kmem_cache_result *r; + + r = bpf_map_lookup_elem(&slab_result, &open_coded_seen); + if (!r) + break; + + if (r->obj_size != s->size) + break; + + open_coded_seen++; + } + return 0; +}