[RLC 10] Rebase Custom Changes to 6.12.0-124.20.1.el10_1

[roxanan1996]

Update process (This kernel CentOS base for 6.12.0-124)

• Kernel History Rebuild Process for all src.rpms hosted by RESF
• Create rlc-10/6.12.0-124.X.1.el10_0 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
• Build and Test

Removed Commits

Since the commit "github actions: Add build checks for Rocky10 on supported Architectures"
was already part of the rocky10_1, I had to skip the one from the
rlc-10/6.12.0-124.16.1.el10_1

Rebuild Log

❯ python3 rolling-release-update.py --repo ../kernel-src-tree/ --new-base-branch rocky10_1 --old-rolling-branch rlc-10/6.12.0-124.16.1.el10_1 --interactive
[rolling release update] Rolling Product:  rlc-10
[rolling release update] Checking out branch:  rlc-10/6.12.0-124.16.1.el10_1
[rolling release update] Gathering all the RESF kernel Tags
[rolling release update] Found 2 RESF kernel tags
[rolling release update] Checking out branch:  rocky10_1
[rolling release update] Gathering all the RESF kernel Tags
[rolling release update] Found 3 RESF kernel tags
[rolling release update] Common tag sha:  b'b4012b5e082b6'
"b4012b5e082b6ad3da6fce24808485b0e0417c35 Rebuild rocky10_1 with kernel-6.12.0-124.16.1.el10_1"
[rolling release update] Checking out old rolling branch:  rlc-10/6.12.0-124.16.1.el10_1
[rolling release update] Finding the CIQ Kernel and Associated Upstream commits between the last resf tag and HEAD
[rolling release update] Getting SHAS b4012b5e082b6..HEAD
Already on 'rlc-10/6.12.0-124.16.1.el10_1'
[rolling release update] Last RESF tag sha:  b'b4012b5e082b6'
[rolling release update] Total commits in old branch: 2
[rolling release update] Checking out new base branch:  rocky10_1
[rolling release update] Finding the kernel version for the new rolling release
[rolling release update] New Branch to create: rlc-10/6.12.0-124.20.1.el10_1
[rolling release update] Creating new branch: rlc-10/6.12.0-124.20.1.el10_1
[rolling release update] Creating new branch for PR:  rnicolescu_rlc-10/6.12.0-124.20.1.el10_1
[rolling release update] Creating Map of all new commits from last rolling release fork
Already on 'rnicolescu_rlc-10/6.12.0-124.20.1.el10_1'
[rolling release update] Total commits in new branch: 55
[rolling release update] Checking if any of the commits from the old rolling release are already present in the new base branch
[rolling release update] Found 0 duplicate commits to remove
[rolling release update] Applying 2 remaining commits to the new branch
  [1/2] e236fc23029d4 github actions: Add build checks for Rocky10 on supported Architectures
[rolling release update] ERROR: Failed to cherry-pick commit e236fc23029d4ac361c9457c90c998d3fc8535e0
error: could not apply e236fc23029d4... github actions: Add build checks for Rocky10 on supported Architectures
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

[rolling release update] ========================================
[rolling release update] INTERACTIVE MODE: Merge conflict detected
[rolling release update] ========================================
[rolling release update] Please resolve or skip the merge conflict manually.
[rolling release update] To resolve:
[rolling release update]   1. Fix merge conflicts in the working directory
[rolling release update]   2. Stage resolved files: git add <files>
[rolling release update]   3. Complete cherry-pick: git cherry-pick --continue
[rolling release update]      (or commit manually if needed)
[rolling release update] To skip:
[rolling release update]   1. To skip this commit: git cherry-pick --skip
[rolling release update] When done:
[rolling release update]   Return here and press Enter to continue
[rolling release update] ========================================
[rolling release update] Press Enter when resolved (or type "stop"/"abort" to exit):
[rolling release update] Cherry-pick resolved successfully, continuing...
  [2/2] c3d157a5cd56f tools: hv: Enable debug logs for hv_kvp_daemon
[rolling release update] Successfully applied all 2 commits

Build

/home/rnicolescu/ciq/kernel-src-tree
Skipping make mrproper
[TIMER]{MRPROPER}: 0s
x86_64 architecture detected, copying config
'configs/kernel-x86_64-rhel.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e"
Making olddefconfig
#
# configuration written to .config
#
Starting Build
  SYNC    include/config/auto.conf
mkdir -p /home/rnicolescu/ciq/kernel-src-tree/tools/bpf/resolve_btfids && make O=/home/rnicolescu/ciq/kernel-src-tree subdir=tools/bpf/resolve_btfids --no-print-directory -C bpf/resolve_btfids 
mkdir -p /home/rnicolescu/ciq/kernel-src-tree/tools/objtool && make O=/home/rnicolescu/ciq/kernel-src-tree subdir=tools/objtool --no-print-directory -C objtool 
  INSTALL libsubcmd_headers
  INSTALL libsubcmd_headers
--
  LD [M]  drivers/net/ethernet/broadcom/bnxt/bnxt_en.ko
  BTF [M] drivers/net/ethernet/broadcom/bnx2x/bnx2x.ko
  BTF [M] drivers/net/ethernet/broadcom/cnic.ko
  BTF [M] drivers/net/ethernet/broadcom/bnxt/bnxt_en.ko
  BTF [M] drivers/net/ethernet/broadcom/tg3.ko
[TIMER]{BUILD}: 195s
Making Modules
  SYMLINK /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+/build
  INSTALL /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+/modules.builtin
  INSTALL /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+/modules.builtin.modinfo
  INSTALL /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+/kernel/arch/x86/events/amd/power.ko
--
  STRIP   /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+/kernel/virt/lib/irqbypass.ko
  SIGN    /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+/kernel/net/qrtr/qrtr-mhi.ko
  SIGN    /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+/kernel/virt/lib/irqbypass.ko
  SIGN    /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+/kernel/drivers/char/ppdev.ko
  DEPMOD  /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+
[TIMER]{MODULES}: 9s
Making Install
  INSTALL /boot
[TIMER]{INSTALL}: 15s
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+ and Index to 3
The default is /boot/loader/entries/1ec340af253243ba801217e50328d48a-6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+.conf with index 3 and kernel /boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+
The default is /boot/loader/entries/1ec340af253243ba801217e50328d48a-6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+.conf with index 3 and kernel /boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.20.1.el10_1-50bfe31c472e+
Generating grub configuration file ...
Adding boot menu entry for UEFI Firmware Settings ...
done
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 0s
[TIMER]{BUILD}: 195s
[TIMER]{MODULES}: 9s
[TIMER]{INSTALL}: 15s
[TIMER]{TOTAL} 222s
Rebooting in 10 seconds

KSelfTest

./kselftest-before.log
524
./kselftest-after.log
517
Before: ./kselftest-before.log
After: ./kselftest-after.log
Diff:
-ok 1 selftests: pidfd: pidfd_test
-ok 2 selftests: pidfd: pidfd_fdinfo_test
-ok 3 selftests: pidfd: pidfd_open_test
-ok 4 selftests: pidfd: pidfd_poll_test
-ok 5 selftests: pidfd: pidfd_wait
-ok 6 selftests: pidfd: pidfd_getfd_test
-ok 7 selftests: pidfd: pidfd_setns_test

[PlaidCat]

I always forget how many changes get dropped during rebases.

[bmastbergen]

🥌