Skip to content

[rocky8_10] History Rebuild through kernel-4.18.0-553.153.1.el8_10 - #1516

Open
PlaidCat wants to merge 5 commits into
rocky8_10from
rocky8_10_rebuild
Open

[rocky8_10] History Rebuild through kernel-4.18.0-553.153.1.el8_10#1516
PlaidCat wants to merge 5 commits into
rocky8_10from
rocky8_10_rebuild

Conversation

@PlaidCat

@PlaidCat PlaidCat commented Aug 6, 2026 •
edited by atlassian Bot
Loading

Copy link
Copy Markdown
Collaborator

This is an automated kernel history rebuild using cron and internal tooling. It follows the same process used for previous history rebuilds:

  • Download all unprocessed src.rpm packages
  • For each src.rpm:
    • Identify all commits in the changelog up to the last known tag (4.18.0-553)
    • Replay commits in chronological order (oldest to newest in the changelog) using git cherry-pick
    • Replace the code in the branch with the output of rpmbuild -bp for the corresponding src.rpm
    • Tag the rebuild branch

JIRA Tickets

Rebuild Splat Inspection

kernel-4.18.0-553.153.1.el8_10

$ cat ciq/ciq_backports/kernel-4.18.0-553.153.1.el8_10/rebuild.details.txt
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v4.18~1..kernel-mainline: 625874
Number of commits in rpm: 11
Number of commits matched with upstream: 4 (36.36%)
Number of commits in upstream but not in rpm: 625870
Number of commits NOT found in upstream: 7 (63.64%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.153.1.el8_10 for kernel-4.18.0-553.153.1.el8_10
Clean Cherry Picks: 3 (75.00%)
Empty Cherry Picks: 1 (25.00%)
_______________________________

__EMPTY COMMITS__________________________
c21b90f77687075115d989e53a8ec5e2bb427ab1 x86/CPU/AMD: Prevent improper isolation of shared resources in Zen2's op cache

__CHANGES NOT IN UPSTREAM________________
Adding prod certs and changed cert date to 20210620
Adding Rocky secure boot certs
Fixing vmlinuz removal
Fixing UEFI CA path
Porting to 8.10, debranding and Rocky branding
Fixing pesign_key_name values
gfs2: page poisoning fix

BUILD

$ grep -E -B 5 -A 5 "\[TIMER\]|^Starting Build" $(ls -t kbuild* | head -n1)
/mnt/code/kernel-src-tree-build
Running make mrproper...
  CLEAN   scripts/basic
  CLEAN   scripts/kconfig
[TIMER]{MRPROPER}: 4s
x86_64 architecture detected, copying config
'configs/kernel-x86_64.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-rocky8_10_rebuild-b435f20084c8"
Making olddefconfig
--
  HOSTLD  scripts/kconfig/conf
scripts/kconfig/conf  --olddefconfig Kconfig
#
# configuration written to .config
#
Starting Build
scripts/kconfig/conf  --syncconfig Kconfig
  SYSTBL  arch/x86/include/generated/asm/syscalls_32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_32_ia32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_64_x32.h
  SYSTBL  arch/x86/include/generated/asm/syscalls_64.h
--
  LD [M]  sound/usb/usx2y/snd-usb-usx2y.ko
  LD [M]  sound/virtio/virtio_snd.ko
  LD [M]  sound/x86/snd-hdmi-lpe-audio.ko
  LD [M]  sound/xen/snd_xen_front.ko
  LD [M]  virt/lib/irqbypass.ko
[TIMER]{BUILD}: 1560s
Making Modules
  INSTALL arch/x86/crypto/blowfish-x86_64.ko
  INSTALL arch/x86/crypto/camellia-aesni-avx-x86_64.ko
  INSTALL arch/x86/crypto/camellia-aesni-avx2.ko
  INSTALL arch/x86/crypto/camellia-x86_64.ko
--
  INSTALL sound/virtio/virtio_snd.ko
  INSTALL sound/x86/snd-hdmi-lpe-audio.ko
  INSTALL sound/xen/snd_xen_front.ko
  INSTALL virt/lib/irqbypass.ko
  DEPMOD  4.18.0-rocky8_10_rebuild-b435f20084c8+
[TIMER]{MODULES}: 14s
Making Install
sh ./arch/x86/boot/install.sh 4.18.0-rocky8_10_rebuild-b435f20084c8+ arch/x86/boot/bzImage \
	System.map "/boot"
[TIMER]{INSTALL}: 20s
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-4.18.0-rocky8_10_rebuild-b435f20084c8+ and Index to 0
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 4s
[TIMER]{BUILD}: 1560s
[TIMER]{MODULES}: 14s
[TIMER]{INSTALL}: 20s
[TIMER]{TOTAL} 1604s
Rebooting in 10 seconds

KSelfTests

$ get_kselftest_diff.sh
ls: cannot access 'selftest-*': No such file or directory
kselftest.4.18.0-rocky8_10_rebuild-635060710ee1+.log
206
kselftest.4.18.0-rocky8_10_rebuild-38a54b766f84+.log
206
kselftest.4.18.0-rocky8_10_rebuild-0abcbab2ac76+.log
206
kselftest.4.18.0-rocky8_10_rebuild-b435f20084c8+.log
206
Before: kselftest.4.18.0-rocky8_10_rebuild-0abcbab2ac76+.log
After: kselftest.4.18.0-rocky8_10_rebuild-b435f20084c8+.log
Diff:
No differences found.

PlaidCat added 5 commits August 6, 2026 06:02
@PlaidCat
bpf: Fix combination of jit blinding and pointers to bpf subprogs.
1f8f055 
jira KERNEL-1444
Rebuild_History Non-Buildable kernel-4.18.0-553.153.1.el8_10
commit-author Alexei Starovoitov <ast@kernel.org>
commit 4b6313c

The combination of jit blinding and pointers to bpf subprogs causes:
[   36.989548] BUG: unable to handle page fault for address: 0000000100000001
[   36.990342] #PF: supervisor instruction fetch in kernel mode
[   36.990968] #PF: error_code(0x0010) - not-present page
[   36.994859] RIP: 0010:0x100000001
[   36.995209] Code: Unable to access opcode bytes at RIP 0xffffffd7.
[   37.004091] Call Trace:
[   37.004351]  <TASK>
[   37.004576]  ? bpf_loop+0x4d/0x70
[   37.004932]  ? bpf_prog_3899083f75e4c5de_F+0xe3/0x13b

The jit blinding logic didn't recognize that ld_imm64 with an address
of bpf subprogram is a special instruction and proceeded to randomize it.
By itself it wouldn't have been an issue, but jit_subprogs() logic
relies on two step process to JIT all subprogs and then JIT them
again when addresses of all subprogs are known.
Blinding process in the first JIT phase caused second JIT to miss
adjustment of special ld_imm64.

Fix this issue by ignoring special ld_imm64 instructions that don't have
user controlled constants and shouldn't be blinded.

Fixes: 69c087b ("bpf: Add bpf_for_each_map_elem() helper")
	Reported-by: Andrii Nakryiko <andrii@kernel.org>
	Signed-off-by: Alexei Starovoitov <ast@kernel.org>
	Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
	Acked-by: Andrii Nakryiko <andrii@kernel.org>
	Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20220513011025.13344-1-alexei.starovoitov@gmail.com
(cherry picked from commit 4b6313c)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
@PlaidCat
x86/CPU/AMD: Prevent improper isolation of shared resources in Zen2's…
bfee662 
… op cache

jira KERNEL-1444
cve CVE-2025-54518
Rebuild_History Non-Buildable kernel-4.18.0-553.153.1.el8_10
commit-author Prathyushi Nangia <prathyushi.nangia@amd.com>
commit c21b90f
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-4.18.0-553.153.1.el8_10/c21b90f7.failed

Make sure resources are not improperly shared in the op cache and
cause instruction corruption this way.

	Signed-off-by: Prathyushi Nangia <prathyushi.nangia@amd.com>
Co-developed-by: Borislav Petkov (AMD) <bp@alien8.de>
	Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
	Cc: stable@vger.kernel.org
	Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit c21b90f)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>

