Skip to content

[SIG CLOUD 9] rebase custom changes to 5.14.0-503.38.1.el9_5 #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 22, 2025
Merged

[SIG CLOUD 9] rebase custom changes to 5.14.0-503.38.1.el9_5 #226

merged 1 commit into from
Apr 22, 2025

Conversation

PlaidCat
Copy link
Collaborator

Update process (This kernel CentOS base for 5.14.0-503)

  • Kernel History Rebuild Process for all src.rpms hosted by RESF
  • Create sig-cloud-9/5.14.0-503.38.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
  • Build and Test

Removed Commits

None

Forward Port Process

$ python3 rolling-release-update.py --repo ../kernel-src-tree --new-base-branch rocky9_5 --old-rolling-branch sig-cloud-9/5.14.0-503.35.1.el9_5
[rolling release update] Rolling Product:  sig-cloud-9
[rolling release update] Checking out branch:  sig-cloud-9/5.14.0-503.35.1.el9_5
[rolling release update] Gathering all the RESF kernel Tags
b'c9a24474a2ec (tag: resf_kernel-5.14.0-503.35.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.35.1.el9_5'
b'e74ec186a727 (tag: resf_kernel-5.14.0-503.34.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.34.1.el9_5'
b'1ddd4016943b (tag: resf_kernel-5.14.0-503.33.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.33.1.el9_5'
b'f69f8dd07b1f (tag: resf_kernel-5.14.0-503.31.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.31.1.el9_5'
b'e6683295364e (tag: resf_kernel-5.14.0-503.29.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.29.1.el9_5'
b'1173e76fd4c0 (tag: resf_kernel-5.14.0-503.26.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.26.1.el9_5'
b'97e08c052a9b (tag: resf_kernel-5.14.0-503.23.2.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.23.2.el9_5'
b'5fee71991ba3 (tag: resf_kernel-5.14.0-503.23.1.el9_5, origin/kernel-5.14.0-503.21.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.23.1.el9_5'
b'208d3b195c90 (tag: resf_kernel-5.14.0-503.22.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.22.1.el9_5'
b'7b30e095ace9 (tag: resf_kernel-5.14.0-503.21.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.21.1.el9_5'
b'20b61fdce2d7 (tag: resf_kernel-5.14.0-503.19.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.19.1.el9_5'
b'ac4598734b5b (tag: resf_kernel-5.14.0-503.16.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.16.1.el9_5'
b'444611411627 (tag: resf_kernel-5.14.0-503.15.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.15.1.el9_5'
b'2c1354e89576 (tag: resf_kernel-5.14.0-503.14.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.14.1.el9_5'
[rolling release update] Old Rolling Branch Tags:  [b'c9a24474a2ec', b'e74ec186a727', b'1ddd4016943b', b'f69f8dd07b1f', b'e6683295364e', b'1173e76fd4c0', b'97e08c052a9b', b'5fee71991ba3', b'208d3b195c90', b'7b30e095ace9', b'20b61fdce2d7', b'ac4598734b5b', b'444611411627', b'2c1354e89576']
[rolling release update] Checking out branch:  rocky9_5
[rolling release update] Gathering all the RESF kernel Tags
b'9e0a22d56093 (HEAD -> rocky9_5, tag: resf_kernel-5.14.0-503.38.1.el9_5, origin/rocky9_5_rebuild, origin/rocky9_5) Rebuild rocky9_5 with kernel-5.14.0-503.38.1.el9_5'
b'c9a24474a2ec (tag: resf_kernel-5.14.0-503.35.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.35.1.el9_5'
b'e74ec186a727 (tag: resf_kernel-5.14.0-503.34.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.34.1.el9_5'
b'1ddd4016943b (tag: resf_kernel-5.14.0-503.33.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.33.1.el9_5'
b'f69f8dd07b1f (tag: resf_kernel-5.14.0-503.31.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.31.1.el9_5'
b'e6683295364e (tag: resf_kernel-5.14.0-503.29.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.29.1.el9_5'
b'1173e76fd4c0 (tag: resf_kernel-5.14.0-503.26.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.26.1.el9_5'
b'97e08c052a9b (tag: resf_kernel-5.14.0-503.23.2.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.23.2.el9_5'
b'5fee71991ba3 (tag: resf_kernel-5.14.0-503.23.1.el9_5, origin/kernel-5.14.0-503.21.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.23.1.el9_5'
b'208d3b195c90 (tag: resf_kernel-5.14.0-503.22.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.22.1.el9_5'
b'7b30e095ace9 (tag: resf_kernel-5.14.0-503.21.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.21.1.el9_5'
b'20b61fdce2d7 (tag: resf_kernel-5.14.0-503.19.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.19.1.el9_5'
b'ac4598734b5b (tag: resf_kernel-5.14.0-503.16.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.16.1.el9_5'
b'444611411627 (tag: resf_kernel-5.14.0-503.15.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.15.1.el9_5'
b'2c1354e89576 (tag: resf_kernel-5.14.0-503.14.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.14.1.el9_5'
[rolling release update] New Base Branch Tags:  [b'9e0a22d56093', b'c9a24474a2ec', b'e74ec186a727', b'1ddd4016943b', b'f69f8dd07b1f', b'e6683295364e', b'1173e76fd4c0', b'97e08c052a9b', b'5fee71991ba3', b'208d3b195c90', b'7b30e095ace9', b'20b61fdce2d7', b'ac4598734b5b', b'444611411627', b'2c1354e89576']
[rolling release update] Latest RESF tag sha:  b'c9a24474a2ec'
"c9a24474a2ec8c4bbe1d97a983f432e0f54e89c7 Rebuild rocky9_5 with kernel-5.14.0-503.35.1.el9_5"
[rolling release update] Checking out old rolling branch:  sig-cloud-9/5.14.0-503.35.1.el9_5
[rolling release update] Finding the CIQ Kernel and Associated Upstream commits between the last resf tag and HEAD
[rolling release update] Last RESF tag sha:  b'c9a24474a2ec'
[rolling release update] Total Commit in old branch:  1
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
{
  "4eec233d50b9b0204e3f71e3178f5f12a7884d51": ""
}
[rolling release update] Checking out new base branch:  rocky9_5
[rolling release update] Finding the kernel version for the new rolling release
b'9e0a22d56093 (HEAD -> rocky9_5, tag: resf_kernel-5.14.0-503.38.1.el9_5, origin/rocky9_5_rebuild, origin/rocky9_5) Rebuild rocky9_5 with kernel-5.14.0-503.38.1.el9_5'
<re.Match object; span=(0, 70), match=b'9e0a22d56093 (HEAD -> rocky9_5, tag: resf_kernel>
[rolling release update} New Branch to create  sig-cloud-9/5.14.0-503.38.1.el9_5
[rolling release update] Check if branch Exists:  sig-cloud-9/5.14.0-503.38.1.el9_5
Branch sig-cloud-9/5.14.0-503.38.1.el9_5 does not exists creating
[rolling release update] Creating new branch for PR:  jmaple_sig-cloud-9/5.14.0-503.38.1.el9_5
[rolling release update] Creating Map of all new commits from last rolling release fork
[rolling release update] Total Commit in new branch:  16
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
Printing first 5 and last 5 commits
{
  "9e0a22d560937e6132749dc6290090901196064d": "",
  "0b48f8346fd1f9c8a18cc931bf21446b6d123160": "a3dd4d63eeb452cfb064a13862fb376ab108f6a6",
  "7a9558af241e355225e63afdc42344dbda260b9c": "8604f633f59375687fa115d6f691de95a42520e3",
  "6763179867c1207f6ff33d0ad1af6ca51d72ae5b": "7e1c3f584ee78b0d0210fc424420d9529f3ca952",
  "8c8623b31b423d1eff7a1013880bdcf09d29ac64": "356983f569c1f5991661fc0050aa263792f50616"
}
{
  "06bf250b90a18508261d5b8ddde07108dce5ac3d": "ff7c2dea9dd1a436fc79d6273adffdcc4a7ffea3",
  "5b073f2e86c3b638e0e9727600bd6553ab0bdb25": "36e3b949e35964e22b9a57f960660fc599038dd4",
  "cec3ba0cc5b462b60403e0230a23577adfd08de6": "03b54bad26f3c78bb1f90410ec3e4e7fe197adc9",
  "1e7a37099d048b46e457f80d748b707a293dc038": "6f4d93b78ade0a4c2cafd587f7b429ce95abb02e",
  "c52f8d537f7a79b57024746aaf8b12b2900bb22f": "1b9f756344416e02b41439bf2324b26aa25e141c"
}
[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] Removing commits from the new branch
[rolling release update] Applying the remaining commits to the new branch
Applying commit  "4eec233d50b9b0204e3f71e3178f5f12a7884d51 selftests/mm temporary fix of hmm infinite loop"

