Rebuild rocky8_10 with kernel-4.18.0-553.72.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: 567023
Number of commits in rpm: 61
Number of commits matched with upstream: 54 (88.52%)
Number of commits in upstream but not in rpm: 566969
Number of commits NOT found in upstream: 7 (11.48%)

Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.72.1.el8_10 for kernel-4.18.0-553.72.1.el8_10
Clean Cherry Picks: 35 (64.81%)
Empty Cherry Picks: 19 (35.19%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-4.18.0-553.72.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.69.1
+RHEL_RELEASE = 553.72.1
 
 #
 # ZSTREAM

arch/x86/boot/compressed/eboot.c

@@ -10,6 +10,7 @@
 
 #include <linux/efi.h>
 #include <linux/pci.h>
+#include <linux/ctype.h>
 
 #include <asm/efi.h>
 #include <asm/e820/types.h>
@@ -863,6 +864,26 @@ static void error(char *str)
 	efi_printk(sys_table, "\n");
 }
 
+static const char *cmdline_memmap_override;
+
+static efi_status_t parse_options(const char *cmdline)
+{
+	static const char opts[][14] = {
+		"mem=", "memmap=", "efi_fake_mem=", "hugepages="
+	};
+
+	for (int i = 0; i < ARRAY_SIZE(opts); i++) {
+		const char *p = strstr(cmdline, opts[i]);
+
+		if (p == cmdline || (p > cmdline && isspace(p[-1]))) {
+			cmdline_memmap_override = opts[i];
+			break;
+		}
+	}
+
+	return efi_parse_options(cmdline);
+}
+
 static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry)
 {
 	unsigned long virt_addr = LOAD_PHYSICAL_ADDR;
@@ -893,6 +914,10 @@ static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry)
 		if (sys_table->hdr.revision <= EFI_2_00_SYSTEM_TABLE_REVISION &&
 		    !memcmp(efistub_fw_vendor(), ami, sizeof(ami))) {
 			seed[0] = 0;
+		} else if (cmdline_memmap_override) {
+			efi_printk(sys_table,
+				"cmdline memmap override detected on the kernel command line - disabling physical KASLR\n");
+			seed[0] = 0;
 		}
 
 		boot_params_ptr->hdr.loadflags |= KASLR_FLAG;
