From: Herbert Xu on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2757
Upstream Status: RHEL only
Restore the changes to /dev/random which were reverted after 5.18.
This reverts commit 900f11e054896bae7b0146055698656e3d1e20a6 and
297bcb88233101e8d5062729ff3a5f989bad1c3b.
This also brings the code up-to-date with respect to centos-stream
commit 9de3a7339793d3c516b9305a8854267156f90c53 so that changes that
were made after the kernel-ark revert have been brought in.
Signed-off-by: Herbert Xu <herbert.xu(a)redhat.com>
---
crypto/drbg.c | 18 ++++-
crypto/rng.c | 149 +++++++++++++++++++++++++++++++++++++++++++-----
drivers/char/random.c | 122 ++++++++++++++++++++++++++++++++++++++++
include/linux/crypto.h | 1 +
include/linux/random.h | 10 +++
5 files changed, 281 insertions(+), 19 deletions(-)
From: Herbert Xu on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1304
NOTE: Truncated patchset since committer email 'herbert(a)gondor.apana.org.au'
does not match the submitter's GitLab public email address
'herbert.xu(a)redhat.com'.
Upstream: RHEL only
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1984784
The RHEL FIPS certification effort ran into an show-stopper with
/dev/urandom and getrandom(2) not being FIPS-compliant. At this
point there is no realistic chance of making them FIPS-compliant
upstream. It has also been deemed unrealistic to change user-space
to use the FIPS-compliant RNG through the Crypto API.
Therefore this patch series overrides /dev/*random as well as
getrandom(2) with the Crypto API RNG so that FIPS certification
can proceed.
Signed-off-by: Herbert Xu <herbert.xu(a)redhat.com>
---
crypto/rng.c | 73 ++++++++++++++++++++++++++++++-
drivers/char/random.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/random.h | 7 ++
3 files changed, 194 insertions(+), 1 deletions(-)
From: Michal Schmidt <mschmidt(a)redhat.com>
redhat/configs: delete renamed CONFIG_MLX5_EN_MACSEC
CONFIG_MLX5_EN_MACSEC was renamed to CONFIG_MLX5_MACSEC in
commit 7390762a0737 ("net/mlx5e: Move MACsec flow steering operations
to be used as core library"). Remove the old name from redhat/configs.
The feature is already correctly enabled under the new name.
Signed-off-by: Michal Schmidt <mschmidt(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_MLX5_EN_MACSEC b/redhat/configs/common/generic/CONFIG_MLX5_EN_MACSEC
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/CONFIG_MLX5_EN_MACSEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MLX5_EN_MACSEC=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3144
From: Rupinderjit Singh on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3373
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.
Also, remove scmi configs from rhel as they have already been enabled in
common now.
Signed-off-by: Rupinderjit Singh <rusingh(a)redhat.com>
---
redhat/configs/common/generic/arm/aarch64/CONFIG_GPIO_PCA953X_IRQ | 2 +-
redhat/configs/common/generic/arm/aarch64/CONFIG_LEDS_TLC591XX | 2 +-
redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_PCA953X_IRQ | 1 -
redhat/configs/fedora/generic/arm/aarch64/CONFIG_LEDS_TLC591XX | 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_I2C_SCMI | 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_RESET_SCMI | 1 -
6 files changed, 2 insertions(+), 6 deletions(-)
From: pbrobinson on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3423
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.
A couple of minor cleanups for common config.
Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
---
redhat/configs/common/generic/CONFIG_KS7010 | 1 -
redhat/configs/common/generic/CONFIG_RPMB | 1 +
redhat/configs/pending-fedora/generic/CONFIG_RPMB | 14 --------------
redhat/configs/rhel/generic/CONFIG_RPMB | 1 -
4 files changed, 1 insertions(+), 16 deletions(-)
From: Clark Williams <williams(a)redhat.com>
redhat: enable changes to build rt variants
Set the %with_realtime specfile variable to be 1 and build the
kernel-rt variant with ARK build jobs.
Add the CONFIG_PREEMPT_RT config and set default values for
PREEMPT_AUTO and PREEMPT_RT for the stock kernels and variants.
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_PREEMPT_AUTO b/redhat/configs/common/generic/CONFIG_PREEMPT_AUTO
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_PREEMPT_AUTO
@@ -0,0 +1 @@
+# CONFIG_PREEMPT_AUTO is not set
diff --git a/redhat/configs/fedora/generic/CONFIG_PREEMPT_RT b/redhat/configs/fedora/generic/CONFIG_PREEMPT_RT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/fedora/generic/CONFIG_PREEMPT_RT
@@ -0,0 +1 @@
+# CONFIG_PREEMPT_RT is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_PREEMPT_RT b/redhat/configs/rhel/generic/CONFIG_PREEMPT_RT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_PREEMPT_RT
@@ -0,0 +1 @@
+# CONFIG_PREEMPT_RT is not set
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_AUTO b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_AUTO
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_AUTO
@@ -0,0 +1 @@
+# CONFIG_PREEMPT_AUTO is not set
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
+++ b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
@@ -1 +1 @@
-# CONFIG_PREEMPT_RT is not set
+CONFIG_PREEMPT_RT=y
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
@@ -207,7 +207,7 @@ Summary: The Linux kernel
# kernel-64k (aarch64 kernel with 64K page_size)
%define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1}
# kernel-rt (x86_64 and aarch64 only PREEMPT_RT enabled kernel)
-%define with_realtime %{?_with_realtime: 1} %{?!_with_realtime: 0}
+%define with_realtime %{?_without_realtime: 0} %{?!_without_realtime: 1}
# Supported variants
# with_base with_debug with_gcov
@@ -1871,7 +1871,7 @@ chmod +x scripts/checkpatch.pl
mv COPYING COPYING-%{specrpmversion}-%{release}
# on linux-next prevent scripts/setlocalversion from mucking with our version numbers
-rm -f localversion-next
+rm -f localversion-next localversion-rt
# Mangle /usr/bin/python shebangs to /usr/bin/python3
# Mangle all Python shebangs to be Python 3 explicitly
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3416