From: Greg Kroah-Hartman Date: Wed, 23 Jul 2025 12:11:20 +0000 (+0200) Subject: 6.12-stable patches X-Git-Tag: v6.1.147~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2799e3d58d8cc354542c506bfd2fb8782849486;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: iommu-vt-d-fix-misplaced-domain_attached-assignment.patch --- diff --git a/queue-6.12/iommu-vt-d-fix-misplaced-domain_attached-assignment.patch b/queue-6.12/iommu-vt-d-fix-misplaced-domain_attached-assignment.patch new file mode 100644 index 0000000000..8d1844fbc0 --- /dev/null +++ b/queue-6.12/iommu-vt-d-fix-misplaced-domain_attached-assignment.patch @@ -0,0 +1,50 @@ +From bbaa@bbaa.fun Wed Jul 23 14:10:01 2025 +From: Ban ZuoXiang +Date: Wed, 23 Jul 2025 20:04:23 +0800 +Subject: iommu/vt-d: Fix misplaced domain_attached assignment +To: stable@vger.kernel.org +Cc: iommu@lists.linux.dev, baolu.lu@linux.intel.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Ban ZuoXiang +Message-ID: <468CF4B655888074+20250723120423.37924-1-bbaa@bbaa.fun> + +From: Ban ZuoXiang + +Commit fb5873b779dd ("iommu/vt-d: Restore context entry setup order +for aliased devices") was incorrectly backported: the domain_attached +assignment was mistakenly placed in device_set_dirty_tracking() +instead of original identity_domain_attach_dev(). + +Fix this by moving the assignment to the correct function as in the +original commit. + +Fixes: fb5873b779dd ("iommu/vt-d: Restore context entry setup order for aliased devices") +Closes: https://lore.kernel.org/linux-iommu/721D44AF820A4FEB+722679cb-2226-4287-8835-9251ad69a1ac@bbaa.fun/ +Cc: stable@vger.kernel.org +Reported-by: Ban ZuoXiang +Signed-off-by: Ban ZuoXiang +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iommu/intel/iommu.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/iommu/intel/iommu.c ++++ b/drivers/iommu/intel/iommu.c +@@ -4414,9 +4414,6 @@ static int device_set_dirty_tracking(str + break; + } + +- if (!ret) +- info->domain_attached = true; +- + return ret; + } + +@@ -4600,6 +4597,9 @@ static int identity_domain_attach_dev(st + ret = device_setup_pass_through(dev); + } + ++ if (!ret) ++ info->domain_attached = true; ++ + return ret; + } + diff --git a/queue-6.12/series b/queue-6.12/series index 5413a1a9a0..08e3909dfa 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -155,3 +155,4 @@ sched-freezer-remove-unnecessary-warning-in-__thaw_task.patch drm-xe-mocs-initialize-mocs-index-early.patch drm-xe-move-page-fault-init-after-topology-init.patch smb-client-let-smbd_post_send_iter-respect-the-peers-max_send_size-and-transmit-all-data.patch +iommu-vt-d-fix-misplaced-domain_attached-assignment.patch