# Conflicts:
#	arch/x86/include/asm/msr-index.h
#	arch/x86/kernel/cpu/amd.c
#	tools/arch/x86/include/asm/msr-index.h
@PlaidCat
scsi: storvsc: Process unsupported MODE_SENSE_10
a2b93ab 
jira KERNEL-1444
Rebuild_History Non-Buildable kernel-4.18.0-553.153.1.el8_10
commit-author Long Li <longli@microsoft.com>
commit 9eacec5

The Hyper-V host does not support MODE_SENSE_10 and MODE_SENSE.  The
driver handles MODE_SENSE as unsupported command, but not for
MODE_SENSE_10. Add MODE_SENSE_10 to the same handling logic and return
correct code to SCSI layer.

Fixes: 89ae7d7 ("Staging: hv: storvsc: Move the storage driver out of the staging area")
	Cc: stable@kernel.org
	Signed-off-by: Long Li <longli@microsoft.com>
	Reviewed-by: Michael Kelley <mhklinux@outlook.com>
Link: https://patch.msgid.link/20260117010302.294068-1-longli@linux.microsoft.com
	Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 9eacec5)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
@PlaidCat
scsi: storvsc: Handle PERSISTENT_RESERVE_IN truncation for Hyper-V vFC
d653a08 
jira KERNEL-1444
Rebuild_History Non-Buildable kernel-4.18.0-553.153.1.el8_10
commit-author Li Tian <litian@redhat.com>
commit 9cf351b

