Rebuild rocky8_10 with kernel-4.18.0-553.50.1.el8_10

Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v4.18~1..kernel-mainline: 538898
Number of commits in rpm: 41
Number of commits matched with upstream: 31 (75.61%)
Number of commits in upstream but not in rpm: 538867
Number of commits NOT found in upstream: 10 (24.39%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.50.1.el8_10 for kernel-4.18.0-553.50.1.el8_10
Clean Cherry Picks: 13 (41.94%)
Empty Cherry Picks: 18 (58.06%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-4.18.0-553.50.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

Author: PlaidCat

Documentation/filesystems/gfs2-glocks.txt

@@ -17,8 +17,7 @@ The gl_holders list contains all the queued lock requests (not
 just the holders) associated with the glock. If there are any
 held locks, then they will be contiguous entries at the head
 of the list. Locks are granted in strictly the order that they
-are queued, except for those marked LM_FLAG_PRIORITY which are
-used only during recovery, and even then only for journal locks.
+are queued.
 
 There are three lock states that users of the glock layer can request,
 namely shared (SH), deferred (DF) and exclusive (EX). Those translate

Makefile.rhelver

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

arch/x86/include/asm/xen/hypercall.h

@@ -41,10 +41,12 @@
 
 #include <trace/events/xen.h>
 
+#include <asm/alternative.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/smap.h>
 #include <asm/nospec-branch.h>
+#include <asm/processor.h>
 
 #include <xen/interface/xen.h>
 #include <xen/interface/sched.h>
@@ -86,11 +88,19 @@ struct xen_dm_op_buf;
  * there aren't more than 5 arguments...)
  */
 
-extern struct { char _entry[32]; } hypercall_page[];
+/* RHEL-only: x86_64 Xen HVM only implementation! */
+#define __XEN_STR(x) #x
+#define __XEN_XSTR(s) __XEN_STR(s)
 
-#define __HYPERCALL		"call hypercall_page+%c[offset]"
-#define __HYPERCALL_ENTRY(x)						\
-	[offset] "i" (__HYPERVISOR_##x * sizeof(hypercall_page[0]))
+#define __HYPERCALL                                     \
+	"cmpq $"__XEN_XSTR(X86_VENDOR_INTEL)", %%rcx \n"\
+	"jne 1f \n"					\
+	"vmcall \n"					\
+	"jmp 2f \n"					\
+	"1: vmmcall \n"					\
+	"2: \n"
+
+#define __HYPERCALL_ENTRY(x)	"a" (x), "c" (boot_cpu_data.x86_vendor)
 
 #ifdef CONFIG_X86_32
 #define __HYPERCALL_RETREG	"eax"
@@ -148,7 +158,7 @@ extern struct { char _entry[32]; } hypercall_page[];
 	__HYPERCALL_0ARG();						\
 	asm volatile (__HYPERCALL					\
 		      : __HYPERCALL_0PARAM				\
-		      : __HYPERCALL_ENTRY(name)				\
+		      : __HYPERCALL_ENTRY(__HYPERVISOR_ ## name)	\
 		      : __HYPERCALL_CLOBBER0);				\
 	(type)__res;							\
 })
@@ -159,7 +169,7 @@ extern struct { char _entry[32]; } hypercall_page[];
 	__HYPERCALL_1ARG(a1);						\
 	asm volatile (__HYPERCALL					\
 		      : __HYPERCALL_1PARAM				\
-		      : __HYPERCALL_ENTRY(name)				\
+		      : __HYPERCALL_ENTRY(__HYPERVISOR_ ## name)	\
 		      : __HYPERCALL_CLOBBER1);				\
 	(type)__res;							\
 })
@@ -170,7 +180,7 @@ extern struct { char _entry[32]; } hypercall_page[];
 	__HYPERCALL_2ARG(a1, a2);					\
 	asm volatile (__HYPERCALL					\
 		      : __HYPERCALL_2PARAM				\
-		      : __HYPERCALL_ENTRY(name)				\
+		      : __HYPERCALL_ENTRY(__HYPERVISOR_ ## name)	\
 		      : __HYPERCALL_CLOBBER2);				\
 	(type)__res;							\
 })
