Skip to content

[SIG-CLOUD-9] rebase custom changes to 5.14.0-570.18.1 - #311

Merged
PlaidCat merged 1 commit into
sig-cloud-9/5.14.0-570.18.1.el9_6from
jmaple_sig-cloud-9/5.14.0-570.18.1.el9_6
Jun 5, 2025
Merged

[SIG-CLOUD-9] rebase custom changes to 5.14.0-570.18.1#311
PlaidCat merged 1 commit into
sig-cloud-9/5.14.0-570.18.1.el9_6from
jmaple_sig-cloud-9/5.14.0-570.18.1.el9_6

Conversation

@PlaidCat

@PlaidCat PlaidCat commented Jun 4, 2025

Copy link
Copy Markdown
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

[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.17.1.el9_6
[rolling release update] Rolling Product:  sig-cloud-9
[rolling release update] Checking out branch:  sig-cloud-9/5.14.0-570.17.1.el9_6
[rolling release update] Gathering all the RESF kernel Tags
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'838cd1e8d046', b'171ceb527773', b'18c0812a6563']
[rolling release update] Checking out branch:  rocky9_6
[rolling release update] Gathering all the RESF kernel Tags
b'e8b954c95fef (HEAD -> rocky9_6, tag: resf_kernel-5.14.0-570.18.1.el9_6, origin/rocky9_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'e8b954c95fef', b'838cd1e8d046', b'171ceb527773', b'18c0812a6563']
[rolling release update] Latest RESF tag sha:  b'838cd1e8d046'
"838cd1e8d046c0d75cafa08220a3d55a5021964f Rebuild rocky9_6 with kernel-5.14.0-570.17.1.el9_6"
[rolling release update] Checking out old rolling branch:  sig-cloud-9/5.14.0-570.17.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'838cd1e8d046'
[rolling release update] Total Commit in old branch:  1
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
{
  "e62424f187dae2ce2a5f472bf2b33135753fe792": ""
}
[rolling release update] Checking out new base branch:  rocky9_6
[rolling release update] Finding the kernel version for the new rolling release
b'e8b954c95fef (HEAD -> rocky9_6, tag: resf_kernel-5.14.0-570.18.1.el9_6, origin/rocky9_6) Rebuild rocky9_6 with kernel-5.14.0-570.18.1.el9_6'
<re.Match object; span=(0, 70), match=b'e8b954c95fef (HEAD -> rocky9_6, tag: resf_kernel>
[rolling release update} New Branch to create  sig-cloud-9/5.14.0-570.18.1.el9_6
[rolling release update] Check if branch Exists:  sig-cloud-9/5.14.0-570.18.1.el9_6
Branch sig-cloud-9/5.14.0-570.18.1.el9_6 does not exists creating
[rolling release update] Creating new branch for PR:  jmaple_sig-cloud-9/5.14.0-570.18.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:  10
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
{
  "e8b954c95fef772d9bfbbb6c0145611183115814": "",
  "7b9d8b5d06a205e2d8b9b29e3e1e7a92df3c9e08": "7489161b1852390b4413d57f2457cd40b34da6cc",
  "d443a8c45b822527541485a367ba8d8ea47fc062": "45f745dd1ac880ce299c0f92b874cda090ddade6",
  "b0c1a21757c4562073569a5e79deaedad3c5995b": "4e75c3e208a06ad6fd9b3517fb77337460d7c2b0",
  "0909bf2088f43111c2a0c05d7a3305142df4abfb": "802a69b6b8a0502a9e2309afec7e1b77f67874f2",
  "8676f4656f6750be7a155f014e1b46ca1fe685ce": "f2e2092a979cd46b43445daf23628015ac776ac3",
  "25ea0bbefaeb6b6d8af90ca7ba514515afb638e2": "f87bdbd66de4a16069525825387e25dae3e0163e",
  "dbfbb48a2f334e3f4e982605d57494965edf0ccb": "d095681373440cc4dda8aee9f9c3152a2396b4d4",
  "05569b5764a4c4e0d2d3b2499fef5588c5643876": "eb920fbbb4c84ffe60124412754491f397640d1f",
  "f99b03e4b9ce43e466153179ea9e755aaba5b082": "26fee9e09be346e93a2fc4126cac244de498ec5a"
}
[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  "e62424f187dae2ce2a5f472bf2b33135753fe792 selftests/mm temporary fix of hmm infinite loop"

KBuild

[jmaple@devbox code]$ egrep -B 5 -A 5 "\[TIMER\]|^Starting Build" kbuild.jmaple_sig-cloud-9_5.14.0-570.18.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.18.1.el9_6-05b5b0fcacf6"
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
--
  LD [M]  sound/x86/snd-hdmi-lpe-audio.ko
  LD [M]  sound/xen/snd_xen_front.ko
  BTF [M] sound/x86/snd-hdmi-lpe-audio.ko
  BTF [M] sound/virtio/virtio_snd.ko
  BTF [M] sound/xen/snd_xen_front.ko
[TIMER]{BUILD}: 1618s
Making Modules
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+/kernel/arch/x86/crypto/blake2s-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+/kernel/arch/x86/crypto/blowfish-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+/kernel/arch/x86/crypto/camellia-aesni-avx2.ko
--
  STRIP   /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+/kernel/sound/x86/snd-hdmi-lpe-audio.ko
  STRIP   /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+/kernel/sound/xen/snd_xen_front.ko
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+/kernel/sound/x86/snd-hdmi-lpe-audio.ko
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+/kernel/sound/xen/snd_xen_front.ko
  DEPMOD  /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+
[TIMER]{MODULES}: 8s
Making Install
sh ./arch/x86/boot/install.sh 5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+ \
	arch/x86/boot/bzImage System.map "/boot"
[TIMER]{INSTALL}: 23s
Checking kABI
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+ and Index to 0
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 0s
[TIMER]{BUILD}: 1618s
[TIMER]{MODULES}: 8s
[TIMER]{INSTALL}: 23s
[TIMER]{TOTAL} 1656s
Rebooting in 10 seconds

KSelfTests

[jmaple@devbox code]$ ls ~/workspace/vms/r9-sigcloud/builder/code/kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.17.1.el9_6-e62424f187da+.log kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+.log | while read line; do echo $line; grep '^ok ' $line | wc -l ; done
/home/jmaple/workspace/vms/r9-sigcloud/builder/code/kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.17.1.el9_6-e62424f187da+.log
317
kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-570.18.1.el9_6-05b5b0fcacf6+.log
317

@PlaidCat
selftests/mm temporary fix of hmm infinite loop
05b5b0f 
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>
@PlaidCat PlaidCat self-assigned this Jun 4, 2025
thefossguy-ciq
thefossguy-ciq approved these changes Jun 5, 2025
View reviewed changes

@thefossguy-ciq thefossguy-ciq left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🚤

bmastbergen
bmastbergen approved these changes Jun 5, 2025
View reviewed changes

@bmastbergen bmastbergen left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

🥌

@PlaidCat
PlaidCat merged commit 05b5b0f into sig-cloud-9/5.14.0-570.18.1.el9_6 Jun 5, 2025
@PlaidCat
PlaidCat deleted the jmaple_sig-cloud-9/5.14.0-570.18.1.el9_6 branch June 5, 2025 14:52
github-actions Bot pushed a commit that referenced this pull request Jul 15, 2026
Rafael Aquini
x86/e820: Discard high memory that can't be addressed by 32-bit systems
26f5b5c 
JIRA: https://redhat.atlassian.net/browse/RHEL-145694

commit 83b2d34
Author: Mike Rapoport (Microsoft) <rppt@kernel.org>
Date:   Sun Apr 13 11:08:58 2025 +0300

    x86/e820: Discard high memory that can't be addressed by 32-bit systems

    Dave Hansen reports the following crash on a 32-bit system with
    CONFIG_HIGHMEM=y and CONFIG_X86_PAE=y:

      > 0xf75fe000 is the mem_map[] entry for the first page >4GB. It
      > obviously wasn't allocated, thus the oops.

      BUG: unable to handle page fault for address: f75fe000
      #PF: supervisor write access in kernel mode
      #PF: error_code(0x0002) - not-present page
      *pdpt = 0000000002da2001 *pde = 000000000300c067 *pte = 0000000000000000
      Oops: Oops: 0002 [#1] SMP NOPTI
      CPU: 0 UID: 0 PID: 0 Comm: swapper Not tainted 6.15.0-rc1-00288-ge618ee89561b-dirty #311 PREEMPT(undef)
      Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014
      EIP: __free_pages_core+0x3c/0x74
      ...
      Call Trace:
       memblock_free_pages+0x11/0x2c
       memblock_free_all+0x2ce/0x3a0
       mm_core_init+0xf5/0x320
       start_kernel+0x296/0x79c
       i386_start_kernel+0xad/0xb0
       startup_32_smp+0x151/0x154

    The mem_map[] is allocated up to the end of ZONE_HIGHMEM which is defined
    by max_pfn.

    The bug was introduced by this recent commit:

      6faea34 ("arch, mm: streamline HIGHMEM freeing")

    Previously, freeing of high memory was also clamped to the end of
    ZONE_HIGHMEM but after this change, memblock_free_all() tries to
    free memory above the of ZONE_HIGHMEM as well and that causes
    access to mem_map[] entries beyond the end of the memory map.

    To fix this, discard the memory after max_pfn from memblock on
    32-bit systems so that core MM would be aware only of actually
    usable memory.

    Fixes: 6faea34 ("arch, mm: streamline HIGHMEM freeing")
    Reported-by: Dave Hansen <dave.hansen@intel.com>
    Tested-by: Arnd Bergmann <arnd@kernel.org>
    Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Cc: Andy Shevchenko <andy@kernel.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Davide Ciminaghi <ciminaghi@gnudd.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Matthew Wilcox <willy@infradead.org>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Sean Christopherson <seanjc@google.com>
    Cc: kvm@vger.kernel.org
    Link: https://lore.kernel.org/r/20250413080858.743221-1-rppt@kernel.org # discussion and submission

Signed-off-by: Rafael Aquini <raquini@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bmastbergen bmastbergen bmastbergen approved these changes
@thefossguy-ciq thefossguy-ciq thefossguy-ciq approved these changes
@jdieter jdieter Awaiting requested review from jdieter
@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.

3 participants

@PlaidCat @bmastbergen @thefossguy-ciq