BUILD

/mnt/code/kernel-src-tree-build
no .config file found, moving on
[TIMER]{MRPROPER}: 0s
x86_64 architecture detected, copying config
'configs/kernel-x86_64-rhel.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-jmaple_sig-cloud-9_5.14.0-503.38.1.el9_5-32a51ac76ceb"
Making olddefconfig
  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  HOSTCC  scripts/kconfig/confdata.o
  HOSTCC  scripts/kconfig/expr.o
  LEX     scripts/kconfig/lexer.lex.c
  YACC    scripts/kconfig/parser.tab.[ch]
  HOSTCC  scripts/kconfig/lexer.lex.o
  HOSTCC  scripts/kconfig/menu.o
  HOSTCC  scripts/kconfig/parser.tab.o
  HOSTCC  scripts/kconfig/preprocess.o
  HOSTCC  scripts/kconfig/symbol.o
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
Starting Build
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_32.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_64.h
  SYSTBL  arch/x86/include/generated/asm/syscalls_32.h
  
  LD [M]  sound/xen/snd_xen_front.ko
  BTF [M] sound/x86/snd-hdmi-lpe-audio.ko
  BTF [M] sound/xen/snd_xen_front.ko
[TIMER]{BUILD}: 1620s
Making Modules
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.38.1.el9_5-32a51ac76ceb+/kernel/arch/x86/crypto/blake2s-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.38.1.el9_5-32a51ac76ceb+/kernel/arch/x86/crypto/blowfish-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.38.1.el9_5-32a51ac76ceb+/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko

  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.38.1.el9_5-32a51ac76ceb+/kernel/sound/xen/snd_xen_front.ko
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.38.1.el9_5-32a51ac76ceb+/kernel/sound/usb/caiaq/snd-usb-caiaq.ko
  DEPMOD  /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.38.1.el9_5-32a51ac76ceb+
