Skip to content

[SIG-CLOUD-9] rebase custom changes to 5.14.0-570.25.1.el9 #403

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 3 commits into from
Jul 9, 2025
Merged

[SIG-CLOUD-9] rebase custom changes to 5.14.0-570.25.1.el9 #403

merged 3 commits into from
Jul 9, 2025

Conversation

PlaidCat
Copy link
Collaborator

@PlaidCat PlaidCat commented Jul 9, 2025

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

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

Already in Base Branch

96794508804e8d69a557061700908bb1781d7ab7 github actions: Update Actions to deal with devel

Forward Port Process

[jmaple@devbox kernel-src-tree-tools]$ python3 rolling-release-update.py --repo ../kernel-src-tree/ --new-base-branch rocky9_6 --old-rolling-branch $(git -C ../kernel-src-tree branch --sort=-creatordate --all --list "*sig-cloud-9*" | sed 's/remotes\/origin\///g' | head -n1)
[rolling release update] Rolling Product:  sig-cloud-9
[rolling release update] Checking out branch:  sig-cloud-9/5.14.0-570.23.1.el9_6
[rolling release update] Gathering all the RESF kernel Tags
b'08b6475feb07 (tag: resf_kernel-5.14.0-570.23.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.23.1.el9_6'
b'667004a38548 (tag: resf_kernel-5.14.0-570.22.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.22.1.el9_6'
b'9477e3364951 (tag: resf_kernel-5.14.0-570.21.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.21.1.el9_6'
b'b94108159618 (tag: resf_kernel-5.14.0-570.19.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.19.1.el9_6'
b'e8b954c95fef (tag: resf_kernel-5.14.0-570.18.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.18.1.el9_6'
b'838cd1e8d046 (tag: resf_kernel-5.14.0-570.17.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.17.1.el9_6'
b'171ceb527773 (tag: resf_kernel-5.14.0-570.16.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.16.1.el9_6'
b'18c0812a6563 (tag: resf_kernel-5.14.0-570.12.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.12.1.el9_6'
[rolling release update] Old Rolling Branch Tags:  [b'08b6475feb07', b'667004a38548', b'9477e3364951', b'b94108159618', b'e8b954c95fef', b'838cd1e8d046', b'171ceb527773', b'18c0812a6563']
[rolling release update] Checking out branch:  rocky9_6
[rolling release update] Gathering all the RESF kernel Tags
b'cad0cbcb03be (HEAD -> rocky9_6, tag: resf_kernel-5.14.0-570.25.1.el9_6, origin/rocky9_6) Rebuild rocky9_6 with kernel-5.14.0-570.25.1.el9_6'
b'4743a27158ca (tag: resf_kernel-5.14.0-570.24.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.24.1.el9_6'
b'08b6475feb07 (tag: resf_kernel-5.14.0-570.23.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.23.1.el9_6'
b'667004a38548 (tag: resf_kernel-5.14.0-570.22.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.22.1.el9_6'
b'9477e3364951 (tag: resf_kernel-5.14.0-570.21.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.21.1.el9_6'
b'b94108159618 (tag: resf_kernel-5.14.0-570.19.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.19.1.el9_6'
b'e8b954c95fef (tag: resf_kernel-5.14.0-570.18.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.18.1.el9_6'
b'838cd1e8d046 (tag: resf_kernel-5.14.0-570.17.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.17.1.el9_6'
b'171ceb527773 (tag: resf_kernel-5.14.0-570.16.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.16.1.el9_6'
b'18c0812a6563 (tag: resf_kernel-5.14.0-570.12.1.el9_6) Rebuild rocky9_6 with kernel-5.14.0-570.12.1.el9_6'
[rolling release update] New Base Branch Tags:  [b'cad0cbcb03be', b'4743a27158ca', b'08b6475feb07', b'667004a38548', b'9477e3364951', b'b94108159618', b'e8b954c95fef', b'838cd1e8d046', b'171ceb527773', b'18c0812a6563']
[rolling release update] Common tag sha:  b'08b6475feb07'
"08b6475feb0710ce784c7dda662b85e110bea9d9 Rebuild rocky9_6 with kernel-5.14.0-570.23.1.el9_6"
[rolling release update] Checking out old rolling branch:  sig-cloud-9/5.14.0-570.23.1.el9_6
[rolling release update] Finding the CIQ Kernel and Associated Upstream commits between the last resf tag and HEAD
[rolling release update] Getting SHAS 08b6475feb07..HEAD
[rolling release update] Last RESF tag sha:  b'08b6475feb07'
[rolling release update] Total Commit in old branch:  4
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
{
  "ac92a001c7aaa70488b9ce8e65eedc3b0e16b004": "a9c0b33ef2306327dd2db02c6274107065ff9307",
  "ef936605a7ddb3c16bcad777c687180cf33062f2": "290e5d3c49f687c1567bde634dc33d57b0674919",
  "5470cad4b6a33e0205287c3bcdac955c7e8776d3": "",
  "96794508804e8d69a557061700908bb1781d7ab7": ""
}
[rolling release update] Checking out new base branch:  rocky9_6
[rolling release update] Finding the kernel version for the new rolling release
b'cad0cbcb03be (HEAD -> rocky9_6, tag: resf_kernel-5.14.0-570.25.1.el9_6, origin/rocky9_6) Rebuild rocky9_6 with kernel-5.14.0-570.25.1.el9_6'
<re.Match object; span=(0, 70), match=b'cad0cbcb03be (HEAD -> rocky9_6, tag: resf_kernel>
[rolling release update} New Branch to create  sig-cloud-9/5.14.0-570.25.1.el9_6
[rolling release update] Check if branch Exists:  sig-cloud-9/5.14.0-570.25.1.el9_6
Branch sig-cloud-9/5.14.0-570.25.1.el9_6 does not exists creating
[rolling release update] Creating new branch for PR:  jmaple_sig-cloud-9/5.14.0-570.25.1.el9_6
[rolling release update] Creating Map of all new commits from last rolling release fork
[rolling release update] Total Commit in new branch:  20
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
Printing first 5 and last 5 commits
{
  "cad0cbcb03be58a6773b9f611dcc85138af73030": "",
  "8766d311440a3d83beeba0fbc44375c52afc3c31": "c8af247de385ce49afabc3bf1cf4fd455c94bfe8",
  "7add85a2d6e4ee06a4a3d61a032f733c5311ee4e": "4c2227656d9003f4d77afc76f34dd81b95e4c2c4",
  "8fb1e012e90e870c106fb6ffec532b5b441f0c2e": "4d4832ed13ff505fe0371544b4773e79be2bb964",
  "8a1a728b59fcbb50efda2d7ce968927481bd254b": "087c1faa594fa07a66933d750c0b2610aa1a2946"
}
{
  "db880e107329adb57df019fd8645cc88404eec16": "fcf857ee1958e9247298251f7615d0c76f1e9b38",
  "833cb8c3b04f7a9388bf8ca65c16d107d7521b54": "eb3fabde15bccdf34f1c9b35a83aa4c0dacbb4ca",
  "1c248300e40d1d0c624eb171ed294908a5450ee1": "62e2a47ceab8f3f7d2e3f0e03fdd1c5e0059fd8b",
  "fcc060fe1b3ede393f8318c956e8e8224aaf7118": "b4bac279319d3082eb42f074799c7b18ba528c71",
  "96794508804e8d69a557061700908bb1781d7ab7": ""
}
[rolling release update] Checking if any of the commits from the old rolling release are already present in the new base branch
- CIQ Commit 96794508804e8d69a557061700908bb1781d7ab7 already present in new base branch: 96794508804e8d69a557061700908bb1781d7ab7 github actions: Update Actions to deal with devel
[rolling release update] Removing commits from the new branch
96794508804e8d69a557061700908bb1781d7ab7 github actions: Update Actions to deal with devel
[rolling release update] Applying the remaining commits to the new branch
Applying commit  "5470cad4b6a33e0205287c3bcdac955c7e8776d3 selftests/mm temporary fix of hmm infinite loop"
Applying commit  "ef936605a7ddb3c16bcad777c687180cf33062f2 net: mana: Add support for Multi Vports on Bare metal"
Applying commit  "ac92a001c7aaa70488b9ce8e65eedc3b0e16b004 tools: hv: Enable debug logs for hv_kvp_daemon"