@@ -942,7 +967,6 @@ void __noreturn efi_main(struct efi_config *c,
 	void *handle;
 	efi_system_table_t *_table;
 	bool is64;
-	unsigned long cmdline_paddr;
 	extern char _bss[], _ebss[];
 
 	/*
@@ -997,9 +1021,22 @@ void __noreturn efi_main(struct efi_config *c,
 	 * case this is the second time we parse the cmdline. This is ok,
 	 * parsing the cmdline multiple times does not have side-effects.
 	 */
-	cmdline_paddr = ((u64)hdr->cmd_line_ptr |
-			 ((u64)boot_params->ext_cmd_line_ptr << 32));
-	efi_parse_options((char *)cmdline_paddr);
+#ifdef CONFIG_CMDLINE_BOOL
+	status = parse_options(CONFIG_CMDLINE);
+	if (status != EFI_SUCCESS) {
+		efi_printk(sys_table, "Failed to parse options\n");
+		goto fail;
+	}
+#endif
+	if (!IS_ENABLED(CONFIG_CMDLINE_OVERRIDE)) {
+		unsigned long cmdline_paddr = ((u64)hdr->cmd_line_ptr |
+					       ((u64)boot_params->ext_cmd_line_ptr << 32));
+		status = parse_options((char *)cmdline_paddr);
+		if (status != EFI_SUCCESS) {
+			efi_printk(sys_table, "Failed to parse options\n");
+			goto fail;
+		}
+	}
 
 	status = efi_decompress_kernel(&kernel_entry);
 	if (status != EFI_SUCCESS) {

block/blk-mq-debugfs.c

@@ -461,7 +461,7 @@ static void blk_mq_debugfs_tags_show(struct seq_file *m,
 	seq_printf(m, "nr_tags=%u\n", tags->nr_tags);
 	seq_printf(m, "nr_reserved_tags=%u\n", tags->nr_reserved_tags);
 	seq_printf(m, "active_queues=%d\n",
-		   atomic_read(&tags->active_queues));
+		   READ_ONCE(tags->active_queues));
 
 	seq_puts(m, "\nbitmap_tags:\n");
 	sbitmap_queue_show(tags->bitmap_tags, m);

block/blk-mq-tag.c

@@ -15,6 +15,21 @@
 #include "blk-mq-sched.h"
 #include "blk-mq-tag.h"
 
+/*
+ * Recalculate wakeup batch when tag is shared by hctx.
+ */
+static void blk_mq_update_wake_batch(struct blk_mq_tags *tags,
+		unsigned int users)
+{
+	if (!users)
+		return;
+
+	sbitmap_queue_recalculate_wake_batch(tags->bitmap_tags,
+			users);
+	sbitmap_queue_recalculate_wake_batch(tags->breserved_tags,
+			users);
+}
+
 /*
  * If a previously inactive queue goes active, bump the active user count.
  * We need to do this before try to allocate driver tag, then even if fail
@@ -23,17 +38,33 @@
  */
 bool __blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx)
 {
+	unsigned int users;
+	unsigned long flags;
+	struct blk_mq_tags *tags = hctx->tags;
+
 	if (blk_mq_is_sbitmap_shared(hctx->flags)) {
 		struct request_queue *q = hctx->queue;
 		struct blk_mq_tag_set *set = q->tag_set;
 
-		if (!test_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags) &&
-		    !test_and_set_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags))
-			atomic_inc(&set->active_queues_shared_sbitmap);
+		if (test_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags) ||
+		    test_and_set_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags)) {
+			return true;
+		}
+		spin_lock_irqsave(&set->active_queues_lock, flags);
+		users = set->active_queues_shared_sbitmap + 1;
+		WRITE_ONCE(set->active_queues_shared_sbitmap, users);
+		blk_mq_update_wake_batch(hctx->tags, users);
+		spin_unlock_irqrestore(&set->active_queues_lock, flags);
 	} else {
-		if (!test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state) &&
-		    !test_and_set_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))
-			atomic_inc(&hctx->tags->active_queues);
+		if (test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state) ||
+		    test_and_set_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state)) {
+			return true;
+		}
+		spin_lock_irqsave(&tags->lock, flags);
+		users = hctx->tags->active_queues + 1;
+		WRITE_ONCE(tags->active_queues, users);
+		blk_mq_update_wake_batch(tags, users);
+		spin_unlock_irqrestore(&tags->lock, flags);
 	}
 
 	return true;
@@ -58,16 +89,25 @@ void __blk_mq_tag_idle(struct blk_mq_hw_ctx *hctx)
 	struct blk_mq_tags *tags = hctx->tags;
 	struct request_queue *q = hctx->queue;
 	struct blk_mq_tag_set *set = q->tag_set;
+	unsigned int users;
 
 	if (blk_mq_is_sbitmap_shared(hctx->flags)) {
 		if (!test_and_clear_bit(QUEUE_FLAG_HCTX_ACTIVE,
 					&q->queue_flags))
 			return;
-		atomic_dec(&set->active_queues_shared_sbitmap);
+		spin_lock_irq(&set->active_queues_lock);
+		users = set->active_queues_shared_sbitmap - 1;
+		WRITE_ONCE(set->active_queues_shared_sbitmap, users);
+		blk_mq_update_wake_batch(tags, users);
+		spin_unlock_irq(&set->active_queues_lock);
 	} else {
 		if (!test_and_clear_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))
 			return;
-		atomic_dec(&tags->active_queues);
+		spin_lock_irq(&tags->lock);
+		users = tags->active_queues - 1;
+		WRITE_ONCE(tags->active_queues, users);
+		blk_mq_update_wake_batch(tags, users);
+		spin_unlock_irq(&tags->lock);
 	}
 
 	blk_mq_tag_wakeup_all(tags, false);

block/blk-mq-tag.h

