From patchwork Tue Oct 1 03:55:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Long via B4 Relay X-Patchwork-Id: 13817413 X-Patchwork-Delegate: bpf@iogearbox.net Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D6641AFB1B; Tue, 1 Oct 2024 03:55:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727754926; cv=none; b=HGRZPbLjwsJ1cWrVsVYuVMx2mDRZ59yQ3W2GQIV1rXpjiMncnddlMbWayEsxCaTgRZHJTB6pTsm04CMnImuCFJbYJjEFm2odGXYPbkLefTwk8VHb6s55jY+aal9XAO956tdr2tF3R4zWFgwsDysshy6s020bFDioQF0Kj7LZlcc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727754926; c=relaxed/simple; bh=coqPH2PT882k6BNfPMpwWVzbrZUXQnlAGeXR1RPfSXA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rr5WTe6qTYzNTwC0POWe/qKRJKERCOQbmdxA2q7X3LbK2f4P7+TTJ3qXw90mv7qtDMU9eW1UfcmAS6+yTOXAZmupcg/b+Dh6aGK6lSMh4qGf3mVLyYzBZTiRJWQpgkX14KCW+FQS0/g3toH8FpwaQbw0nNZ5ubEJYqu2lNoQ/As= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PsFDypdD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PsFDypdD" Received: by smtp.kernel.org (Postfix) with ESMTPS id 24836C4CECE; Tue, 1 Oct 2024 03:55:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727754926; bh=coqPH2PT882k6BNfPMpwWVzbrZUXQnlAGeXR1RPfSXA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=PsFDypdDm/LNrlEd+CrkEyEQlh9TQeu4QnPzNfm+Mn8V7CboW17Z96aWwX1/qcbGM x51+KT0idNVDGenGSEzvvSRkVbzZwk6IrBYwFjSnEyEKnco8fFZ0mGMWcx2l+2w4wt 69FuiV5OFWv7fC0ea0kBLNHVqyW8ozPvgwNmxh2bzZxuwrUXYUa6KPGDGt4j9j67fO P3OE6LhW1f6nLdf+LYw3xyK/92On7IE0Uc3q57fg+oQdkR7+cHNsOtUDqx/A/pYOGA jEQYE36PGDD2lIif7YCA18hc+boIpjsmgYZNLawF0lI1XmVtHS+SWNRJ5iAUHPsRO7 MMCVbg23GWMBQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EEE5CEB2E3; Tue, 1 Oct 2024 03:55:26 +0000 (UTC) From: Eric Long via B4 Relay Date: Tue, 01 Oct 2024 11:55:21 +0800 Subject: [PATCH bpf-next v3 1/2] libbpf: do not resolve size on duplicate FUNCs Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241001-libbpf-dup-extern-funcs-v3-1-42f7774efbf3@hack3r.moe> References: <20241001-libbpf-dup-extern-funcs-v3-0-42f7774efbf3@hack3r.moe> In-Reply-To: <20241001-libbpf-dup-extern-funcs-v3-0-42f7774efbf3@hack3r.moe> To: bpf@vger.kernel.org Cc: Andrii Nakryiko , Alexei Starovoitov , netdev@vger.kernel.org, Eric Long X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=985; i=i@hack3r.moe; h=from:subject:message-id; bh=IhJnEF2eUexSNHu1rLCPbrDJ161gDmPF/o4WkeIj0mA=; b=owGbwMvMwCUWYb/agfVY0D7G02pJDGm/i9asrJm/+HGWVJQDW8LCpVfs0m+arxTg0O/t+uvZJ rZlvn16RykLgxgXg6yYIsuWw3/UEvS7Ny3hnlMOM4eVCWQIAxenAEykXZ3hf67L4aPHn51hkLiV e7y48NrFQ5K/2R6cjM8Q0Koo2tBS5sDIcPlU9JHbnMy5BYJC1jXuP44veRv4K21uWfBu0wBZjhU aDAA= X-Developer-Key: i=i@hack3r.moe; a=openpgp; fpr=3A7A1F5A7257780C45A9A147E1487564916D3DF5 X-Endpoint-Received: by B4 Relay for i@hack3r.moe/default with auth_id=225 X-Original-From: Eric Long Reply-To: i@hack3r.moe X-Patchwork-Delegate: bpf@iogearbox.net From: Eric Long FUNCs do not have sizes, thus currently btf__resolve_size will fail with -EINVAL. Add conditions so that we only update size when the BTF object is not function or function prototype. Signed-off-by: Eric Long --- tools/lib/bpf/linker.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c index 81dbbdd79a7c65a4b048b85e1dba99cb5f7cb56b..ff249ba0ab067526e82d91481d21ec88a2732b4f 100644 --- a/tools/lib/bpf/linker.c +++ b/tools/lib/bpf/linker.c @@ -2451,6 +2451,10 @@ static int linker_append_btf(struct bpf_linker *linker, struct src_obj *obj) if (glob_sym && glob_sym->var_idx >= 0) { __s64 sz; + /* FUNCs don't have size, nothing to update */ + if (btf_is_func(t) || btf_is_func_proto(t)) + continue; + dst_var = &dst_sec->sec_vars[glob_sym->var_idx]; /* Because underlying BTF type might have * changed, so might its size have changed, so From patchwork Tue Oct 1 03:55:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Long via B4 Relay X-Patchwork-Id: 13817414 X-Patchwork-Delegate: bpf@iogearbox.net Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5388D1AFB29; Tue, 1 Oct 2024 03:55:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727754926; cv=none; b=hWUy2qxGXvrmHxHcC5bgkOBG2v2oVhyiAG4Gm2EJW8UYnR3HExDAVnM1CNksOzyZe96Q/swrgnSFWrtu7+1kVXykxLy7lWCszE0hy2fMrsA8yB4LdfzjyvsA/mjO+/j8Ah+vmGiWKgDSOBNo73BVLxLlHtq9Cy8Dk35JqR0d9Qk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727754926; c=relaxed/simple; bh=+SL4iD42TElvYHd+Fi83SbrkqmPXI/D9XApoWLsNksM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mLlMh4zGgXuVV2GKYNq3nXZgsYfQTZNKGmOphHGBghd47eplSiT5yCcYDtwpz7Fd0YYRsBXb7nCyw1BAjpUmNzciSjMZVOTcoD3eSLBNTmO4YLzhgb117CROTtVL3EPXn5mZlqlfeb0df9B0o60g7dCnnmowjslyLAdAJBrL6TE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BB7UsrcP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BB7UsrcP" Received: by smtp.kernel.org (Postfix) with ESMTPS id 2D23FC4CECF; Tue, 1 Oct 2024 03:55:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727754926; bh=+SL4iD42TElvYHd+Fi83SbrkqmPXI/D9XApoWLsNksM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=BB7UsrcP83M9ng6GvIP0GXt8XZd4/ua3+84rCX9ynGFq+H6ByCozlWIrVIzfzfLli JJ7jtrggACJRVQdzq/4p+lc/DahkzJXKjg9Fr0oUudX/0kbZJ/6DoiNES9wVU4vZwH eNVwbHr6U4KShbhY57TT+iUxlGy8Pkc/ej3DZdZeLVcKoxCYfG0WpZ2clt9N5EUd3s M/WK0Glv29UMBHU/mBCnk4kAtdkBQxn4gy3shQOH7z/3X9YfkE1YzGwb5Q4157Y4Lt 3AUMVyUhnPy/JwusJoBNJ56rzhGTImRj1SIMA6fbzP0l26sVWdSCO6Eb9QMXBlDd1m ak3zqPuLIntMg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21DF9CEB2E4; Tue, 1 Oct 2024 03:55:26 +0000 (UTC) From: Eric Long via B4 Relay Date: Tue, 01 Oct 2024 11:55:22 +0800 Subject: [PATCH bpf-next v3 2/2] selftests/bpf: test linking with duplicate extern functions Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241001-libbpf-dup-extern-funcs-v3-2-42f7774efbf3@hack3r.moe> References: <20241001-libbpf-dup-extern-funcs-v3-0-42f7774efbf3@hack3r.moe> In-Reply-To: <20241001-libbpf-dup-extern-funcs-v3-0-42f7774efbf3@hack3r.moe> To: bpf@vger.kernel.org Cc: Andrii Nakryiko , Alexei Starovoitov , netdev@vger.kernel.org, Eric Long X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3710; i=i@hack3r.moe; h=from:subject:message-id; bh=lBW/ZkssutZzZs0+icq0x4wdMAyMMqQZLN7YcP9oJJs=; b=owGbwMvMwCUWYb/agfVY0D7G02pJDGm/i9b8Wm/+2/V0QO/tHyEnru/S2vh//3HOt7NnfOCcc 07F0TWzraOUhUGMi0FWTJFly+E/agn63ZuWcM8ph5nDygQyhIGLUwAmwqTJ8FdUrfmGVK+7a2Xy 12XbTJ5Mc1jhMO+M1+bd79+0mF8wyeNlZFjdl/TAP6z4VIPkBwUXa58ZjzdEznWfd37DTpOZZve u7GUCAA== X-Developer-Key: i=i@hack3r.moe; a=openpgp; fpr=3A7A1F5A7257780C45A9A147E1487564916D3DF5 X-Endpoint-Received: by B4 Relay for i@hack3r.moe/default with auth_id=225 X-Original-From: Eric Long Reply-To: i@hack3r.moe X-Patchwork-Delegate: bpf@iogearbox.net From: Eric Long Previously when multiple BPF object files referencing the same extern function (usually kfunc) are statically linked using `bpftool gen object`, libbpf tries to get the nonexistent size of BTF_KIND_FUNC_PROTO and fails. This test ensures it is fixed. Signed-off-by: Eric Long --- tools/testing/selftests/bpf/Makefile | 3 ++- .../selftests/bpf/prog_tests/dup_extern_funcs.c | 9 +++++++++ tools/testing/selftests/bpf/progs/dup_extern_funcs1.c | 19 +++++++++++++++++++ tools/testing/selftests/bpf/progs/dup_extern_funcs2.c | 17 +++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index e295e3df5ec6c3c21abe368038514cfb34b42f69..644c4dd6002c691a9cd94ef26ddf51f6dc84e2cc 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -496,7 +496,7 @@ SKEL_BLACKLIST := btf__% test_pinning_invalid.c test_sk_assign.c LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \ linked_vars.skel.h linked_maps.skel.h \ test_subskeleton.skel.h test_subskeleton_lib.skel.h \ - test_usdt.skel.h + test_usdt.skel.h dup_extern_funcs.skel.h LSKELS := fentry_test.c fexit_test.c fexit_sleep.c atomics.c \ trace_printk.c trace_vprintk.c map_ptr_kern.c \ @@ -520,6 +520,7 @@ test_usdt.skel.h-deps := test_usdt.bpf.o test_usdt_multispec.bpf.o xsk_xdp_progs.skel.h-deps := xsk_xdp_progs.bpf.o xdp_hw_metadata.skel.h-deps := xdp_hw_metadata.bpf.o xdp_features.skel.h-deps := xdp_features.bpf.o +dup_extern_funcs.skel.h-deps := dup_extern_funcs1.bpf.o dup_extern_funcs2.bpf.o LINKED_BPF_OBJS := $(foreach skel,$(LINKED_SKELS),$($(skel)-deps)) LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.c,$(LINKED_BPF_OBJS)) diff --git a/tools/testing/selftests/bpf/prog_tests/dup_extern_funcs.c b/tools/testing/selftests/bpf/prog_tests/dup_extern_funcs.c new file mode 100644 index 0000000000000000000000000000000000000000..b26f855745b451f7f53e44b27d47a2f659ad1378 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/dup_extern_funcs.c @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include "dup_extern_funcs.skel.h" + +void test_dup_extern_funcs(void) +{ + RUN_TESTS(dup_extern_funcs); +} diff --git a/tools/testing/selftests/bpf/progs/dup_extern_funcs1.c b/tools/testing/selftests/bpf/progs/dup_extern_funcs1.c new file mode 100644 index 0000000000000000000000000000000000000000..a5b6ea361c3d457d48bc562040f1ef946fadfc81 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/dup_extern_funcs1.c @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "vmlinux.h" +#include + +char _license[] SEC("license") = "GPL"; + +void *bpf_cast_to_kern_ctx(void *obj) __ksym; + +SEC("tc") +int handler1(struct __sk_buff *skb) +{ + struct sk_buff *skb_kern = bpf_cast_to_kern_ctx(skb); + + if (!skb_kern) + return -1; + + return 0; +} diff --git a/tools/testing/selftests/bpf/progs/dup_extern_funcs2.c b/tools/testing/selftests/bpf/progs/dup_extern_funcs2.c new file mode 100644 index 0000000000000000000000000000000000000000..2f9f63dcc6ed2a35e82b55da54356502cfc95c9d --- /dev/null +++ b/tools/testing/selftests/bpf/progs/dup_extern_funcs2.c @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "vmlinux.h" +#include + +void *bpf_cast_to_kern_ctx(void *obj) __ksym; + +SEC("xdp") +int handler2(struct xdp_md *xdp) +{ + struct xdp_buff *xdp_kern = bpf_cast_to_kern_ctx(xdp); + + if (!xdp_kern) + return -1; + + return 0; +}