Rebuild rocky8_10 with kernel-4.18.0-553.89.1.el8_10

PlaidCat · PlaidCat · commit a8a2edf9cea8 · 2025-12-11T06:02:14.000-05:00
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v4.18~1..kernel-mainline: 581414
Number of commits in rpm: 14
Number of commits matched with upstream: 8 (57.14%)
Number of commits in upstream but not in rpm: 581406
Number of commits NOT found in upstream: 6 (42.86%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.89.1.el8_10 for kernel-4.18.0-553.89.1.el8_10
Clean Cherry Picks: 4 (50.00%)
Empty Cherry Picks: 4 (50.00%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-4.18.0-553.89.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
diff --git a/Makefile.rhelver b/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.87.1
+RHEL_RELEASE = 553.89.1
 
 #
 # ZSTREAM
diff --git a/ciq/ciq_backports/kernel-4.18.0-553.89.1.el8_10/rebuild.details.txt b/ciq/ciq_backports/kernel-4.18.0-553.89.1.el8_10/rebuild.details.txt
@@ -0,0 +1,26 @@
+Rebuild_History BUILDABLE
+Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
+Number of commits in upstream range v4.18~1..kernel-mainline: 581414
+Number of commits in rpm: 14
+Number of commits matched with upstream: 8 (57.14%)
+Number of commits in upstream but not in rpm: 581406
+Number of commits NOT found in upstream: 6 (42.86%)
+
+Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.89.1.el8_10 for kernel-4.18.0-553.89.1.el8_10
+Clean Cherry Picks: 4 (50.00%)
+Empty Cherry Picks: 4 (50.00%)
+_______________________________
+
+__EMPTY COMMITS__________________________
+5d122db2ff80cd2aed4dcd630befb56b51ddf947 RDMA/rxe: Fix incomplete state save in rxe_requester
+6ab26555c9ffef96c56ca16356e55ac5ab61ec93 gfs2: Add proper lockspace locking
+fead2b869764f89d524b79dc8862e61d5191be55 mm/memcg: revert ("mm/memcg: optimize user context object stock access")
+3b8abb3239530c423c0b97e42af7f7e856e1ee96 mm: kmem: fix a NULL pointer dereference in obj_stock_flush_required()
+
+__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
diff --git a/configs/kernel-4.18.0-aarch64-debug.config b/configs/kernel-4.18.0-aarch64-debug.config
@@ -5,7 +5,7 @@
 #
 
 #
-# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)
+# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-11)
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
diff --git a/configs/kernel-4.18.0-aarch64.config b/configs/kernel-4.18.0-aarch64.config
@@ -5,7 +5,7 @@
 #
 
 #
-# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)
+# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-11)
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
diff --git a/configs/kernel-4.18.0-ppc64le-debug.config b/configs/kernel-4.18.0-ppc64le-debug.config
@@ -5,7 +5,7 @@
 #
 
 #
-# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)
+# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-11)
 #
 CONFIG_PPC64=y
 
diff --git a/configs/kernel-4.18.0-ppc64le.config b/configs/kernel-4.18.0-ppc64le.config
@@ -5,7 +5,7 @@
 #
 
 #
-# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)
+# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-11)
 #
 CONFIG_PPC64=y
 
diff --git a/configs/kernel-4.18.0-s390x-debug.config b/configs/kernel-4.18.0-s390x-debug.config
@@ -5,7 +5,7 @@
 #
 
 #
-# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)
+# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-11)
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
diff --git a/configs/kernel-4.18.0-s390x-zfcpdump.config b/configs/kernel-4.18.0-s390x-zfcpdump.config
@@ -5,7 +5,7 @@
 #
 
 #
-# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)
+# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-11)
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
diff --git a/configs/kernel-4.18.0-s390x.config b/configs/kernel-4.18.0-s390x.config
@@ -5,7 +5,7 @@
 #
 
 #
-# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)
+# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-11)
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
diff --git a/configs/kernel-4.18.0-x86_64-debug.config b/configs/kernel-4.18.0-x86_64-debug.config
@@ -5,7 +5,7 @@
 #
 
 #
-# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)
+# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-11)
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/configs/kernel-4.18.0-x86_64.config b/configs/kernel-4.18.0-x86_64.config
@@ -5,7 +5,7 @@
 #
 
 #
-# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)
+# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-11)
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c
@@ -529,21 +529,23 @@ static void save_state(struct rxe_send_wqe *wqe,
 		       struct rxe_send_wqe *rollback_wqe,
 		       u32 *rollback_psn)
 {
-	rollback_wqe->state     = wqe->state;
+	rollback_wqe->state = wqe->state;
 	rollback_wqe->first_psn = wqe->first_psn;
-	rollback_wqe->last_psn  = wqe->last_psn;
-	*rollback_psn		= qp->req.psn;
+	rollback_wqe->last_psn = wqe->last_psn;
+	rollback_wqe->dma = wqe->dma;
+	*rollback_psn = qp->req.psn;
 }
 
 static void rollback_state(struct rxe_send_wqe *wqe,
 			   struct rxe_qp *qp,
 			   struct rxe_send_wqe *rollback_wqe,
 			   u32 rollback_psn)
 {
-	wqe->state     = rollback_wqe->state;
+	wqe->state = rollback_wqe->state;
 	wqe->first_psn = rollback_wqe->first_psn;
-	wqe->last_psn  = rollback_wqe->last_psn;
-	qp->req.psn    = rollback_psn;
+	wqe->last_psn = rollback_wqe->last_psn;
+	wqe->dma = rollback_wqe->dma;
+	qp->req.psn = rollback_psn;
 }
 
 static void update_state(struct rxe_qp *qp, struct rxe_pkt_info *pkt)
@@ -746,6 +748,9 @@ int rxe_requester(void *arg)
 	pkt.mask = rxe_opcode[opcode].mask;
 	pkt.wqe = wqe;
 
+	/* save wqe state before we build and send packet */
+	save_state(wqe, qp, &rollback_wqe, &rollback_psn);
+
 	av = rxe_get_av(&pkt, &ah);
 	if (unlikely(!av)) {
 		pr_err("qp#%d Failed no address vector\n", qp_num(qp));
@@ -778,29 +783,29 @@ int rxe_requester(void *arg)
 	if (ah)
 		rxe_put(ah);
 
-	/*
-	 * To prevent a race on wqe access between requester and completer,
-	 * wqe members state and psn need to be set before calling
-	 * rxe_xmit_packet().
-	 * Otherwise, completer might initiate an unjustified retry flow.
-	 */
-	save_state(wqe, qp, &rollback_wqe, &rollback_psn);
+	/* update wqe state as though we had sent it */
 	update_wqe_state(qp, wqe, &pkt);
 	update_wqe_psn(qp, wqe, &pkt, payload);
 
 	err = rxe_xmit_packet(qp, &pkt, skb);
 	if (err) {
-		qp->need_req_skb = 1;
+		if (err != -EAGAIN) {
+			wqe->status = IB_WC_LOC_QP_OP_ERR;
+			goto err;
+		}
 
+		/* the packet was dropped so reset wqe to the state
+		 * before we sent it so we can try to resend
+		 */
 		rollback_state(wqe, qp, &rollback_wqe, rollback_psn);
 
-		if (err == -EAGAIN) {
-			rxe_run_task(&qp->req.task, 1);
-			goto exit;
-		}
+		/* force a delay until the dropped packet is freed and
+		 * the send queue is drained below the low water mark
+		 */
+		qp->need_req_skb = 1;
 
-		wqe->status = IB_WC_LOC_QP_OP_ERR;
-		goto err;
+		rxe_run_task(&qp->req.task, 1);
+		goto exit;
 	}
 
 	update_state(qp, &pkt);
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
@@ -1414,6 +1414,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
 	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
 	struct gfs2_sbd *sdp = GFS2_SB(file->f_mapping->host);
 	struct lm_lockstruct *ls = &sdp->sd_lockstruct;
+	int ret;
 
 	if (!(fl->fl_flags & FL_POSIX))
 		return -ENOLCK;
@@ -1430,12 +1431,18 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
 			locks_lock_file_wait(file, fl);
 		return -EIO;
 	}
-	if (IS_GETLK(cmd))
-		return dlm_posix_get(ls->ls_dlm, ip->i_no_addr, file, fl);
-	else if (fl->fl_type == F_UNLCK)
-		return dlm_posix_unlock(ls->ls_dlm, ip->i_no_addr, file, fl);
-	else
-		return dlm_posix_lock(ls->ls_dlm, ip->i_no_addr, file, cmd, fl);
+	down_read(&ls->ls_sem);
+	ret = -ENODEV;
+	if (likely(ls->ls_dlm != NULL)) {
+		if (IS_GETLK(cmd))
+			ret = dlm_posix_get(ls->ls_dlm, ip->i_no_addr, file, fl);
+		else if (fl->fl_type == F_UNLCK)
+			ret = dlm_posix_unlock(ls->ls_dlm, ip->i_no_addr, file, fl);
+		else
+			ret = dlm_posix_lock(ls->ls_dlm, ip->i_no_addr, file, cmd, fl);
+	}
+	up_read(&ls->ls_sem);
+	return ret;
 }
 
 static int do_flock(struct file *file, int cmd, struct file_lock *fl)
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
@@ -827,9 +827,8 @@ __acquires(&gl->gl_lockref.lock)
 		}
 		clear_bit(GLF_PENDING_REPLY, &gl->gl_flags);
 
