Skip to content

[SIG-CLOUD-8] Add bugfixes for carried patches

Jonathan Maple requested to merge {jmaple}_r8_carried_pathes_upstream_bugfixes into r8

Bug fixes are being pulled in for patches that are were requested by SIG CLOUD hyperscalers.

Source Code PR / Branch

https://github.com/ctrliq/kernel-src-tree/tree/sig-cloud-8/4.18.0-553.33.1.el8_10

https://github.com/ctrliq/kernel-src-tree/pull/37

Upgrade/Update Process (This kernel CentOS base for 4.18.0-553)

  • Kernel History Rebuild Process for all src.rpms hosted by RESF
  • Create sig-cloud-8/4.18.0-553.33.1.el8_10 branch
  • Check if any maintained code is included in the new el release.
  • Cherry-pick all code from previous branch into new branch (skipping unneeded code)
    • Fix conflicts as they arise
  • Check for any new bug fixes upstream for carried patches
  • Build and Test

Removed Patches

  • None

New Patches from last Sig/Cloud Update

Build (with srpmproc)

~/workspace/SIG/cloud
[cloud]$ cd kernel/r8/
[r8]$ ls
SOURCES  SPECS

[jmaple@devbox r8]$ time mock -r /etc/mock/rocky+epel-8-x86_64.cfg --resultdir=../../rpms/8_10/ --spec=SPECS/kernel.spec --sources=SOURCES/
INFO: mock.py version 5.9 starting (python version = 3.9.19, NVR = mock-5.9-1.el9), args: /usr/libexec/mock/mock -r /etc/mock/rocky+epel-8-x86_64.cfg --resultdir=../../rpms/8_10/ --spec=SPECS/kernel.spec --sources=SOURCES/
Start(bootstrap): init plugins
INFO: selinux enabled
Finish(bootstrap): init plugins
Start: init plugins
INFO: selinux enabled

[SNIP]

Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/kernel-4.18.0-553.33.1.el8.0.1.x86_64
Wrote: /builddir/build/RPMS/kernel-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-headers-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-cross-headers-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-debuginfo-common-x86_64-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/perf-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/perf-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/python3-perf-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/python3-perf-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-tools-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-tools-libs-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-tools-libs-devel-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-tools-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/bpftool-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/bpftool-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-selftests-internal-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-debug-core-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-debug-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-debug-devel-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-debug-modules-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-debug-modules-extra-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-debug-modules-internal-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-debug-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-core-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-devel-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-modules-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-modules-extra-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-modules-internal-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Wrote: /builddir/build/RPMS/kernel-ipaclones-internal-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.LPL7jR
+ umask 022
+ cd /builddir/build/BUILD
+ cd kernel-4.18.0-553.33.1.el8_10
+ rm -rf /builddir/build/BUILDROOT/kernel-4.18.0-553.33.1.el8.0.1.x86_64
+ exit 0
Finish: rpmbuild kernel-4.18.0-553.33.1.el8.0.1.src.rpm
Finish: build phase for kernel-4.18.0-553.33.1.el8.0.1.src.rpm
INFO: Done(../../rpms/8_10/kernel-4.18.0-553.33.1.el8.0.1.src.rpm) Config(rocky+epel-8-x86_64) 36 minutes 30 seconds
INFO: Results and/or logs in: ../../rpms/8_10/
INFO: Cleaning up build root ('cleanup_on_success=True')
Start: clean chroot
Finish: clean chroot
Finish: run

real	37m54.747s
user	435m12.243s
sys	47m55.939s

Install and Boot

