[rocky9_8] History Rebuild through kernel-5.14.0-687.10.1.el9_8

Makefile.rhelver

@@ -12,7 +12,7 @@ RHEL_MINOR = 8
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 687.5.3
+RHEL_RELEASE = 687.10.1
 
 #
 # ZSTREAM

arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
 set -e
-set -o pipefail
 
 # To debug, uncomment the following line
 # set -x

arch/x86/boot/compressed/Makefile

@@ -122,6 +122,7 @@ vmlinux-objs-$(CONFIG_EFI_SBAT) += $(obj)/sbat.o
 ifdef CONFIG_EFI_SBAT
 # Strip quotes
 $(obj)/sbat.o: $(strip $(subst ",,$(CONFIG_EFI_SBAT_FILE)))
+AFLAGS_sbat.o += -I $(srctree)
 endif
 
 $(obj)/vmlinux: $(vmlinux-objs-y) FORCE

arch/x86/kvm/mmu/mmu.c

@@ -2892,12 +2892,6 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, struct kvm_memory_slot *slot,
 	bool prefetch = !fault || fault->prefetch;
 	bool write_fault = fault && fault->write;
 
-	if (unlikely(is_noslot_pfn(pfn))) {
-		vcpu->stat.pf_mmio_spte_created++;
-		mark_mmio_spte(vcpu, sptep, gfn, pte_access);
-		return RET_PF_EMULATE;
-	}
-
 	if (is_shadow_present_pte(*sptep)) {
 		if (prefetch)
 			return RET_PF_SPURIOUS;
@@ -2920,6 +2914,14 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, struct kvm_memory_slot *slot,
 			was_rmapped = 1;
 	}
 
+	if (unlikely(is_noslot_pfn(pfn))) {
+		vcpu->stat.pf_mmio_spte_created++;
+		mark_mmio_spte(vcpu, sptep, gfn, pte_access);
+		if (flush)
+			kvm_flush_remote_tlbs_gfn(vcpu->kvm, gfn, level);
+		return RET_PF_EMULATE;
+	}
+
 	wrprot = make_spte(vcpu, sp, slot, pte_access, gfn, pfn, *sptep, prefetch,
 			   true, host_writable, &spte);
 

ciq/ciq_backports/kernel-5.14.0-687.10.1.el9_8/13e00fdc.failed

@@ -0,0 +1,59 @@
+net: add skb_header_pointer_careful() helper
+
+jira KERNEL-1052
+Rebuild_History Non-Buildable kernel-5.14.0-687.10.1.el9_8
+commit-author Eric Dumazet <edumazet@google.com>
+commit 13e00fdc9236bd4d0bff4109d2983171fbcb74c4
+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-5.14.0-687.10.1.el9_8/13e00fdc.failed
+
+This variant of skb_header_pointer() should be used in contexts
+where @offset argument is user-controlled and could be negative.
+
+Negative offsets are supported, as long as the zone starts
+between skb->head and skb->data.
+
+	Signed-off-by: Eric Dumazet <edumazet@google.com>
+Link: https://patch.msgid.link/20260128141539.3404400-2-edumazet@google.com
+	Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+(cherry picked from commit 13e00fdc9236bd4d0bff4109d2983171fbcb74c4)
+	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
+
+# Conflicts:
+#	include/linux/skbuff.h
+diff --cc include/linux/skbuff.h
+index 3f4decc985ea,112e48970338..000000000000
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@@ -4043,6 -4301,26 +4043,29 @@@ skb_header_pointer(const struct sk_buf
+  				    skb_headlen(skb), buffer);
+  }
+
+++<<<<<<< HEAD
+++=======
++ /* Variant of skb_header_pointer() where @offset is user-controlled
++  * and potentially negative.
++  */
++ static inline void * __must_check
++ skb_header_pointer_careful(const struct sk_buff *skb, int offset,
++ 			   int len, void *buffer)
++ {
++ 	if (unlikely(offset < 0 && -offset > skb_headroom(skb)))
++ 		return NULL;
++ 	return skb_header_pointer(skb, offset, len, buffer);
++ }
++ 
++ static inline void * __must_check
++ skb_pointer_if_linear(const struct sk_buff *skb, int offset, int len)
++ {
++ 	if (likely(skb_headlen(skb) - offset >= len))
++ 		return skb->data + offset;
++ 	return NULL;
++ }
++ 
+++>>>>>>> 13e00fdc9236 (net: add skb_header_pointer_careful() helper)
+  /**
+   *	skb_needs_linearize - check if we need to linearize a given skb
+   *			      depending on the given device features.
+* Unmerged path include/linux/skbuff.h

ciq/ciq_backports/kernel-5.14.0-687.10.1.el9_8/3d1973a0.failed

@@ -0,0 +1,55 @@
+x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths
+
+jira KERNEL-1052
+Rebuild_History Non-Buildable kernel-5.14.0-687.10.1.el9_8
+commit-author Jan Stancek <jstancek@redhat.com>
+commit 3d1973a0c76a78a4728cff13648a188ed486cf44
+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-5.14.0-687.10.1.el9_8/3d1973a0.failed
+
+CONFIG_EFI_SBAT_FILE can be a relative path. When compiling using a different
+output directory (O=) the build currently fails because it can't find the
+filename set in CONFIG_EFI_SBAT_FILE:
+
+  arch/x86/boot/compressed/sbat.S: Assembler messages:
+  arch/x86/boot/compressed/sbat.S:6: Error: file not found: kernel.sbat
+
+Add $(srctree) as include dir for sbat.o.
+
+  [ bp: Massage commit message. ]
+
+Fixes: 61b57d35396a ("x86/efi: Implement support for embedding SBAT data for x86")
+	Signed-off-by: Jan Stancek <jstancek@redhat.com>
+	Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
+	Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+	Cc: <stable@kernel.org>
+Link: https://patch.msgid.link/f4eda155b0cef91d4d316b4e92f5771cb0aa7187.1772047658.git.jstancek@redhat.com
+(cherry picked from commit 3d1973a0c76a78a4728cff13648a188ed486cf44)
+	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
+
+# Conflicts:
+#	arch/x86/boot/compressed/Makefile
+diff --cc arch/x86/boot/compressed/Makefile
+index b294f0a7ac32,b8b2b7bea1d3..000000000000
+--- a/arch/x86/boot/compressed/Makefile
++++ b/arch/x86/boot/compressed/Makefile
+@@@ -120,11 -112,11 +120,16 @@@ vmlinux-objs-$(CONFIG_EFI_STUB) += $(ob
+  vmlinux-objs-$(CONFIG_EFI_SBAT) += $(obj)/sbat.o
+
+  ifdef CONFIG_EFI_SBAT
+++<<<<<<< HEAD
+ +# Strip quotes
+ +$(obj)/sbat.o: $(strip $(subst ",,$(CONFIG_EFI_SBAT_FILE)))
+++=======
++ $(obj)/sbat.o: $(CONFIG_EFI_SBAT_FILE)
++ AFLAGS_sbat.o += -I $(srctree)
+++>>>>>>> 3d1973a0c76a (x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths)
+  endif
+
+ -$(obj)/vmlinux: $(vmlinux-objs-y) $(vmlinux-libs-y) FORCE
+ +$(obj)/vmlinux: $(vmlinux-objs-y) FORCE
+  	$(call if_changed,ld)
+
+  OBJCOPYFLAGS_vmlinux.bin :=  -R .comment -S
+* Unmerged path arch/x86/boot/compressed/Makefile

ciq/ciq_backports/kernel-5.14.0-687.10.1.el9_8/rebuild.details.txt

@@ -0,0 +1,27 @@
+Rebuild_History BUILDABLE
+Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
+Number of commits in upstream range v5.14~1..kernel-mainline: 380232
+Number of commits in rpm: 100
+Number of commits matched with upstream: 91 (91.00%)
+Number of commits in upstream but not in rpm: 380141
+Number of commits NOT found in upstream: 9 (9.00%)
+
+Rebuilding Kernel on Branch rocky9_8_rebuild_kernel-5.14.0-687.10.1.el9_8 for kernel-5.14.0-687.10.1.el9_8
+Clean Cherry Picks: 38 (41.76%)
+Empty Cherry Picks: 2 (2.20%)
+_______________________________
+
+__EMPTY COMMITS__________________________
+13e00fdc9236bd4d0bff4109d2983171fbcb74c4 net: add skb_header_pointer_careful() helper
+3d1973a0c76a78a4728cff13648a188ed486cf44 x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths
+
+__CHANGES NOT IN UPSTREAM________________
+Replace sbat with Rocky Linux sbat
+Change bug tracker URL
+Ensure appended release in sbat is removed'
+net: skbuff: propagate shared-frag marker through frag-transfer helpers
+net: skbuff: preserve shared-frag marker during coalescing
+ptrace: slightly saner 'get_dumpable()' logic
+xfrm: esp: avoid in-place decrypt on shared skb frags
+scsi: lpfc: avoid crashing in lpfc_nlp_get() if lpfc_nodelist was freed
+ice: fix page leak for zero-size Rx descriptors