From: Yonghong Song <yhs@meta.com>
To: xiangxia.m.yue@gmail.com, bpf@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Hou Tao <houtao1@huawei.com>
Subject: Re: [bpf-next 2/2] selftests/bpf: add test cases for htab map
Date: Thu, 15 Dec 2022 20:10:52 -0800 [thread overview]
Message-ID: <73b9ef21-de67-e421-378a-1814ffbc263f@meta.com> (raw)
In-Reply-To: <20221214103857.69082-2-xiangxia.m.yue@gmail.com>
On 12/14/22 2:38 AM, xiangxia.m.yue@gmail.com wrote:
> From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
>
> This testing show how to reproduce deadlock in special case.
>
> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Cc: Andrii Nakryiko <andrii@kernel.org>
> Cc: Martin KaFai Lau <martin.lau@linux.dev>
> Cc: Song Liu <song@kernel.org>
> Cc: Yonghong Song <yhs@fb.com>
> Cc: John Fastabend <john.fastabend@gmail.com>
> Cc: KP Singh <kpsingh@kernel.org>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Hao Luo <haoluo@google.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Hou Tao <houtao1@huawei.com>
> ---
> .../selftests/bpf/prog_tests/htab_deadlock.c | 74 +++++++++++++++++++
> .../selftests/bpf/progs/htab_deadlock.c | 30 ++++++++
> 2 files changed, 104 insertions(+)
> create mode 100644 tools/testing/selftests/bpf/prog_tests/htab_deadlock.c
> create mode 100644 tools/testing/selftests/bpf/progs/htab_deadlock.c
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/htab_deadlock.c b/tools/testing/selftests/bpf/prog_tests/htab_deadlock.c
> new file mode 100644
> index 000000000000..7dce4c2fe4f5
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/prog_tests/htab_deadlock.c
> @@ -0,0 +1,74 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (c) 2022 DiDi Global Inc. */
> +#define _GNU_SOURCE
> +#include <pthread.h>
> +#include <sched.h>
> +#include <test_progs.h>
> +
> +#include "htab_deadlock.skel.h"
> +
> +static int perf_event_open(void)
> +{
> + struct perf_event_attr attr = {0};
> + int pfd;
> +
> + /* create perf event */
> + attr.size = sizeof(attr);
> + attr.type = PERF_TYPE_HARDWARE;
> + attr.config = PERF_COUNT_HW_CPU_CYCLES;
> + attr.freq = 1;
> + attr.sample_freq = 1000;
> + pfd = syscall(__NR_perf_event_open, &attr, -1, 0, -1, PERF_FLAG_FD_CLOEXEC);
> +
> + return pfd >= 0 ? pfd : -errno;
> +}
> +
> +void test_htab_deadlock(void)
> +{
> + unsigned int val = 0, key = 20;
> + struct bpf_link *link = NULL;
> + struct htab_deadlock *skel;
> + cpu_set_t cpus;
> + int err;
> + int pfd;
> + int i;
No need to have three lines for type 'int' variables. One line
is enough to hold all three variables.
> +
> + skel = htab_deadlock__open_and_load();
> + if (!ASSERT_OK_PTR(skel, "skel_open_and_load"))
> + return;
> +
> + err = htab_deadlock__attach(skel);
> + if (!ASSERT_OK(err, "skel_attach"))
> + goto clean_skel;
> +
> + /* NMI events. */
> + pfd = perf_event_open();
> + if (pfd < 0) {
> + if (pfd == -ENOENT || pfd == -EOPNOTSUPP) {
> + printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__);
> + test__skip();
> + goto clean_skel;
> + }
> + if (!ASSERT_GE(pfd, 0, "perf_event_open"))
> + goto clean_skel;
> + }
> +
> + link = bpf_program__attach_perf_event(skel->progs.bpf_perf_event, pfd);
> + if (!ASSERT_OK_PTR(link, "attach_perf_event"))
> + goto clean_pfd;
> +
> + /* Pinned on CPU 0 */
> + CPU_ZERO(&cpus);
> + CPU_SET(0, &cpus);
> + pthread_setaffinity_np(pthread_self(), sizeof(cpus), &cpus);
> +
> + for (i = 0; i < 100000; i++)
Please add some comments in the above loop to mention the test
expects (hopefully) duriing one of bpf_map_update_elem(), one
perf event might kick to trigger prog bpf_nmi_handle run.
> + bpf_map_update_elem(bpf_map__fd(skel->maps.htab),
> + &key, &val, BPF_ANY);
> +
> + bpf_link__destroy(link);
> +clean_pfd:
> + close(pfd);
> +clean_skel:
> + htab_deadlock__destroy(skel);
> +}
> diff --git a/tools/testing/selftests/bpf/progs/htab_deadlock.c b/tools/testing/selftests/bpf/progs/htab_deadlock.c
> new file mode 100644
> index 000000000000..c4bd1567f882
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/htab_deadlock.c
> @@ -0,0 +1,30 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (c) 2022 DiDi Global Inc. */
> +#include <linux/bpf.h>
> +#include <bpf/bpf_helpers.h>
> +#include <bpf/bpf_tracing.h>
> +
> +char _license[] SEC("license") = "GPL";
> +
> +struct {
> + __uint(type, BPF_MAP_TYPE_HASH);
> + __uint(max_entries, 2);
> + __uint(map_flags, BPF_F_ZERO_SEED);
> + __uint(key_size, sizeof(unsigned int));
> + __uint(value_size, sizeof(unsigned int));
> +} htab SEC(".maps");
You can use
__type(key, unsigned int);
__type(value, unsigned int);
This is more expressive.
> +
> +SEC("fentry/nmi_handle")
> +int bpf_nmi_handle(struct pt_regs *regs)
Do we need this fentry function? Can be just put
bpf_map_update_elem() into bpf_perf_event program?
Also s390x and aarch64 failed the test due to none/incomplete trampoline
support. See bpf ci https://github.com/kernel-patches/bpf/pull/4211.
You need to add them in their corresponding deny list if this fentry
bpf program is used.
> +{
> + unsigned int val = 0, key = 4;
> +
> + bpf_map_update_elem(&htab, &key, &val, BPF_ANY);
> + return 0;
> +}
> +
> +SEC("perf_event")
> +int bpf_perf_event(struct pt_regs *regs)
> +{
> + return 0;
> +}
next prev parent reply other threads:[~2022-12-16 4:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 10:38 [bpf-next 1/2] bpf: hash map, avoid deadlock with suitable hash mask xiangxia.m.yue
2022-12-14 10:38 ` [bpf-next 2/2] selftests/bpf: add test cases for htab map xiangxia.m.yue
2022-12-16 4:10 ` Yonghong Song [this message]
2022-12-16 10:36 ` Tonghao Zhang
2022-12-16 18:57 ` Yonghong Song
2022-12-16 10:41 ` Hou Tao
2022-12-16 10:45 ` Hou Tao
2022-12-16 11:01 ` Tonghao Zhang
2022-12-14 16:12 ` [bpf-next 1/2] bpf: hash map, avoid deadlock with suitable hash mask kernel test robot
2022-12-16 3:43 ` Yonghong Song
2022-12-16 10:15 ` Hou Tao
2022-12-16 10:31 ` Tonghao Zhang
2022-12-17 1:58 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=73b9ef21-de67-e421-378a-1814ffbc263f@meta.com \
--to=yhs@meta.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=houtao1@huawei.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=martin.lau@linux.dev \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=xiangxia.m.yue@gmail.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.