From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in samples/damon
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: SAMPLE_DAMON_PRCL [=n]
Type : bool
Defined at samples/damon/Kconfig:17
Prompt: DAMON sameple module for access-aware proactive reclamation
Depends on: SAMPLES [=y] && DAMON [=y] && DAMON_VADDR [=y]
Location:
-> Kernel hacking
-> Sample kernel code (SAMPLES [=y])
-> DAMON Samples
-> DAMON sameple module for access-aware proactive reclamation (SAMPLE_DAMON_PRCL [=n])
Commit: 2aca254620a8 (samples/damon: introduce a skeleton of a smaple DAMON module for proactive reclamation)
---
Symbol: SAMPLE_DAMON_WSSE [=n]
Type : bool
Defined at samples/damon/Kconfig:5
Prompt: DAMON sameple module for working set size estimation
Depends on: SAMPLES [=y] && DAMON [=y] && DAMON_VADDR [=y]
Location:
-> Kernel hacking
-> Sample kernel code (SAMPLES [=y])
-> DAMON Samples
-> DAMON sameple module for working set size estimation (SAMPLE_DAMON_WSSE [=n])
Commit: 19d7c3adfdd4 (samples: add a skeleton of a sample DAMON module for working set size estimation)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_SAMPLE_DAMON_PRCL b/redhat/configs/pending-rhel/generic/CONFIG_SAMPLE_DAMON_PRCL
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_SAMPLE_DAMON_PRCL
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: SAMPLE_DAMON_PRCL [=n]
-# Type : bool
-# Defined at samples/damon/Kconfig:17
-# Prompt: DAMON sameple module for access-aware proactive reclamation
-# Depends on: SAMPLES [=y] && DAMON [=y] && DAMON_VADDR [=y]
-# Location:
-# -> Kernel hacking
-# -> Sample kernel code (SAMPLES [=y])
-# -> DAMON Samples
-# -> DAMON sameple module for access-aware proactive reclamation (SAMPLE_DAMON_PRCL [=n])
-#
-#
-#
-# Commit: 2aca254620a8 (samples/damon: introduce a skeleton of a smaple DAMON module for proactive reclamation)
-# CONFIG_SAMPLE_DAMON_PRCL is not set
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_SAMPLE_DAMON_WSSE b/redhat/configs/pending-rhel/generic/CONFIG_SAMPLE_DAMON_WSSE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_SAMPLE_DAMON_WSSE
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: SAMPLE_DAMON_WSSE [=n]
-# Type : bool
-# Defined at samples/damon/Kconfig:5
-# Prompt: DAMON sameple module for working set size estimation
-# Depends on: SAMPLES [=y] && DAMON [=y] && DAMON_VADDR [=y]
-# Location:
-# -> Kernel hacking
-# -> Sample kernel code (SAMPLES [=y])
-# -> DAMON Samples
-# -> DAMON sameple module for working set size estimation (SAMPLE_DAMON_WSSE [=n])
-#
-#
-#
-# Commit: 19d7c3adfdd4 (samples: add a skeleton of a sample DAMON module for working set size estimation)
-# CONFIG_SAMPLE_DAMON_WSSE is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_SAMPLE_DAMON_PRCL b/redhat/configs/rhel/generic/CONFIG_SAMPLE_DAMON_PRCL
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_SAMPLE_DAMON_PRCL
@@ -0,0 +1 @@
+# CONFIG_SAMPLE_DAMON_PRCL is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_SAMPLE_DAMON_WSSE b/redhat/configs/rhel/generic/CONFIG_SAMPLE_DAMON_WSSE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_SAMPLE_DAMON_WSSE
@@ -0,0 +1 @@
+# CONFIG_SAMPLE_DAMON_WSSE is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3651
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: Thorsten Leemhuis <fedora(a)leemhuis.info>
set a more reasonable default for number of jobs
Instead of just one use four jobs by default, which is a more reasonable
default these days. The worst that can^w should happen is some
performance drop due to increased concurrency in setups with less than
four CPU cores.
Signed-off-by: Thorsten Leemhuis <fedora(a)leemhuis.info>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -99,7 +99,7 @@ endif
ifndef RHJOBS
RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "(^|[ ])-j[0-9]*" | xargs ); \
if [ -z "$${j}" ]; then \
- echo "1"; \
+ echo "4"; \
else \
j=$$(echo "$${j}" | tr -d "\-j"); \
[ -z "$${j}" ] && nproc || echo $${j}; \
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3589
From: Dorinda Bassey <dbassey(a)redhat.com>
redhat/configs: automotive: Disable MRP/8021Q_MVRP Protocol
Upstream Status: RHEL only
Disable The MRP/8021Q_MVRP Protocol. This also
automatically disables it's related dependencies
This is needed to satisfy a requirement of FuSa efforts
for RHIVOS.
Link: https://issues.redhat.com/browse/RHEL-75478
Signed-off-by: Dorinda Bassey <dbassey(a)redhat.com>
diff --git a/redhat/configs/rhel/automotive/generic/CONFIG_MRP b/redhat/configs/rhel/automotive/generic/CONFIG_MRP
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/automotive/generic/CONFIG_MRP
@@ -0,0 +1 @@
+# CONFIG_MRP is not set
diff --git a/redhat/configs/rhel/automotive/generic/CONFIG_VLAN_8021Q_MVRP b/redhat/configs/rhel/automotive/generic/CONFIG_VLAN_8021Q_MVRP
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/automotive/generic/CONFIG_VLAN_8021Q_MVRP
@@ -0,0 +1 @@
+# CONFIG_VLAN_8021Q_MVRP is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3608
From: Benjamin Poirier <bpoirier(a)redhat.com>
redhat/configs: Change script interpreter to /bin/bash
Upstream-status: RHEL-only
Bugzilla: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3668
When running `make dist-configs` on a system where /bin/sh is dash (rather
than bash), the command fails with:
[...]
Building .../redhat/configs/kernel-riscv64-rt-debug-fedora.config ...
Building .../redhat/configs/kernel-riscv64-rt-debug-fedora.config complete
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
head: cannot open '.../redhat/configs/kernel-6.14.0*.config' for reading: No such file or directory
cat: '.../redhat/configs/kernel-6.14.0*.config': No such file or directory
Processing .../redhat/configs/kernel-6.14.0*.config ...
.../Makefile:750: arch//Makefile: No such file or directory
make[3]: *** No rule to make target 'arch//Makefile'. Stop.
make[2]: *** [Makefile:263: __sub-make] Error 2
make[1]: *** [Makefile:564: dist-configs] Error 1
make[1]: Leaving directory '.../redhat'
make: *** [makefile:12: dist-configs] Error 2
The problem is due to the following substitution:
${i:$specpackage_name_len}
If we remove the shellcheck ignore, shellcheck explains:
SC3057 (warning): In POSIX sh, string indexing is undefined.
Since there are already many other scripts under redhat/ which use
/bin/bash as their interpreter, fix this problem by changing the
interpreter for this script to use bash as well.
We can then remove the shellcheck ignore but this results in another
message:
SC2001 (style): See if you can use ${variable//search/replace} instead.
The code is restructured as suggested.
Signed-off-by: Benjamin Poirier <bpoirier(a)redhat.com>
diff --git a/redhat/configs/generate_all_configs.sh b/redhat/configs/generate_all_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/generate_all_configs.sh
+++ b/redhat/configs/generate_all_configs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Adjusts the configuration options to build the variants correctly
@@ -22,9 +22,9 @@ fi
# The +1 is to remove the - at the end of the SPECPACKAGE_NAME string
specpackage_name_len=$((${#SPECPACKAGE_NAME} + 1))
for i in "${SPECPACKAGE_NAME}"*-"$FLAVOR".config; do
- # shellcheck disable=SC3057
- NEW=${SPECPACKAGE_NAME}-"$SPECRPMVERSION"-$(echo "${i:$specpackage_name_len}" | sed s/-"$FLAVOR"//)
- mv "$i" "$NEW"
+ variant=${i:$specpackage_name_len}
+ variant=${variant/-$FLAVOR}
+ mv "$i" "$SPECPACKAGE_NAME-$SPECRPMVERSION-$variant"
done
rm -f kernel-*-"$SECONDARY".config
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3668
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in drivers/dma
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: AMD_AE4DMA [=n]
Type : tristate
Defined at drivers/dma/amd/Kconfig:4
Prompt: AMD AE4DMA Engine
Depends on: DMADEVICES [=y] && (X86_64 [=y] || COMPILE_TEST [=n]) && PCI [=y] && AMD_PTDMA [=m]
Location:
-> Device Drivers
-> DMA Engine support (DMADEVICES [=y])
-> AMD AE4DMA Engine (AMD_AE4DMA [=n])
Selects: DMA_ENGINE [=y] && DMA_VIRTUAL_CHANNELS [=y]
Commit: 90a30e268d9b (dmaengine: ae4dma: Add AMD ae4dma controller driver)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_AMD_AE4DMA b/redhat/configs/pending-rhel/generic/CONFIG_AMD_AE4DMA
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_AMD_AE4DMA
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: AMD_AE4DMA [=n]
-# Type : tristate
-# Defined at drivers/dma/amd/Kconfig:4
-# Prompt: AMD AE4DMA Engine
-# Depends on: DMADEVICES [=y] && (X86_64 [=y] || COMPILE_TEST [=n]) && PCI [=y] && AMD_PTDMA [=m]
-# Location:
-# -> Device Drivers
-# -> DMA Engine support (DMADEVICES [=y])
-# -> AMD AE4DMA Engine (AMD_AE4DMA [=n])
-# Selects: DMA_ENGINE [=y] && DMA_VIRTUAL_CHANNELS [=y]
-#
-#
-#
-# Commit: 90a30e268d9b (dmaengine: ae4dma: Add AMD ae4dma controller driver)
-# CONFIG_AMD_AE4DMA is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_AMD_AE4DMA b/redhat/configs/rhel/generic/CONFIG_AMD_AE4DMA
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_AMD_AE4DMA
@@ -0,0 +1 @@
+# CONFIG_AMD_AE4DMA is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3663
From: Benjamin Poirier <bpoirier(a)redhat.com>
redhat/configs: Change script interpreter to /bin/bash
Upstream-status: RHEL-only
Bugzilla: 2343226
When running `make dist-configs` on a system where /bin/sh is dash (rather
than bash), the command fails with:
[...]
Building .../redhat/configs/kernel-riscv64-rt-debug-fedora.config ...
Building .../redhat/configs/kernel-riscv64-rt-debug-fedora.config complete
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
./generate_all_configs.sh: 26: Bad substitution
head: cannot open '.../redhat/configs/kernel-6.14.0*.config' for reading: No such file or directory
cat: '.../redhat/configs/kernel-6.14.0*.config': No such file or directory
Processing .../redhat/configs/kernel-6.14.0*.config ...
.../Makefile:750: arch//Makefile: No such file or directory
make[3]: *** No rule to make target 'arch//Makefile'. Stop.
make[2]: *** [Makefile:263: __sub-make] Error 2
make[1]: *** [Makefile:564: dist-configs] Error 1
make[1]: Leaving directory '.../redhat'
make: *** [makefile:12: dist-configs] Error 2
The problem is due to the following substitution:
${i:$specpackage_name_len}
If we remove the shellcheck ignore, shellcheck explains:
SC3057 (warning): In POSIX sh, string indexing is undefined.
Since there are already many other scripts under redhat/ which use
/bin/bash as their interpreter, fix this problem by changing the
interpreter for this script to use bash as well.
We can then remove the shellcheck ignore but this results in another
message:
SC2001 (style): See if you can use ${variable//search/replace} instead.
The code is restructured as suggested.
Signed-off-by: Benjamin Poirier <bpoirier(a)redhat.com>
diff --git a/redhat/configs/generate_all_configs.sh b/redhat/configs/generate_all_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/generate_all_configs.sh
+++ b/redhat/configs/generate_all_configs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Adjusts the configuration options to build the variants correctly
@@ -22,9 +22,9 @@ fi
# The +1 is to remove the - at the end of the SPECPACKAGE_NAME string
specpackage_name_len=$((${#SPECPACKAGE_NAME} + 1))
for i in "${SPECPACKAGE_NAME}"*-"$FLAVOR".config; do
- # shellcheck disable=SC3057
- NEW=${SPECPACKAGE_NAME}-"$SPECRPMVERSION"-$(echo "${i:$specpackage_name_len}" | sed s/-"$FLAVOR"//)
- mv "$i" "$NEW"
+ variant=${i:$specpackage_name_len}
+ variant=${variant/-$FLAVOR}
+ mv "$i" "$SPECPACKAGE_NAME-$SPECRPMVERSION-$variant"
done
rm -f kernel-*-"$SECONDARY".config
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3668
From: Yanko Kaneti <yaneti(a)declera.com>
configs/fedora: Enable CONFIG_PCI_REALLOC_ENABLE_AUTO
This should help with automatically allocating resources for
hotplug PCI devices (e.g. U.2 NVMe) when the BIOS/firmware hasn't
made provisions for that.
See merge requests cki-project/kernel-ark!3622 and
cki-project/kernel-ark!3597
Signed-off-by: Yanko Kaneti <yaneti(a)declera.com>
diff --git a/redhat/configs/fedora/generic/CONFIG_PCI_REALLOC_ENABLE_AUTO b/redhat/configs/fedora/generic/CONFIG_PCI_REALLOC_ENABLE_AUTO
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/fedora/generic/CONFIG_PCI_REALLOC_ENABLE_AUTO
@@ -0,0 +1 @@
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3622
From: Herbert Xu <herbert.xu(a)redhat.com>
not upstream: Set vdso is_ready later during boot process
Instead of setting vdso is_ready when the CRNG becomes ready, do
it later in the boot process as FIPS mode itself may not have been
set yet during the early-boot stages.
In particular, the CRNG gets initialised very early on arm64, even
before the early boot paramaters are parsed.
Delaying vdso is_ready setting on the other hand is harmless as
there is always a fallback code path that leads to getrandom(2).
Signed-off-by: Herbert Xu <herbert.xu(a)redhat.com>
diff --git a/drivers/char/random.c b/drivers/char/random.c
index blahblah..blahblah 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -121,6 +121,10 @@ EXPORT_SYMBOL(rng_is_initialized);
static void __cold crng_set_ready(struct work_struct *work)
{
static_branch_enable(&crng_is_ready);
+#ifdef CONFIG_VDSO_GETRANDOM
+ if (!fips_enabled)
+ WRITE_ONCE(__arch_get_k_vdso_rng_data()->is_ready, true);
+#endif
}
/* Used by wait_for_random_bytes(), and considered an entropy collector, below. */
@@ -749,10 +753,6 @@ static void __cold _credit_init_bits(size_t bits)
if (static_key_initialized && system_unbound_wq)
queue_work(system_unbound_wq, &set_ready);
atomic_notifier_call_chain(&random_ready_notifier, 0, NULL);
-#ifdef CONFIG_VDSO_GETRANDOM
- if (!fips_enabled)
- WRITE_ONCE(__arch_get_k_vdso_rng_data()->is_ready, true);
-#endif
wake_up_interruptible(&crng_init_wait);
kill_fasync(&fasync, SIGIO, POLL_IN);
pr_notice("crng init done\n");
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3667