Builder

[jmaple@devbox code]$ egrep -B 5 -A 5 "\[TIMER\]|^Starting Build" kbuild.jmaple_sig-cloud-9_5.14.0-570.25.1.el9_6.log
/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-570.25.1.e-05c2d4780a1c"
Making olddefconfig
--
  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
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_x32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_32_ia32.h
  SYSTBL  arch/x86/include/generated/asm/syscalls_32.h
--
  BTF [M] sound/x86/snd-hdmi-lpe-audio.ko
  BTF [M] sound/usb/usx2y/snd-usb-us122l.ko
  BTF [M] sound/virtio/virtio_snd.ko
  BTF [M] sound/xen/snd_xen_front.ko
  BTF [M] sound/usb/usx2y/snd-usb-usx2y.ko
[TIMER]{BUILD}: 1857s
Making Modules
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+/kernel/arch/x86/crypto/blake2s-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+/kernel/arch/x86/crypto/blowfish-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+/kernel/arch/x86/crypto/camellia-aesni-avx2.ko
--
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+/kernel/sound/x86/snd-hdmi-lpe-audio.ko
  STRIP   /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+/kernel/sound/xen/snd_xen_front.ko
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+/kernel/sound/virtio/virtio_snd.ko
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+/kernel/sound/xen/snd_xen_front.ko
  DEPMOD  /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+
