From: Oleksandr Tyshchenko <olekstysh@gmail.com> To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>, Stefano Stabellini <sstabellini@kernel.org>, Russell King <linux@armlinux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Boris Ostrovsky <boris.ostrovsky@oracle.com>, Juergen Gross <jgross@suse.com>, Logan Gunthorpe <logang@deltatee.com>, David Hildenbrand <david@redhat.com>, Martin Oliveira <martin.oliveira@eideticom.com>, Kees Cook <keescook@chromium.org>, Jean-Philippe Brucker <jean-philippe@linaro.org>, Julien Grall <julien@xen.org> Subject: [RFC PATCH 5/6] arm/xen: Introduce xen_setup_dma_ops() Date: Thu, 14 Apr 2022 22:19:32 +0300 [thread overview] Message-ID: <1649963973-22879-6-git-send-email-olekstysh@gmail.com> (raw) In-Reply-To: <1649963973-22879-1-git-send-email-olekstysh@gmail.com> From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> This patch introduces new helper and places it in new header. The helper's purpose is to assign any Xen specific DMA ops in a single place. For now, we deal with xen-swiotlb DMA ops only. The subsequent patch will add xen-virtio DMA ops case. Also re-use the xen_swiotlb_detect() check on Arm32. Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> --- arch/arm/include/asm/xen/xen-ops.h | 1 + arch/arm/mm/dma-mapping.c | 5 ++--- arch/arm64/include/asm/xen/xen-ops.h | 1 + arch/arm64/mm/dma-mapping.c | 5 ++--- include/xen/arm/xen-ops.h | 13 +++++++++++++ 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 arch/arm/include/asm/xen/xen-ops.h create mode 100644 arch/arm64/include/asm/xen/xen-ops.h create mode 100644 include/xen/arm/xen-ops.h diff --git a/arch/arm/include/asm/xen/xen-ops.h b/arch/arm/include/asm/xen/xen-ops.h new file mode 100644 index 00000000..8d2fa24 --- /dev/null +++ b/arch/arm/include/asm/xen/xen-ops.h @@ -0,0 +1 @@ +#include <xen/arm/xen-ops.h> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 82ffac6..a1bf9dd 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -33,7 +33,7 @@ #include <asm/dma-iommu.h> #include <asm/mach/map.h> #include <asm/system_info.h> -#include <xen/swiotlb-xen.h> +#include <asm/xen/xen-ops.h> #include "dma.h" #include "mm.h" @@ -2288,8 +2288,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()) - dev->dma_ops = &xen_swiotlb_dma_ops; + xen_setup_dma_ops(dev); #endif dev->archdata.dma_ops_setup = true; } diff --git a/arch/arm64/include/asm/xen/xen-ops.h b/arch/arm64/include/asm/xen/xen-ops.h new file mode 100644 index 00000000..8d2fa24 --- /dev/null +++ b/arch/arm64/include/asm/xen/xen-ops.h @@ -0,0 +1 @@ +#include <xen/arm/xen-ops.h> diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 6719f9e..831e673 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -9,9 +9,9 @@ #include <linux/dma-map-ops.h> #include <linux/dma-iommu.h> #include <xen/xen.h> -#include <xen/swiotlb-xen.h> #include <asm/cacheflush.h> +#include <asm/xen/xen-ops.h> void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, enum dma_data_direction dir) @@ -53,7 +53,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, iommu_setup_dma_ops(dev, dma_base, dma_base + size - 1); #ifdef CONFIG_XEN - if (xen_swiotlb_detect()) - dev->dma_ops = &xen_swiotlb_dma_ops; + xen_setup_dma_ops(dev); #endif } diff --git a/include/xen/arm/xen-ops.h b/include/xen/arm/xen-ops.h new file mode 100644 index 00000000..621da05 --- /dev/null +++ b/include/xen/arm/xen-ops.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_ARM_XEN_OPS_H +#define _ASM_ARM_XEN_OPS_H + +#include <xen/swiotlb-xen.h> + +static inline void xen_setup_dma_ops(struct device *dev) +{ + if (xen_swiotlb_detect()) + dev->dma_ops = &xen_swiotlb_dma_ops; +} + +#endif /* _ASM_ARM_XEN_OPS_H */ -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Oleksandr Tyshchenko <olekstysh@gmail.com> To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>, Stefano Stabellini <sstabellini@kernel.org>, Russell King <linux@armlinux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Boris Ostrovsky <boris.ostrovsky@oracle.com>, Juergen Gross <jgross@suse.com>, Logan Gunthorpe <logang@deltatee.com>, David Hildenbrand <david@redhat.com>, Martin Oliveira <martin.oliveira@eideticom.com>, Kees Cook <keescook@chromium.org>, Jean-Philippe Brucker <jean-philippe@linaro.org>, Julien Grall <julien@xen.org> Subject: [RFC PATCH 5/6] arm/xen: Introduce xen_setup_dma_ops() Date: Thu, 14 Apr 2022 22:19:32 +0300 [thread overview] Message-ID: <1649963973-22879-6-git-send-email-olekstysh@gmail.com> (raw) In-Reply-To: <1649963973-22879-1-git-send-email-olekstysh@gmail.com> From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> This patch introduces new helper and places it in new header. The helper's purpose is to assign any Xen specific DMA ops in a single place. For now, we deal with xen-swiotlb DMA ops only. The subsequent patch will add xen-virtio DMA ops case. Also re-use the xen_swiotlb_detect() check on Arm32. Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> --- arch/arm/include/asm/xen/xen-ops.h | 1 + arch/arm/mm/dma-mapping.c | 5 ++--- arch/arm64/include/asm/xen/xen-ops.h | 1 + arch/arm64/mm/dma-mapping.c | 5 ++--- include/xen/arm/xen-ops.h | 13 +++++++++++++ 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 arch/arm/include/asm/xen/xen-ops.h create mode 100644 arch/arm64/include/asm/xen/xen-ops.h create mode 100644 include/xen/arm/xen-ops.h diff --git a/arch/arm/include/asm/xen/xen-ops.h b/arch/arm/include/asm/xen/xen-ops.h new file mode 100644 index 00000000..8d2fa24 --- /dev/null +++ b/arch/arm/include/asm/xen/xen-ops.h @@ -0,0 +1 @@ +#include <xen/arm/xen-ops.h> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 82ffac6..a1bf9dd 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -33,7 +33,7 @@ #include <asm/dma-iommu.h> #include <asm/mach/map.h> #include <asm/system_info.h> -#include <xen/swiotlb-xen.h> +#include <asm/xen/xen-ops.h> #include "dma.h" #include "mm.h" @@ -2288,8 +2288,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()) - dev->dma_ops = &xen_swiotlb_dma_ops; + xen_setup_dma_ops(dev); #endif dev->archdata.dma_ops_setup = true; } diff --git a/arch/arm64/include/asm/xen/xen-ops.h b/arch/arm64/include/asm/xen/xen-ops.h new file mode 100644 index 00000000..8d2fa24 --- /dev/null +++ b/arch/arm64/include/asm/xen/xen-ops.h @@ -0,0 +1 @@ +#include <xen/arm/xen-ops.h> diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 6719f9e..831e673 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -9,9 +9,9 @@ #include <linux/dma-map-ops.h> #include <linux/dma-iommu.h> #include <xen/xen.h> -#include <xen/swiotlb-xen.h> #include <asm/cacheflush.h> +#include <asm/xen/xen-ops.h> void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, enum dma_data_direction dir) @@ -53,7 +53,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, iommu_setup_dma_ops(dev, dma_base, dma_base + size - 1); #ifdef CONFIG_XEN - if (xen_swiotlb_detect()) - dev->dma_ops = &xen_swiotlb_dma_ops; + xen_setup_dma_ops(dev); #endif } diff --git a/include/xen/arm/xen-ops.h b/include/xen/arm/xen-ops.h new file mode 100644 index 00000000..621da05 --- /dev/null +++ b/include/xen/arm/xen-ops.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_ARM_XEN_OPS_H +#define _ASM_ARM_XEN_OPS_H + +#include <xen/swiotlb-xen.h> + +static inline void xen_setup_dma_ops(struct device *dev) +{ + if (xen_swiotlb_detect()) + dev->dma_ops = &xen_swiotlb_dma_ops; +} + +#endif /* _ASM_ARM_XEN_OPS_H */ -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-04-14 19:20 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-14 19:19 [RFC PATCH 0/6] virtio: Solution to restrict memory access under Xen using xen-virtio DMA ops layer Oleksandr Tyshchenko 2022-04-14 19:19 ` Oleksandr Tyshchenko 2022-04-14 19:19 ` [RFC PATCH 1/6] xen/grants: support allocating consecutive grants Oleksandr Tyshchenko 2022-04-14 19:19 ` Oleksandr Tyshchenko 2022-04-14 19:19 ` [RFC PATCH 2/6] virtio: add option to restrict memory access under Xen Oleksandr Tyshchenko 2022-04-14 19:19 ` Oleksandr Tyshchenko 2022-04-14 19:43 ` H. Peter Anvin 2022-04-15 15:20 ` Oleksandr 2022-04-15 15:20 ` Oleksandr 2022-04-15 22:01 ` Stefano Stabellini 2022-04-17 17:02 ` Oleksandr 2022-04-17 17:02 ` Oleksandr 2022-04-18 19:11 ` Stefano Stabellini 2022-04-18 19:11 ` Stefano Stabellini 2022-04-19 6:21 ` Juergen Gross 2022-04-19 6:21 ` Juergen Gross 2022-04-19 6:37 ` Oleksandr 2022-04-19 6:37 ` Oleksandr 2022-04-14 19:19 ` [RFC PATCH 3/6] dt-bindings: xen: Add xen,dev-domid property description for xen-virtio layer Oleksandr Tyshchenko 2022-04-14 19:19 ` [RFC PATCH 3/6] dt-bindings: xen: Add xen, dev-domid " Oleksandr Tyshchenko 2022-04-15 22:01 ` [RFC PATCH 3/6] dt-bindings: xen: Add xen,dev-domid " Stefano Stabellini 2022-04-15 22:01 ` Stefano Stabellini 2022-04-17 17:24 ` Oleksandr 2022-04-17 17:24 ` Oleksandr 2022-04-14 19:19 ` [RFC PATCH 4/6] virtio: Various updates to xen-virtio DMA ops layer Oleksandr Tyshchenko 2022-04-14 19:19 ` Oleksandr Tyshchenko 2022-04-15 22:02 ` Stefano Stabellini 2022-04-15 22:02 ` Stefano Stabellini 2022-04-17 18:21 ` Oleksandr 2022-04-17 18:21 ` Oleksandr 2022-04-18 19:11 ` Stefano Stabellini 2022-04-18 19:11 ` Stefano Stabellini 2022-04-19 6:58 ` Juergen Gross 2022-04-19 6:58 ` Juergen Gross 2022-04-19 7:07 ` Oleksandr 2022-04-19 7:07 ` Oleksandr 2022-04-16 6:05 ` Christoph Hellwig 2022-04-16 6:05 ` Christoph Hellwig 2022-04-17 18:39 ` Oleksandr 2022-04-17 18:39 ` Oleksandr 2022-04-14 19:19 ` Oleksandr Tyshchenko [this message] 2022-04-14 19:19 ` [RFC PATCH 5/6] arm/xen: Introduce xen_setup_dma_ops() Oleksandr Tyshchenko 2022-04-15 22:02 ` Stefano Stabellini 2022-04-15 22:02 ` Stefano Stabellini 2022-04-17 18:43 ` Oleksandr 2022-04-17 18:43 ` Oleksandr 2022-04-14 19:19 ` [RFC PATCH 6/6] arm/xen: Assign xen-virtio DMA ops for virtio devices in Xen guests Oleksandr Tyshchenko 2022-04-14 19:19 ` Oleksandr Tyshchenko 2022-04-15 22:02 ` Stefano Stabellini 2022-04-15 22:02 ` Stefano Stabellini 2022-04-16 6:07 ` Christoph Hellwig 2022-04-16 6:07 ` Christoph Hellwig 2022-04-17 21:05 ` Oleksandr 2022-04-17 21:05 ` Oleksandr 2022-04-18 19:11 ` Stefano Stabellini 2022-04-18 19:11 ` Stefano Stabellini 2022-04-19 12:17 ` Oleksandr 2022-04-19 12:17 ` Oleksandr 2022-04-19 14:48 ` Juergen Gross 2022-04-19 14:48 ` Juergen Gross 2022-04-19 17:11 ` Oleksandr 2022-04-19 17:11 ` Oleksandr 2022-04-20 0:23 ` Stefano Stabellini 2022-04-20 0:23 ` Stefano Stabellini 2022-04-20 9:00 ` Oleksandr 2022-04-20 9:00 ` Oleksandr 2022-04-20 22:49 ` Stefano Stabellini 2022-04-20 22:49 ` Stefano Stabellini 2022-04-17 19:20 ` Oleksandr 2022-04-17 19:20 ` Oleksandr 2022-04-15 7:41 ` [RFC PATCH 0/6] virtio: Solution to restrict memory access under Xen using xen-virtio DMA ops layer Christoph Hellwig 2022-04-15 7:41 ` Christoph Hellwig 2022-04-15 7:41 ` Christoph Hellwig 2022-04-15 10:04 ` Oleksandr 2022-04-15 10:04 ` Oleksandr 2022-04-15 8:44 ` Michael S. Tsirkin 2022-04-15 8:44 ` Michael S. Tsirkin 2022-04-15 8:44 ` Michael S. Tsirkin 2022-04-15 15:29 ` Oleksandr 2022-04-15 15:29 ` Oleksandr
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=1649963973-22879-6-git-send-email-olekstysh@gmail.com \ --to=olekstysh@gmail.com \ --cc=boris.ostrovsky@oracle.com \ --cc=catalin.marinas@arm.com \ --cc=david@redhat.com \ --cc=jean-philippe@linaro.org \ --cc=jgross@suse.com \ --cc=julien@xen.org \ --cc=keescook@chromium.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=logang@deltatee.com \ --cc=martin.oliveira@eideticom.com \ --cc=oleksandr_tyshchenko@epam.com \ --cc=sstabellini@kernel.org \ --cc=will@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: 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.