Received: by 10.223.176.46 with SMTP id f43csp2451788wra; Sun, 21 Jan 2018 20:31:20 -0800 (PST) X-Google-Smtp-Source: AH8x225tQrVNC/0JyyJ4CpnU7UVOszCiP7hz89pznv3D+p+8OS4yCN9t5Mnlnfr2jJByLVpnkh+i X-Received: by 10.99.49.88 with SMTP id x85mr5995922pgx.77.1516595480385; Sun, 21 Jan 2018 20:31:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516595480; cv=none; d=google.com; s=arc-20160816; b=lvfkk6iKIGGmcrjAeZ3jSD7djrvXlNU7Wd9+S1gItP8ITc7c0DFwIKnzgLF3y6wOMy zP9GKTf4fMVdoBMju6ujlU50LJ9qpj5FUX64WFR0taYvcsUoSEhhIyAlPXnSGcBqJHgH n1xo5WbjqppmEhoBShXLrTwsNxc0zuYsNO7gboNDMTi0/p9U9bZYilWZJlPVdAmgO2AR gtaRIb2xaEX7oPpl/GmB0HZKtmvpfLahoMekizsdgkkYffCT6MF65l26KFFhJaVyPunw IXXCdtrfHEFdRj9cl2KKQ0wZRBZOJUbgAGbDnscPDw+8OU+5lKoyMu2JoGeqJXgsR5Xl /tYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:message-id:date:subject:cc:to :from:dkim-signature:arc-authentication-results; bh=clxWlBeUGZv05UWBVEajkL39Oekf4ldue91ZZSPiFBE=; b=W5kFmxUYEdKt/tKCtTLK/Zk2kQ0YJ7OcgNJLZ2+EtzetpRfSc1Qr3CTbjljtwUlW2F gGEKTUanwjB4hXKYJII7IfwzZNIp/aT2tYNfAAtY86yLh5A7vxGxGvdQQ4dvEyKS8gtQ Bts4nfT8utHbQvhVH3rSoQJ207Wk3gvZe6VYT4nZeTkrtXXiemthp9QLKjUMkg9+0bKk DumIsd5FUPBP30mmRAWgI438eYi69TCSJykRLPxohN9lSVuc0xiVPT3nP2Lxew3Z9T1z 6ZQy8bL7o9GyBH0ANjxzxn1zAbJxp/ozEnwI1GRA3bRBGUZ2D+uPQPYkB40OnQCENq7C /dDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector1-amd-com header.b=VJeYDyug; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m4-v6si3053218plt.44.2018.01.21.20.30.56; Sun, 21 Jan 2018 20:31:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector1-amd-com header.b=VJeYDyug; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751128AbeAVEaT (ORCPT + 99 others); Sun, 21 Jan 2018 23:30:19 -0500 Received: from mail-by2nam01on0074.outbound.protection.outlook.com ([104.47.34.74]:27968 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751004AbeAVEaR (ORCPT ); Sun, 21 Jan 2018 23:30:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=clxWlBeUGZv05UWBVEajkL39Oekf4ldue91ZZSPiFBE=; b=VJeYDyugFusjVCk1Hhpz12hGs7zU614+tTWsJCUD3A39S52cv5a+UqytoQBbfd/aFLHUcbkONbaOAsE5i0LTRlOmLAl4hgtptTtbl05MBSN5O33y1RjoZo4hB1nLFuv6heLNxqNLL/P1lwyahC88Ho3Q4JBTJQvKx1kx0vY32AA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; Received: from ssuthiku-rhel74.localdomain (114.109.128.54) by CY4PR12MB1733.namprd12.prod.outlook.com (10.175.62.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Mon, 22 Jan 2018 04:30:12 +0000 From: Suravee Suthikulpanit To: kvm@vger.kernel.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: alex.williamson@redhat.com, joro@8bytes.org, jroedel@suse.de, Suravee Suthikulpanit Subject: [PATCH v3] vfio/type1: Adopt fast IOTLB flush interface when unmap IOVAs Date: Sun, 21 Jan 2018 23:29:37 -0500 Message-Id: <1516595377-4681-1-git-send-email-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [114.109.128.54] X-ClientProxiedBy: HK2PR02CA0181.apcprd02.prod.outlook.com (10.171.31.17) To CY4PR12MB1733.namprd12.prod.outlook.com (10.175.62.143) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e902bdf-aac8-495e-5ac2-08d56150d57c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(48565401081)(2017052603307)(7153060)(7193020);SRVR:CY4PR12MB1733; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1733;3:5vJnvGhy58XmmhiiBLVTvzVcHPbvc+pHQ8fovVaOu8Z30DgVxYXnEHP3iulGNr3tL/CeDVqF6B0txq0YjtHB/uwzwQeqzg5ssuNYP055mTLuI40NW9GZcxYaQ0MhnwV2PgqWjItxRSTyA6Ouq+UWv6viBdkeLTGImFnK7M3+2/5WTOX9RiloSYcBQX1UrKQUFws8bU1CdpzYAttoCRqNU7O/RNl5tTzHFxyXNoy4Mj5EY9A/eerlDJ8a3lYaNpOa;25:67+GtTFIe6aCb1vmiVy7Yzp9E9Nh5QRzkAA//acOpsPPy5/LgKp35wDJt+PpAHU72suxXZCvc0XM42unX0JAvFYNmRTl5q34pQXPFjnmFqaTxaOOX85xPWZXgWACgJ82bfXYXhP3sdKh8af+wzAbogG4RLlFZOv28N4lqXeGzr3REWNChKQCv7rgqIuzi4BoNLKGpxLx7Ac2rKpG0ycCmsCM+66MgRUvX/C1W6NhWAX+h0lsZSKpJqhpv8sspxagVjVbF5QotY2OskczlrXN+zN2vcjxzWDj8Q8qhKir0qw017eJNyOuDfhOLt/KV4ry9b5HsrhqBGjiKkUd/v0mHg==;31:gY7q+3f/BDOQ4/oqB4HivzCzLdAK+9tLelmOKKPjI1RUNg0JSBPNchw68vlgfprhdZwBZk9yNBselecmMHHkvNIbMhFA/JjrUwO3tJzBh5HHnCqnRzhGPWT/kSl6JTeVYRaMO7lKTwwgeqOfxzbchNuheG9sj27ljJ5R74F2JDdmwjc185spy5hvr5GPToZxhwHfahxMPpStmN8tOIJLQMfxfxd/mOeooF+8S+OYdPk= X-MS-TrafficTypeDiagnostic: CY4PR12MB1733: X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1733;20:newHd4r5KbzbZAiJ4mD7bNaoQ50m4rWAbjs6JvLqquQfCrqcHBYeXEkjD03G9rLv0wj1e+PKHdVim31qDj0Cfgukr+XzRhk2yGw56NPFfgVuAlXKwGvKp01JtPpYTX6EBLc1WmLsSOmbEKZMDPFpzM9g0InOSDLotiK15wH8KasDEwjP8ZdWIOHflxigBaIUcKM8j94cu6xKx15iCwat3rkVaC78fmcgn4fDL2BboUbO99IGCsYN19n0+KVkAtA6q6B6rYsbrIOY7Tuol/4E4a4TMWf06Ay7w1T044mr0iIMH9B6py4JW2PRGnVVc9q+Q1Kd84HkNhA6w1SS3nnzKSxDRdBPBhJ8PJ+DCwgzqu6jQgM3TTPGw9vcuaqw79651dXJj61omyQRx9z5BHxsmwteDBc/xKEi94qGB0twuTzRTPZW7hlH9aulDVti684YBWjmtnqtHlgYH6kqQIPJcg5OM16vQgwLGUFyw7dz/xdvnz7jurGdU1XT9Z3G27qI;4:TLtsZuYg1xeJgyEPAUJrijUBJimarUngnO+K/k7JWVNVhkL0cXCJSIvpwxyWvddJ3QY4m9afTZHvyZHo8RT85iT9XQUB7RRD4b8uGwRbJ39lxtc5UijfUhlVINNGavWBluY/sG9sZQouJovlNkm1zSmZzdUBd95tDapSHBbPJIeF7519DpD3PYlggQSNUPmPPargXAWTvj2ir9g6H65AdQXC1VvibS/DdOrq+rlL73A6x+D6NbJoG8xSG5bi/IId00RRsQ3pvZr+cwGv1JAanb12T0FTcLt94duK4jP/MCp45f4rVHZ+gL0kQGtLhn1a X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040501)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231023)(2400081)(944501161)(6055026)(6041288)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(6072148)(201708071742011);SRVR:CY4PR12MB1733;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:CY4PR12MB1733; X-Forefront-PRVS: 0560A2214D X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(346002)(376002)(366004)(39380400002)(39860400002)(396003)(199004)(189003)(6486002)(2906002)(48376002)(50466002)(68736007)(50226002)(3846002)(6116002)(5660300001)(16526018)(16586007)(52116002)(51416003)(316002)(26005)(6506007)(386003)(59450400001)(305945005)(7736002)(66066001)(47776003)(478600001)(6306002)(6512007)(6666003)(36756003)(4720700003)(86362001)(53936002)(105586002)(8676002)(81156014)(81166006)(97736004)(8936002)(4326008)(72206003)(106356001)(25786009);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR12MB1733;H:ssuthiku-rhel74.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR12MB1733;23:YIIZM1FUUSAhlj8LpLvlKICp7VOXDVO2f1mJcZiBG?= =?us-ascii?Q?FuZVZBCiv2usvNgixgyNMyamG0XZ2rcw4duaJozPiYoM9LPbVa+FLVhDrSXb?= =?us-ascii?Q?rAdpgXgYUjetGTlHCOwYR3s/ke3whQWRTeh9aYiKXhsRJWk9h5t8tCo1i6dH?= =?us-ascii?Q?t9HOElAjEP50l/oIMi42mqu1Se3l734q6D5HxLlW2DJ1bCywbH5rvo46Zo0G?= =?us-ascii?Q?ohJ6mb7ywIthihKPMywFp7yRh6sg6VFWsbrzphhEQgvLfHf1YY7Jab4ZCiyc?= =?us-ascii?Q?w0Do/qHaH7ndN9xiu1kCyhHYb1cX4rjEQbKpHfRDpYhgkd/+iI4Heu9E8geq?= =?us-ascii?Q?ldSoF0zqanowz6xs7ofUfg+hxeC3ZZVEFfGHlkP7BF3CQugXoZJ/oj5lcy3L?= =?us-ascii?Q?T1pH7l+eaoWW/V/jYlw29Xn9AQcZPX+6Qmph7DkWND10PzWahL1XHOkw2Hn0?= =?us-ascii?Q?PGHq4DIvu3XDorIt02u0LhTylFwjNvYPwHi4VbFi1jdBt+M1uBKWJoBCmUo0?= =?us-ascii?Q?lXEHwmLCw2WYzd2WkuLIJCcu0oFz4d/Q6NQqoNzc4VHQrWurCH2p8/ZCPt2i?= =?us-ascii?Q?OUfTYYDG4+XO13hh8muI6kuBqcGt94eQ/wmyoIBC1wwH0NdeqdMJcz2flZcw?= =?us-ascii?Q?KllT9R0xaKIkLTITVjj2ybXCPbZpiP7XQWQxjrDuO7CmFpUEGnnW4b++mQDW?= =?us-ascii?Q?8yjL5MPFD6cEBMHEIarmAB0p5d/EL1kCeSXiLQxFEr7FUaeiboOG+JL1tDyY?= =?us-ascii?Q?RHcYU2Nhhx5gxW0r8PoiMzQxqylGSg7XM6iILlxARpZmqm7qApuzT4yPO1ha?= =?us-ascii?Q?R0RJzmqaPJq9knuFXG4r+hjbf6pMUuLeDo+vN8+udt6BJcoszlV4Pb/eWKKB?= =?us-ascii?Q?v9sCV0hGDnhwu3+RX1EHSguLrBIOROilF0HA5JIwCIpHll7DcVUKH9H/0Exj?= =?us-ascii?Q?M3uxUhof5QMCo7zsQDm6t2U8eVYNDwRZitiFm3Xit1l5KrW+98eMuc5ua6q4?= =?us-ascii?Q?zps6i+tTZiR4dg7Hf+6iVpk81dQ9HTlGWAj/NI/WMWZOHR8JTSZhXISoNLPU?= =?us-ascii?Q?sJwiXh0En2gUXkWGbhGY8bt0cucwF/dqq9ReI+2aOMTFANllD8uhv/uLlyTE?= =?us-ascii?Q?nI9nvVrjFM=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1733;6:KvxFdRuz23fXdKaOmmf53gtukdP98OaOIM7tNsQ0PGQqvxRUHPVYXFc+FjW/PrtWS0qpp/PdtjQWNHN1zV+JKnmaDDAUv4jF1JKwGsIG3YBF4stjhQvwBeHU1ojMpqvE0RlxQx8GQut5wtipD6rVZ7yCnsil4e7kK1WsV6fUkwoNUz1mEdUd4+IDaab6vcMD5jqE7KoL/8fyC8dlo8vZOvLx6J3TdNTpsHkXn+TfrthtFuJUAv4Sv8Z0rOyFYJxQrExImG6OaoLptYPdrfRx11EYGbphLScDM0od+kWfCu1RUqEoxMieMprk1yrXxfazA82SRXlSqX8d88Kljkc7TuWPdgj7Y1jBdszl8aZ9GCA=;5:iBZIuCoNAGJDf3eExW9rE7GcU8aHSScoAjmM1zMJFux+s5cGYEsfWvcDBNXnRSpqX3Hh0OdZ0kP+w3/NnsqlkobHK4VcSP76mQ25M2voQPyaTwSXpnzG952CPHhHlBkZrSB5T66j6Fk2ZVf/BHLQBmgqlhRth4cShGkVjePMgBY=;24:jbXZuqpW5P5unJbMxpIM2vIasOMX5NnCmqFU/V+xInzJrhk32OTbECOullpA/7pzdpLNXLWS+brK9fgnCTBX/tKfAa1mAHt7xi4vlxAqEj8=;7:3vAbHxe5n2TJyjcpxAFfFi+0Zfv1AMS9CDl2Ebp/uegGX0GyQVnV3YJjN5lTFsGJJz99Am2OmmKVjByjlEHoAB/CnjaHImQpsxCMyrSRuMOOgQ5CtvpHnTXlJswb2OZFDKDyERrTzz9+0Onvg1vNWcVWIsFCstgv9PX1mWYh0kuEqlT3AYE7vYKbkgeX0NzC8nPLuvCngsz0Efm6ZsvS+ja1gOz/n9/4nJLwj8QToI6l0IYgURVa7cS3vbw/q0ZD SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1733;20:sbYGRqAfhrCFlFpKT9IHfPyPXpyp2CMUqOjkZbm7V2dKkYAAYYIT04oYWE7Z3ugZTTW3fbPYfpL7Ay9jrGvbAWYeYQE04blWwss+zcd89rf1Z3AcnyrKSlRLvjwHFUzC/R/XauFbi7BAR+FYwO2oaYe/3itdYRR144L3yotv4Sf81jOusiQ9XVLcyHOJjmbKuMloTXnoLZwf0ayKM+gzDujgTHvqE5PiHNvuei2nf/+30erX+kzo9dSt1COyi2jB X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2018 04:30:12.5548 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9e902bdf-aac8-495e-5ac2-08d56150d57c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1733 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VFIO IOMMU type1 currently upmaps IOVA pages synchronously, which requires IOTLB flushing for every unmapping. This results in large IOTLB flushing overhead when handling pass-through devices has a large number of mapped IOVAs (e.g. GPUs). This could also cause IOTLB invalidate time-out issue on AMD IOMMU with certain dGPUs. This can be avoided by using the new IOTLB flushing interface. Cc: Alex Williamson Cc: Joerg Roedel Signed-off-by: Suravee Suthikulpanit --- Changes from V2: (https://lkml.org/lkml/2017/12/27/43) * In vfio_unmap_unpin(), fallback to use slow IOTLB flush when fast IOTLB flush fails (per Alex). * Do not adopt fast IOTLB flush in map_try_harder(). * Submit VFIO and AMD IOMMU patches separately. drivers/vfio/vfio_iommu_type1.c | 98 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index e30e29a..5c40b00 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -102,6 +102,13 @@ struct vfio_pfn { atomic_t ref_count; }; +struct vfio_regions { + struct list_head list; + dma_addr_t iova; + phys_addr_t phys; + size_t len; +}; + #define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu) \ (!list_empty(&iommu->domain_list)) @@ -479,6 +486,36 @@ static long vfio_unpin_pages_remote(struct vfio_dma *dma, dma_addr_t iova, return unlocked; } +/* + * Generally, VFIO needs to unpin remote pages after each IOTLB flush. + * Therefore, when using IOTLB flush sync interface, VFIO need to keep track + * of these regions (currently using a list). + * + * This value specifies maximum number of regions for each IOTLB flush sync. + */ +#define VFIO_IOMMU_TLB_SYNC_MAX 512 + +static long vfio_sync_unpin(struct vfio_dma *dma, struct vfio_domain *domain, + struct list_head *regions) +{ + long unlocked = 0; + struct vfio_regions *entry, *next; + + iommu_tlb_sync(domain->domain); + + list_for_each_entry_safe(entry, next, regions, list) { + unlocked += vfio_unpin_pages_remote(dma, + entry->iova, + entry->phys >> PAGE_SHIFT, + entry->len >> PAGE_SHIFT, + false); + list_del(&entry->list); + kfree(entry); + } + cond_resched(); + return unlocked; +} + static int vfio_pin_page_external(struct vfio_dma *dma, unsigned long vaddr, unsigned long *pfn_base, bool do_accounting) { @@ -648,12 +685,40 @@ static int vfio_iommu_type1_unpin_pages(void *iommu_data, return i > npage ? npage : (i > 0 ? i : -EINVAL); } +static size_t try_unmap_unpin_fast(struct vfio_domain *domain, dma_addr_t iova, + size_t len, phys_addr_t phys, + struct list_head *unmapped_regions) +{ + struct vfio_regions *entry; + size_t unmapped; + + entry = kzalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) + return -ENOMEM; + + unmapped = iommu_unmap_fast(domain->domain, iova, len); + if (WARN_ON(!unmapped)) { + kfree(entry); + return -EINVAL; + } + + iommu_tlb_range_add(domain->domain, iova, unmapped); + entry->iova = iova; + entry->phys = phys; + entry->len = unmapped; + list_add_tail(&entry->list, unmapped_regions); + return unmapped; +} + static long vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma, bool do_accounting) { dma_addr_t iova = dma->iova, end = dma->iova + dma->size; struct vfio_domain *domain, *d; + struct list_head unmapped_regions; + bool use_fastpath = true; long unlocked = 0; + int cnt = 0; if (!dma->size) return 0; @@ -661,6 +726,8 @@ static long vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma, if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu)) return 0; + INIT_LIST_HEAD(&unmapped_regions); + /* * We use the IOMMU to track the physical addresses, otherwise we'd * need a much more complicated tracking system. Unfortunately that @@ -698,6 +765,33 @@ static long vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma, break; } + /* + * First, try to use fast unmap/unpin. In case of failure, + * sync upto the current point, and continue the slow + * unmap/unpin path. + */ + if (use_fastpath) { + unmapped = try_unmap_unpin_fast(domain, iova, + len, phys, + &unmapped_regions); + if (unmapped > 0) { + iova += unmapped; + cnt++; + } else { + use_fastpath = false; + } + + if (cnt >= VFIO_IOMMU_TLB_SYNC_MAX || !use_fastpath) { + unlocked += vfio_sync_unpin(dma, domain, + &unmapped_regions); + cnt = 0; + } + + if (use_fastpath) + continue; + } + + /* Slow unmap/unpin path */ unmapped = iommu_unmap(domain->domain, iova, len); if (WARN_ON(!unmapped)) break; @@ -712,6 +806,10 @@ static long vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma, } dma->iommu_mapped = false; + + if (cnt) + unlocked += vfio_sync_unpin(dma, domain, &unmapped_regions); + if (do_accounting) { vfio_lock_acct(dma->task, -unlocked, NULL); return 0; -- 1.8.3.1