[maple@r8-sigcloud-builder build_files]$ ls
bpftool-4.18.0-553.33.1.el8.0.1.x86_64.rpm                         kernel-devel-4.18.0-553.33.1.el8.0.1.x86_64.rpm
bpftool-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm               kernel-headers-4.18.0-553.33.1.el8.0.1.x86_64.rpm
build.log                                                          kernel-ipaclones-internal-4.18.0-553.33.1.el8.0.1.x86_64.rpm
hw_info.log                                                        kernel-modules-4.18.0-553.33.1.el8.0.1.x86_64.rpm
installed_pkgs.log                                                 kernel-modules-extra-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-4.18.0-553.33.1.el8.0.1.src.rpm                             kernel-modules-internal-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-4.18.0-553.33.1.el8.0.1.x86_64.rpm                          kernel-selftests-internal-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-core-4.18.0-553.33.1.el8.0.1.x86_64.rpm                     kernel-tools-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-cross-headers-4.18.0-553.33.1.el8.0.1.x86_64.rpm            kernel-tools-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-debug-4.18.0-553.33.1.el8.0.1.x86_64.rpm                    kernel-tools-libs-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-debug-core-4.18.0-553.33.1.el8.0.1.x86_64.rpm               kernel-tools-libs-devel-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-debug-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm          perf-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-debug-devel-4.18.0-553.33.1.el8.0.1.x86_64.rpm              perf-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm                python3-perf-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-debuginfo-common-x86_64-4.18.0-553.33.1.el8.0.1.x86_64.rpm  python3-perf-debuginfo-4.18.0-553.33.1.el8.0.1.x86_64.rpm
kernel-debug-modules-4.18.0-553.33.1.el8.0.1.x86_64.rpm            root.log
kernel-debug-modules-extra-4.18.0-553.33.1.el8.0.1.x86_64.rpm      state.log
kernel-debug-modules-internal-4.18.0-553.33.1.el8.0.1.x86_64.rpm
[maple@r8-sigcloud-builder build_files]$ sudo dnf install bpftool-4.18.0-553.33.1.el8.0.1.x86_64.rpm kernel-4.18.0-553.33.1.el8.0.1.x86_64.rpm kernel-core-4.18.0-553.33.1.el8.0.1.x86_64.rpm kernel-cross-headers-4.18.0-553.33.1.el8.0.1.x86_64.rpm kernel-headers-4.18.0-553.33.1.el8.0.1.x86_64.rpm kernel-modules-4.18.0-553.33.1.el8.0.1.x86_64.rpm kernel-modules-extra-4.18.0-553.33.1.el8.0.1.x86_64.rpm kernel-modules-internal-4.18.0-553.33.1.el8.0.1.x86_64.rpm kernel-selftests-internal-4.18.0-553.33.1.el8.0.1.x86_64.rpm kernel-tools-4.18.0-553.33.1.el8.0.1.x86_64.rpm kernel-tools-libs-4.18.0-553.33.1.el8.0.1.x86_64.rpm perf-4.18.0-553.33.1.el8.0.1.x86_64.rpm python3-perf-4.18.0-553.33.1.el8.0.1.x86_64.rpm
Last metadata expiration check: 0:12:38 ago on Fri 27 Dec 2024 04:39:01 PM UTC.
Dependencies resolved.
=======================================================================================================================================================================
 Package                                       Architecture               Version                                               Repository                        Size
=======================================================================================================================================================================
Installing:
 bpftool                                       x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      11 M
 kernel                                        x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      10 M
 kernel-cross-headers                          x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      16 M
 kernel-modules-extra                          x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      11 M
 kernel-modules-internal                       x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      11 M
 kernel-selftests-internal                     x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      28 M
 perf                                          x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      13 M
Upgrading:
 kernel-tools                                  x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      11 M
 kernel-tools-libs                             x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      10 M
 python3-perf                                  x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      11 M
Installing dependencies:
 iproute-tc                                    x86_64                     6.2.0-6.el8_10                                        baseos                           468 k
 kernel-core                                   x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      43 M
 kernel-modules                                x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      36 M
 libtraceevent                                 x86_64                     1.5.3-1.el8                                           baseos                           216 k
 linux-firmware                                noarch                     20241014-125.git06bad2f1.el8_10                       baseos                           388 M
 nmap-ncat                                     x86_64                     2:7.92-1.el8                                          appstream                        241 k
