From nobody Thu May 7 21:43:09 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86D47C433EF for ; Wed, 18 May 2022 02:51:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234359AbiERCvO (ORCPT ); Tue, 17 May 2022 22:51:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234384AbiERCvK (ORCPT ); Tue, 17 May 2022 22:51:10 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F5F414D1F for ; Tue, 17 May 2022 19:51:07 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id q4so506640plr.11 for ; Tue, 17 May 2022 19:51:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Muu06nupwh+dYqU+u10ilHsVeZYqZAWfb+sLHhJaZYQ=; b=ljs3G+HiMoygvaVR8Rt7yJ2Nd2WzhNi6OfQtUHYlF+8Pgs/b2GvbZnI7x+Dq+QGqBt Kzb+XR5XQpjqvT76n7BLmu7joPqIHyAgx8e6EtRtvq5ldgL7hlkWuZJbKoYkDIF97rk9 0qhlXzFcES2PbUrlPoflHkEPbrEDy5+i6ITDkCtJOxgNOGWSQ3i9HQ07vJB4NgRoTfUu 4qRr0rBE3lT/S54N1vqnnI4TmDJ8z9p/Vnrq0P04HB/PqiiHNtD6vwEaB8WXmvJgvu9d 2IVXrQgdaMpiLL3vwCsY61R13y6WjVXffD6cQ9uaFhnQAl//Z3joXktTuakmw2pvZlCD rOOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Muu06nupwh+dYqU+u10ilHsVeZYqZAWfb+sLHhJaZYQ=; b=6vjAaBAbXhBVpJj7naKZt4IouHdGCa3JK/2EjtOCQJcOayF58WWrafJy7ZOrXi/yFY 41NET6Ly6qRVg32G8LNB6CiRqwJrG9x3ly5V7ez3sLHk97RjszO/Xh+T9VGBOUFKWzL/ Pl2Z/Wx1A+zmnxg4zBPC0eUT39EHczVI7+LuJCbeYi7ybwDLQYiHaOpgljnqef0MbBvj RVtkHwPC0VHiLmZXhGZyqz00A9h+2B4SKUmcVJU2RnlCQYTIahS2mpknjTfXr0+R+qQz WckHXyqET7gto4EegXti4ZgUxNlYNst5BwfJyf1TLtY4o7XNaDYk1CXYenh2o9ZhJQwX EaGQ== X-Gm-Message-State: AOAM533eg+szHiRwhCslfeeAUSwUKS0JRFtpHfbNGL0nwMHw15NXwV3b AVUp0TAn1KVEnv4rNe6wo6h2WQ== X-Google-Smtp-Source: ABdhPJzRum1Bupggi4Of/+lsrd4ap5QtiRlPTR/TLJWmPoJF7yht4wCozlydHu58gRr18QghdxKAKw== X-Received: by 2002:a17:90b:1b0d:b0:1dc:672e:c8c2 with SMTP id nu13-20020a17090b1b0d00b001dc672ec8c2mr28480250pjb.96.1652842266979; Tue, 17 May 2022 19:51:06 -0700 (PDT) Received: from C02F52LSML85.bytedance.net ([139.177.225.225]) by smtp.gmail.com with ESMTPSA id h67-20020a62de46000000b0050dc7628191sm468755pfg.107.2022.05.17.19.50.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 May 2022 19:51:06 -0700 (PDT) From: Feng zhou To: shuah@kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, rostedt@goodmis.org, mingo@redhat.com, jolsa@kernel.org, davemarchevsky@fb.com, joannekoong@fb.com, geliang.tang@suse.com Cc: linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, duanxiongchun@bytedance.com, songmuchun@bytedance.com, wangdongdong.6@bytedance.com, cong.wang@bytedance.com, zhouchengming@bytedance.com, zhoufeng.zf@bytedance.com, yosryahmed@google.com Subject: [PATCH bpf-next v2] selftests/bpf: fix some bugs in map_lookup_percpu_elem testcase Date: Wed, 18 May 2022 10:50:53 +0800 Message-Id: <20220518025053.20492-1-zhoufeng.zf@bytedance.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Feng Zhou comments from Andrii Nakryiko, details in here: https://lore.kernel.org/lkml/20220511093854.411-1-zhoufeng.zf@bytedance.com= /T/ use /* */ instead of // use libbpf_num_possible_cpus() instead of sysconf(_SC_NPROCESSORS_ONLN) use 8 bytes for value size fix memory leak use ASSERT_EQ instead of ASSERT_OK add bpf_loop to fetch values on each possible CPU Fixes: ed7c13776e20c74486b0939a3c1de984c5efb6aa ("selftests/bpf: add test c= ase for bpf_map_lookup_percpu_elem") Signed-off-by: Feng Zhou Acked-by: Yonghong Song --- v1->v2: Addressed comments from Yonghong Song. - Adjust the code format more details can be seen from here: https://lore.kernel.org/lkml/80ab09cf-6072-a75a-082d-2721f6f907ef@fb.com/T/ .../bpf/prog_tests/map_lookup_percpu_elem.c | 50 +++++++++------ .../bpf/progs/test_map_lookup_percpu_elem.c | 62 ++++++++++++------- 2 files changed, 71 insertions(+), 41 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/map_lookup_percpu_elem.= c b/tools/testing/selftests/bpf/prog_tests/map_lookup_percpu_elem.c index 58b24c2112b0..f987c9278912 100644 --- a/tools/testing/selftests/bpf/prog_tests/map_lookup_percpu_elem.c +++ b/tools/testing/selftests/bpf/prog_tests/map_lookup_percpu_elem.c @@ -1,30 +1,38 @@ -// SPDX-License-Identifier: GPL-2.0 -// Copyright (c) 2022 Bytedance +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (c) 2022 Bytedance */ =20 #include - #include "test_map_lookup_percpu_elem.skel.h" =20 -#define TEST_VALUE 1 - void test_map_lookup_percpu_elem(void) { struct test_map_lookup_percpu_elem *skel; - int key =3D 0, ret; - int nr_cpus =3D sysconf(_SC_NPROCESSORS_ONLN); - int *buf; + __u64 key =3D 0, sum; + int ret, i; + int nr_cpus =3D libbpf_num_possible_cpus(); + __u64 *buf; =20 - buf =3D (int *)malloc(nr_cpus*sizeof(int)); + buf =3D (__u64 *)malloc(nr_cpus*sizeof(__u64)); if (!ASSERT_OK_PTR(buf, "malloc")) return; - memset(buf, 0, nr_cpus*sizeof(int)); - buf[0] =3D TEST_VALUE; =20 - skel =3D test_map_lookup_percpu_elem__open_and_load(); - if (!ASSERT_OK_PTR(skel, "test_map_lookup_percpu_elem__open_and_load")) - return; + for (i =3D 0; i < nr_cpus; i++) + buf[i] =3D i; + sum =3D (nr_cpus-1)*nr_cpus/2; + + skel =3D test_map_lookup_percpu_elem__open(); + if (!ASSERT_OK_PTR(skel, "test_map_lookup_percpu_elem__open")) + goto exit; + + skel->rodata->nr_cpus =3D nr_cpus; + + ret =3D test_map_lookup_percpu_elem__load(skel); + if (!ASSERT_OK(ret, "test_map_lookup_percpu_elem__load")) + goto cleanup; + ret =3D test_map_lookup_percpu_elem__attach(skel); - ASSERT_OK(ret, "test_map_lookup_percpu_elem__attach"); + if (!ASSERT_OK(ret, "test_map_lookup_percpu_elem__attach")) + goto cleanup; =20 ret =3D bpf_map_update_elem(bpf_map__fd(skel->maps.percpu_array_map), &ke= y, buf, 0); ASSERT_OK(ret, "percpu_array_map update"); @@ -37,10 +45,14 @@ void test_map_lookup_percpu_elem(void) =20 syscall(__NR_getuid); =20 - ret =3D skel->bss->percpu_array_elem_val =3D=3D TEST_VALUE && - skel->bss->percpu_hash_elem_val =3D=3D TEST_VALUE && - skel->bss->percpu_lru_hash_elem_val =3D=3D TEST_VALUE; - ASSERT_OK(!ret, "bpf_map_lookup_percpu_elem success"); + test_map_lookup_percpu_elem__detach(skel); + + ASSERT_EQ(skel->bss->percpu_array_elem_sum, sum, "percpu_array lookup per= cpu elem"); + ASSERT_EQ(skel->bss->percpu_hash_elem_sum, sum, "percpu_hash lookup percp= u elem"); + ASSERT_EQ(skel->bss->percpu_lru_hash_elem_sum, sum, "percpu_lru_hash look= up percpu elem"); =20 +cleanup: test_map_lookup_percpu_elem__destroy(skel); +exit: + free(buf); } diff --git a/tools/testing/selftests/bpf/progs/test_map_lookup_percpu_elem.= c b/tools/testing/selftests/bpf/progs/test_map_lookup_percpu_elem.c index 5d4ef86cbf48..57e875d6e6e0 100644 --- a/tools/testing/selftests/bpf/progs/test_map_lookup_percpu_elem.c +++ b/tools/testing/selftests/bpf/progs/test_map_lookup_percpu_elem.c @@ -1,52 +1,70 @@ -// SPDX-License-Identifier: GPL-2.0 -// Copyright (c) 2022 Bytedance +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (c) 2022 Bytedance */ =20 #include "vmlinux.h" #include =20 -int percpu_array_elem_val =3D 0; -int percpu_hash_elem_val =3D 0; -int percpu_lru_hash_elem_val =3D 0; +__u64 percpu_array_elem_sum =3D 0; +__u64 percpu_hash_elem_sum =3D 0; +__u64 percpu_lru_hash_elem_sum =3D 0; +const volatile int nr_cpus; =20 struct { __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); __uint(max_entries, 1); __type(key, __u32); - __type(value, __u32); + __type(value, __u64); } percpu_array_map SEC(".maps"); =20 struct { __uint(type, BPF_MAP_TYPE_PERCPU_HASH); __uint(max_entries, 1); - __type(key, __u32); - __type(value, __u32); + __type(key, __u64); + __type(value, __u64); } percpu_hash_map SEC(".maps"); =20 struct { __uint(type, BPF_MAP_TYPE_LRU_PERCPU_HASH); __uint(max_entries, 1); - __type(key, __u32); - __type(value, __u32); + __type(key, __u64); + __type(value, __u64); } percpu_lru_hash_map SEC(".maps"); =20 +struct read_percpu_elem_ctx { + void *map; + __u64 sum; +}; + +static int read_percpu_elem_callback(__u32 index, struct read_percpu_elem_= ctx *ctx) +{ + __u64 key =3D 0; + __u64 *value; + + value =3D bpf_map_lookup_percpu_elem(ctx->map, &key, index); + if (value) + ctx->sum +=3D *value; + return 0; +} + SEC("tp/syscalls/sys_enter_getuid") int sysenter_getuid(const void *ctx) { - __u32 key =3D 0; - __u32 cpu =3D 0; - __u32 *value; + struct read_percpu_elem_ctx map_ctx; =20 - value =3D bpf_map_lookup_percpu_elem(&percpu_array_map, &key, cpu); - if (value) - percpu_array_elem_val =3D *value; + map_ctx.map =3D &percpu_array_map; + map_ctx.sum =3D 0; + bpf_loop(nr_cpus, read_percpu_elem_callback, &map_ctx, 0); + percpu_array_elem_sum =3D map_ctx.sum; =20 - value =3D bpf_map_lookup_percpu_elem(&percpu_hash_map, &key, cpu); - if (value) - percpu_hash_elem_val =3D *value; + map_ctx.map =3D &percpu_hash_map; + map_ctx.sum =3D 0; + bpf_loop(nr_cpus, read_percpu_elem_callback, &map_ctx, 0); + percpu_hash_elem_sum =3D map_ctx.sum; =20 - value =3D bpf_map_lookup_percpu_elem(&percpu_lru_hash_map, &key, cpu); - if (value) - percpu_lru_hash_elem_val =3D *value; + map_ctx.map =3D &percpu_lru_hash_map; + map_ctx.sum =3D 0; + bpf_loop(nr_cpus, read_percpu_elem_callback, &map_ctx, 0); + percpu_lru_hash_elem_sum =3D map_ctx.sum; =20 return 0; } --=20 2.20.1