Rebuild rocky8_10 with kernel-4.18.0-553.30.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..master: 488125
Number of commits in rpm: 31
Number of commits matched with upstream: 18 (58.06%)
Number of commits in upstream but not in rpm: 488107
Number of commits NOT found in upstream: 13 (41.94%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.30.1.el8_10 for kernel-4.18.0-553.30.1.el8_10
Clean Cherry Picks: 13 (72.22%)
Empty Cherry Picks: 5 (27.78%)
_______________________________

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

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.27.1
+RHEL_RELEASE = 553.30.1
 
 #
 # ZSTREAM

arch/s390/mm/cmm.c

@@ -98,11 +98,12 @@ static long cmm_alloc_pages(long nr, long *counter,
 		(*counter)++;
 		spin_unlock(&cmm_lock);
 		nr--;
+		cond_resched();
 	}
 	return nr;
 }
 
-static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
+static long __cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
 {
 	struct cmm_page_array *pa;
 	unsigned long addr;
@@ -126,6 +127,21 @@ static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
 	return nr;
 }
 
+static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
+{
+	long inc = 0;
+
+	while (nr) {
+		inc = min(256L, nr);
+		nr -= inc;
+		inc = __cmm_free_pages(inc, counter, list);
+		if (inc)
+			break;
+		cond_resched();
+	}
+	return nr + inc;
+}
+
 static int cmm_oom_notify(struct notifier_block *self,
 			  unsigned long dummy, void *parm)
 {

arch/x86/mm/ident_map.c

@@ -33,7 +33,7 @@ static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page,
 			next = end;
 
 		/* if this is already a gbpage, this portion is already mapped */
-		if (pud_large(*pud))
+		if (pud_leaf(*pud))
 			continue;
 
 		/* Is using a gbpage allowed? */

block/blk-core.c

@@ -1214,7 +1214,10 @@ blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request *
 	 * bypass a potential scheduler on the bottom device for
 	 * insert.
 	 */
-	return blk_mq_request_issue_directly(rq, true);
+	ret = blk_mq_request_issue_directly(rq, true);
+	if (ret)
+		blk_account_io_done(rq, ktime_get_ns());
+	return ret;
 }
 EXPORT_SYMBOL_GPL(blk_insert_cloned_request);
 

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

@@ -0,0 +1,34 @@
+Rebuild_History BUILDABLE
+Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
+Number of commits in upstream range v4.18~1..master: 488125
+Number of commits in rpm: 31
+Number of commits matched with upstream: 18 (58.06%)
+Number of commits in upstream but not in rpm: 488107
+Number of commits NOT found in upstream: 13 (41.94%)
+
+Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.30.1.el8_10 for kernel-4.18.0-553.30.1.el8_10
+Clean Cherry Picks: 13 (72.22%)
+Empty Cherry Picks: 5 (27.78%)
+_______________________________
+
+__EMPTY COMMITS__________________________
+70f08f914a37a0881a7f17068e03ff5a5024822d cifs: remove useless DeleteMidQEntry()
+e6322fd177c6885a21dd4609dc5e5c973d1a2eb7 smb: client: fix potential deadlock when releasing mids
+543576ec15b17c0c93301ac8297333c7b6e84ac7 bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE
+de036dcaca65cf94bf7ff09c571c077f02bc92b4 cifs: Fix uninitialized memory reads for oparms.mode
+592ee1197f78b30bd60c87db9b6c8c045c8d8314 blk-mq: fix missing blk_account_io_done() in error path
+
+__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
+smb: client: use actual path when queryfs
+autofs: fix thinko in validate_dev_ioctl()
+autofs: add per dentry expire timeout
+mptcp: pm: Fix uaf in __timer_delete_sync
+cifs: fix dfs link failover in cifs_tree_connect()
+s390/mm: Add cond_resched() to cmm_alloc/free_pages()
+gitlab-ci: provide consistent kcidb_tree_name