From: pbrobinson on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1274
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.
Primarily removing some old FB unused drivers but also enabling the VMWare DRM
driver on Fedora.
Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com>
---
redhat/configs/ark/generic/CONFIG_DRM_VMWGFX => redhat/configs/common/generic/CONFIG_DRM_VMWGFX | 0
redhat/configs/ark/generic/CONFIG_DRM_VMWGFX_FBCON => redhat/configs/common/generic/CONFIG_DRM_VMWGFX_FBCON | 0
redhat/configs/ark/generic/CONFIG_FB_VIRTUAL => redhat/configs/common/generic/CONFIG_FB_VIRTUAL | 0
redhat/configs/fedora/generic/arm/aarch64/CONFIG_FB_XILINX | 1 -
redhat/configs/fedora/generic/arm/CONFIG_FB_ARMCLCD | 1 -
redhat/configs/fedora/generic/arm/armv7/CONFIG_FB_XILINX => redhat/configs/fedora/generic/arm/CONFIG_FB_XILINX | 0
redhat/configs/fedora/generic/CONFIG_FB_VIRTUAL | 1 -
redhat/configs/pending-fedora/generic/CONFIG_DRM_VMWGFX | 21 ----------
8 files changed, 0 insertions(+), 24 deletions(-)
From: Herton R. Krzesinski <herton(a)redhat.com>
rpmspec: fix verbose output on kernel-devel installation
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1981406
The current hardlink implementation that is available on latest
util-linux versions (at least >= 2.37) is verbose by default. Thus
lots of output is printed when hardlink runs at the kernel-devel
install with newer hardlink versions. Avoid that by redirecting
the output to /dev/null. I also could use the -q option, but that
may not be available with hardlink versions eg. on older stable Fedora
versions where current kernels might still be built for them, so the
redirection seems the safest approach.
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
@@ -2592,7 +2592,7 @@ if [ "$HARDLINK" != "no" -a -x /usr/bin/hardlink -a ! -e /run/ostree-booted ] \
then\
(cd /usr/src/kernels/%{KVERREL}%{?1:+%{1}} &&\
/usr/bin/find . -type f | while read f; do\
- hardlink -c /usr/src/kernels/*%{?dist}.*/$f $f\
+ hardlink -c /usr/src/kernels/*%{?dist}.*/$f $f > /dev/null\
done)\
fi\
%{nil}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1275
Hello,
We ran automated tests on the following kernel build:
Kernel package: kernel-5.13.5-200.fc34
Task URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=72632395
The results of these automated tests are provided below.
Overall result: FAILED (see details below)
Tests: FAILED
One or more kernel tests failed:
ppc64le:
❌ LTP
All kernel binaries, config files, and logs are available for download here:
https://arr-cki-prod-datawarehouse-public.s3.amazonaws.com/index.html?prefi…
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
For the full detail on our testing procedures, please scroll to the bottom of
this message.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
✅ Boot test
✅ Reboot test
✅ xfstests - ext4
✅ xfstests - xfs
✅ Storage: swraid mdadm raid_module test
🚧 ✅ xfstests - btrfs
🚧 ✅ Storage blktests
🚧 ✅ Storage block - filesystem fio test
🚧 ✅ Storage block - queue scheduler test
🚧 ✅ Storage nvme - tcp
🚧 ✅ storage: software RAID testing
🚧 💥 stress: stress-ng
Host 2:
✅ Boot test
✅ Reboot test
✅ ACPI table test
✅ LTP
✅ CIFS Connectathon
✅ Loopdev Sanity
✅ Memory: fork_mem
✅ Memory function: memfd_create
✅ AMTU (Abstract Machine Test Utility)
✅ Ethernet drivers sanity
🚧 ✅ xarray-idr-radixtree-test
ppc64le:
Host 1:
✅ Boot test
✅ Reboot test
❌ LTP
✅ CIFS Connectathon
✅ Loopdev Sanity
✅ Memory: fork_mem
✅ Memory function: memfd_create
✅ AMTU (Abstract Machine Test Utility)
✅ Ethernet drivers sanity
🚧 ✅ xarray-idr-radixtree-test
Host 2:
✅ Boot test
✅ Reboot test
✅ xfstests - ext4
✅ xfstests - xfs
✅ Storage: swraid mdadm raid_module test
🚧 ✅ xfstests - btrfs
🚧 ✅ Storage blktests
🚧 ✅ Storage block - filesystem fio test
🚧 ✅ Storage block - queue scheduler test
🚧 ✅ Storage nvme - tcp
🚧 ✅ Storage: lvm device-mapper test - upstream
🚧 ✅ storage: software RAID testing
s390x:
Host 1:
✅ Boot test
✅ Reboot test
✅ LTP
✅ CIFS Connectathon
✅ Loopdev Sanity
✅ Memory: fork_mem
✅ Memory function: memfd_create
✅ AMTU (Abstract Machine Test Utility)
✅ Ethernet drivers sanity
🚧 ✅ xarray-idr-radixtree-test
Host 2:
✅ Boot test
✅ Reboot test
✅ Storage: swraid mdadm raid_module test
🚧 ✅ Storage blktests
🚧 ✅ Storage nvme - tcp
🚧 ❌ stress: stress-ng
x86_64:
Host 1:
✅ Boot test
✅ Reboot test
✅ ACPI table test
✅ LTP
✅ CIFS Connectathon
✅ Loopdev Sanity
✅ Memory: fork_mem
✅ Memory function: memfd_create
✅ AMTU (Abstract Machine Test Utility)
✅ Ethernet drivers sanity
🚧 ✅ xarray-idr-radixtree-test
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
⚡⚡⚡ xfstests - ext4
⚡⚡⚡ xfstests - xfs
⚡⚡⚡ xfstests - nfsv4.2
⚡⚡⚡ Storage: swraid mdadm raid_module test
🚧 ⚡⚡⚡ xfstests - btrfs
🚧 ⚡⚡⚡ xfstests - cifsv3.11
🚧 ⚡⚡⚡ Storage blktests
🚧 ⚡⚡⚡ Storage block - filesystem fio test
🚧 ⚡⚡⚡ Storage block - queue scheduler test
🚧 ⚡⚡⚡ Storage nvme - tcp
🚧 ⚡⚡⚡ Storage: lvm device-mapper test - upstream
🚧 ⚡⚡⚡ storage: software RAID testing
🚧 ⚡⚡⚡ stress: stress-ng
Host 3:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
⚡⚡⚡ xfstests - ext4
⚡⚡⚡ xfstests - xfs
⚡⚡⚡ xfstests - nfsv4.2
⚡⚡⚡ Storage: swraid mdadm raid_module test
🚧 ⚡⚡⚡ xfstests - btrfs
🚧 ⚡⚡⚡ xfstests - cifsv3.11
🚧 ⚡⚡⚡ Storage blktests
🚧 ⚡⚡⚡ Storage block - filesystem fio test
🚧 ⚡⚡⚡ Storage block - queue scheduler test
🚧 ⚡⚡⚡ Storage nvme - tcp
🚧 ⚡⚡⚡ Storage: lvm device-mapper test - upstream
🚧 ⚡⚡⚡ storage: software RAID testing
🚧 ⚡⚡⚡ stress: stress-ng
Host 4:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
⚡⚡⚡ xfstests - ext4
⚡⚡⚡ xfstests - xfs
⚡⚡⚡ xfstests - nfsv4.2
⚡⚡⚡ Storage: swraid mdadm raid_module test
🚧 ⚡⚡⚡ xfstests - btrfs
🚧 ⚡⚡⚡ xfstests - cifsv3.11
🚧 ⚡⚡⚡ Storage blktests
🚧 ⚡⚡⚡ Storage block - filesystem fio test
🚧 ⚡⚡⚡ Storage block - queue scheduler test
🚧 ⚡⚡⚡ Storage nvme - tcp
🚧 ⚡⚡⚡ Storage: lvm device-mapper test - upstream
🚧 ⚡⚡⚡ storage: software RAID testing
🚧 ⚡⚡⚡ stress: stress-ng
Test sources: https://gitlab.com/cki-project/kernel-tests
💚 Pull requests are welcome for new tests or improvements to existing tests!
Aborted tests
-------------
Tests that didn't complete running successfully are marked with ⚡⚡⚡.
If this was caused by an infrastructure issue, we try to mark that
explicitly in the report.
Waived tests
------------
If the test run included waived tests, they are marked with 🚧. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
Testing timeout
---------------
We aim to provide a report within reasonable timeframe. Tests that haven't
finished running yet are marked with ⏱.
From: Prarit Bhargava <prarit(a)redhat.com>
mod-denylist.sh: Change to denylist
Change blacklist references to denylist.
v2: modprobe still uses blacklist
v3: modprobe doesn't care what the denylist file is named
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,28 @@ Dir="$1/$2"
List=$3
Dest="$4"
-blacklist()
+denylist()
{
- cat > "$RpmDir/etc/modprobe.d/$1-blacklist.conf" <<-__EOF__
+ cat > "$RpmDir/etc/modprobe.d/$1-denylist.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 +142,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 +152,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: Waiman Long <longman(a)redhat.com>
redhat/configs: Double MAX_LOCKDEP_ENTRIES
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1940075
Upstream: RHEL only
MAX_LOCKDEP_ENTRIES in lockdep is controlled by CONFIG_LOCKDEP_BITS. By
increasing it from a default of 15 to 16, we double MAX_LOCKDEP_ENTRIES
from 32k to 64k. That should be big enough for our internal use by our
QE.
CONFIG_LOCKDEP_BITS isn't used in generic kernel. It is only used
in debug kernel when CONFIG_LOCKDEP is turned on by the enabling of
CONFIG_PROVE_LOCKING.
Signed-off-by: Waiman Long <longman(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_LOCKDEP_BITS b/redhat/configs/common/generic/CONFIG_LOCKDEP_BITS
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_LOCKDEP_BITS
+++ b/redhat/configs/common/generic/CONFIG_LOCKDEP_BITS
@@ -1 +1 @@
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1271
From: Waiman Long <longman(a)redhat.com>
redhat/configs: Double MAX_LOCKDEP_ENTRIES
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1972078
Upstream: RHEL only
MAX_LOCKDEP_ENTRIES in lockdep is controlled by CONFIG_LOCKDEP_BITS. By
increasing it from a default of 15 to 16, we double MAX_LOCKDEP_ENTRIES
from 32k to 64k. That should be big enough for our internal use.
CONFIG_LOCKDEP_BITS isn't used in generic kernel. It is only used
in debug kernel when CONFIG_LOCKDEP is turned on by the enabling of
CONFIG_PROVE_LOCKING.
Signed-off-by: Waiman Long <longman(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_LOCKDEP_BITS b/redhat/configs/common/generic/CONFIG_LOCKDEP_BITS
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_LOCKDEP_BITS
+++ b/redhat/configs/common/generic/CONFIG_LOCKDEP_BITS
@@ -1 +1 @@
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1271
From: Herton R. Krzesinski on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1268
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1977056
As reported on bugzilla above, rpm -V on kernel-core package fails, eg.:
```
.M....... g /boot/System.map-5.13.0-0.rc7.51.el9.x86_64
.M....... g /boot/initramfs-5.13.0-0.rc7.51.el9.x86_64.img
.......T. /lib/modules/5.13.0-0.rc7.51.el9.x86_64/modules.builtin.alias.bin
```
This merge request with two commits are aimed to fix those. The ghost files
issue were already fixed in rhel7/rhel8 but kernel-ark lacked the commit,
which I cherry-picked here. The other commit fixes the problem with
modules.builtin.alias.bin which is a depmod created file and we need to remove
in the build process.
---
redhat/kernel.spec.template | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)