This is a note to let you know that I've just added the patch titled
iommu/amd: Fix domain flush size when syncing iotlb
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iommu-amd-fix-domain-flush-size-when-syncing-iotlb.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 2212fc2acf3f6ee690ea36506fb882a19d1bfcab Mon Sep 17 00:00:00 2001
From: Jon Pan-Doh <pandoh@xxxxxxxxxx>
Date: Wed, 26 Apr 2023 13:32:56 -0700
Subject: iommu/amd: Fix domain flush size when syncing iotlb
From: Jon Pan-Doh <pandoh@xxxxxxxxxx>
commit 2212fc2acf3f6ee690ea36506fb882a19d1bfcab upstream.
When running on an AMD vIOMMU, we observed multiple invalidations (of
decreasing power of 2 aligned sizes) when unmapping a single page.
Domain flush takes gather bounds (end-start) as size param. However,
gather->end is defined as the last inclusive address (start + size - 1).
This leads to an off by 1 error.
With this patch, verified that 1 invalidation occurs when unmapping a
single page.
Fixes: a270be1b3fdf ("iommu/amd: Use only natural aligned flushes in a VM")
Cc: stable@xxxxxxxxxxxxxxx # >= 5.15
Signed-off-by: Jon Pan-Doh <pandoh@xxxxxxxxxx>
Tested-by: Sudheer Dantuluri <dantuluris@xxxxxxxxxx>
Suggested-by: Gary Zibrat <gzibrat@xxxxxxxxxx>
Reviewed-by: Vasant Hegde <vasant.hegde@xxxxxxx>
Acked-by: Nadav Amit <namit@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230426203256.237116-1-pandoh@xxxxxxxxxx
Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/iommu/amd/iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2396,7 +2396,7 @@ static void amd_iommu_iotlb_sync(struct
unsigned long flags;
spin_lock_irqsave(&dom->lock, flags);
- domain_flush_pages(dom, gather->start, gather->end - gather->start, 1);
+ domain_flush_pages(dom, gather->start, gather->end - gather->start + 1, 1);
amd_iommu_domain_flush_complete(dom);
spin_unlock_irqrestore(&dom->lock, flags);
}
Patches currently in stable-queue which might be from pandoh@xxxxxxxxxx are
queue-6.1/iommu-amd-fix-domain-flush-size-when-syncing-iotlb.patch
