From: Nadav Amit <nadav.amit@gmail.com> To: Joerg Roedel <joro@8bytes.org> Cc: Nadav Amit <namit@vmware.com>, Will Deacon <will@kernel.org>, Jiajun Cao <caojiajun@vmware.com>, Robin Murphy <robin.murphy@arm.com>, Lu Baolu <baolu.lu@linux.intel.com>, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 6/6] iommu/amd: Sync once for scatter-gather operations Date: Mon, 7 Jun 2021 11:25:41 -0700 [thread overview] Message-ID: <20210607182541.119756-7-namit@vmware.com> (raw) In-Reply-To: <20210607182541.119756-1-namit@vmware.com> From: Nadav Amit <namit@vmware.com> On virtual machines, software must flush the IOTLB after each page table entry update. The iommu_map_sg() code iterates through the given scatter-gather list and invokes iommu_map() for each element in the scatter-gather list, which calls into the vendor IOMMU driver through iommu_ops callback. As the result, a single sg mapping may lead to multiple IOTLB flushes. Fix this by adding amd_iotlb_sync_map() callback and flushing at this point after all sg mappings we set. This commit is followed and inspired by commit 933fcd01e97e2 ("iommu/vt-d: Add iotlb_sync_map callback"). Cc: Joerg Roedel <joro@8bytes.org> Cc: Will Deacon <will@kernel.org> Cc: Jiajun Cao <caojiajun@vmware.com> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Lu Baolu <baolu.lu@linux.intel.com> Cc: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Nadav Amit <namit@vmware.com> --- drivers/iommu/amd/iommu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 128f2e889ced..dd23566f1db8 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -2027,6 +2027,16 @@ static int amd_iommu_attach_device(struct iommu_domain *dom, return ret; } +static void amd_iommu_iotlb_sync_map(struct iommu_domain *dom, + unsigned long iova, size_t size) +{ + struct protection_domain *domain = to_pdomain(dom); + struct io_pgtable_ops *ops = &domain->iop.iop.ops; + + if (ops->map) + domain_flush_np_cache(domain, iova, size); +} + static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova, phys_addr_t paddr, size_t page_size, int iommu_prot, gfp_t gfp) @@ -2045,10 +2055,8 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova, if (iommu_prot & IOMMU_WRITE) prot |= IOMMU_PROT_IW; - if (ops->map) { + if (ops->map) ret = ops->map(ops, iova, paddr, page_size, prot, gfp); - domain_flush_np_cache(domain, iova, page_size); - } return ret; } @@ -2249,6 +2257,7 @@ const struct iommu_ops amd_iommu_ops = { .attach_dev = amd_iommu_attach_device, .detach_dev = amd_iommu_detach_device, .map = amd_iommu_map, + .iotlb_sync_map = amd_iommu_iotlb_sync_map, .unmap = amd_iommu_unmap, .iova_to_phys = amd_iommu_iova_to_phys, .probe_device = amd_iommu_probe_device, -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Nadav Amit <nadav.amit@gmail.com> To: Joerg Roedel <joro@8bytes.org> Cc: Robin Murphy <robin.murphy@arm.com>, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Nadav Amit <namit@vmware.com>, Jiajun Cao <caojiajun@vmware.com>, Will Deacon <will@kernel.org> Subject: [PATCH v3 6/6] iommu/amd: Sync once for scatter-gather operations Date: Mon, 7 Jun 2021 11:25:41 -0700 [thread overview] Message-ID: <20210607182541.119756-7-namit@vmware.com> (raw) In-Reply-To: <20210607182541.119756-1-namit@vmware.com> From: Nadav Amit <namit@vmware.com> On virtual machines, software must flush the IOTLB after each page table entry update. The iommu_map_sg() code iterates through the given scatter-gather list and invokes iommu_map() for each element in the scatter-gather list, which calls into the vendor IOMMU driver through iommu_ops callback. As the result, a single sg mapping may lead to multiple IOTLB flushes. Fix this by adding amd_iotlb_sync_map() callback and flushing at this point after all sg mappings we set. This commit is followed and inspired by commit 933fcd01e97e2 ("iommu/vt-d: Add iotlb_sync_map callback"). Cc: Joerg Roedel <joro@8bytes.org> Cc: Will Deacon <will@kernel.org> Cc: Jiajun Cao <caojiajun@vmware.com> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Lu Baolu <baolu.lu@linux.intel.com> Cc: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Nadav Amit <namit@vmware.com> --- drivers/iommu/amd/iommu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 128f2e889ced..dd23566f1db8 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -2027,6 +2027,16 @@ static int amd_iommu_attach_device(struct iommu_domain *dom, return ret; } +static void amd_iommu_iotlb_sync_map(struct iommu_domain *dom, + unsigned long iova, size_t size) +{ + struct protection_domain *domain = to_pdomain(dom); + struct io_pgtable_ops *ops = &domain->iop.iop.ops; + + if (ops->map) + domain_flush_np_cache(domain, iova, size); +} + static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova, phys_addr_t paddr, size_t page_size, int iommu_prot, gfp_t gfp) @@ -2045,10 +2055,8 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova, if (iommu_prot & IOMMU_WRITE) prot |= IOMMU_PROT_IW; - if (ops->map) { + if (ops->map) ret = ops->map(ops, iova, paddr, page_size, prot, gfp); - domain_flush_np_cache(domain, iova, page_size); - } return ret; } @@ -2249,6 +2257,7 @@ const struct iommu_ops amd_iommu_ops = { .attach_dev = amd_iommu_attach_device, .detach_dev = amd_iommu_detach_device, .map = amd_iommu_map, + .iotlb_sync_map = amd_iommu_iotlb_sync_map, .unmap = amd_iommu_unmap, .iova_to_phys = amd_iommu_iova_to_phys, .probe_device = amd_iommu_probe_device, -- 2.25.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2021-06-08 1:56 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-07 18:25 [PATCH v3 0/6] iommu/amd: Enable page-selective flushes Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-07 18:25 ` [PATCH v3 1/6] iommu/amd: Selective flush on unmap Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-07 18:25 ` [PATCH v3 2/6] iommu/amd: Do not use flush-queue when NpCache is on Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-15 13:08 ` Robin Murphy 2021-06-15 13:08 ` Robin Murphy 2021-06-15 18:26 ` Nadav Amit 2021-06-15 18:26 ` Nadav Amit 2021-06-15 19:36 ` Robin Murphy 2021-06-15 19:36 ` Robin Murphy 2021-06-07 18:25 ` [PATCH v3 3/6] iommu: Improve iommu_iotlb_gather helpers Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-11 13:50 ` Will Deacon 2021-06-11 13:50 ` Will Deacon 2021-06-15 10:42 ` Robin Murphy 2021-06-15 10:42 ` Robin Murphy 2021-06-15 19:05 ` Nadav Amit 2021-06-15 19:05 ` Nadav Amit 2021-06-15 19:07 ` Nadav Amit 2021-06-15 19:07 ` Nadav Amit 2021-06-15 12:29 ` Yong Wu 2021-06-15 12:29 ` Yong Wu 2021-06-15 12:41 ` Robin Murphy 2021-06-15 12:41 ` Robin Murphy 2021-06-07 18:25 ` [PATCH v3 4/6] iommu: Factor iommu_iotlb_gather_is_disjoint() out Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-11 13:57 ` Will Deacon 2021-06-11 13:57 ` Will Deacon 2021-06-11 16:50 ` Nadav Amit 2021-06-11 16:50 ` Nadav Amit 2021-06-15 10:29 ` Will Deacon 2021-06-15 10:29 ` Will Deacon 2021-06-15 18:54 ` Nadav Amit 2021-06-15 18:54 ` Nadav Amit 2021-06-07 18:25 ` [PATCH v3 5/6] iommu/amd: Tailored gather logic for AMD Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-15 12:55 ` Robin Murphy 2021-06-15 12:55 ` Robin Murphy 2021-06-15 18:14 ` Nadav Amit 2021-06-15 18:14 ` Nadav Amit 2021-06-15 19:20 ` Robin Murphy 2021-06-15 19:20 ` Robin Murphy 2021-06-15 19:46 ` Nadav Amit 2021-06-15 19:46 ` Nadav Amit 2021-06-07 18:25 ` Nadav Amit [this message] 2021-06-07 18:25 ` [PATCH v3 6/6] iommu/amd: Sync once for scatter-gather operations Nadav Amit 2021-06-15 11:25 ` Robin Murphy 2021-06-15 11:25 ` Robin Murphy 2021-06-15 18:51 ` Nadav Amit 2021-06-15 18:51 ` Nadav Amit
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210607182541.119756-7-namit@vmware.com \ --to=nadav.amit@gmail.com \ --cc=baolu.lu@linux.intel.com \ --cc=caojiajun@vmware.com \ --cc=iommu@lists.linux-foundation.org \ --cc=joro@8bytes.org \ --cc=linux-kernel@vger.kernel.org \ --cc=namit@vmware.com \ --cc=robin.murphy@arm.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.