[TIMER]{MODULES}: 12s
Making Install
sh ./arch/x86/boot/install.sh 5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+ \
	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-570.25.1.e-05c2d4780a1c+ and Index to 2
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 0s
[TIMER]{BUILD}: 1857s
[TIMER]{MODULES}: 12s
[TIMER]{INSTALL}: 24s
[TIMER]{TOTAL} 1899s
Rebooting in 10 seconds

KSelfTest

[jmaple@devbox code]$ ls kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+.log kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+.log | while read line ; do echo $line; grep '^ok ' $line | wc -l ; done
kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+.log
317
kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.25.1.e-05c2d4780a1c+.log
317

PlaidCat added 3 commits July 9, 2025 10:09
@PlaidCat
selftests/mm temporary fix of hmm infinite loop
e9135a7 
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
net: mana: Add support for Multi Vports on Bare metal
ce91a47 
jira LE-3208
feature net_mana
commit-author Haiyang Zhang <[email protected]>
commit 290e5d3

To support Multi Vports on Bare metal, increase the device config response
version. And, skip the register HW vport, and register filter steps, when
the Bare metal hostmode is set.

	Signed-off-by: Haiyang Zhang <[email protected]>
Link: https://patch.msgid.link/[email protected]
	Signed-off-by: Paolo Abeni <[email protected]>

(cherry picked from commit 290e5d3)
	Signed-off-by: Jonathan Maple <[email protected]>
Signed-off-by: Jonathan Maple <[email protected]>
@PlaidCat
tools: hv: Enable debug logs for hv_kvp_daemon
05c2d47 
jira LE-3207
feature tools_hv
commit-author Shradha Gupta <[email protected]>
commit a9c0b33

Allow the KVP daemon to log the KVP updates triggered in the VM
with a new debug flag(-d).
When the daemon is started with this flag, it logs updates and debug
information in syslog with loglevel LOG_DEBUG. This information comes
in handy for debugging issues where the key-value pairs for certain
pools show mismatch/incorrect values.
The distro-vendors can further consume these changes and modify the
respective service files to redirect the logs to specific files as
needed.

	Signed-off-by: Shradha Gupta <[email protected]>
	Reviewed-by: Naman Jain <[email protected]>
	Reviewed-by: Dexuan Cui <[email protected]>
Link: https://lore.kernel.org/r/1744715978-8185-1-git-send-email-shradhagupta@linux.microsoft.com
	Signed-off-by: Wei Liu <[email protected]>
Message-ID: <1744715978-8185-1-git-send-email-shradhagupta@linux.microsoft.com>
(cherry picked from commit a9c0b33)
	Signed-off-by: Jonathan Maple <[email protected]>
Signed-off-by: Jonathan Maple <[email protected]>
@PlaidCat PlaidCat self-assigned this Jul 9, 2025
thefossguy-ciq
thefossguy-ciq approved these changes Jul 9, 2025
View reviewed changes
Copy link

@thefossguy-ciq thefossguy-ciq left a comment

Choose a reason for hiding this comment

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

No .config files were harmed in this PR, whooo! :P
🚤

jdieter
jdieter approved these changes Jul 9, 2025
View reviewed changes
Copy link

@jdieter jdieter left a comment

Choose a reason for hiding this comment

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

:shipit:

@PlaidCat PlaidCat merged commit 05c2d47 into sig-cloud-9/5.14.0-570.25.1.el9_6 Jul 9, 2025
4 checks passed
@PlaidCat PlaidCat deleted the jmaple_sig-cloud-9/5.14.0-570.25.1.el9_6 branch July 9, 2025 17:03
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

@thefossguy-ciq thefossguy-ciq thefossguy-ciq approved these changes

@kerneltoast kerneltoast Awaiting requested review from kerneltoast

@bmastbergen bmastbergen Awaiting requested review from bmastbergen

@shreeya-patel98 shreeya-patel98 Awaiting requested review from shreeya-patel98

Assignees

@PlaidCat PlaidCat

Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@PlaidCat @jdieter @thefossguy-ciq