From: Fangrui Song <maskray@google.com>
To: bpf@vger.kernel.org, netdev@vger.kernel.org
Cc: daniel@iogearbox.net, Nick Desaulniers <ndesaulniers@google.com>,
Nathan Chancellor <natechancellor@gmail.com>,
clang-built-linux@googlegroups.com,
Stanislav Fomichev <sdf@google.com>,
davem@davemloft.net, ast@kernel.org
Subject: [PATCH bpf] bpf: Support llvm-objcopy and llvm-objdump for vmlinux BTF
Date: Mon, 16 Mar 2020 18:16:54 -0700 [thread overview]
Message-ID: <20200317011654.zkx5r7so53skowlc@google.com> (raw)
Simplify gen_btf logic to make it work with llvm-objcopy and
llvm-objdump. We just need to retain one section .BTF. To do so, we can
use a simple objcopy --only-section=.BTF instead of jumping all the
hoops via an architecture-less binary file.
We use a dd comment to change the e_type field in the ELF header from
ET_EXEC to ET_REL so that .btf.vmlinux.bin.o will be accepted by lld.
Fixes: df786c9b9476 ("bpf: Force .BTF section start to zero when dumping from vmlinux")
Cc: Stanislav Fomichev <sdf@google.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/871
Signed-off-by: Fangrui Song <maskray@google.com>
---
scripts/link-vmlinux.sh | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index dd484e92752e..84be8d7c361d 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -120,18 +120,9 @@ gen_btf()
info "BTF" ${2}
vmlinux_link ${1}
- LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${1}
- # dump .BTF section into raw binary file to link with final vmlinux
- bin_arch=$(LANG=C ${OBJDUMP} -f ${1} | grep architecture | \
- cut -d, -f1 | cut -d' ' -f2)
- bin_format=$(LANG=C ${OBJDUMP} -f ${1} | grep 'file format' | \
- awk '{print $4}')
- ${OBJCOPY} --change-section-address .BTF=0 \
- --set-section-flags .BTF=alloc -O binary \
- --only-section=.BTF ${1} .btf.vmlinux.bin
- ${OBJCOPY} -I binary -O ${bin_format} -B ${bin_arch} \
- --rename-section .data=.BTF .btf.vmlinux.bin ${2}
+ # Extract .BTF section, change e_type to ET_REL, to link with final vmlinux
+ ${OBJCOPY} --only-section=.BTF ${1} ${2} && printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16
}
# Create ${2} .o file with all symbols from the ${1} object file
--
2.25.1.481.gfbce0eb801-goog
next reply other threads:[~2020-03-17 1:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 1:16 Fangrui Song [this message]
2020-03-17 3:10 ` [PATCH bpf] bpf: Support llvm-objcopy and llvm-objdump for vmlinux BTF Andrii Nakryiko
2020-03-17 3:37 ` [PATCH bpf v2] " Fangrui Song
2020-03-17 5:09 ` Andrii Nakryiko
2020-03-17 5:21 ` Fangrui Song
2020-03-17 5:31 ` Andrii Nakryiko
2020-03-17 5:43 ` [PATCH bpf v3] " Fangrui Song
2020-03-17 16:05 ` Stanislav Fomichev
2020-03-17 16:24 ` Stanislav Fomichev
2020-03-17 20:58 ` [PATCH bpf-next v4] " Fangrui Song
2020-03-17 23:37 ` Andrii Nakryiko
2020-03-18 17:59 ` Fangrui Song
2020-03-18 18:30 ` Andrii Nakryiko
2020-03-18 18:53 ` Fangrui Song
2020-03-18 19:23 ` Andrii Nakryiko
2020-03-17 17:02 ` [PATCH bpf] " kbuild test robot
2020-03-17 18:34 ` kbuild 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=20200317011654.zkx5r7so53skowlc@google.com \
--to=maskray@google.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=clang-built-linux@googlegroups.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=natechancellor@gmail.com \
--cc=ndesaulniers@google.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@google.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 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).