Downgrading:
 kernel-headers                                x86_64                     4.18.0-553.33.1.el8.0.1                               @commandline                      12 M

Transaction Summary
=======================================================================================================================================================================
Install    13 Packages
Upgrade     3 Packages
Downgrade   1 Package

[SNIP]

Upgraded:
  kernel-tools-4.18.0-553.33.1.el8.0.1.x86_64          kernel-tools-libs-4.18.0-553.33.1.el8.0.1.x86_64          python3-perf-4.18.0-553.33.1.el8.0.1.x86_64
Downgraded:
  kernel-headers-4.18.0-553.33.1.el8.0.1.x86_64
Installed:
  bpftool-4.18.0-553.33.1.el8.0.1.x86_64              iproute-tc-6.2.0-6.el8_10.x86_64                       kernel-4.18.0-553.33.1.el8.0.1.x86_64
  kernel-core-4.18.0-553.33.1.el8.0.1.x86_64          kernel-cross-headers-4.18.0-553.33.1.el8.0.1.x86_64    kernel-modules-4.18.0-553.33.1.el8.0.1.x86_64
  kernel-modules-extra-4.18.0-553.33.1.el8.0.1.x86_64 kernel-modules-internal-4.18.0-553.33.1.el8.0.1.x86_64 kernel-selftests-internal-4.18.0-553.33.1.el8.0.1.x86_64
  libtraceevent-1.5.3-1.el8.x86_64                    linux-firmware-20241014-125.git06bad2f1.el8_10.noarch  nmap-ncat-2:7.92-1.el8.x86_64
  perf-4.18.0-553.33.1.el8.0.1.x86_64

Complete!
[maple@r8-sigcloud-builder build_files]$ sudo reboot
[SNIP]

[maple@r8-sigcloud-builder code]$ uname -a
Linux r8-sigcloud-builder 4.18.0-553.33.1.el8.0.1.x86_64 #1 SMP Thu Dec 26 16:28:22 EST 2024 x86_64 x86_64 x86_64 GNU/Linux

Testing

Just ran two built in kernel self tests.

This is usually flappiness, I'm not treating this as interesting

[maple@r8-sigcloud-builder code]$ uname -a
Linux r8-sigcloud-builder 4.18.0-553.33.1.el8_10.x86_64 #1 SMP Thu Dec 19 14:28:01 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
[maple@r8-sigcloud-builder code]$ ./run_kerselftests.sh 2
Starting Test Loop 1
Test Loop 1 Done
Starting Test Loop 2
Test Loop 2 Done

[maple@r8-sigcloud-builder code]$ uname -a
Linux r8-sigcloud-builder 4.18.0-553.33.1.el8.0.1.x86_64 #1 SMP Thu Dec 26 16:28:22 EST 2024 x86_64 x86_64 x86_64 GNU/Linux
[maple@r8-sigcloud-builder code]$ ./run_kerselftests.sh 2
Starting Test Loop 1
Test Loop 1 Done
Starting Test Loop 2
Test Loop 2 Done

[maple@r8-sigcloud-builder code]$ ls *_nocomments.log
kernel_4.18.0-553.33.1.el8.0.1.x86_64_iteration_1_nocomments.log  kernel_4.18.0-553.33.1.el8.0.1.x86_64_iteration_2_nocomments.log  kernel_4.18.0-553.33.1.el8_10.x86_64_iteration_1_nocomments.log  kernel_4.18.0-553.33.1.el8_10.x86_64_iteration_2_nocomments.log

[jmaple@devbox code]$ vimdiff kernel_4.18.0-553.33.1.el8_10.x86_64_iteration_1_nocomments.log kernel_4.18.0-553.33.1.el8_10.x86_64_iteration_2_nocomments.log kernel_4.18.0-553.33.1.el8.0.1.x86_64_iteration_1_nocomments.log kernel_4.18.0-553.33.1.el8.0.1.x86_64_iteration_2_nocomments.log

Screenshot 2024-12-27 at 4.57.19 PM.png

Merge request reports

Loading