From: Ming Lei <ming.lei(a)redhat.com>
redhat/configs: enable CONFIG_BLK_DEV_ZONED
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1638087
This option has been enabled in Fedora already.
Also it is mentioned in this BZ that 'our current plan is to enable this
in RHEL 9 first', so enable this option in redhat/configs/common so that
people can use ZNS via userspace or play it via nvme-cli.
Signed-off-by: Ming Lei <ming.lei(a)redhat.com>
diff --git a/redhat/configs/ark/generic/CONFIG_BLK_DEV_ZONED b/redhat/configs/ark/generic/CONFIG_BLK_DEV_ZONED
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_BLK_DEV_ZONED
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_ZONED is not set
diff --git a/redhat/configs/fedora/generic/CONFIG_BLK_DEV_ZONED b/redhat/configs/common/generic/CONFIG_BLK_DEV_ZONED
rename from redhat/configs/fedora/generic/CONFIG_BLK_DEV_ZONED
rename to redhat/configs/common/generic/CONFIG_BLK_DEV_ZONED
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_BLK_DEV_ZONED
+++ b/redhat/configs/common/generic/CONFIG_BLK_DEV_ZONED
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1182
From: Phil Auld <pauld(a)redhat.com>
redhat/configs: Disable CONFIG_RT_GROUP_SCHED in rhel config
Fedora and rhel-rt config already have CONFIG_RT_GROUP_SCHED disabled.
RT_GROUP_SCHED does not play well with cgroups v2. Rather than keep
this enabled, disable it in rhel going forward.
Signed-off-by: Phil Auld <pauld(a)redhat.com>
diff --git a/redhat/configs/ark/generic/CONFIG_RT_GROUP_SCHED b/redhat/configs/ark/generic/CONFIG_RT_GROUP_SCHED
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_RT_GROUP_SCHED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RT_GROUP_SCHED=y
diff --git a/redhat/configs/fedora/generic/CONFIG_RT_GROUP_SCHED b/redhat/configs/common/generic/CONFIG_RT_GROUP_SCHED
rename from redhat/configs/fedora/generic/CONFIG_RT_GROUP_SCHED
rename to redhat/configs/common/generic/CONFIG_RT_GROUP_SCHED
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_RT_GROUP_SCHED
+++ b/redhat/configs/common/generic/CONFIG_RT_GROUP_SCHED
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1177
From: Kairui Song on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1171
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
It has been a long-term demand for having a default crashkernel
value for each kernel build. This helps to manage kernel's
crashkernel usage by kernel version and provide users a reference
default value.
RHEL kernels support a `crashkernel=auto` cmdline param. And kernel
have a built-in default value used when `auto` is specified.
Many attempts are made to push this upstream. Recent attempt to
push this upstream raised a lot of discussions [1].
Upstream is not accepting this `crashkernel=auto` design. So after
more discussions, instead of adding a default value in kernel, just
add a config that packaged with kernel is more doable. Other packages,
like kexec-tools[2], can use this as a reference and update kernel
cmdline param.
[1]: https://lore.kernel.org/linux-mm/20210507010432.IN24PudKT%25akpm@linux-foundation.org/
[2]: https://lists.fedoraproject.org/archives/list/kexec@lists.fedoraproject.o
rg/thread/MKUSELX3GKKXPFNLEGJMWXSS2LADRPMQ/
Signed-off-by: Kairui Song <kasong(a)redhat.com>
---
Documentation/admin-guide/kdump/kdump.rst | 11 -----------
kernel/crash_core.c | 28 ++--------------------------
redhat/Makefile | 1 +
redhat/generate_crashkernel_conf.sh | 25 +++++++++++++++++++++++++
redhat/kernel.spec.template | 5 +++++
5 files changed, 33 insertions(+), 37 deletions(-)
From: Philipp Rudo <prudo(a)redhat.com>
configs/common/s390: disable CONFIG_QETH_{OSN,OSX}
Shipment of the devices required for these options were ceased with z13.
With the ALS set to z14 for ark there is no need to keep the options
enabled.
v2: disable the configs for fedora as well
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1903201
Signed-off-by: Philipp Rudo <prudo(a)redhat.com>
diff a/redhat/configs/common/generic/s390x/CONFIG_QETH_OSN b/redhat/configs/common/generic/s390x/CONFIG_QETH_OSN
--- a/redhat/configs/common/generic/s390x/CONFIG_QETH_OSN
+++ b/redhat/configs/common/generic/s390x/CONFIG_QETH_OSN
@@ -1 +1 @@
-CONFIG_QETH_OSN=y
+# CONFIG_QETH_OSN is not set
diff a/redhat/configs/common/generic/s390x/CONFIG_QETH_OSX b/redhat/configs/common/generic/s390x/CONFIG_QETH_OSX
--- a/redhat/configs/common/generic/s390x/CONFIG_QETH_OSX
+++ b/redhat/configs/common/generic/s390x/CONFIG_QETH_OSX
@@ -1 +1 @@
-CONFIG_QETH_OSX=y
+# CONFIG_QETH_OSX is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1149
From: Prarit Bhargava <prarit(a)redhat.com>
mod-denylist.sh: Change to denylist
Change blacklist references to denylist.
v2: modprobe still uses blacklist
Suggested-by: Brian Masney <bmasney(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/mod-denylist.sh b/redhat/mod-denylist.sh
index blahblah..blahblah 100755
--- a/redhat/mod-denylist.sh
+++ b/redhat/mod-denylist.sh
@@ -10,28 +10,29 @@ Dir="$1/$2"
List=$3
Dest="$4"
-blacklist()
+denylist()
{
+ # modprobe still uses the phrase 'blacklist' instead of 'denylist'
cat > "$RpmDir/etc/modprobe.d/$1-blacklist.conf" <<-__EOF__
# This kernel module can be automatically loaded by non-root users. To
- # enhance system security, the module is blacklisted by default to ensure
+ # enhance system security, the module is denylisted by default to ensure
# system administrators make the module available for use as needed.
# See https://access.redhat.com/articles/3760101 for more details.
#
- # Remove the blacklist by adding a comment # at the start of the line.
+ # Remove the denylist by adding a comment # at the start of the line.
blacklist $1
__EOF__
}
-check_blacklist()
+check_denylist()
{
mod=$(find "$RpmDir/$ModDir" -name "$1")
[ ! "$mod" ] && return 0
if modinfo "$mod" | grep -q '^alias:\s\+net-'; then
mod="${1##*/}"
mod="${mod%.ko*}"
- echo "$mod has an alias that allows auto-loading. Blacklisting."
- blacklist "$mod"
+ echo "Blocking $mod from auto-loading."
+ denylist "$mod"
fi
}
@@ -142,7 +143,7 @@ if [ -z "$Dest" ]; then
sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName"
echo "./$RpmDir/$ListName created."
[ -d "$RpmDir/etc/modprobe.d/" ] || mkdir -p "$RpmDir/etc/modprobe.d/"
- foreachp check_blacklist < "$List"
+ foreachp check_denylist < "$List"
fi
# Many BIOS-es export a PNP-id which causes the floppy driver to autoload
@@ -152,7 +153,7 @@ fi
floppylist=("$RpmDir"/"$ModDir"/kernel/drivers/block/floppy.ko*)
if [[ -n ${floppylist[0]} && -f ${floppylist[0]} ]]; then
- blacklist "floppy"
+ denylist "floppy"
fi
# avoid an empty kernel-extra package
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1185
From: Herton R. Krzesinski <herton(a)redhat.com>
rpmspec: only build debug meta packages where we build debug ones
Previous commit "rpmspec: build debug-* meta-packages if debug
builds are disabled" failed to consider the architectures or
cases where we disable debug packages, and made meta packages
being built for them even if real debug package build was
disabled in the normal case. So eg. for arches we don't build
kernels (eg. i686) debug meta packages could appear even if we
don't have kernel/kernel-debug being built.
This adds some logic to see if really with_debug was enabled,
and creating the meta-package only when it is enabled/set.
Signed-off-by: Herton R. Krzesinski <herton(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
@@ -281,10 +281,6 @@ Summary: The Linux kernel
%define debugbuildsenabled 1
%endif
-%if !%{debugbuildsenabled}
-%define with_debug 0
-%endif
-
%if !%{with_debuginfo}
%define _enable_debug_packages 0
%endif
@@ -508,6 +504,18 @@ Summary: The Linux kernel
%define _use_vdso 0
%endif
+# If build of debug packages is disabled, we need to know if we want to create
+# meta debug packages or not, after we define with_debug for all specific cases
+# above. So this must be at the end here, after all cases of with_debug or not.
+%define with_debug_meta 0
+%if !%{debugbuildsenabled}
+%if %{with_debug}
+%define with_debug_meta 1
+%endif
+%define with_debug 0
+%endif
+
+
#
# Packages that need to be installed before the kernel is, because the %%post
# scripts use them.
@@ -2856,7 +2864,7 @@ fi
%kernel_variant_files %{_use_vdso} %{with_up}
%kernel_variant_files %{_use_vdso} %{with_debug} debug
-%if !%{debugbuildsenabled}
+%if %{with_debug_meta}
%files debug
%files debug-core
%files debug-devel
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1198
From: Vladis Dronov <vdronov(a)redhat.com>
Revert "Merge branch 'ec_fips' into 'os-build'"
We need to revert the merge request !1150 and make CONFIG_CRYPTO_ECDH
and CONFIG_CRYPTO_ECDSA back to =m. Current =y setting prevents a kernel
booting in FIPS mode. This blocks some processes, see bz1915290#c23. This
is an upstream issue and we need this revert until a proposed upstream
solution is fully tested.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1947240
Link: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1150
Signed-off-by: Vladis Dronov <vdronov(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_ECDH b/redhat/configs/common/generic/CONFIG_CRYPTO_ECDH
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_CRYPTO_ECDH
+++ b/redhat/configs/common/generic/CONFIG_CRYPTO_ECDH
@@ -1 +1 @@
-CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_ECDH=m
diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_ECDSA b/redhat/configs/common/generic/CONFIG_CRYPTO_ECDSA
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_CRYPTO_ECDSA
+++ b/redhat/configs/common/generic/CONFIG_CRYPTO_ECDSA
@@ -1 +1 @@
-CONFIG_CRYPTO_ECDSA=y
+CONFIG_CRYPTO_ECDSA=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1189
From: Herton R. Krzesinski <herton(a)redhat.com>
rpmspec: do not BuildRequires bpftool on nobuildarches
Kernel builds are failing on i686 due missing or not available bpftool.
It does not make sense to require it on arches that we only build
headers and don't need bpftool, so make it not required on this case.
Signed-off-by: Herton R. Krzesinski <herton(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
@@ -545,7 +545,9 @@ BuildRequires: net-tools, hostname, bc, elfutils-devel
BuildRequires: dwarves
BuildRequires: python3-devel
BuildRequires: gcc-plugin-devel
+%ifnarch %{nobuildarches}
BuildRequires: bpftool
+%endif
%if %{with_headers}
BuildRequires: rsync
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1197
From: Phil Auld <pauld(a)redhat.com>
redhat/configs: Disable CONFIG_RT_GROUP_SCHED in rhel config
Fedora and rhel-rt config already have CONFIG_RT_GROUP_SCHED disabled.
RT_GROUP_SCHED does not play well with cgroups v2. Rather than keep
this enabled, disable it in rhel going forward.
Signed-off-by: Phil Auld <pauld(a)redhat.com>
diff --git a/redhat/configs/ark/generic/CONFIG_RT_GROUP_SCHED b/redhat/configs/ark/generic/CONFIG_RT_GROUP_SCHED
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_RT_GROUP_SCHED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RT_GROUP_SCHED=y
diff --git a/redhat/configs/fedora/generic/CONFIG_RT_GROUP_SCHED b/redhat/configs/common/generic/CONFIG_RT_GROUP_SCHED
rename from redhat/configs/fedora/generic/CONFIG_RT_GROUP_SCHED
rename to redhat/configs/common/generic/CONFIG_RT_GROUP_SCHED
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_RT_GROUP_SCHED
+++ b/redhat/configs/common/generic/CONFIG_RT_GROUP_SCHED
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1177
From: pbrobinson on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1176
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
Add upstream patches destined for 5.14 for Fedora's 5.13 kernel and enable the
PCIE driver to resolve the long standing issue of not having PCIE enabled for
Rockchip rk3399 SoCs such as the Pinebook Pro.
Fixes: RHBZ #1704945
Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com>
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
drivers/pci/controller/pcie-rockchip-host.c | 12 ++++----
drivers/pci/of.c | 17 +++++++++---
redhat/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP_HOST | 2 +-
redhat/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_PCIE | 2 +-
5 files changed, 21 insertions(+), 14 deletions(-)