3:13 p.m.
From: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1153
Adding/generating vmlinux.h by bpftool to the kernel-devel
package:
$ rpm -ql -p kernel-devel-5.13.0-0.rc...x86_64.rpm | grep vmlinux.h
/usr/src/kernels/5.13.0-0.rc...x86_64/vmlinux.h
Some tools like bpftool or selftest need vmlinux.h to properly
compile. The vmlinux.h will be used by build system to compile
tools separately.
Signed-off-by: Jiri Olsa <jolsa(a)redhat.com>
---
redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_KERNEL | 2 +-
redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_MISC | 1 +
redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_SHIRQ | 1 +
redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KALLSYMS_ALL | 1 +
redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_LOCK_TORTURE_TEST | 1 +
redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST | 1 +
redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_TORTURE_TEST | 1 +
redhat/kernel.spec.template | 19 ++++++++-
8 files changed, 23 insertions(+), 4 deletions(-)
3:13 p.m.
New subject: [OS-BUILD PATCHv3 1/3] spec: Add vmlinux.h to kernel-devel package
From: Jiri Olsa <jolsa(a)kernel.org>
spec: Add vmlinux.h to kernel-devel package
Adding/generating vmlinux.h by bpftool to the kernel-devel
package:
$ rpm -ql -p kernel-devel-5.13.0-0.rc...x86_64.rpm | grep vmlinux.h
/usr/src/kernels/5.13.0-0.rc...x86_64/vmlinux.h
Some tools like bpftool or selftest need vmlinux.h to properly
compile. The vmlinux.h will be used by build system to compile
tools separately.
Signed-off-by: Jiri Olsa <jolsa(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -554,6 +554,7 @@ BuildRequires: net-tools, hostname, bc, elfutils-devel
BuildRequires: dwarves
BuildRequires: python3-devel
BuildRequires: gcc-plugin-devel
+BuildRequires: bpftool
%if %{with_headers}
BuildRequires: rsync
%endif
@@ -2026,6 +2027,11 @@ BuildKernel() {
# the F17 UsrMove feature.
ln -sf $DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+%ifnarch armv7hl
+ # Generate vmlinux.h and put it to kernel-devel path
+ bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h
+%endif
+
# prune junk from kernel-devel
find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1153
3:13 p.m.
New subject: [OS-BUILD PATCHv3 2/3] kernel.spec: Add support to use vmlinux.h
From: Don Zickus <dzickus(a)redhat.com>
kernel.spec: Add support to use vmlinux.h
For split environments where the kernel and userspace tools are not
built together, take the -devel packaged vmlinux.h file and use it
to build bpftools.
Use the VMLINUX_H= env variable to tell the tools which file to use.
Orginally done by Jiri Olsa <jolsa(a)redhat.com>
Updated to transition from artifacts to -devel package.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -222,7 +222,6 @@ Summary: The Linux kernel
# Fedora builds these separately
%define with_perf 0
%define with_tools 0
-%define with_bpftool 0
%endif
%if %{with_verbose}
@@ -2160,8 +2159,12 @@ pushd tools/vm/
popd
%endif
+if [ -f $DevelDir/vmlinux.h ]; then
+ RPM_VMLINUX_H=$DevelDir/vmlinux.h
+fi
+
%global bpftool_make \
- %{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}"
EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts}
+ %{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}"
EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts}
VMLINUX_H="${RPM_VMLINUX_H}" V=1
%if %{with_bpftool}
pushd tools/bpf/bpftool
%{bpftool_make}
@@ -2181,7 +2184,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
@@ -2421,6 +2424,10 @@ install -m755 page_owner_sort
%{buildroot}%{_bindir}/page_owner_sort
popd
%endif
+if [ -f $DevelDir/vmlinux.h ]; then
+ RPM_VMLINUX_H=$DevelDir/vmlinux.h
+fi
+
%if %{with_bpftool}
pushd tools/bpf/bpftool
%{bpftool_make} prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/
mandir=%{_mandir} install doc-install
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1153
3:13 p.m.
New subject: [OS-BUILD PATCHv3 3/3] configs: Enable CONFIG_DEBUG_KERNEL for
zfcpdump
From: Jiri Olsa <jolsa(a)kernel.org>
configs: Enable CONFIG_DEBUG_KERNEL for zfcpdump
Enabling CONFIG_DEBUG_KERNEL for zfcpdump otherwise
CONFIG_DEBUG_INFO_BTF won't be enabled.
The CONFIG_DEBUG_KERNEL rnabled several other generic
options. Disabling them so the zfcp config stays the
same (apart from CONFIG_DEBUG_INFO_BTF enablement).
Signed-off-by: Jiri Olsa <jolsa(a)redhat.com>
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_KERNEL
b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_KERNEL
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_KERNEL
+++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_KERNEL
@@ -1 +1 @@
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_MISC
b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_MISC
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_MISC
@@ -0,0 +1 @@
+# CONFIG_DEBUG_MISC is not set
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_SHIRQ
b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_SHIRQ
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_SHIRQ
@@ -0,0 +1 @@
+# CONFIG_DEBUG_SHIRQ is not set
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KALLSYMS_ALL
b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KALLSYMS_ALL
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KALLSYMS_ALL
@@ -0,0 +1 @@
+# CONFIG_KALLSYMS_ALL is not set
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_LOCK_TORTURE_TEST
b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_LOCK_TORTURE_TEST
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_LOCK_TORTURE_TEST
@@ -0,0 +1 @@
+# CONFIG_LOCK_TORTURE_TEST is not set
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST
b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST
@@ -0,0 +1 @@
+# CONFIG_RCU_TORTURE_TEST is not set
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_TORTURE_TEST
b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_TORTURE_TEST
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_TORTURE_TEST
@@ -0,0 +1 @@
+# CONFIG_TORTURE_TEST is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1153
3:15 p.m.
New subject: [OS-BUILD PATCHv3 0/3] spec: Add vmlinux.h to kernel-devel
package
From: Don Zickus on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1153#note_6056...
rebased and resolved merge conflict with @jolsa1 's kselftest changes. Only
diff change is dropping the 'define with_selftests 0' line because it was
removed with @jolsa1 1e6b8cf520f276c553a7626db6cbda7feace9616.
3:23 p.m.
New subject: [OS-BUILD PATCHv3 0/3] spec: Add vmlinux.h to kernel-devel
package
From: Justin M. Forbes on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1153#note_6056...
Acked-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
(via approve button)
11:14 a.m.
New subject: [OS-BUILD PATCHv3 0/3] spec: Add vmlinux.h to kernel-devel
package
From: Jiri Olsa on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1153#note_6068...
Acked-by: Jiri Olsa <jolsa(a)redhat.com>
1042
days inactive
1045
days old
kernel@lists.fedoraproject.org
6 comments
3 participants
participants (3)
-
Don Zickus (via Email Bridge) -
Jiri Olsa (via Email Bridge)
-
Justin M. Forbes (via Email Bridge)