From: Yonghong Song <yhs@fb.com>
To: Andrii Nakryiko <andrii@kernel.org>, <bpf@vger.kernel.org>,
<netdev@vger.kernel.org>, <ast@fb.com>, <daniel@iogearbox.net>
Cc: <kernel-team@fb.com>
Subject: Re: [PATCH v2 bpf-next 5/6] selftests/bpf: extend linked_vars selftests with static variables
Date: Fri, 23 Apr 2021 16:03:36 -0700 [thread overview]
Message-ID: <d1693e2c-35a3-a411-edd8-3ea0964abb74@fb.com> (raw)
In-Reply-To: <20210423185357.1992756-6-andrii@kernel.org>
On 4/23/21 11:53 AM, Andrii Nakryiko wrote:
> Now that BPF static linker supports static variable renames and thus
> non-unique static variables in BPF skeleton, add tests validating static
> variables are resolved properly during multi-file static linking.
>
> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
> ---
> tools/testing/selftests/bpf/prog_tests/linked_vars.c | 12 ++++++++----
> tools/testing/selftests/bpf/progs/linked_vars1.c | 4 +++-
> tools/testing/selftests/bpf/progs/linked_vars2.c | 4 +++-
> 3 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/linked_vars.c b/tools/testing/selftests/bpf/prog_tests/linked_vars.c
> index 267166abe4c1..75dcce539ff1 100644
> --- a/tools/testing/selftests/bpf/prog_tests/linked_vars.c
> +++ b/tools/testing/selftests/bpf/prog_tests/linked_vars.c
> @@ -14,8 +14,12 @@ void test_linked_vars(void)
> if (!ASSERT_OK_PTR(skel, "skel_open"))
> return;
>
> + skel->bss->linked_vars1__input_bss_static = 100;
> skel->bss->input_bss1 = 1000;
> +
> + skel->bss->linked_vars2__input_bss_static = 200;
> skel->bss->input_bss2 = 2000;
> +
> skel->bss->input_bss_weak = 3000;
>
> err = linked_vars__load(skel);
> @@ -29,11 +33,11 @@ void test_linked_vars(void)
> /* trigger */
> syscall(SYS_getpgid);
>
> - ASSERT_EQ(skel->bss->output_bss1, 1000 + 2000 + 3000, "output_bss1");
> - ASSERT_EQ(skel->bss->output_bss2, 1000 + 2000 + 3000, "output_bss2");
> + ASSERT_EQ(skel->bss->output_bss1, 100 + 1000 + 2000 + 3000, "output_bss1");
> + ASSERT_EQ(skel->bss->output_bss2, 200 + 1000 + 2000 + 3000, "output_bss2");
> /* 10 comes from "winner" input_data_weak in first obj file */
> - ASSERT_EQ(skel->bss->output_data1, 1 + 2 + 10, "output_bss1");
> - ASSERT_EQ(skel->bss->output_data2, 1 + 2 + 10, "output_bss2");
> + ASSERT_EQ(skel->bss->output_data1, 1 + 2 + 10, "output_data1");
> + ASSERT_EQ(skel->bss->output_data2, 1 + 2 + 10, "output_data2");
> /* 100 comes from "winner" input_rodata_weak in first obj file */
> ASSERT_EQ(skel->bss->output_rodata1, 11 + 22 + 100, "output_weak1");
> ASSERT_EQ(skel->bss->output_rodata2, 11 + 22 + 100, "output_weak2");
> diff --git a/tools/testing/selftests/bpf/progs/linked_vars1.c b/tools/testing/selftests/bpf/progs/linked_vars1.c
> index ef9e9d0bb0ca..7d5152c066d9 100644
> --- a/tools/testing/selftests/bpf/progs/linked_vars1.c
> +++ b/tools/testing/selftests/bpf/progs/linked_vars1.c
> @@ -10,6 +10,8 @@ extern int LINUX_KERNEL_VERSION __kconfig;
> extern bool CONFIG_BPF_SYSCALL __kconfig __weak;
> extern const void bpf_link_fops __ksym __weak;
>
> +static volatile int input_bss_static;
> +
> int input_bss1;
> int input_data1 = 1;
> const volatile int input_rodata1 = 11;
> @@ -32,7 +34,7 @@ long output_sink1;
> static __noinline int get_bss_res(void)
> {
> /* just make sure all the relocations work against .text as well */
> - return input_bss1 + input_bss2 + input_bss_weak;
> + return input_bss_static + input_bss1 + input_bss2 + input_bss_weak;
> }
>
> SEC("raw_tp/sys_enter")
> diff --git a/tools/testing/selftests/bpf/progs/linked_vars2.c b/tools/testing/selftests/bpf/progs/linked_vars2.c
> index e4f5bd388a3c..fdc347a609d9 100644
> --- a/tools/testing/selftests/bpf/progs/linked_vars2.c
> +++ b/tools/testing/selftests/bpf/progs/linked_vars2.c
> @@ -10,6 +10,8 @@ extern int LINUX_KERNEL_VERSION __kconfig;
> extern bool CONFIG_BPF_SYSCALL __kconfig;
> extern const void __start_BTF __ksym;
>
> +static volatile int input_bss_static;
> +
> int input_bss2;
> int input_data2 = 2;
> const volatile int input_rodata2 = 22;
> @@ -38,7 +40,7 @@ static __noinline int get_data_res(void)
> SEC("raw_tp/sys_enter")
> int BPF_PROG(handler2)
> {
> - output_bss2 = input_bss1 + input_bss2 + input_bss_weak;
> + output_bss2 = input_bss_static + input_bss1 + input_bss2 + input_bss_weak;
> output_data2 = get_data_res();
> output_rodata2 = input_rodata1 + input_rodata2 + input_rodata_weak;
>
>
next prev parent reply other threads:[~2021-04-23 23:04 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 18:53 [PATCH v2 bpf-next 0/6] BPF static linker: support static vars and maps Andrii Nakryiko
2021-04-23 18:53 ` [PATCH v2 bpf-next 1/6] bpftool: strip const/volatile/restrict modifiers from .bss and .data vars Andrii Nakryiko
2021-04-23 20:02 ` Yonghong Song
2021-04-23 18:53 ` [PATCH v2 bpf-next 2/6] libbpf: rename static variables during linking Andrii Nakryiko
2021-04-23 20:24 ` Yonghong Song
2021-04-23 21:38 ` Andrii Nakryiko
2021-04-23 21:56 ` Yonghong Song
2021-04-23 23:05 ` Alexei Starovoitov
2021-04-23 23:26 ` Yonghong Song
2021-04-23 23:35 ` Alexei Starovoitov
2021-04-23 23:35 ` Andrii Nakryiko
2021-04-23 23:48 ` Alexei Starovoitov
2021-04-24 0:13 ` Andrii Nakryiko
2021-04-24 0:22 ` Alexei Starovoitov
2021-04-26 15:44 ` Andrii Nakryiko
2021-04-26 22:34 ` Alexei Starovoitov
2021-04-26 23:11 ` Andrii Nakryiko
2021-04-27 2:22 ` Alexei Starovoitov
2021-04-27 21:27 ` Andrii Nakryiko
2021-04-28 4:55 ` Alexei Starovoitov
2021-04-28 19:33 ` Andrii Nakryiko
2021-05-04 4:42 ` bpf libraries and static variables. Was: " Alexei Starovoitov
2021-05-05 5:22 ` Alexei Starovoitov
2021-05-06 22:54 ` Daniel Borkmann
2021-05-11 17:57 ` Andrii Nakryiko
2021-05-11 18:05 ` Andrii Nakryiko
2021-05-11 14:20 ` Lorenz Bauer
2021-05-11 18:04 ` Andrii Nakryiko
2021-05-11 18:59 ` Andrii Nakryiko
2021-05-11 23:05 ` Alexei Starovoitov
2021-05-12 13:40 ` Lorenz Bauer
2021-05-12 18:50 ` Andrii Nakryiko
2021-05-12 23:39 ` Alexei Starovoitov
2021-05-13 8:37 ` Lorenz Bauer
2021-05-13 15:41 ` Alexei Starovoitov
2021-04-24 2:36 ` Yonghong Song
2021-04-26 15:45 ` Andrii Nakryiko
2021-04-26 16:34 ` Yonghong Song
2021-04-23 18:53 ` [PATCH v2 bpf-next 3/6] libbpf: support static map definitions Andrii Nakryiko
2021-04-23 20:25 ` Yonghong Song
2021-04-23 18:53 ` [PATCH v2 bpf-next 4/6] bpftool: handle transformed static map names in BPF skeleton Andrii Nakryiko
2021-04-23 22:59 ` Yonghong Song
2021-04-23 18:53 ` [PATCH v2 bpf-next 5/6] selftests/bpf: extend linked_vars selftests with static variables Andrii Nakryiko
2021-04-23 23:03 ` Yonghong Song [this message]
2021-04-23 23:03 ` Yonghong Song
2021-04-23 18:53 ` [PATCH v2 bpf-next 6/6] selftests/bpf: extend linked_maps selftests with static maps Andrii Nakryiko
2021-04-23 23:11 ` Yonghong Song
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=d1693e2c-35a3-a411-edd8-3ea0964abb74@fb.com \
--to=yhs@fb.com \
--cc=andrii@kernel.org \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).