The storvsc driver has become stricter in handling SRB status codes
returned by the Hyper-V host. When using Virtual Fibre Channel (vFC)
passthrough, the host may return SRB_STATUS_DATA_OVERRUN for
PERSISTENT_RESERVE_IN commands if the allocation length in the CDB does
not match the host's expected response size.

Currently, this status is treated as a fatal error, propagating
Host_status=0x07 [DID_ERROR] to the SCSI mid-layer. This causes
userspace storage utilities (such as sg_persist) to fail with transport
errors, even when the host has actually returned the requested
reservation data in the buffer.

Refactor the existing command-specific workarounds into a new helper
function, storvsc_host_mishandles_cmd(), and add PERSISTENT_RESERVE_IN
to the list of commands where SRB status errors should be suppressed for
vFC devices. This ensures that the SCSI mid-layer processes the returned
data buffer instead of terminating the command.

	Signed-off-by: Li Tian <litian@redhat.com>
	Reviewed-by: Long Li <longli@microsoft.com>
	Reviewed-by: Laurence Oberman <loberman@redhat.com>
Link: https://patch.msgid.link/20260406015344.12566-1-litian@redhat.com
	Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 9cf351b)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
@PlaidCat
Rebuild rocky8_10 with kernel-4.18.0-553.153.1.el8_10
b435f20 
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v4.18~1..kernel-mainline: 625874
Number of commits in rpm: 11
Number of commits matched with upstream: 4 (36.36%)
Number of commits in upstream but not in rpm: 625870
Number of commits NOT found in upstream: 7 (63.64%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.153.1.el8_10 for kernel-4.18.0-553.153.1.el8_10
Clean Cherry Picks: 3 (75.00%)
Empty Cherry Picks: 1 (25.00%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-4.18.0-553.153.1.el8_10/rebuild.details.txt

Includes:
* git commit header above
* Empty Commits with upstream SHA
* RPM ChangeLog Entries that could not be matched

Individual Empty Commit failures contained in the same containing directory.
The git message for empty commits will have the path for the failed commit.
File names are the first 8 characters of the upstream SHA
@PlaidCat PlaidCat self-assigned this Aug 6, 2026
@PlaidCat
PlaidCat requested review from a team August 6, 2026 10:48
bmastbergen
bmastbergen approved these changes Aug 6, 2026
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.

🥌

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
@shreeya-patel98 shreeya-patel98 shreeya-patel98 approved these changes

Assignees

@PlaidCat PlaidCat

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@PlaidCat @bmastbergen @shreeya-patel98