-		if (ret == -EINVAL && gl->gl_target == LM_ST_UNLOCKED &&
-		    target == LM_ST_UNLOCKED &&
-		    test_bit(DFL_UNMOUNT, &ls->ls_recover_flags)) {
+		if (ret == -ENODEV && gl->gl_target == LM_ST_UNLOCKED &&
+		    target == LM_ST_UNLOCKED) {
 			/*
 			 * The lockspace has been released and the lock has
 			 * been unlocked implicitly.
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
@@ -665,6 +665,8 @@ struct lm_lockstruct {
 	struct completion ls_sync_wait; /* {control,mounted}_{lock,unlock} */
 	char *ls_lvb_bits;
 
+	struct rw_semaphore ls_sem;
+
 	spinlock_t ls_recover_spin; /* protects following fields */
 	unsigned long ls_recover_flags; /* DFL_ */
 	uint32_t ls_recover_mount; /* gen in first recover_done cb */
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
@@ -294,8 +294,13 @@ static int gdlm_lock(struct gfs2_glock *gl, unsigned int req_state,
 	 */
 
 again:
-	error = dlm_lock(ls->ls_dlm, req, &gl->gl_lksb, lkf, strname,
-			GDLM_STRNAME_BYTES - 1, 0, gdlm_ast, gl, gdlm_bast);
+	down_read(&ls->ls_sem);
+	error = -ENODEV;
+	if (likely(ls->ls_dlm != NULL)) {
+		error = dlm_lock(ls->ls_dlm, req, &gl->gl_lksb, lkf, strname,
+				GDLM_STRNAME_BYTES - 1, 0, gdlm_ast, gl, gdlm_bast);
+	}
+	up_read(&ls->ls_sem);
 	if (error == -EBUSY) {
 		msleep(20);
 		goto again;
@@ -335,8 +340,13 @@ static void gdlm_put_lock(struct gfs2_glock *gl)
 	}
 
 again:
-	error = dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid, DLM_LKF_VALBLK,
-			   NULL, gl);
+	down_read(&ls->ls_sem);
+	error = -ENODEV;
+	if (likely(ls->ls_dlm != NULL)) {
+		error = dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid,
+				   DLM_LKF_VALBLK, NULL, gl);
+	}
+	up_read(&ls->ls_sem);
 	if (error == -EBUSY) {
 		msleep(20);
 		goto again;
@@ -352,7 +362,12 @@ static void gdlm_put_lock(struct gfs2_glock *gl)
 static void gdlm_cancel(struct gfs2_glock *gl)
 {
 	struct lm_lockstruct *ls = &gl->gl_name.ln_sbd->sd_lockstruct;
-	dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid, DLM_LKF_CANCEL, NULL, gl);
+
+	down_read(&ls->ls_sem);
+	if (likely(ls->ls_dlm != NULL)) {
+		dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid, DLM_LKF_CANCEL, NULL, gl);
+	}
+	up_read(&ls->ls_sem);
 }
 
 /*
@@ -533,7 +548,11 @@ static int sync_unlock(struct gfs2_sbd *sdp, struct dlm_lksb *lksb, char *name)
 	struct lm_lockstruct *ls = &sdp->sd_lockstruct;
 	int error;
 
-	error = dlm_unlock(ls->ls_dlm, lksb->sb_lkid, 0, lksb, ls);
+	down_read(&ls->ls_sem);
+	error = -ENODEV;
+	if (likely(ls->ls_dlm != NULL))
+		error = dlm_unlock(ls->ls_dlm, lksb->sb_lkid, 0, lksb, ls);
+	up_read(&ls->ls_sem);
 	if (error) {
 		fs_err(sdp, "%s lkid %x error %d\n",
 		       name, lksb->sb_lkid, error);
@@ -560,9 +579,14 @@ static int sync_lock(struct gfs2_sbd *sdp, int mode, uint32_t flags,
 	memset(strname, 0, GDLM_STRNAME_BYTES);
 	snprintf(strname, GDLM_STRNAME_BYTES, "%8x%16x", LM_TYPE_NONDISK, num);
 
-	error = dlm_lock(ls->ls_dlm, mode, lksb, flags,
-			 strname, GDLM_STRNAME_BYTES - 1,
-			 0, sync_wait_cb, ls, NULL);
+	down_read(&ls->ls_sem);
+	error = -ENODEV;
+	if (likely(ls->ls_dlm != NULL)) {
+		error = dlm_lock(ls->ls_dlm, mode, lksb, flags,
+				 strname, GDLM_STRNAME_BYTES - 1,
+				 0, sync_wait_cb, ls, NULL);
+	}
+	up_read(&ls->ls_sem);
 	if (error) {
 		fs_err(sdp, "%s lkid %x flags %x mode %d error %d\n",
 		       name, lksb->sb_lkid, flags, mode, error);
@@ -1288,6 +1312,7 @@ static int gdlm_mount(struct gfs2_sbd *sdp, const char *table)
 	 */
 
 	INIT_DELAYED_WORK(&sdp->sd_control_work, gfs2_control_func);