@@ -9,7 +9,11 @@ struct blk_mq_tags {
 	unsigned int nr_tags;
 	unsigned int nr_reserved_tags;
 
+#ifdef __GENKSYMS__
 	atomic_t active_queues;
+#else
+	unsigned int active_queues;
+#endif
 
 	struct sbitmap_queue RH_KABI_RENAME(bitmap_tags, __bitmap_tags);
 	struct sbitmap_queue RH_KABI_RENAME(breserved_tags, __breserved_tags);

block/blk-mq.c

@@ -3666,8 +3666,6 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)
 		goto out_free_mq_map;
 
 	if (blk_mq_is_sbitmap_shared(set->flags)) {
-		atomic_set(&set->active_queues_shared_sbitmap, 0);
-
 		if (blk_mq_init_shared_sbitmap(set)) {
 			ret = -ENOMEM;
 			goto out_free_mq_rq_maps;
@@ -3676,6 +3674,7 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)
 
 	mutex_init(&set->tag_list_lock);
 	INIT_LIST_HEAD(&set->tag_list);
+	spin_lock_init(&set->active_queues_lock);
 
 	return 0;
 

block/blk-mq.h

@@ -343,11 +343,11 @@ static inline bool hctx_may_queue(struct blk_mq_hw_ctx *hctx,
 
 		if (!test_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags))
 			return true;
-		users = atomic_read(&set->active_queues_shared_sbitmap);
+		users = READ_ONCE(set->active_queues_shared_sbitmap);
 	} else {
 		if (!test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))
 			return true;
-		users = atomic_read(&hctx->tags->active_queues);
+		users = READ_ONCE(hctx->tags->active_queues);
 	}
 
 	if (!users)

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

@@ -0,0 +1,42 @@
+Rebuild_History BUILDABLE
+Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
+Number of commits in upstream range v4.18~1..kernel-mainline: 567023
+Number of commits in rpm: 61
+Number of commits matched with upstream: 54 (88.52%)
+Number of commits in upstream but not in rpm: 566969
+Number of commits NOT found in upstream: 7 (11.48%)
+
+Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.72.1.el8_10 for kernel-4.18.0-553.72.1.el8_10
+Clean Cherry Picks: 35 (64.81%)
+Empty Cherry Picks: 19 (35.19%)
+_______________________________
+
+__EMPTY COMMITS__________________________
+1d6123102e9fbedc8d25bf4731da6d513173e49e Bluetooth: hci_core: Fix use-after-free in vhci_flush()
+f80d882edcf242d0256d9e51b09d5fb7a3a0d3b4 gfs2: Get rid of gfs2_glock_queue_put in signal_our_withdraw
+deb016c1669002e48c431d6fd32ea1c20ef41756 gfs2: No more self recovery
+ae9f3bd8259a0a8f67be2420e66bb05fbb95af48 gfs2: replace sd_aspace with sd_inode
+df207de9d9e7a4d92f8567e2c539d9c8c12fd99d udp: Fix memory accounting leak.
+180dccb0dba4f5e84a4a70c1be1d34cbb6528b32 blk-mq: fix tag_get wait task can't be awakened
+10825410b956dc1ed8c5fbc8bbedaffdadde7f20 blk-mq: Fix wrong wakeup batch configuration which will cause hang
+4f8126bb2308066b877859e4b5923ffb54143630 sbitmap: Use single per-bitmap counting to wake up queued tags
+976570b4ecd30d3ec6e1b0910da8e5edc591f2b6 sbitmap: Advance the queue index before waking up a queue
+26edb30dd1c0c9be11fa676b4f330ada7b794ba6 sbitmap: Try each queue to wake up at least one waiter
+b5fcf7871acb7f9a3a8ed341a68bd86aba3e254a sbitmap: correct wake_batch recalculation to avoid potential IO hung
+106397376c0369fcc01c58dd189ff925a2724a57 sbitmap: fix batching wakeup
+72d04bdcf3f7d7e07d82f9757946f68802a7270a sbitmap: fix io hung due to race on sbitmap_word::cleared
+65f666c6203600053478ce8e34a1db269a8701c9 lib/sbitmap: define swap_lock as raw_spinlock_t
+4f1731df60f9033669f024d06ae26a6301260b55 blk-mq: fix potential io hang by wrong 'wake_batch'
+b313a8c835516bdda85025500be866ac8a74e022 block: Fix lockdep warning in blk_mq_mark_tag_wait
+7dde67f2a23ac11962b17128d9a71698430ced95 efi/x86: Support builtin command line
+055042bedd4e0af8186266b189b81e73e708b82b efi/libstub: Check return value of efi_parse_options
+15aa8fb852f995dd234a57f12dfb989044968bb6 x86/efistub: Omit physical KASLR when memory reservations exist
+
+__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
+aacraid: fix a buffer overflow