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 X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38EC5C43332 for ; Wed, 17 Feb 2021 18:19:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13F1964DF0 for ; Wed, 17 Feb 2021 18:19:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234787AbhBQSTE (ORCPT ); Wed, 17 Feb 2021 13:19:04 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:48330 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234152AbhBQSTC (ORCPT ); Wed, 17 Feb 2021 13:19:02 -0500 Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 11HI8dh4020140 for ; Wed, 17 Feb 2021 10:18:22 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=ZZJerUN0CeabzZG0dc8e9UGD6JdPzsEuf66jQHttB74=; b=pYRKP1sFNDsoHB/A2HUz9+SUTM/RcQv4CKHFsOxeELgk6rRO02H1YN6pF+FT4UV94cKj SuRqBJJq+OJGCo/DEJCPtfCxqUF5cizwsf8eWhWAML50VkPuE799f9CvZ0c4/r84RnUI GDkbckGPLQyRPZaPEaPspQROOoezo8IwWMo= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 36s1jganq5-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 17 Feb 2021 10:18:21 -0800 Received: from intmgw001.38.frc1.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 17 Feb 2021 10:18:20 -0800 Received: by devbig003.ftw2.facebook.com (Postfix, from userid 128203) id 0B4413704F7A; Wed, 17 Feb 2021 10:18:15 -0800 (PST) From: Yonghong Song To: CC: Alexei Starovoitov , Cong Wang , Daniel Borkmann , Subject: [PATCH bpf-next v2 10/11] selftests/bpf: add hashmap test for bpf_for_each_map_elem() helper Date: Wed, 17 Feb 2021 10:18:14 -0800 Message-ID: <20210217181815.3191955-1-yhs@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20210217181803.3189437-1-yhs@fb.com> References: <20210217181803.3189437-1-yhs@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.761 definitions=2021-02-17_13:2021-02-16,2021-02-17 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxlogscore=999 impostorscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 suspectscore=0 phishscore=0 malwarescore=0 adultscore=0 spamscore=0 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102170133 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org A test case is added for hashmap and percpu hashmap. The test also exercises nested bpf_for_each_map_elem() calls like bpf_prog: bpf_for_each_map_elem(func1) func1: bpf_for_each_map_elem(func2) func2: $ ./test_progs -n 44 #44/1 hash_map:OK #44 for_each:OK Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED Signed-off-by: Yonghong Song --- .../selftests/bpf/prog_tests/for_each.c | 74 +++++++++++++++ .../bpf/progs/for_each_hash_map_elem.c | 95 +++++++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/for_each.c create mode 100644 tools/testing/selftests/bpf/progs/for_each_hash_map_e= lem.c diff --git a/tools/testing/selftests/bpf/prog_tests/for_each.c b/tools/te= sting/selftests/bpf/prog_tests/for_each.c new file mode 100644 index 000000000000..aa0c23e83ab8 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/for_each.c @@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2021 Facebook */ +#include +#include +#include "for_each_hash_map_elem.skel.h" + +static unsigned int duration; + +static void test_hash_map(void) +{ + int i, err, hashmap_fd, max_entries, percpu_map_fd; + struct for_each_hash_map_elem *skel; + __u64 *percpu_valbuf =3D NULL; + __u32 key, num_cpus, retval; + __u64 val; + + skel =3D for_each_hash_map_elem__open_and_load(); + if (CHECK(!skel, "for_each_hash_map_elem__open_and_load", + "skeleton open_and_load failed\n")) + return; + + hashmap_fd =3D bpf_map__fd(skel->maps.hashmap); + max_entries =3D bpf_map__max_entries(skel->maps.hashmap); + for (i =3D 0; i < max_entries; i++) { + key =3D i; + val =3D i + 1; + err =3D bpf_map_update_elem(hashmap_fd, &key, &val, BPF_ANY); + if (CHECK(err, "map_update", "map_update failed\n")) + goto out; + } + + num_cpus =3D bpf_num_possible_cpus(); + percpu_map_fd =3D bpf_map__fd(skel->maps.percpu_map); + percpu_valbuf =3D malloc(sizeof(__u64) * num_cpus); + if (!ASSERT_OK_PTR(percpu_valbuf, "percpu_valbuf")) + goto out; + + key =3D 1; + for (i =3D 0; i < num_cpus; i++) + percpu_valbuf[i] =3D i + 1; + err =3D bpf_map_update_elem(percpu_map_fd, &key, percpu_valbuf, BPF_ANY= ); + if (CHECK(err, "percpu_map_update", "map_update failed\n")) + goto out; + + err =3D bpf_prog_test_run(bpf_program__fd(skel->progs.test_pkt_access), + 1, &pkt_v4, sizeof(pkt_v4), NULL, NULL, + &retval, &duration); + if (CHECK(err || retval, "ipv4", "err %d errno %d retval %d\n", + err, errno, retval)) + goto out; + + ASSERT_EQ(skel->bss->hashmap_output, 4, "hashmap_output"); + ASSERT_EQ(skel->bss->hashmap_elems, max_entries, "hashmap_elems"); + + key =3D 1; + err =3D bpf_map_lookup_elem(hashmap_fd, &key, &val); + ASSERT_ERR(err, "hashmap_lookup"); + + ASSERT_EQ(skel->bss->percpu_called, 1, "percpu_called"); + ASSERT_EQ(skel->bss->cpu < num_cpus, 1, "num_cpus"); + ASSERT_EQ(skel->bss->percpu_map_elems, 1, "percpu_map_elems"); + ASSERT_EQ(skel->bss->percpu_key, 1, "percpu_key"); + ASSERT_EQ(skel->bss->percpu_val, skel->bss->cpu + 1, "percpu_val"); + ASSERT_EQ(skel->bss->percpu_output, 100, "percpu_output"); +out: + free(percpu_valbuf); + for_each_hash_map_elem__destroy(skel); +} + +void test_for_each(void) +{ + if (test__start_subtest("hash_map")) + test_hash_map(); +} diff --git a/tools/testing/selftests/bpf/progs/for_each_hash_map_elem.c b= /tools/testing/selftests/bpf/progs/for_each_hash_map_elem.c new file mode 100644 index 000000000000..e47e68d7a769 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/for_each_hash_map_elem.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2021 Facebook */ +#include "vmlinux.h" +#include + +char _license[] SEC("license") =3D "GPL"; + +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __uint(max_entries, 3); + __type(key, __u32); + __type(value, __u64); +} hashmap SEC(".maps"); + +struct { + __uint(type, BPF_MAP_TYPE_PERCPU_HASH); + __uint(max_entries, 1); + __type(key, __u32); + __type(value, __u64); +} percpu_map SEC(".maps"); + +struct callback_ctx { + struct __sk_buff *ctx; + int input; + int output; +}; + +static __u64 +check_hash_elem(struct bpf_map *map, __u32 *key, __u64 *val, + struct callback_ctx *data) +{ + struct __sk_buff *skb =3D data->ctx; + __u32 k; + __u64 v; + + if (skb) { + k =3D *key; + v =3D *val; + if (skb->len =3D=3D 10000 && k =3D=3D 10 && v =3D=3D 10) + data->output =3D 3; /* impossible path */ + else + data->output =3D 4; + } else { + data->output =3D data->input; + bpf_map_delete_elem(map, key); + } + + return 0; +} + +__u32 cpu =3D 0; +__u32 percpu_called =3D 0; +__u32 percpu_key =3D 0; +__u64 percpu_val =3D 0; +int percpu_output =3D 0; + +static __u64 +check_percpu_elem(struct bpf_map *map, __u32 *key, __u64 *val, + struct callback_ctx *unused) +{ + struct callback_ctx data; + + percpu_called++; + cpu =3D bpf_get_smp_processor_id(); + percpu_key =3D *key; + percpu_val =3D *val; + + data.ctx =3D 0; + data.input =3D 100; + data.output =3D 0; + bpf_for_each_map_elem(&hashmap, check_hash_elem, &data, 0); + percpu_output =3D data.output; + + return 0; +} + +int hashmap_output =3D 0; +int hashmap_elems =3D 0; +int percpu_map_elems =3D 0; + +SEC("classifier/") +int test_pkt_access(struct __sk_buff *skb) +{ + struct callback_ctx data; + + data.ctx =3D skb; + data.input =3D 10; + data.output =3D 0; + hashmap_elems =3D bpf_for_each_map_elem(&hashmap, check_hash_elem, &dat= a, 0); + hashmap_output =3D data.output; + + percpu_map_elems =3D bpf_for_each_map_elem(&percpu_map, check_percpu_el= em, + (void *)0, 0); + return 0; +} --=20 2.24.1