Merge: [RHEL9.8] Recent upstream fixes for iommufd

CKI KWF Bot · CKI KWF Bot · commit 28e87e5a0707 · 2025-12-03T13:14:21.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7642 JIRA: https://issues.redhat.com/browse/RHEL-131315 Upstream Status: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7479 Recent upstream fixes: ``` cb30dfa ("iommufd: Don't overflow during division for dirty tracking") b07bf25 ("iommufd/iommufd_private.h: Avoid -Wflex-array-member-not-at-end warning") ac84ff4 ("iommufd/driver: Fix counter initialization for counted_by annotation") ``` Signed-off-by: Eder Zulian <ezulian@redhat.com> Approved-by: Jerry Snitselaar <jsnitsel@redhat.com> Approved-by: Rafael Aquini <raquini@redhat.com> Approved-by: Donald Dutile <ddutile@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
diff --git a/drivers/iommu/iommufd/driver.c b/drivers/iommu/iommufd/driver.c
@@ -161,8 +161,8 @@ int iommufd_viommu_report_event(struct iommufd_viommu *viommu,
 		vevent = &veventq->lost_events_header;
 		goto out_set_header;
 	}
-	memcpy(vevent->event_data, event_data, data_len);
 	vevent->data_len = data_len;
+	memcpy(vevent->event_data, event_data, data_len);
 	veventq->num_events++;
 
 out_set_header:
diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h
@@ -614,14 +614,16 @@ struct iommufd_veventq {
 	struct iommufd_eventq common;
 	struct iommufd_viommu *viommu;
 	struct list_head node; /* for iommufd_viommu::veventqs */
-	struct iommufd_vevent lost_events_header;
 
 	enum iommu_veventq_type type;
 	unsigned int depth;
 
 	/* Use common.lock for protection */
 	u32 num_events;
 	u32 sequence;
+
+	/* Must be last as it ends in a flexible-array member. */
+	struct iommufd_vevent lost_events_header;
 };
 
 static inline struct iommufd_veventq *
diff --git a/drivers/iommu/iommufd/iova_bitmap.c b/drivers/iommu/iommufd/iova_bitmap.c
@@ -130,9 +130,8 @@ struct iova_bitmap {
 static unsigned long iova_bitmap_offset_to_index(struct iova_bitmap *bitmap,
 						 unsigned long iova)
 {
-	unsigned long pgsize = 1UL << bitmap->mapped.pgshift;
-
-	return iova / (BITS_PER_TYPE(*bitmap->bitmap) * pgsize);
+	return (iova >> bitmap->mapped.pgshift) /
+	       BITS_PER_TYPE(*bitmap->bitmap);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,8 @@ int iommufd_viommu_report_event(struct iommufd_viommu *viommu,`
`161`	`161`	`vevent = &veventq->lost_events_header;`
`162`	`162`	`goto out_set_header;`
`163`	`163`	`}`
`164`		`- memcpy(vevent->event_data, event_data, data_len);`
`165`	`164`	`vevent->data_len = data_len;`
	`165`	`+ memcpy(vevent->event_data, event_data, data_len);`
`166`	`166`	`veventq->num_events++;`
`167`	`167`
`168`	`168`	`out_set_header:`
Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,8 @@ struct iova_bitmap {`
`130`	`130`	`static unsigned long iova_bitmap_offset_to_index(struct iova_bitmap *bitmap,`
`131`	`131`	`unsigned long iova)`
`132`	`132`	`{`
`133`		`- unsigned long pgsize = 1UL << bitmap->mapped.pgshift;`
`134`		`-`
`135`		`- return iova / (BITS_PER_TYPE(bitmap->bitmap) pgsize);`
	`133`	`+ return (iova >> bitmap->mapped.pgshift) /`
	`134`	`+ BITS_PER_TYPE(*bitmap->bitmap);`
`136`	`135`	`}`
`137`	`136`
`138`	`137`	`/*`