From: Jeremy Linton <jlinton(a)redhat.com>
[redhat] arm: turn SPE back on
While attempting to turn SPE on for all redhat distros
except for armv7 builds, the enable/disable was inverted
and it was left disabled for everything except for armv7.
This was incorrect, lets fix it.
Fixes: d76aee99af90 ("[redhat] arm: move SPE to generic")
Signed-off-by: Jeremy Linton <jlinton(a)redhat.com>
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_SPE_PMU b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_SPE_PMU
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_SPE_PMU
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_SPE_PMU
@@ -1 +1 @@
-# CONFIG_ARM_SPE_PMU is not set
+CONFIG_ARM_SPE_PMU=m
diff --git a/redhat/configs/common/generic/arm/armv7/CONFIG_ARM_SPE_PMU b/redhat/configs/common/generic/arm/armv7/CONFIG_ARM_SPE_PMU
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/arm/armv7/CONFIG_ARM_SPE_PMU
+++ b/redhat/configs/common/generic/arm/armv7/CONFIG_ARM_SPE_PMU
@@ -1 +1 @@
-CONFIG_ARM_SPE_PMU=m
+# CONFIG_ARM_SPE_PMU is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1745
From: Joel Savitz <jsavitz(a)redhat.com>
redhat/configs: enable CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2026319
Upstream Status: RHEL-only
Performance testing has indicated no performance impact to the
enablement of kstack offset randomization, so enable it by default.
Signed-off-by: Joel Savitz <jsavitz(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT b/redhat/configs/common/generic/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT
+++ b/redhat/configs/common/generic/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT
@@ -1 +1 @@
-# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
diff --git a/redhat/configs/fedora/generic/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT b/redhat/configs/fedora/generic/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT
+++ b/redhat/configs/fedora/generic/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT
@@ -1 +1 @@
-# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1743
Hey Fedorans,
As most of you might know, we have Fedora testing events happening where you all
can participate. As of today, we are running 3 events in parallel.
1. Kernel 5.17 Test Week [0]
2. Fedora 36 CoreOS [1]
3. Fedora Cloud Test Day [2]
These are events that are easy to start off if you are new to Fedora
and some of them
even reward you with a Fedora Badge as token of gratitude and reward
for your time and energy
that you spent contributing!
The wikis below will guide you through the instructions and how to
participate. In case of an
unlikely event of things not working as intended. File a bug and if
you have any questions,
reach out to @test list directly.
In the coming week, we have two of the most community impacting topics
that we will test for
the Audio and Upgrade path to Fedora 36 from Fedora 35 and Fedora 34.
More details can you found
in this Fedora Magazine Article[3]
[0] http://fedoraproject.org/wiki/Test_Day:2022-04-03_Kernel_5.17_Test_Week
[1] http://fedoraproject.org/wiki/Test_Day:Fedora_36_CoreOS_2022-04-04
[2] http://fedoraproject.org/wiki/Test_Day:2022-04-08_Fedora_36_Cloud_Testday
[3] https://fedoramagazine.org/contribute-at-the-fedora-kernel-5-17-coreos-clou…
--
//sumantro
Fedora QE
TRIED AND PERSONALLY TESTED, ERGO TRUSTED
From: Benjamin Tissoires <benjamin.tissoires(a)redhat.com>
configs: enable CONFIG_RMI4_F3A
Upstream: RHEL only
Tested: make dist-configs
This config is required for supporting the touchpad of the Lenovo
T14 and T490 at least.
We should not disable it in RHEL.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_RMI4_F3A b/redhat/configs/common/generic/CONFIG_RMI4_F3A
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_RMI4_F3A
+++ b/redhat/configs/common/generic/CONFIG_RMI4_F3A
@@ -1 +1 @@
-# CONFIG_RMI4_F3A is not set
+CONFIG_RMI4_F3A=y
diff --git a/redhat/configs/fedora/generic/CONFIG_RMI4_F3A b/redhat/configs/fedora/generic/CONFIG_RMI4_F3A
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/CONFIG_RMI4_F3A
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RMI4_F3A=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1670
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Spec fixes for intel-speed-select
Now that Herton's patch is in, we still need the includes added to the
make commands from the spec. This patch makes intel-speed-select build
in current koji.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
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
@@ -2246,7 +2246,7 @@ chmod +x tools/power/cpupower/utils/version-gen.sh
%{tools_make}
popd
pushd tools/power/x86/intel-speed-select
- %{make}
+ %{make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3"
popd
%endif
%endif
@@ -2511,7 +2511,7 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
%{tools_make} DESTDIR=%{buildroot} install
popd
pushd tools/power/x86/intel-speed-select
- %{tools_make} CFLAGS+="-D_GNU_SOURCE -Iinclude" DESTDIR=%{buildroot} install
+ %{tools_make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" DESTDIR=%{buildroot} install
popd
%endif
pushd tools/thermal/tmon
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1740
From: Prarit Bhargava <prarit(a)redhat.com>
tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed
Upstream Status: https://www.spinics.net/lists/platform-driver-x86/msg31958.html
Build of intel-speed-select will fail if you run:
$ LDFLAGS="-Wl,--as-needed" /usr/bin/make V=1
...
gcc -O2 -Wall -g -D_GNU_SOURCE -Iinclude -I/usr/include/libnl3 -Wl,--as-needed -lnl-genl-3 -lnl-3 intel-speed-select-in.o -o intel-speed-select
/usr/bin/ld: intel-speed-select-in.o: in function `handle_event':
(...)/linux/tools/power/x86/intel-speed-select/hfi-events.c:189: undefined reference to `nlmsg_hdr'
...
In this case the problem is that order when linking matters when using
the flag -Wl,--as-needed, symbols not used at that point are discarded.
So since intel-speed-select-in.o comes after, at that point the
libraries/symbols are already discarded and then missing/undefined
references are reported.
To fix this, make sure we specify LDFLAGS after the object file.
Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/tools/power/x86/intel-speed-select/Makefile b/tools/power/x86/intel-speed-select/Makefile
index blahblah..blahblah 100644
--- a/tools/power/x86/intel-speed-select/Makefile
+++ b/tools/power/x86/intel-speed-select/Makefile
@@ -42,7 +42,7 @@ ISST_IN := $(OUTPUT)intel-speed-select-in.o
$(ISST_IN): prepare FORCE
$(Q)$(MAKE) $(build)=intel-speed-select
$(OUTPUT)intel-speed-select: $(ISST_IN)
- $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
+ $(QUIET_LINK)$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
clean:
rm -f $(ALL_PROGRAMS)
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1721
From: Jarod Wilson <jarod(a)redhat.com>
redhat: indicate HEAD state in tarball/rpm name
For the non-Fedora (RHEL) case, we are looking to move to a setup where we
include Merge Requests as soon as they are ready, and thus the head of
main may not always be a tagged build. This gives some indication to
someone basing a build on main that they're basing their work on the tree
at a state between tagged builds.
If HEAD is a tagged build, as usual, you should see:
linux-4.18.0-374.el8.tar.xz
kernel-4.18.0-374.el8.src.rpm
If HEAD has additional commits, with this change, you should see:
linux-4.18.0-374.p1.g797fdad2a6e5.el8.tar.xz
kernel-4.18.0-374.p1.g797fdad2a6e5.el8.src.rpm
The .pX field is "X patches since tag" and the .gSHA field is the HEAD sha
of the branch after adding your local changes.
This is directly related to:
https://gitlab.com/redhat/rhel/src/kernel/rhel-8/-/merge_requests/2405
Signed-off-by: Jarod Wilson <jarod(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -189,6 +189,14 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
endif
else
SNAPSHOT:=0
+ EXACT_TAG:=$(shell $(GIT) describe --exact-match 2>/dev/null)
+ ifeq ($(EXACT_TAG),)
+ _TAG:=$(shell $(GIT) describe 2>/dev/null)
+ ifneq ($(_TAG),)
+ RHEL_EXTRAVERSION:=$(shell echo $(_TAG) | awk -F- '{ printf(".p%d.%s", $$(NF-1),$$(NF)) }')
+ BUILD:=$(BUILD)$(RHEL_EXTRAVERSION)
+ endif
+ endif
endif
KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1735
From: Herton R. Krzesinski <herton(a)redhat.com>
tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed
Upstream Status: patch submitted to platform-driver-x86/upstream maintainer
Build of intel-speed-select will fail if you run:
$ LDFLAGS="-Wl,--as-needed" /usr/bin/make V=1
...
gcc -O2 -Wall -g -D_GNU_SOURCE -Iinclude -I/usr/include/libnl3 -Wl,--as-needed -lnl-genl-3 -lnl-3 intel-speed-select-in.o -o intel-speed-select
/usr/bin/ld: intel-speed-select-in.o: in function `handle_event':
(...)/linux/tools/power/x86/intel-speed-select/hfi-events.c:189: undefined reference to `nlmsg_hdr'
...
In this case the problem is that order when linking matters when using
the flag -Wl,--as-needed, symbols not used at that point are discarded.
So since intel-speed-select-in.o comes after, at that point the
libraries/symbols are already discarded and then missing/undefined
references are reported.
To fix this, make sure we specify LDFLAGS after the object file.
Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com>
diff --git a/tools/power/x86/intel-speed-select/Makefile b/tools/power/x86/intel-speed-select/Makefile
index blahblah..blahblah 100644
--- a/tools/power/x86/intel-speed-select/Makefile
+++ b/tools/power/x86/intel-speed-select/Makefile
@@ -42,7 +42,7 @@ ISST_IN := $(OUTPUT)intel-speed-select-in.o
$(ISST_IN): prepare FORCE
$(Q)$(MAKE) $(build)=intel-speed-select
$(OUTPUT)intel-speed-select: $(ISST_IN)
- $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
+ $(QUIET_LINK)$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
clean:
rm -f $(ALL_PROGRAMS)
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1736
From: Waiman Long <longman(a)redhat.com>
redhat/configs: Enable CONFIG_RCU_SCALE_TEST & CONFIG_RCU_REF_SCALE_TEST
Enable CONFIG_RCU_SCALE_TEST and CONFIG_RCU_REF_SCALE_TEST to build
the rcuscale and refscale test kernel modules to be included in
kernel-modules-internal rpm to be used for internal QE testing.
Signed-off-by: Waiman Long <longman(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_RCU_REF_SCALE_TEST b/redhat/configs/common/generic/CONFIG_RCU_REF_SCALE_TEST
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_RCU_REF_SCALE_TEST
+++ b/redhat/configs/common/generic/CONFIG_RCU_REF_SCALE_TEST
@@ -1 +1 @@
-# CONFIG_RCU_REF_SCALE_TEST is not set
+CONFIG_RCU_REF_SCALE_TEST=m
diff --git a/redhat/configs/common/generic/CONFIG_RCU_SCALE_TEST b/redhat/configs/common/generic/CONFIG_RCU_SCALE_TEST
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_RCU_SCALE_TEST
+++ b/redhat/configs/common/generic/CONFIG_RCU_SCALE_TEST
@@ -1 +1 @@
-# CONFIG_RCU_SCALE_TEST is not set
+CONFIG_RCU_SCALE_TEST=m
diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_REF_SCALE_TEST b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_REF_SCALE_TEST
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_REF_SCALE_TEST
@@ -0,0 +1 @@
+# CONFIG_RCU_REF_SCALE_TEST is not set
diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_SCALE_TEST b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_SCALE_TEST
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_SCALE_TEST
@@ -0,0 +1 @@
+# CONFIG_RCU_SCALE_TEST is not set
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST
rename from redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST
rename to redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST
+++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST
diff --git a/redhat/mod-internal.list b/redhat/mod-internal.list
index blahblah..blahblah 100644
--- a/redhat/mod-internal.list
+++ b/redhat/mod-internal.list
@@ -45,6 +45,7 @@ test_klp_state2
test_klp_state3
torture
refscale
+rcuscale
memcpy_kunit
dev_addr_lists_test
test_hash
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1726