History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says: ==================== pull-request: bpf 2019-12-02 The following pull-request contains BPF updates for your *net* tree. We've added 10 non-merge commits during the last 6 day(s) which contain a total of 10 files changed, 60 insertions(+), 51 deletions(-). The main changes are: 1) Fix vmlinux BTF generation for binutils pre v2.25, from Stanislav Fomichev. 2) Fix libbpf global variable relocation to take symbol's st_value offset into account, from Andrii Nakryiko. 3) Fix libbpf build on powerpc where check_abi target fails due to different readelf output format, from Aurelien Jarno. 4) Don't set BPF insns RO for the case when they are JITed in order to avoid fragmenting the direct map, from Daniel Borkmann. 5) Fix static checker warning in btf_distill_func_proto() as well as a build error due to empty enum when BPF is compiled out, from Alexei Starovoitov. 6) Fix up generation of bpf_helper_defs.h for perf, from Arnaldo Carvalho de Melo. ====================

David S. Miller committed 6 years ago

Commit 734c7022 parents 596cf45 3464afd10 files · +60 −51Browse files

Showing the changes to scripts (1 of 10 files). Show all

Unified · Split

scripts/link-vmlinux.sh+7−1
@@ -127,7 +127,9 @@ gen_btf() · 126 unmodified lines
127 cut -d, -f1 | cut -d' ' -f2)127 cut -d, -f1 | cut -d' ' -f2)
128 bin_format=$(LANG=C ${OBJDUMP} -f ${1} | grep 'file format' | \128 bin_format=$(LANG=C ${OBJDUMP} -f ${1} | grep 'file format' | \
129 awk '{print $4}')129 awk '{print $4}')
130 ${OBJCOPY} --dump-section .BTF=.btf.vmlinux.bin ${1} 2>/dev/null130 ${OBJCOPY} --change-section-address .BTF=0 \
131 --set-section-flags .BTF=alloc -O binary \
132 --only-section=.BTF ${1} .btf.vmlinux.bin
131 ${OBJCOPY} -I binary -O ${bin_format} -B ${bin_arch} \133 ${OBJCOPY} -I binary -O ${bin_format} -B ${bin_arch} \
132 --rename-section .data=.BTF .btf.vmlinux.bin ${2}134 --rename-section .data=.BTF .btf.vmlinux.bin ${2}
133}135}
@@ -253,6 +255,10 @@ btf_vmlinux_bin_o="" · 119 unmodified lines
253if [ -n "${CONFIG_DEBUG_INFO_BTF}" ]; then255if [ -n "${CONFIG_DEBUG_INFO_BTF}" ]; then
254 if gen_btf .tmp_vmlinux.btf .btf.vmlinux.bin.o ; then256 if gen_btf .tmp_vmlinux.btf .btf.vmlinux.bin.o ; then
255 btf_vmlinux_bin_o=.btf.vmlinux.bin.o257 btf_vmlinux_bin_o=.btf.vmlinux.bin.o
258 else
259 echo >&2 "Failed to generate BTF for vmlinux"
260 echo >&2 "Try to disable CONFIG_DEBUG_INFO_BTF"
261 exit 1
256 fi262 fi
257fi263fi
258 264

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t