Skip to content

[SIG-CLOUD-9] rebase custom changes to 5.14.0-570.19.1 #327

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.

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

Conversation

PlaidCat
Copy link
Collaborator

@PlaidCat PlaidCat commented Jun 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

None

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 sig-cloud-9/5.14.0-570.18.1.el9_6
[rolling release update] Rolling Product:  sig-cloud-9
[rolling release update] Checking out branch:  sig-cloud-9/5.14.0-570.18.1.el9_6
[rolling release update] Gathering all the RESF kernel Tags
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'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'b94108159618 (HEAD -> rocky9_6, tag: resf_kernel-5.14.0-570.19.1.el9_6, origin/rocky9_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'b94108159618', b'e8b954c95fef', b'838cd1e8d046', b'171ceb527773', b'18c0812a6563']
[rolling release update] Latest RESF tag sha:  b'e8b954c95fef'
"e8b954c95fef772d9bfbbb6c0145611183115814 Rebuild rocky9_6 with kernel-5.14.0-570.18.1.el9_6"
[rolling release update] Checking out old rolling branch:  sig-cloud-9/5.14.0-570.18.1.el9_6
[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'e8b954c95fef'
[rolling release update] Total Commit in old branch:  1
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
{
  "05b5b0fcacf69d64f032f64c2c24af53a45e6f0e": ""
}
[rolling release update] Checking out new base branch:  rocky9_6
[rolling release update] Finding the kernel version for the new rolling release
b'b94108159618 (HEAD -> rocky9_6, tag: resf_kernel-5.14.0-570.19.1.el9_6, origin/rocky9_6) Rebuild rocky9_6 with kernel-5.14.0-570.19.1.el9_6'
<re.Match object; span=(0, 70), match=b'b94108159618 (HEAD -> rocky9_6, tag: resf_kernel>
[rolling release update} New Branch to create  sig-cloud-9/5.14.0-570.19.1.el9_6
[rolling release update] Check if branch Exists:  sig-cloud-9/5.14.0-570.19.1.el9_6
Branch sig-cloud-9/5.14.0-570.19.1.el9_6 does not exists creating
[rolling release update] Creating new branch for PR:  jmaple_sig-cloud-9/5.14.0-570.19.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:  9
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
{
  "b94108159618043bdd64112095dff10f5a5d7b34": "",
  "4726988beceab8f63b85fc2b27ec77b736fba988": "643a16a0eb1d6ac23744bb6e90a00fc21148a9dc",
  "75f89b0509a811c688c1569177b46e3a3512fc07": "628e6d18930bbd21f2d4562228afe27694f66da9",
  "9601d848e58b26bb531cf17638c474c5bec30cfb": "3c8ffcd248da34fc41e52a46e51505900115fc2a",
  "cb324233337ed1454783cc1cf4d4cb702144f30a": "482ad2a4ace2740ca0ff1cbc8f3c7f862f3ab507",
  "719f037b2266d6a707b00dccc98c4370d7586e0e": "ee62ce7a1d909ccba0399680a03c2dee83bcae95",
  "7fdffbb885965391b28c20e782ef1c7a250f0e1d": "cd3c93167da0e760b5819246eae7a4ea30fd014b",
  "9dec56d590f6f7b229ff4195a7dc1acd0a0c0d20": "1f6bc02f18489b9c9ea39b068d0695fb0e4567e9",
  "49cf2d4734b6b029973c94fb17799ec775b32b82": "6636c58b946c9cbfbd68a453d4eba2ef4585c65c"
}
[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  "05b5b0fcacf69d64f032f64c2c24af53a45e6f0e selftests/mm temporary fix of hmm infinite loop"

KBuild

Lost to output issues

KSelfTest

[jmaple@devbox code]$ ls kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+.log kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.19.1.el9_6-8690e71328ef+.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.18.1.el9_6-05b5b0fcacf6+.log
317
kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.19.1.el9_6-8690e71328ef+.log
317

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/26017fe3-5ad7-6946-57db-e5ec48063ceb@suse.cz/#25046055

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

Signed-off-by: Jonathan Maple <jmaple@ciq.com>
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.

🚤

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 8690e71 into sig-cloud-9/5.14.0-570.19.1.el9_6 Jun 9, 2025
4 checks passed
@PlaidCat PlaidCat deleted the jmaple_sig-cloud-9/5.14.0-570.19.1.el9_6 branch June 9, 2025 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants