Rebuild rocky8_10-rt with kernel-rt-4.18.0-553.22.1.rt7.363.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: 540031
Number of commits in rpm: 290
Number of commits matched with upstream: 275 (94.83%)
Number of commits in upstream but not in rpm: 539756
Number of commits NOT found in upstream: 15 (5.17%)

Rebuilding Kernel on Branch rocky8_10-rt_rebuild_kernel-rt-4.18.0-553.22.1.rt7.363.el8_10 for kernel-rt-4.18.0-553.22.1.rt7.363.el8_10
Clean Cherry Picks: 199 (72.36%)
Empty Cherry Picks: 76 (27.64%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-rt-4.18.0-553.22.1.rt7.363.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/admin-guide/device-mapper/dm-crypt.rst

@@ -155,6 +155,17 @@ iv_large_sectors
    The <iv_offset> must be multiple of <sector_size> (in 512 bytes units)
    if this flag is specified.
 
+
+Module parameters::
+max_read_size
+max_write_size
+   Maximum size of read or write requests. When a request larger than this size
+   is received, dm-crypt will split the request. The splitting improves
+   concurrency (the split requests could be encrypted in parallel by multiple
+   cores), but it also causes overhead. The user should tune these parameters to
+   fit the actual workload.
+
+
 Example scripts
 ===============
 LUKS (Linux Unified Key Setup) is now the preferred way to set up disk

Documentation/media/kapi/cec-core.rst

@@ -105,6 +105,7 @@ your driver:
 		int (*adap_monitor_all_enable)(struct cec_adapter *adap, bool enable);
 		int (*adap_monitor_pin_enable)(struct cec_adapter *adap, bool enable);
 		int (*adap_log_addr)(struct cec_adapter *adap, u8 logical_addr);
+		void (*adap_configured)(struct cec_adapter *adap, bool configured);
 		int (*adap_transmit)(struct cec_adapter *adap, u8 attempts,
 				      u32 signal_free_time, struct cec_msg *msg);
 		void (*adap_status)(struct cec_adapter *adap, struct seq_file *file);
@@ -113,7 +114,7 @@ your driver:
 		/* Error injection callbacks */
 		...
 
-		/* High-level callbacks */
+		/* High-level callback */
 		...
 	};
 
@@ -175,7 +176,17 @@ can receive directed messages to that address.
 Note that adap_log_addr must return 0 if logical_addr is CEC_LOG_ADDR_INVALID.
 
 
-To transmit a new message:
+Called when the adapter is fully configured or unconfigured::
+
+	void (*adap_configured)(struct cec_adapter *adap, bool configured);
+
+If configured == true, then the adapter is fully configured, i.e. all logical
+addresses have been successfully claimed. If configured == false, then the
+adapter is unconfigured. If the driver has to take specific actions after
+(un)configuration, then that can be done through this optional callback.
+
+
+To transmit a new message::
 
 .. c:function::
 	int (*adap_transmit)(struct cec_adapter *adap, u8 attempts,

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.16.1
+RHEL_RELEASE = 553.22.1
 
 #
 # ZSTREAM
@@ -67,4 +67,4 @@ ifneq ("$(ZSTREAM)", "yes")
 endif
 
 # Realtime build number
-RTBUILD:=.357
+RTBUILD:=.363

arch/arm64/kvm/vgic/vgic-init.c

@@ -352,7 +352,7 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm)
 
 	if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3) {
 		list_for_each_entry_safe(rdreg, next, &dist->rd_regions, list)
-			vgic_v3_free_redist_region(rdreg);
+			vgic_v3_free_redist_region(kvm, rdreg);
 		INIT_LIST_HEAD(&dist->rd_regions);
 	} else {
 		dist->vgic_cpu_base = VGIC_ADDR_UNDEF;

arch/arm64/kvm/vgic/vgic-mmio-v3.c

@@ -833,8 +833,17 @@ static int vgic_v3_alloc_redist_region(struct kvm *kvm, uint32_t index,
 	return ret;
 }
 
-void vgic_v3_free_redist_region(struct vgic_redist_region *rdreg)
+void vgic_v3_free_redist_region(struct kvm *kvm, struct vgic_redist_region *rdreg)
 {
+	struct kvm_vcpu *vcpu;
+	unsigned long c;
+
+	/* Garbage collect the region */
+	kvm_for_each_vcpu(c, vcpu, kvm) {
+		if (vcpu->arch.vgic_cpu.rdreg == rdreg)
+			vcpu->arch.vgic_cpu.rdreg = NULL;
+	}
+
 	list_del(&rdreg->list);
 	kfree(rdreg);
 }
@@ -856,7 +865,7 @@ int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count)
 		struct vgic_redist_region *rdreg;
 
 		rdreg = vgic_v3_rdist_region_from_index(kvm, index);
-		vgic_v3_free_redist_region(rdreg);
+		vgic_v3_free_redist_region(kvm, rdreg);
 		return ret;
 	}
 

arch/arm64/kvm/vgic/vgic.h

