From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in fs/sysfs
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
Symbol: SYSFS [=y]
Type : bool
Defined at fs/sysfs/Kconfig:2
Prompt: sysfs file system support
Visible if: EXPERT [=y]
Location:
-> File systems
-> Pseudo filesystems
-> sysfs file system support (SYSFS [=y])
Selects: KERNFS [=y]
Commit: 5f3a211a8b02 (fs/Kconfig: move sysfs out)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_SYSFS b/redhat/configs/pending-rhel/generic/CONFIG_SYSFS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_SYSFS
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: SYSFS [=y]
-# Type : bool
-# Defined at fs/sysfs/Kconfig:2
-# Prompt: sysfs file system support
-# Visible if: EXPERT [=y]
-# Location:
-# -> File systems
-# -> Pseudo filesystems
-# -> sysfs file system support (SYSFS [=y])
-# Selects: KERNFS [=y]
-#
-#
-#
-# Commit: 5f3a211a8b02 (fs/Kconfig: move sysfs out)
-CONFIG_SYSFS=y
diff --git a/redhat/configs/rhel/generic/CONFIG_SYSFS b/redhat/configs/rhel/generic/CONFIG_SYSFS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_SYSFS
@@ -0,0 +1 @@
+CONFIG_SYSFS=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3923
From: Viktor Malik on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3958
Currently, BPF selftests do not build in ARK due to multiple reasons. This
addresses all of them.
Signed-off-by: Viktor Malik <vmalik(a)redhat.com>
---
redhat/kernel.spec.template | 26 ++++++++++++++++--
tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 ----------------------
tools/testing/selftests/bpf/Makefile | 2 +-
3 files changed, 24 insertions(+), 35 deletions(-)
From: Michal Schmidt <mschmidt(a)redhat.com>
redhat/configs: enable fwctl for RHEL
JIRA: https://issues.redhat.com/browse/RHEL-96987
Enable fwctl and the mlx5 fwctl driver for RHEL.
s390x/zfcpdump cannot inherit CONFIG_FWCTL=m, because it has
CONFIG_MODULES off. Just disable it there.
Signed-off-by: Michal Schmidt <mschmidt(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/CONFIG_FWCTL b/redhat/configs/common/generic/CONFIG_FWCTL
rename from redhat/configs/fedora/generic/CONFIG_FWCTL
rename to redhat/configs/common/generic/CONFIG_FWCTL
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_FWCTL
+++ b/redhat/configs/common/generic/CONFIG_FWCTL
diff --git a/redhat/configs/fedora/generic/CONFIG_FWCTL_MLX5 b/redhat/configs/common/generic/CONFIG_FWCTL_MLX5
rename from redhat/configs/fedora/generic/CONFIG_FWCTL_MLX5
rename to redhat/configs/common/generic/CONFIG_FWCTL_MLX5
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_FWCTL_MLX5
+++ b/redhat/configs/common/generic/CONFIG_FWCTL_MLX5
diff --git a/redhat/configs/rhel/generic/CONFIG_FWCTL b/redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_FWCTL
rename from redhat/configs/rhel/generic/CONFIG_FWCTL
rename to redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_FWCTL
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_FWCTL
+++ b/redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_FWCTL
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3957
From: Francesco Poli (wintermute) <invernomuto(a)paranoici.org>
cpupower: split unitdir from libdir in Makefile
Improve the installation procedure for the systemd service unit
'cpupower.service', to be more flexible. Some distros install libraries
to /usr/lib64/, but systemd service units have to be installed to
/usr/lib/systemd/system: as a consequence, the installation procedure
should not assume that systemd service units can be installed to
${libdir}/systemd/system ...
Define a dedicated variable ("unitdir") in the Makefile.
Link: https://lore.kernel.org/linux-pm/260b6d79-ab61-43b7-a0eb-813e257bc028@leemh…
Fixes: 9c70b779ad91 ("cpupower: add a systemd service to run cpupower")
Signed-off-by: Francesco Poli (wintermute) <invernomuto(a)paranoici.org>
Tested-by: Thorsten Leemhuis <linux(a)leemhuis.info>
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
index blahblah..blahblah 100644
--- a/tools/power/cpupower/Makefile
+++ b/tools/power/cpupower/Makefile
@@ -73,6 +73,7 @@ sbindir ?= /usr/sbin
mandir ?= /usr/man
libdir ?= /usr/lib
libexecdir ?= /usr/libexec
+unitdir ?= /usr/lib/systemd/system
includedir ?= /usr/include
localedir ?= /usr/share/locale
docdir ?= /usr/share/doc/packages/cpupower
@@ -309,9 +310,9 @@ install-tools: $(OUTPUT)cpupower
$(INSTALL_DATA) cpupower-service.conf '$(DESTDIR)${confdir}'
$(INSTALL) -d $(DESTDIR)${libexecdir}
$(INSTALL_PROGRAM) cpupower.sh '$(DESTDIR)${libexecdir}/cpupower'
- $(INSTALL) -d $(DESTDIR)${libdir}/systemd/system
- sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${libdir}/systemd/system/cpupower.service'
- $(SETPERM_DATA) '$(DESTDIR)${libdir}/systemd/system/cpupower.service'
+ $(INSTALL) -d $(DESTDIR)${unitdir}
+ sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${unitdir}/cpupower.service'
+ $(SETPERM_DATA) '$(DESTDIR)${unitdir}/cpupower.service'
install-man:
$(INSTALL_DATA) -D man/cpupower.1 $(DESTDIR)${mandir}/man1/cpupower.1
@@ -348,7 +349,7 @@ uninstall:
- rm -f $(DESTDIR)${bindir}/utils/cpupower
- rm -f $(DESTDIR)${confdir}cpupower-service.conf
- rm -f $(DESTDIR)${libexecdir}/cpupower
- - rm -f $(DESTDIR)${libdir}/systemd/system/cpupower.service
+ - rm -f $(DESTDIR)${unitdir}/cpupower.service
- rm -f $(DESTDIR)${mandir}/man1/cpupower.1
- rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1
- rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3898
From: Gregory Bell on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3956
BPF selftests build fails b/c some compiler and linker options (namely
-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 and
-specs=/usr/lib/rpm/redhat/redhat-hardened-ld) are not passed to
sub-makes for bpftool and libbpf. This, for instance, causes that
libbpf.a is not build as PIE and other binaries cannot link against it.
Fix the problem by passing the default compiler/linker options via
EXTRA_CFLAGS/EXTRA_LDFLAGS to the selftests build. They are then
correctly propagated to sub-makes.
Signed-off-by: Gregory Bell <grbell(a)redhat.com>
---
redhat/kernel.spec.template | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
From: Gregory Bell <grbell(a)redhat.com>
redhat/spec: Fix BPF selftests build with PIE
BPF selftests build fails b/c some compiler and linker options (namely
-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 and
-specs=/usr/lib/rpm/redhat/redhat-hardened-ld) are not passed to
sub-makes for bpftool and libbpf. This, for instance, causes that
libbpf.a is not build as PIE and other binaries cannot link against it.
Fix the problem by passing the default compiler/linker options via
EXTRA_CFLAGS/EXTRA_LDFLAGS to the selftests build. They are then
correctly propagated to sub-makes.
Signed-off-by: Gregory Bell <grbell(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -3254,7 +3254,7 @@ pushd tools/testing/selftests
%endif
%{log_msg "main selftests compile"}
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf cgroup kmod mm net net/forwarding net/mptcp net/netfilter net/packetdrill tc-testing memfd drivers/net/bonding iommu cachestat pid_namespace rlimits timens pidfd" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
+%{make} %{?_smp_mflags} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" ARCH=$Arch V=1 TARGETS="bpf cgroup mm net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding iommu cachestat" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
%ifarch %{klptestarches}
# kernel livepatching selftest test_modules will build against
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3956
From: Gregory Bell <grbell(a)redhat.com>
redhat/spec: package full bpftool in selftests
JIRA: https://issues.redhat.com/browse/RHEL-91378
Upstream Status: RHEL-only
test_bpftool.sh selftests fails because selftests is packaged
with bootstrap bpftool. Replace bootstrap bpftool with
full bpftool in selftests package
Signed-off-by: Gregory Bell <grbell(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -3251,6 +3251,13 @@ for dir in bpf bpf/no_alu32 bpf/progs; do
done
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs"
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs-no_alu32"
+
+# Copy bpftool to kselftests so selftests is packaged with
+# the full bpftool instead of bootstrap bpftool
+pwd
+find / -name "bpftool"
+cp ./tools/sbin/bpftool %{buildroot}%{_libexecdir}/kselftests/bpf/bpftool
+
popd
%{log_msg "end build selftests"}
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3948
From: Gregory Bell <grbell(a)redhat.com>
redhat/spec: package full bpftool in selftests
JIRA: https://issues.redhat.com/browse/RHEL-91378
Upstream Status: RHEL-only
test_bpftool.sh selftests fails because selftests is packaged
with bootstrap bpftool. Replace bootstrap bpftool with
full bpftool in selftests package
Signed-off-by: Gregory Bell <grbell(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -3251,6 +3251,11 @@ for dir in bpf bpf/no_alu32 bpf/progs; do
done
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs"
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs-no_alu32"
+
+# Copy bpftool to kselftests so selftests is packaged with
+# the full bpftool instead of bootstrap bpftool
+cp ./tools/sbin/bpftool %{buildroot}%{_libexecdir}/kselftests/bpf/bpftool
+
popd
%{log_msg "end build selftests"}
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3948
From: Gregory Bell <grbell(a)redhat.com>
redhat/spec: package full bpftool in selftests
JIRA: https://issues.redhat.com/browse/RHEL-91378
Upstream Status: RHEL-only
test_bpftool.sh selftests fails because selftests is packaged
with bootstrap bpftool. Replace bootstrap bpftool with
full bpftool in selftests package
Signed-off-by: Gregory Bell <grbell(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -3251,6 +3251,11 @@ for dir in bpf bpf/no_alu32 bpf/progs; do
done
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs"
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs-no_alu32"
+
+# Copy bpftool to kselftests so selftests is packaged with
+# the full bpftool instead of bootstrap bpftool
+cp ./bpf/tools/sbin/bpftool %{buildroot}%{_libexecdir}/kselftests/bpf/bpftool
+
popd
%{log_msg "end build selftests"}
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3948