[TIMER]{MODULES}: 8s
Making Install
sh ./arch/x86/boot/install.sh 5.14.0-jmaple_sig-cloud-9_5.14.0-503.38.1.el9_5-32a51ac76ceb+ \
        arch/x86/boot/bzImage System.map "/boot"
[TIMER]{INSTALL}: 24s
Checking kABI
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-5.14.0-jmaple_sig-cloud-9_5.14.0-503.38.1.el9_5-32a51ac76ceb+ and Index to 2
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 0s
[TIMER]{BUILD}: 1620s
[TIMER]{MODULES}: 8s
[TIMER]{INSTALL}: 24s
[TIMER]{TOTAL} 1658s
Rebooting in 10 seconds

Kselftest

$ grep '^ok ' 5.14.0-jmaple_sig-cloud-9_5.14.0-503.35.1.el9_5-4eec233d50b9+.keselftest.log | wc -l
317

$ grep '^ok ' kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-503.38.1.el9_5-32a51ac76ceb+.log | wc -l
317

@PlaidCat
selftests/mm temporary fix of hmm infinite loop
32a51ac 
jira SECO-170

In Rocky9 if you run ./run_vmtests.sh -t hmm it will fail and cause an
infinite loop on ASSERTs in FIXTURE_TEARDOWN()
This temporary fix is based on the discussion here
https://patchwork.kernel.org/project/linux-kselftest/patch/[email protected]/#25046055

We will investigate further kselftest updates that will resolve the root
causes of this.

Signed-off-by: Jonathan Maple <[email protected]>
@PlaidCat PlaidCat self-assigned this Apr 22, 2025
bmastbergen
bmastbergen approved these changes Apr 22, 2025
View reviewed changes
Copy link
Collaborator

@bmastbergen bmastbergen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥌

@PlaidCat PlaidCat merged commit 32a51ac into sig-cloud-9/5.14.0-503.38.1.el9_5 Apr 22, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdieter jdieter jdieter approved these changes

@bmastbergen bmastbergen bmastbergen approved these changes

@juphoff juphoff Awaiting requested review from juphoff

@thefossguy-ciq thefossguy-ciq Awaiting requested review from thefossguy-ciq

Assignees

@PlaidCat PlaidCat

Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@PlaidCat @jdieter @bmastbergen