Skip to content

[SIG-CLOUD-9] rebase custom changes to 5.14.0-570.23.1.el9 #377

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
Jun 30, 2025
Merged

[SIG-CLOUD-9] rebase custom changes to 5.14.0-570.23.1.el9 #377

merged 3 commits into from
Jun 30, 2025

Conversation

PlaidCat
Copy link
Collaborator

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

None

Forward Port Process

[rolling release update] Rolling Product:  sig-cloud-9
[rolling release update] Checking out branch:  sig-cloud-9/5.14.0-570.22.1.el9_6
[rolling release update] Gathering all the RESF kernel Tags
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, origin/fips-9-compliant/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'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'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, origin/fips-9-compliant/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'08b6475feb07', b'667004a38548', b'9477e3364951', b'b94108159618', b'e8b954c95fef', b'838cd1e8d046', b'171ceb527773', b'18c0812a6563']
[rolling release update] Common tag sha:  b'667004a38548'
"667004a38548a723e0bb9930f465a40ae73af01f Rebuild rocky9_6 with kernel-5.14.0-570.22.1.el9_6"
[rolling release update] Checking out old rolling branch:  sig-cloud-9/5.14.0-570.22.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 667004a38548..HEAD
[rolling release update] Last RESF tag sha:  b'667004a38548'
[rolling release update] Total Commit in old branch:  3
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
{
  "597d631a000529931ef504c0e8af2c019976b0fb": "a9c0b33ef2306327dd2db02c6274107065ff9307",
  "c49ca939c3d44fa4bafb5a02d088dfc86e2b2c0d": "290e5d3c49f687c1567bde634dc33d57b0674919",
  "841d3ac3132ebee27c9bb4a11b22512d5ea847c7": ""
}
[rolling release update] Checking out new base branch:  rocky9_6
[rolling release update] Finding the kernel version for the new rolling release
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'
<re.Match object; span=(0, 52), match=b'08b6475feb07 (tag: resf_kernel-5.14.0-570.23.1.e>
[rolling release update} New Branch to create  sig-cloud-9/5.14.0-570.23.1.el9_6
[rolling release update] Check if branch Exists:  sig-cloud-9/5.14.0-570.23.1.el9_6
Branch sig-cloud-9/5.14.0-570.23.1.el9_6 does not exists creating
[rolling release update] Creating new branch for PR:  jmaple_sig-cloud-9/5.14.0-570.23.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:  12
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
Printing first 5 and last 5 commits
{
  "96794508804e8d69a557061700908bb1781d7ab7": "",
  "08b6475feb0710ce784c7dda662b85e110bea9d9": "",
  "51f11651aa4b4f242ad2a5154d2f4820c4af1aa6": "c8e008b60492cf6fd31ef127aea6d02fd3d314cd",
  "bc42ef3f898169e29a1abacdc2835fda8e24a4a5": "d93a6caab5d7d9b5ce034d75b1e1e993338e3852",
  "0848fd624f825eaa66f272f9b277a9c21facae41": "5c07be96d8b3f8447e980f29b967bf2e1d7ac732"
}
{
  "95925e7fa4673d4e78f833f6c5b327b104146ee0": "3b4035ddbfc8e4521f85569998a7569668cccf51",
  "f4ff959306afda00e6776e78c08607a7b0c1ba44": "4545ca51dd5bd1a652d514a5de9e8ec97579a5b1",
  "9558211345ad9859104ec852fd4e16e1c127ca0c": "c692696fc51c5acee555b94d391d328510b557c8",
  "4782928c9ee5858c4bf50c2d56122305ce7f86f0": "fd17e3a9a7886ec949ce269a396b67875b51ff45",
  "882361a07c05014c898435597dc274c346f28e9d": "94824ac9a8aaf2fb3c54b4bdde842db80ffa555d"
}
[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  "841d3ac3132ebee27c9bb4a11b22512d5ea847c7 selftests/mm temporary fix of hmm infinite loop"
Applying commit  "c49ca939c3d44fa4bafb5a02d088dfc86e2b2c0d net: mana: Add support for Multi Vports on Bare metal"
Applying commit  "597d631a000529931ef504c0e8af2c019976b0fb tools: hv: Enable debug logs for hv_kvp_daemon"

KBUILD

[jmaple@devbox code]$ egrep -B 5 -A 5 "\[TIMER\]|^Starting Build" kbuild.resf_kernel-5.14.0-570.23.1.el9_6.log
  CLEAN   scripts/mod
  CLEAN   scripts/selinux/genheaders
  CLEAN   scripts/selinux/mdp
  CLEAN   scripts
  CLEAN   include/config include/generated arch/x86/include/generated .config .config.old .version Module.symvers certs/signing_key.pem certs/signing_key.x509 certs/x509.genkey
[TIMER]{MRPROPER}: 9s
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.23.1.el9_6-ac92a001c7aa"
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
  SYSTBL  arch/x86/include/generated/asm/syscalls_32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_32_ia32.h
--
  BTF [M] sound/virtio/virtio_snd.ko
  BTF [M] sound/x86/snd-hdmi-lpe-audio.ko
  BTF [M] sound/usb/snd-usb-audio.ko
  LD [M]  sound/xen/snd_xen_front.ko
  BTF [M] sound/xen/snd_xen_front.ko
[TIMER]{BUILD}: 1773s
Making Modules
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+/kernel/arch/x86/crypto/blake2s-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+/kernel/arch/x86/crypto/blowfish-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+/kernel/arch/x86/crypto/camellia-aesni-avx2.ko
--
  STRIP   /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+/kernel/sound/xen/snd_xen_front.ko
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+/kernel/sound/virtio/virtio_snd.ko
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+/kernel/sound/x86/snd-hdmi-lpe-audio.ko
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+/kernel/sound/xen/snd_xen_front.ko
  DEPMOD  /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+
[TIMER]{MODULES}: 12s
Making Install
sh ./arch/x86/boot/install.sh 5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+ \
	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.23.1.el9_6-ac92a001c7aa+ and Index to 0
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 9s
[TIMER]{BUILD}: 1773s
[TIMER]{MODULES}: 12s
[TIMER]{INSTALL}: 24s
[TIMER]{TOTAL} 1824s
Rebooting in 10 seconds

KSelfTests

[jmaple@devbox code]$ ls kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.22.1.el9_6-597d631a0005+.log kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+.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.22.1.el9_6-597d631a0005+.log
332
kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.23.1.el9_6-ac92a001c7aa+.log
317

PlaidCat added 3 commits June 27, 2025 12:30
@PlaidCat
selftests/mm temporary fix of hmm infinite loop
5470cad 
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
ef93660 
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
ac92a00 
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 Jun 27, 2025
bmastbergen
bmastbergen approved these changes Jun 27, 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.

🥌

thefossguy-ciq
thefossguy-ciq approved these changes Jun 29, 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.

🚤

@PlaidCat PlaidCat merged commit ac92a00 into sig-cloud-9/5.14.0-570.23.1.el9_6 Jun 30, 2025
4 of 6 checks passed
@PlaidCat PlaidCat deleted the jmaple_sig-cloud-9/5.14.0-570.23.1.el9_6 branch June 30, 2025 16:36
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

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

@juphoff juphoff Awaiting requested review from juphoff

@kerneltoast kerneltoast Awaiting requested review from kerneltoast

Assignees

@PlaidCat PlaidCat

Labels
None yet
Milestone
No milestone
Development

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