Skip to content

[SIG-CLOUD-10] Rebase custom changes to 6.12.0-55.21.1.el10_0 #430

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 2 commits into from
Jul 22, 2025
Merged

[SIG-CLOUD-10] Rebase custom changes to 6.12.0-55.21.1.el10_0 #430

merged 2 commits into from
Jul 22, 2025

Conversation

PlaidCat
Copy link
Collaborator

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

  • Kernel History Rebuild Process for all src.rpms hosted by RESF
  • Create sig-cloud-10/6.12.0-55.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

None

Forward Port Process

[jmaple@devbox kernel-src-tree-tools]$  python3 rolling-release-update.py --repo ../kernel-src-tree/ --new-base-branch rocky10_0 --old-rolling-branch sig-cloud-10/6.12.0-55.20.1.el10_0
[rolling release update] Rolling Product:  sig-cloud-10
[rolling release update] Checking out branch:  sig-cloud-10/6.12.0-55.20.1.el10_0
[rolling release update] Gathering all the RESF kernel Tags
b'3381775694c1 (tag: resf_kernel-6.12.0-55.20.1.el10_0, origin/rocky10_0_rebuild, rocky10_0_rebuild_kernel-6.12.0-55.20.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.20.1.el10_0'
b'072c27213755 (tag: resf_kernel-6.12.0-55.19.1.el10_0, origin/sig-cloud-10/6.12.0-55.19.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.19.1.el10_0'
b'4de01b5748c7 (tag: resf_kernel-6.12.0-55.18.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.18.1.el10_0'
b'71d4955b6748 (tag: resf_kernel-6.12.0-55.17.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.17.1.el10_0'
b'31b726f7bb14 (tag: resf_kernel-6.12.0-55.16.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.16.1.el10_0'
b'defbb7341054 (tag: resf_kernel-6.12.0-55.14.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.14.1.el10_0'
b'abf881e2d199 (tag: resf_kernel-6.12.0-55.13.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.13.1.el10_0'
b'd3c6fc1a3a45 (tag: resf_kernel-6.12.0-55.12.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.12.1.el10_0'
b'ce19035f5d30 (tag: resf_kernel-6.12.0-55.11.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.11.1.el10_0'
[rolling release update] Old Rolling Branch Tags:  [b'3381775694c1', b'072c27213755', b'4de01b5748c7', b'71d4955b6748', b'31b726f7bb14', b'defbb7341054', b'abf881e2d199', b'd3c6fc1a3a45', b'ce19035f5d30']
[rolling release update] Checking out branch:  rocky10_0
[rolling release update] Gathering all the RESF kernel Tags
b'fef28841a44f (HEAD -> rocky10_0, tag: resf_kernel-6.12.0-55.21.1.el10_0, origin/rocky10_0, rocky10_0_rebuild_kernel-6.12.0-55.21.1.el10_0, rocky10_0_rebuild) Rebuild rocky10_0 with kernel-6.12.0-55.21.1.el10_0'
b'3381775694c1 (tag: resf_kernel-6.12.0-55.20.1.el10_0, origin/rocky10_0_rebuild, rocky10_0_rebuild_kernel-6.12.0-55.20.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.20.1.el10_0'
b'072c27213755 (tag: resf_kernel-6.12.0-55.19.1.el10_0, origin/sig-cloud-10/6.12.0-55.19.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.19.1.el10_0'
b'4de01b5748c7 (tag: resf_kernel-6.12.0-55.18.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.18.1.el10_0'
b'71d4955b6748 (tag: resf_kernel-6.12.0-55.17.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.17.1.el10_0'
b'31b726f7bb14 (tag: resf_kernel-6.12.0-55.16.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.16.1.el10_0'
b'defbb7341054 (tag: resf_kernel-6.12.0-55.14.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.14.1.el10_0'
b'abf881e2d199 (tag: resf_kernel-6.12.0-55.13.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.13.1.el10_0'
b'd3c6fc1a3a45 (tag: resf_kernel-6.12.0-55.12.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.12.1.el10_0'
b'ce19035f5d30 (tag: resf_kernel-6.12.0-55.11.1.el10_0) Rebuild rocky10_0 with kernel-6.12.0-55.11.1.el10_0'
[rolling release update] New Base Branch Tags:  [b'fef28841a44f', b'3381775694c1', b'072c27213755', b'4de01b5748c7', b'71d4955b6748', b'31b726f7bb14', b'defbb7341054', b'abf881e2d199', b'd3c6fc1a3a45', b'ce19035f5d30']
[rolling release update] Latest RESF tag sha:  b'3381775694c1'
"3381775694c1e4264886dd2aae5e5ce8dc05747e Rebuild rocky10_0 with kernel-6.12.0-55.20.1.el10_0"
[rolling release update] Checking out old rolling branch:  sig-cloud-10/6.12.0-55.20.1.el10_0
[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'3381775694c1'
[rolling release update] Total Commit in old branch:  2
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
{
  "c62cc6a8c42085509da00426bd3dd48b93c4458b": "a9c0b33ef2306327dd2db02c6274107065ff9307",
  "0c88564865565e29eec2a1b98ad316e4fadde657": "290e5d3c49f687c1567bde634dc33d57b0674919"
}
[rolling release update] Checking out new base branch:  rocky10_0
[rolling release update] Finding the kernel version for the new rolling release
b'fef28841a44f (HEAD -> rocky10_0, tag: resf_kernel-6.12.0-55.21.1.el10_0, origin/rocky10_0, rocky10_0_rebuild_kernel-6.12.0-55.21.1.el10_0, rocky10_0_rebuild) Rebuild rocky10_0 with kernel-6.12.0-55.21.1.el10_0'
<re.Match object; span=(0, 137), match=b'fef28841a44f (HEAD -> rocky10_0, tag: resf_kerne>
[rolling release update} New Branch to create  sig-cloud-10/6.12.0-55.21.1.el10_0
[rolling release update] Check if branch Exists:  sig-cloud-10/6.12.0-55.21.1.el10_0
Branch sig-cloud-10/6.12.0-55.21.1.el10_0 does not exists creating
[rolling release update] Creating new branch for PR:  jmaple_sig-cloud-10/6.12.0-55.21.1.el10_0
[rolling release update] Creating Map of all new commits from last rolling release fork
[rolling release update] Total Commit in new branch:  17
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
Printing first 5 and last 5 commits
{
  "fef28841a44faed2e822b33d02681b805e3e8a37": "",
  "4531b5fc5c9257675b47a826287b1a88345b66a5": "4bcc063939a560f05b05b34be68d20045a646e6e",
  "10ffd789b9ba0533e1976e7a8bad428553611e21": "80f2ab46c2ee16f046b55306dc4db4be53125016",
  "ba944100d631741ab4b10bb1599e44c28e311ef2": "c2ddb619fa8d535af968965181656c20a6de3f81",
  "fc8160abbb5d05ad69325b8ebce1798f46735618": "d67627e7b53203ca150e54723abbed81a0716286"
}
{
  "65dec48ef8947e9fe50a89d6055b3061bee0314a": "fb59a520bbb1055e403c831ab9ff1a88a4848847",
  "e5ce34eb0bea7f4112eb9c80132d339a23e2e2d8": "5d5d9c2c0fb9d2028f52ed67e7db86a4be03f342",
  "8617320e3922a8c3d8189d0d2c26b835381345d4": "4d3f59bfa2cd3193b8bbe724df0a9cd41bdc507d",
  "c11031d1c93d56a45fc4dcb6f27e9b741a7c087a": "c37dd67c423308c5a58c1a6e5b53229a95e19c3f",
  "0849dfaaeff6eb1fdaae8051fdf416e6dda86364": "1bb7ff4204b6d4927e982cd256286c09ed4fd8ca"
}
[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  "0c88564865565e29eec2a1b98ad316e4fadde657 net: mana: Add support for Multi Vports on Bare metal"
Applying commit  "c62cc6a8c42085509da00426bd3dd48b93c4458b tools: hv: Enable debug logs for hv_kvp_daemon"

Build

[jmaple@devbox code]$ egrep -B 5 -A 5 "\[TIMER\]|^Starting Build" $(ls -t kbuild* | head -n1)
  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/x509.genkey
[TIMER]{MRPROPER}: 12s
x86_64 architecture detected, copying config
'configs/kernel-x86_64-rhel.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4"
Making olddefconfig
--
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
Starting Build
  GEN     arch/x86/include/generated/asm/orc_hash.h
  WRAP    arch/x86/include/generated/uapi/asm/bpf_perf_event.h
  WRAP    arch/x86/include/generated/uapi/asm/errno.h
  WRAP    arch/x86/include/generated/uapi/asm/fcntl.h
  WRAP    arch/x86/include/generated/uapi/asm/ioctl.h
--
  LD [M]  net/qrtr/qrtr.ko
  LD [M]  net/qrtr/qrtr-mhi.ko
  BTF [M] net/hsr/hsr.ko
  BTF [M] net/qrtr/qrtr.ko
  BTF [M] net/qrtr/qrtr-mhi.ko
[TIMER]{BUILD}: 2145s
Making Modules
  SYMLINK /lib/modules/6.12.0-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4+/build
  INSTALL /lib/modules/6.12.0-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4+/modules.order
  INSTALL /lib/modules/6.12.0-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4+/modules.builtin
  INSTALL /lib/modules/6.12.0-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4+/modules.builtin.modinfo
--
  SIGN    /lib/modules/6.12.0-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4+/kernel/net/hsr/hsr.ko
  SIGN    /lib/modules/6.12.0-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4+/kernel/net/qrtr/qrtr.ko
  SIGN    /lib/modules/6.12.0-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4+/kernel/net/qrtr/qrtr-mhi.ko
  SIGN    /lib/modules/6.12.0-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4+/kernel/net/vmw_vsock/vsock_loopback.ko
  DEPMOD  /lib/modules/6.12.0-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4+
[TIMER]{MODULES}: 9s
Making Install
  INSTALL /boot
[TIMER]{INSTALL}: 20s
Checking kABI
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-6.12.0-jmaple_sig-cloud-10_6.12.0-55.21.1.el10_0-8cd774f1d1e4+ and Index to 1
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 12s
[TIMER]{BUILD}: 2145s
[TIMER]{MODULES}: 9s
[TIMER]{INSTALL}: 20s
[TIMER]{TOTAL} 2192s
Rebooting in 10 seconds

KselfTest

[jmaple@devbox code]$ ls -rt kselftest.*rebuild* | tail -n2 | while read line; do echo $line; grep '^ok ' $line | wc -l ; done
kselftest.6.12.0-rocky10_0_rebuild-3381775694c1+.log
498
kselftest.6.12.0-rocky10_0_rebuild-fef28841a44f+.log
498

PlaidCat added 2 commits July 21, 2025 19:37
@PlaidCat
net: mana: Add support for Multi Vports on Bare metal
0486695 
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
8cd774f 
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 22, 2025
thefossguy-ciq
thefossguy-ciq approved these changes Jul 22, 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.

🚤

jdieter
jdieter approved these changes Jul 22, 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 closed this Jul 22, 2025
@PlaidCat PlaidCat deleted the jmaple_sig-cloud-10/6.12.0-55.21.1.el10_0 branch July 22, 2025 20:01
@PlaidCat PlaidCat merged commit 8cd774f into sig-cloud-10/6.12.0-55.21.1.el10_0 Jul 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

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

@kerneltoast kerneltoast Awaiting requested review from kerneltoast

@jainanmol84 jainanmol84 Awaiting requested review from jainanmol84

@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