@@ -305,7 +305,7 @@ vgic_v3_rd_region_size(struct kvm *kvm, struct vgic_redist_region *rdreg)
 
 struct vgic_redist_region *vgic_v3_rdist_region_from_index(struct kvm *kvm,
 							   u32 index);
-void vgic_v3_free_redist_region(struct vgic_redist_region *rdreg);
+void vgic_v3_free_redist_region(struct kvm *kvm, struct vgic_redist_region *rdreg);
 
 bool vgic_v3_rdist_overlap(struct kvm *kvm, gpa_t base, size_t size);
 

arch/x86/entry/entry_64_compat.S

@@ -108,10 +108,6 @@ SYM_FUNC_START(entry_SYSENTER_compat)
 	xorl	%r15d, %r15d		/* nospec   r15 */
 	cld
 
-	IBRS_ENTER
-	UNTRAIN_RET
-	CLEAR_BRANCH_HISTORY
-
 	/*
 	 * SYSENTER doesn't filter flags, so we need to clear NT and AC
 	 * ourselves.  To save a few cycles, we can check whether
@@ -135,6 +131,16 @@ SYM_FUNC_START(entry_SYSENTER_compat)
 	jnz	.Lsysenter_fix_flags
 .Lsysenter_flags_fixed:
 
+	/*
+	 * CPU bugs mitigations mechanisms can call other functions. They
+	 * should be invoked after making sure TF is cleared because
+	 * single-step is ignored only for instructions inside the
+	 * entry_SYSENTER_compat function.
+	 */
+	IBRS_ENTER
+	UNTRAIN_RET
+	CLEAR_BRANCH_HISTORY
+
 	/*
 	 * User mode is traced as though IRQs are on, and SYSENTER
 	 * turned them off.

arch/x86/kernel/cpu/common.c

@@ -104,6 +104,15 @@ void __init setup_cpu_local_masks(void)
 static const bool cpu_in_retbleed_whitelist(struct cpuinfo_x86 *c)
 {
 	static const bool retbleed_whitelist[] = {
+		[INTEL_FAM6_CORE_YONAH]		= true,
+		[INTEL_FAM6_CORE2_MEROM]	= true,
+		[INTEL_FAM6_CORE2_MEROM_L]	= true,
+		[INTEL_FAM6_CORE2_PENRYN]	= true,
+		[INTEL_FAM6_CORE2_DUNNINGTON]	= true,
+		[INTEL_FAM6_NEHALEM]		= true,
+		[INTEL_FAM6_NEHALEM_G]		= true,
+		[INTEL_FAM6_NEHALEM_EP]		= true,
+		[INTEL_FAM6_NEHALEM_EX]		= true,
 		[INTEL_FAM6_WESTMERE]		= true,
 		[INTEL_FAM6_WESTMERE_EP]	= true,
 		[INTEL_FAM6_WESTMERE_EX]	= true,

block/bfq-iosched.c

@@ -2329,9 +2329,8 @@ static void bfq_remove_request(struct request_queue *q,
 
 }
 
-static bool bfq_bio_merge(struct blk_mq_hw_ctx *hctx, struct bio *bio)
+static bool bfq_bio_merge(struct request_queue *q, struct bio *bio)
 {
-	struct request_queue *q = hctx->queue;
 	struct bfq_data *bfqd = q->elevator->elevator_data;
 	struct request *free = NULL;
 	/*
@@ -7292,7 +7291,7 @@ static struct elevator_type iosched_bfq_mq = {
 		.next_request		= elv_rb_latter_request,
 		.former_request		= elv_rb_former_request,
 		.allow_merge		= bfq_allow_bio_merge,
-		.bio_merge		= bfq_bio_merge,
+		.bio_merge2		= bfq_bio_merge,
 		.request_merge		= bfq_request_merge,
 		.requests_merged	= bfq_requests_merged,
 		.request_merged		= bfq_request_merged,

block/bio.c

@@ -1912,11 +1912,11 @@ void update_io_ticks(struct hd_struct *part, unsigned long now, bool end)
 	unsigned long stamp;
 again:
 	stamp = READ_ONCE(part->stamp);
-	if (unlikely(time_after(now, stamp))) {
-		if (likely(cmpxchg(&part->stamp, stamp, now) == stamp)) {
-			__part_stat_add(part, io_ticks, end ? now - stamp : 1);
-		}
-	}
+	if (unlikely(time_after(now, stamp)) &&
+	    likely(cmpxchg(&part->stamp, stamp, now) == stamp) &&
+	    (end || part_in_flight(part)))
+		__part_stat_add(part, io_ticks, now - stamp);
+
 	if (part->partno) {
 		part = &part_to_disk(part)->part0;
 		goto again;
@@ -2002,7 +2002,7 @@ void bio_endio(struct bio *bio)
 	if (!bio_integrity_endio(bio))
 		return;
 
-	if (bio->bi_disk)
+	if (bio->bi_disk && bio_flagged(bio, BIO_TRACKED))
 		rq_qos_done_bio(bio->bi_disk->queue, bio);
 
 	if (bio->bi_disk && bio_flagged(bio, BIO_TRACE_COMPLETION)) {