@@ -181,7 +191,7 @@ extern struct { char _entry[32]; } hypercall_page[];
 	__HYPERCALL_3ARG(a1, a2, a3);					\
 	asm volatile (__HYPERCALL					\
 		      : __HYPERCALL_3PARAM				\
-		      : __HYPERCALL_ENTRY(name)				\
+		      : __HYPERCALL_ENTRY(__HYPERVISOR_ ## name)	\
 		      : __HYPERCALL_CLOBBER3);				\
 	(type)__res;							\
 })
@@ -192,7 +202,7 @@ extern struct { char _entry[32]; } hypercall_page[];
 	__HYPERCALL_4ARG(a1, a2, a3, a4);				\
 	asm volatile (__HYPERCALL					\
 		      : __HYPERCALL_4PARAM				\
-		      : __HYPERCALL_ENTRY(name)				\
+		      : __HYPERCALL_ENTRY(__HYPERVISOR_ ## name)	\
 		      : __HYPERCALL_CLOBBER4);				\
 	(type)__res;							\
 })
@@ -203,7 +213,7 @@ extern struct { char _entry[32]; } hypercall_page[];
 	__HYPERCALL_5ARG(a1, a2, a3, a4, a5);				\
 	asm volatile (__HYPERCALL					\
 		      : __HYPERCALL_5PARAM				\
-		      : __HYPERCALL_ENTRY(name)				\
+		      : __HYPERCALL_ENTRY(__HYPERVISOR_ ## name)	\
 		      : __HYPERCALL_CLOBBER5);				\
 	(type)__res;							\
 })
@@ -218,9 +228,9 @@ privcmd_call(unsigned call,
 	__HYPERCALL_5ARG(a1, a2, a3, a4, a5);
 
 	stac();
-	asm volatile(CALL_NOSPEC
+	asm volatile(__HYPERCALL
 		     : __HYPERCALL_5PARAM
-		     : [thunk_target] "a" (&hypercall_page[call])
+		     : __HYPERCALL_ENTRY(call)
 		     : __HYPERCALL_CLOBBER5);
 	clac();
 

arch/x86/xen/enlighten.c

@@ -19,8 +19,6 @@
 #include "smp.h"
 #include "pmu.h"
 
-EXPORT_SYMBOL_GPL(hypercall_page);
-
 /*
  * Pointer to the xen_vcpu_info structure or
  * &HYPERVISOR_shared_info->vcpu_info[cpu]. See xen_hvm_init_shared_info

arch/x86/xen/enlighten_hvm.c

@@ -97,15 +97,8 @@ static void __init init_hvm_pv_info(void)
 	/* PVH set up hypercall page in xen_prepare_pvh(). */
 	if (xen_pvh_domain())
 		pv_info.name = "Xen PVH";
-	else {
-		u64 pfn;
-		uint32_t msr;
-
+	else
 		pv_info.name = "Xen HVM";
-		msr = cpuid_ebx(base + 2);
-		pfn = __pa(hypercall_page);
-		wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));
-	}
 
 	xen_setup_features();
 

arch/x86/xen/enlighten_pvh.c

@@ -88,9 +88,6 @@ static void __init init_pvh_bootparams(void)
  */
 void __init xen_prepare_pvh(void)
 {
-	u32 msr;
-	u64 pfn;
-
 	if (pvh_start_info.magic != XEN_HVM_START_MAGIC_VALUE) {
 		xen_raw_printk("Error: Unexpected magic value (0x%08x)\n",
 				pvh_start_info.magic);
@@ -100,9 +97,5 @@ void __init xen_prepare_pvh(void)
 	xen_pvh = 1;
 	xen_start_flags = pvh_start_info.flags;
 
-	msr = cpuid_ebx(xen_cpuid_base() + 2);
-	pfn = __pa(hypercall_page);
-	wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));
-
 	init_pvh_bootparams();
 }

arch/x86/xen/xen-head.S

@@ -56,22 +56,6 @@ SYM_CODE_END(startup_xen)
 	__FINIT
 #endif
 
