From: "Michael Kelley (LINUX)" <mikelley@microsoft.com>
To: Christoph Hellwig <hch@lst.de>,
"iommu@lists.linux-foundation.org"
<iommu@lists.linux-foundation.org>
Cc: "x86@kernel.org" <x86@kernel.org>,
Anshuman Khandual <anshuman.khandual@arm.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Juergen Gross <jgross@suse.com>, Joerg Roedel <joro@8bytes.org>,
David Woodhouse <dwmw2@infradead.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
Robin Murphy <robin.murphy@arm.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>,
"linux-ia64@vger.kernel.org" <linux-ia64@vger.kernel.org>,
"linux-mips@vger.kernel.org" <linux-mips@vger.kernel.org>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
"linux-riscv@lists.infradead.org"
<linux-riscv@lists.infradead.org>,
"linux-s390@vger.kernel.org" <linux-s390@vger.kernel.org>,
"linux-hyperv@vger.kernel.org" <linux-hyperv@vger.kernel.org>,
"tboot-devel@lists.sourceforge.net"
<tboot-devel@lists.sourceforge.net>,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>
Subject: RE: [PATCH 10/12] swiotlb: add a SWIOTLB_ANY flag to lift the low memory restriction
Date: Fri, 4 Mar 2022 18:12:52 +0000 [thread overview]
Message-ID: <MN0PR21MB3098F7AFC85BE5D83B0E64E5D7059@MN0PR21MB3098.namprd21.prod.outlook.com> (raw)
In-Reply-To: <20220301105311.885699-11-hch@lst.de>
From: Christoph Hellwig <hch@lst.de> Sent: Tuesday, March 1, 2022 2:53 AM
>
> Power SVM wants to allocate a swiotlb buffer that is not restricted to low memory for
> the trusted hypervisor scheme. Consolidate the support for this into the swiotlb_init
> interface by adding a new flag.
Hyper-V Isolated VMs want to do the same thing of not restricting the swiotlb
buffer to low memory. That's what Tianyu Lan's patch set[1] is proposing.
Hyper-V synthetic devices have no DMA addressing limitations, and the
likelihood of using a PCI pass-thru device with addressing limitations in an
Isolated VM seems vanishingly small.
So could use of the SWIOTLB_ANY flag be generalized? Let Hyper-V init
code set the flag before swiotlb_init() is called. Or provide a CONFIG
variable that Hyper-V Isolated VMs could set.
Michael
[1] https://lore.kernel.org/lkml/20220209122302.213882-1-ltykernel@gmail.com/
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> arch/powerpc/include/asm/svm.h | 4 ----
> arch/powerpc/include/asm/swiotlb.h | 1 +
> arch/powerpc/kernel/dma-swiotlb.c | 1 +
> arch/powerpc/mm/mem.c | 5 +----
> arch/powerpc/platforms/pseries/svm.c | 26 +-------------------------
> include/linux/swiotlb.h | 1 +
> kernel/dma/swiotlb.c | 9 +++++++--
> 7 files changed, 12 insertions(+), 35 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/svm.h b/arch/powerpc/include/asm/svm.h
> index 7546402d796af..85580b30aba48 100644
> --- a/arch/powerpc/include/asm/svm.h
> +++ b/arch/powerpc/include/asm/svm.h
> @@ -15,8 +15,6 @@ static inline bool is_secure_guest(void)
> return mfmsr() & MSR_S;
> }
>
> -void __init svm_swiotlb_init(void);
> -
> void dtl_cache_ctor(void *addr);
> #define get_dtl_cache_ctor() (is_secure_guest() ? dtl_cache_ctor : NULL)
>
> @@ -27,8 +25,6 @@ static inline bool is_secure_guest(void)
> return false;
> }
>
> -static inline void svm_swiotlb_init(void) {}
> -
> #define get_dtl_cache_ctor() NULL
>
> #endif /* CONFIG_PPC_SVM */
> diff --git a/arch/powerpc/include/asm/swiotlb.h
> b/arch/powerpc/include/asm/swiotlb.h
> index 3c1a1cd161286..4203b5e0a88ed 100644
> --- a/arch/powerpc/include/asm/swiotlb.h
> +++ b/arch/powerpc/include/asm/swiotlb.h
> @@ -9,6 +9,7 @@
> #include <linux/swiotlb.h>
>
> extern unsigned int ppc_swiotlb_enable;
> +extern unsigned int ppc_swiotlb_flags;
>
> #ifdef CONFIG_SWIOTLB
> void swiotlb_detect_4g(void);
> diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-
> swiotlb.c
> index fc7816126a401..ba256c37bcc0f 100644
> --- a/arch/powerpc/kernel/dma-swiotlb.c
> +++ b/arch/powerpc/kernel/dma-swiotlb.c
> @@ -10,6 +10,7 @@
> #include <asm/swiotlb.h>
>
> unsigned int ppc_swiotlb_enable;
> +unsigned int ppc_swiotlb_flags;
>
> void __init swiotlb_detect_4g(void)
> {
> diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index
> e1519e2edc656..a4d65418c30a9 100644
> --- a/arch/powerpc/mm/mem.c
> +++ b/arch/powerpc/mm/mem.c
> @@ -249,10 +249,7 @@ void __init mem_init(void)
> * back to to-down.
> */
> memblock_set_bottom_up(true);
> - if (is_secure_guest())
> - svm_swiotlb_init();
> - else
> - swiotlb_init(ppc_swiotlb_enable, 0);
> + swiotlb_init(ppc_swiotlb_enable, ppc_swiotlb_flags);
> #endif
>
> high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); diff --git
> a/arch/powerpc/platforms/pseries/svm.c b/arch/powerpc/platforms/pseries/svm.c
> index c5228f4969eb2..3b4045d508ec8 100644
> --- a/arch/powerpc/platforms/pseries/svm.c
> +++ b/arch/powerpc/platforms/pseries/svm.c
> @@ -28,7 +28,7 @@ static int __init init_svm(void)
> * need to use the SWIOTLB buffer for DMA even if dma_capable() says
> * otherwise.
> */
> - swiotlb_force = SWIOTLB_FORCE;
> + ppc_swiotlb_flags |= SWIOTLB_ANY | SWIOTLB_FORCE;
>
> /* Share the SWIOTLB buffer with the host. */
> swiotlb_update_mem_attributes();
> @@ -37,30 +37,6 @@ static int __init init_svm(void) } machine_early_initcall(pseries,
> init_svm);
>
> -/*
> - * Initialize SWIOTLB. Essentially the same as swiotlb_init(), except that it
> - * can allocate the buffer anywhere in memory. Since the hypervisor doesn't have
> - * any addressing limitation, we don't need to allocate it in low addresses.
> - */
> -void __init svm_swiotlb_init(void)
> -{
> - unsigned char *vstart;
> - unsigned long bytes, io_tlb_nslabs;
> -
> - io_tlb_nslabs = (swiotlb_size_or_default() >> IO_TLB_SHIFT);
> - io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE);
> -
> - bytes = io_tlb_nslabs << IO_TLB_SHIFT;
> -
> - vstart = memblock_alloc(PAGE_ALIGN(bytes), PAGE_SIZE);
> - if (vstart && !swiotlb_init_with_tbl(vstart, io_tlb_nslabs, false))
> - return;
> -
> -
> - memblock_free(vstart, PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
> - panic("SVM: Cannot allocate SWIOTLB buffer");
> -}
> -
> int set_memory_encrypted(unsigned long addr, int numpages) {
> if (!cc_platform_has(CC_ATTR_MEM_ENCRYPT))
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index
> dcecf953f7997..ee655f2e4d28b 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -15,6 +15,7 @@ struct scatterlist;
>
> #define SWIOTLB_VERBOSE (1 << 0) /* verbose initialization */
> #define SWIOTLB_FORCE (1 << 1) /* force bounce buffering */
> +#define SWIOTLB_ANY (1 << 2) /* allow any memory for the buffer */
>
> /*
> * Maximum allowable number of contiguous slabs to map, diff --git
> a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 1a40c71c4d51a..77cf73dc20a78
> 100644
> --- a/kernel/dma/swiotlb.c
> +++ b/kernel/dma/swiotlb.c
> @@ -275,8 +275,13 @@ void __init swiotlb_init(bool addressing_limit, unsigned int
> flags)
> if (swiotlb_force_disable)
> return;
>
> - /* Get IO TLB memory from the low pages */
> - tlb = memblock_alloc_low(bytes, PAGE_SIZE);
> + /*
> + * By default allocate the bonuce buffer memory from low memory.
> + */
> + if (flags & SWIOTLB_ANY)
> + tlb = memblock_alloc(bytes, PAGE_SIZE);
> + else
> + tlb = memblock_alloc_low(bytes, PAGE_SIZE);
> if (!tlb)
> goto fail;
> if (swiotlb_init_with_tbl(tlb, default_nslabs, flags))
> --
> 2.30.2
next prev parent reply other threads:[~2022-03-04 18:12 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 10:52 cleanup swiotlb initialization v4 Christoph Hellwig
2022-03-01 10:53 ` [PATCH 01/12] dma-direct: use is_swiotlb_active in dma_direct_map_page Christoph Hellwig
2022-03-01 10:53 ` [PATCH 02/12] swiotlb: make swiotlb_exit a no-op if SWIOTLB_FORCE is set Christoph Hellwig
2022-03-01 10:53 ` [PATCH 03/12] swiotlb: simplify swiotlb_max_segment Christoph Hellwig
2022-03-01 10:53 ` [PATCH 04/12] swiotlb: rename swiotlb_late_init_with_default_size Christoph Hellwig
2022-03-01 10:53 ` [PATCH 05/12] swiotlb: pass a gfp_mask argument to swiotlb_init_late Christoph Hellwig
2022-03-01 10:53 ` [PATCH 06/12] MIPS/octeon: use swiotlb_init instead of open coding it Christoph Hellwig
2022-03-03 16:39 ` Thomas Bogendoerfer
2022-03-01 10:53 ` [PATCH 07/12] x86: remove the IOMMU table infrastructure Christoph Hellwig
2022-03-01 10:53 ` [PATCH 08/12] x86: centralize setting SWIOTLB_FORCE when guest memory encryption is enabled Christoph Hellwig
2022-03-01 11:39 ` Andrew Cooper
2022-03-01 11:43 ` Christoph Hellwig
2022-03-01 10:53 ` [PATCH 09/12] swiotlb: make the swiotlb_init interface more useful Christoph Hellwig
2022-03-01 10:53 ` [PATCH 10/12] swiotlb: add a SWIOTLB_ANY flag to lift the low memory restriction Christoph Hellwig
2022-03-04 18:12 ` Michael Kelley (LINUX) [this message]
2022-03-04 18:27 ` Dongli Zhang
2022-03-06 17:01 ` Michael Kelley (LINUX)
2022-03-01 10:53 ` [PATCH 11/12] swiotlb: merge swiotlb-xen initialization into swiotlb Christoph Hellwig
2022-03-02 2:55 ` Stefano Stabellini
2022-03-02 8:15 ` Christoph Hellwig
2022-03-03 1:25 ` Stefano Stabellini
2022-03-03 10:59 ` Christoph Hellwig
2022-03-03 22:49 ` Stefano Stabellini
2022-03-04 16:34 ` Christoph Hellwig
2022-03-04 23:22 ` Stefano Stabellini
2022-03-02 13:15 ` Boris Ostrovsky
2022-03-02 13:17 ` Boris Ostrovsky
2022-03-03 10:57 ` Christoph Hellwig
2022-03-03 19:06 ` Boris Ostrovsky
2022-03-04 17:28 ` Christoph Hellwig
2022-03-04 17:36 ` Boris Ostrovsky
2022-03-04 17:43 ` Christoph Hellwig
2022-03-04 20:18 ` Boris Ostrovsky
2022-03-04 21:03 ` Christoph Hellwig
2022-03-08 21:38 ` Boris Ostrovsky
2022-03-09 6:18 ` Christoph Hellwig
2022-03-09 15:18 ` Boris Ostrovsky
2022-03-01 10:53 ` [PATCH 12/12] x86: remove cruft from <asm/dma-mapping.h> Christoph Hellwig
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=MN0PR21MB3098F7AFC85BE5D83B0E64E5D7059@MN0PR21MB3098.namprd21.prod.outlook.com \
--to=mikelley@microsoft.com \
--cc=anshuman.khandual@arm.com \
--cc=baolu.lu@linux.intel.com \
--cc=boris.ostrovsky@oracle.com \
--cc=dwmw2@infradead.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jgross@suse.com \
--cc=joro@8bytes.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=robin.murphy@arm.com \
--cc=sstabellini@kernel.org \
--cc=tboot-devel@lists.sourceforge.net \
--cc=thomas.lendacky@amd.com \
--cc=x86@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).