From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 20 May 2022 10:21:49 +0000 (+0200)
Subject: IOMMU: simplify unmap-on-error in iommu_map()
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~628
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=09e4ac7bc071ad0549adcb24d82d8a3c4e72d05c;p=xen.git

IOMMU: simplify unmap-on-error in iommu_map()

As of 68a8aa5d7264 ("iommu: make map and unmap take a page count,
similar to flush") there's no need anymore to have a loop here.

Suggested-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
---

diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c
index 67ffe6635e..3762d0bd86 100644
--- a/xen/drivers/passthrough/iommu.c
+++ b/xen/drivers/passthrough/iommu.c
@@ -308,11 +308,9 @@ int iommu_map(struct domain *d, dfn_t dfn, mfn_t mfn,
                    d->domain_id, dfn_x(dfn_add(dfn, i)),
                    mfn_x(mfn_add(mfn, i)), rc);
 
-        while ( i-- )
-            /* if statement to satisfy __must_check */
-            if ( iommu_call(hd->platform_ops, unmap_page, d, dfn_add(dfn, i),
-                            flush_flags) )
-                continue;
+        /* while statement to satisfy __must_check */
+        while ( iommu_unmap(d, dfn, i, flush_flags) )
+            break;
 
         if ( !is_hardware_domain(d) )
             domain_crash(d);