-.pushsection .text
-	.balign PAGE_SIZE
-SYM_CODE_START(hypercall_page)
-	.rept (PAGE_SIZE / 32)
-		UNWIND_HINT_EMPTY
-		.skip 32
-	.endr
-
-#define HYPERCALL(n) \
-	.equ xen_hypercall_##n, hypercall_page + __HYPERVISOR_##n * 32; \
-	.type xen_hypercall_##n, @function; .size xen_hypercall_##n, 32
-#include <asm/xen-hypercalls.h>
-#undef HYPERCALL
-SYM_CODE_END(hypercall_page)
-.popsection
-
 	ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS,       .asciz "linux")
 	ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION,  .asciz "2.6")
 	ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION,    .asciz "xen-3.0")
@@ -85,7 +69,6 @@ SYM_CODE_END(hypercall_page)
 #ifdef CONFIG_XEN_PV
 	ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,          _ASM_PTR startup_xen)
 #endif
-	ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page)
 	ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,
 		.ascii "!writable_page_tables|pae_pgdir_above_4gb")
 	ELFNOTE(Xen, XEN_ELFNOTE_SUPPORTED_FEATURES,

certs/rhel.pem

@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIFCTCCA/GgAwIBAgIBIjANBgkqhkiG9w0BAQsFADCB1DELMAkGA1UEBhMCVVMx
+MIIFCTCCA/GgAwIBAgIBNzANBgkqhkiG9w0BAQsFADCB1DELMAkGA1UEBhMCVVMx
 ETAPBgNVBAgMCERlbGF3YXJlMQ4wDAYDVQQHDAVEb3ZlcjEtMCsGA1UECgwkUm9j
 a3kgRW50ZXJwcmlzZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMSEwHwYDVQQLDBhSZWxl
 YXNlIGVuZ2luZWVyaW5nIHRlYW0xKDAmBgNVBAMMH1JvY2t5IExpbnV4IFNlY3Vy
 ZSBCb290IFJvb3QgQ0ExJjAkBgkqhkiG9w0BCQEWF3NlY3VyaXR5QHJvY2t5bGlu
-dXgub3JnMB4XDTI0MDQwNDAwMzM0OVoXDTI1MDQwNDAwMzM0OVowgdgxCzAJBgNV
+dXgub3JnMB4XDTI1MDQxMDIxMjIzN1oXDTI2MDQxMDIxMjIzN1owgdgxCzAJBgNV
 BAYTAlVTMREwDwYDVQQIDAhEZWxhd2FyZTEOMAwGA1UEBwwFRG92ZXIxLTArBgNV
 BAoMJFJvY2t5IEVudGVycHJpc2UgU29mdHdhcmUgRm91bmRhdGlvbjEhMB8GA1UE
 CwwYUmVsZWFzZSBlbmdpbmVlcmluZyB0ZWFtMSwwKgYDVQQDDCNSb2NreSBMaW51
@@ -20,20 +20,20 @@ IALu0fDg9joHwYb9aaU4vCHhgddYtCqs491NIzoK6wEMa3lIKsW1qeKW6eeRWf/0
 2f6kup3mBZYupayJMU3xtD7p849dJdPPTVJwcZUcRFRCXcAFPHKGfg1MtdhSrIRO
 TjMCAwEAAaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
 BBYEFM5TfwxhXAOBFKy7ASM6W2K5OhlxMB8GA1UdIwQYMBaAFEwsa9fWTugVgcq4
-6YZmH2XiFm/EMA0GCSqGSIb3DQEBCwUAA4IBAQA+3NhUBeJxOJ80q9rHJmN6nypr
-xUbZFs4SELumPQFcr5OViiyZc2scAd9VPtb8IaIu5kcvWChozvgcq8nKQnPPIglQ
-UlS2qcJ5o9YI4dc7IoxbcojykusicxOCIgJecVOVirOGd40Lz4pSGVpI6yaruXiI
-anQ9Ve+tJBmKMnN5wXvMnpA1lqO/nzvv9fvbU/8Y/VUFmNNoOs8miP/O4uVbd2uZ
-JGsGjonO3kGdFMd1Wy7e52A9aOP44qEHOb7/B6MD+RzAyvbUBpYPQENTQlE/vmeG
-4u/bjR9073kgoFFFNp3OL08KGIfUtlGj4xdhPDi+pu13JaiDzd7ZmYrE+ktZ
+6YZmH2XiFm/EMA0GCSqGSIb3DQEBCwUAA4IBAQDVY7myBpeNL7/MYZ+XAUvySePi
+mATYLRmSCnmJMA+gOzoaAAZo3iPBhFTGzjiExPKI6A8eHjeF9d3m9MhhQQ8laitU
+4ZCyCzIcVrtiBwCfl+Mkn5ZkdvP4K4Ft74cVob7rr4mbTKwhD+HRJ7zDtIble6dQ
+6yUVpcGqvAxAPXVCHX9ey94mF7qFwDofEmVnuapHNT2ytRNNa2hTlgh2NWBkD8YA
+QdIPYZR0R9VaObBQ+kGLS07QZcr65tFuzwkCTNIEMVC4Ome4TKqx+1rPrOj2WvsD
+0dmNvE91vzvkFPOCZUPw/E2asMufiFBujv1PCNQfSsdpts6Kc17lpGTxfPns
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIFCTCCA/GgAwIBAgIBJjANBgkqhkiG9w0BAQsFADCB1DELMAkGA1UEBhMCVVMx
+MIIFCTCCA/GgAwIBAgIBQDANBgkqhkiG9w0BAQsFADCB1DELMAkGA1UEBhMCVVMx
 ETAPBgNVBAgMCERlbGF3YXJlMQ4wDAYDVQQHDAVEb3ZlcjEtMCsGA1UECgwkUm9j
 a3kgRW50ZXJwcmlzZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMSEwHwYDVQQLDBhSZWxl
 YXNlIGVuZ2luZWVyaW5nIHRlYW0xKDAmBgNVBAMMH1JvY2t5IExpbnV4IFNlY3Vy
 ZSBCb290IFJvb3QgQ0ExJjAkBgkqhkiG9w0BCQEWF3NlY3VyaXR5QHJvY2t5bGlu
-dXgub3JnMB4XDTI0MDQwNDAwMzM0OVoXDTI1MDQwNDAwMzM0OVowgdgxCzAJBgNV
+dXgub3JnMB4XDTI1MDQxMDIxMjIzN1oXDTI2MDQxMDIxMjIzN1owgdgxCzAJBgNV
 BAYTAlVTMREwDwYDVQQIDAhEZWxhd2FyZTEOMAwGA1UEBwwFRG92ZXIxLTArBgNV
 BAoMJFJvY2t5IEVudGVycHJpc2UgU29mdHdhcmUgRm91bmRhdGlvbjEhMB8GA1UE
 CwwYUmVsZWFzZSBlbmdpbmVlcmluZyB0ZWFtMSwwKgYDVQQDDCNSb2NreSBMaW51
@@ -49,10 +49,10 @@ ZVHvTTCfSTPYYhtepZYMINuaWIbX3DD3wMOEK2kmNU5Qjg459RDZMb0Rl/PhbGuS
 F/GbkOVQhllENKjAxsGFi+IfApB2Dvz+EyWouvQlKDRBw5G0KHqauy/aWkeWeRzp
 n3kCAwEAAaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
 BBYEFLXuB8c35X7L6u1JOlE3l2OwYxLFMB8GA1UdIwQYMBaAFEwsa9fWTugVgcq4
-6YZmH2XiFm/EMA0GCSqGSIb3DQEBCwUAA4IBAQAAnyGNChwn8gs0srrl/F8h0yJO
-2SAcb+wMq0TypF0TuTCFWZL6ICCQ30HNXi7RSyajF/qa3xspXQv7Klu/uguW5SOz
-DCpx/YDp2VABTQtOWrsJXYmqicmeaNipfIhUJCrS/opPASQv1CQxl7JSSKlJDYtx
-jzE7QG3ptd8xBWj9RsVxpoeoF2qhv1A0VBmb5WUYp5w9S4TGL34U1fWTkEnLk+sy
-vMPYZ0FOYWF8o133kJTcjwXWPjVPW1L4evyTGzguju9eZP3OiCBxbjYwi43p4HlK
-3K8UhkhoCsIWT6Ucj3OFcZ3MUQXGxOa8BZEV4TdyPUFvtahlOIgfqMbxK12g
+6YZmH2XiFm/EMA0GCSqGSIb3DQEBCwUAA4IBAQAnLU6i0W3QLQtwlsaFpMMCVSJx
+YtqsAjvQ60YohSovZXj9sTU7AADdNRn23rMMSmO1gTQY59JyQluvfjLZ4lkSJiZd
+dIHiT1v1LJ6eyIAmLmIRAEJxIvGPzcCevnSutWHrU9jK7X9mt+hnmfcSmQ1naXwn
+voVGKaIX6yWLIoXSpEMZQjpb9dhWvKPeCo5bvSK4HCWj2NBDAoCC5+Z60Waufjh9
+DdlYJMkVRYn1hcHMsbjsggcIFYLOfbbW38zVCVsG5nmB7fsmyIxA3kuN+Gx+qurs
+diLX6L4StfQBmZHZBf/oapwcxCY+pWL2zyu6LzC12eDMtdfUNTWBKkFu/6vT
 -----END CERTIFICATE-----

ciq/ciq_backports/kernel-4.18.0-553.50.1.el8_10/rebuild.details.txt

@@ -0,0 +1,44 @@
+Rebuild_History BUILDABLE
+Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
+Number of commits in upstream range v4.18~1..kernel-mainline: 538898
+Number of commits in rpm: 41
+Number of commits matched with upstream: 31 (75.61%)
+Number of commits in upstream but not in rpm: 538867
+Number of commits NOT found in upstream: 10 (24.39%)
+
+Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.50.1.el8_10 for kernel-4.18.0-553.50.1.el8_10
+Clean Cherry Picks: 13 (41.94%)
+Empty Cherry Picks: 18 (58.06%)
+_______________________________
+
+__EMPTY COMMITS__________________________
+ce895cf15ab60b93464ebbb515f2fc9e7a8cef9a gfs2: Remove misleading comments in gfs2_evict_inode
+03ff3781bf6c149554d88e7b702a3abd5e400dc0 gfs2: gfs2_evict_inode clarification
+86934198eefa10a71f35162b06c44c36d85b98ba gfs2: Clear flags when withdraw prevents xmote
+9947a06d29c0a30da88cdc6376ca5fd87083e130 gfs2: do_xmote fixes
+1e86044402c45b70a9b31beeaefb5cc732a7470c gfs2: Remove and replace gfs2_glock_queue_work
+8bbfde0875590b71f012bd8b0c9cb988c9a873b9 gfs2: Add GLF_PENDING_REPLY flag
+3774f53d7f0b30a996eab4a1264611489b48f14c gfs2: Replace GIF_DEFER_DELETE with GLF_DEFER_DELETE
+0b93bac2271e11beb980fca037a34a9819c7dc37 gfs2: Remove LM_FLAG_PRIORITY flag
+bb25b97562e52b2b5808b348db32568b1f5394b5 gfs2: remove dead code in add_to_queue
+0360faca5d4dfc18d06644c7661cea1dc2b44dcf gfs2: Remove more dead code in add_to_queue
+a431d49243a012738f132054b2303e0815663aac gfs2: Fix request cancelation bug
+6cb3b1c2df87a8048ee1d54ec16d2e757af86c7f gfs2: Fix additional unlikely request cancelation race
+9136cad723ec3e5ab5ca85a839f151abf1c9a106 gfs2: Prevent inode creation race (2)
+b1c2cb86f4a7861480ad54bb9a58df3cbebf8e92 x86/xen: use new hypercall functions instead of hypercall page
+7fa0da5373685e7ed249af3fa317ab1e1ba8b0a6 x86/xen: remove hypercall page
+0e2bddf9e5f926ce32ed635012d0f8a0b54075d5 ice: add ice_adapter for shared data across PFs on the same NIC
+d29a8134c78232213fb88f20d7ae865ec364e367 ice: avoid the PTP hardware semaphore in gettimex64 path
+22118810fc7cc98f3afb38919348060ab67ddc5b ice: fold ice_ptp_read_time into ice_ptp_gettimex64
+
+__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
+redhat: drop Y issues from changelog
+md/md-bitmap: fix writing non bitmap changes local to RHEL
+raid1: update discard granularity when adding new disk
+rhel-8.10: gate kernel on kernel-qe tests results not cki ones