Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 17 May 2023 18:50:54 -0700
Mime-Version: 1.0
Message-ID: <20230518015054.2223833-1-pandoh@google.com>
Subject: [PATCH RESEND] iommu/amd: Fix domain flush size when syncing iotlb
From:   Jon Pan-Doh <pandoh@google.com>
To:     Joerg Roedel <joro@8bytes.org>,
        Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Cc:     Will Deacon <will@kernel.org>, Robin Murphy <robin.murphy@arm.com>,
        iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
        Jon Pan-Doh <pandoh@google.com>, stable@vger.kernel.org,
        Gary Zibrat <gzibrat@google.com>,
        Sudheer Dantuluri <dantuluris@google.com>,
        Nadav Amit <namit@vmware.com>,
        Vasant Hegde <vasant.hegde@amd.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

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@vger.kernel.org> # 5.15.x
Suggested-by: Gary Zibrat <gzibrat@google.com>
Tested-by: Sudheer Dantuluri <dantuluris@google.com>
Acked-by: Nadav Amit <namit@vmware.com>
Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
Signed-off-by: Jon Pan-Doh <pandoh@google.com>
---
 drivers/iommu/amd/iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 5a505ba5467e..da45b1ab042d 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2378,7 +2378,7 @@ static void amd_iommu_iotlb_sync(struct iommu_domain *domain,
 	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);
 }
-- 
2.40.0.634.g4ca3ef3211-goog