From: Roman Skakun <rm.skakun@gmail.com>
To: Stefano Stabellini <sstabellini@kernel.org>,
Julien Grall <julien@xen.org>,
xen-devel@lists.xenproject.org
Cc: Roman Skakun <roman_skakun@epam.com>,
Roman Skakun <rm.skakun@gmail.com>,
Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>,
Andrii Anisov <andrii_anisov@epam.com>,
Roman Skakun <Roman_Skakun@epam.com>
Subject: [RFC PATCH] dma-mapping: don't set swiotlb-xen fops for IOMMU-protected devices
Date: Mon, 4 Oct 2021 12:54:03 +0300 [thread overview]
Message-ID: <20211004095415.100756-1-Roman_Skakun@epam.com> (raw)
In-Reply-To: <cover.1633106362.git.roman_skakun@epam.com>
Prior to this patch swiotlb-xen fops are set for all devices when
we are booting as as Dom0 or direct-mapped DomU.
Since Xen now marks devices which are IOMMU-protected by
adding additional property to the relevant device, we can
check for this property and don't set swiotlb-xen fops for
any IOMMU-protected device.
Signed-off-by: Roman Skakun <Roman_Skakun@epam.com>
---
arch/arm/mm/dma-mapping.c | 2 +-
arch/arm/xen/enlighten.c | 4 ++++
arch/arm64/mm/dma-mapping.c | 2 +-
include/xen/xen.h | 2 ++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index c4b8df2ad328..c3e5841d871e 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -2280,7 +2280,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
set_dma_ops(dev, dma_ops);
#ifdef CONFIG_XEN
- if (xen_initial_domain())
+ if (xen_initial_domain() && !xen_is_device_protected(dev))
dev->dma_ops = &xen_swiotlb_dma_ops;
#endif
dev->archdata.dma_ops_setup = true;
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 49f566ad9acb..6ddef3233095 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -425,6 +425,10 @@ static int __init xen_pm_init(void)
}
late_initcall(xen_pm_init);
+bool xen_is_device_protected(void *obj) {
+ struct device *dev = obj;
+ return of_property_read_bool(dev->of_node, "xen,behind-iommu");
+}
/* empty stubs */
void xen_arch_pre_suspend(void) { }
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 93e87b287556..0af5f7a63124 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -53,7 +53,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
iommu_setup_dma_ops(dev, dma_base, size);
#ifdef CONFIG_XEN
- if (xen_initial_domain())
+ if (xen_initial_domain() && !xen_is_device_protected(dev))
dev->dma_ops = &xen_swiotlb_dma_ops;
#endif
}
diff --git a/include/xen/xen.h b/include/xen/xen.h
index 43efba045acc..3725d69de6f9 100644
--- a/include/xen/xen.h
+++ b/include/xen/xen.h
@@ -61,4 +61,6 @@ void xen_free_unpopulated_pages(unsigned int nr_pages, struct page **pages);
#include <xen/balloon.h>
#endif
+bool xen_is_device_protected(void *obj);
+
#endif /* _XEN_XEN_H */
--
2.27.0
next prev parent reply other threads:[~2021-10-04 9:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-04 9:54 [RFC 0/1] tag IOMMU-protected devices in Dom0 fdt Roman Skakun
2021-10-04 9:54 ` [RFC 1/1] xen/arm: set iommu property for IOMMU-protected devices Roman Skakun
2021-10-06 12:45 ` Oleksandr
2021-10-07 11:04 ` Roman Skakun
2021-11-08 18:30 ` Julien Grall
2021-11-10 21:12 ` Stefano Stabellini
2021-12-07 15:40 ` Sergiy Kibrik
2021-12-10 2:04 ` Stefano Stabellini
2021-10-04 9:54 ` Roman Skakun [this message]
2021-10-12 14:11 ` [RFC 0/1] tag IOMMU-protected devices in Dom0 fdt Roman Skakun
2021-10-12 14:20 ` Julien Grall
2021-10-12 14:23 ` Roman Skakun
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=20211004095415.100756-1-Roman_Skakun@epam.com \
--to=rm.skakun@gmail.com \
--cc=Volodymyr_Babchuk@epam.com \
--cc=andrii_anisov@epam.com \
--cc=julien@xen.org \
--cc=roman_skakun@epam.com \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).