+	ls->ls_dlm = NULL;
 	spin_lock_init(&ls->ls_recover_spin);
 	ls->ls_recover_flags = 0;
 	ls->ls_recover_mount = 0;
@@ -1322,6 +1347,7 @@ static int gdlm_mount(struct gfs2_sbd *sdp, const char *table)
 	 * create/join lockspace
 	 */
 
+	init_rwsem(&ls->ls_sem);
 	error = dlm_new_lockspace(fsname, cluster, flags, GDLM_LVB_SIZE,
 				  &gdlm_lockspace_ops, sdp, &ops_result,
 				  &ls->ls_dlm);
@@ -1401,10 +1427,12 @@ static void gdlm_unmount(struct gfs2_sbd *sdp)
 
 	/* mounted_lock and control_lock will be purged in dlm recovery */
 release:
+	down_write(&ls->ls_sem);
 	if (ls->ls_dlm) {
 		dlm_release_lockspace(ls->ls_dlm, 2);
 		ls->ls_dlm = NULL;
 	}
+	up_write(&ls->ls_sem);
 
 	free_recover_size(ls);
 }
diff --git a/mm/memcontrol.c b/mm/memcontrol.c

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ RHEL_MINOR = 10`
`12`	`12`	`#`
`13`	`13`	`# Use this spot to avoid future merge conflicts.`
`14`	`14`	`# Do not trim this comment.`
`15`		`-RHEL_RELEASE = 553.87.1`
	`15`	`+RHEL_RELEASE = 553.89.1`
`16`	`16`
`17`	`17`	`#`
`18`	`18`	`# ZSTREAM`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`#`
`8`		`-# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)`
	`8`	`+# Compiler: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-11)`
`9`	`9`	`#`
`10`	`10`	`CONFIG_ARM64=y`
`11`	`11`	`CONFIG_64BIT=y`