From: Christoph Hellwig <hch@lst.de>
To: David Rientjes <rientjes@google.com>
Cc: Christoph Hellwig <hch@lst.de>,
Tom Lendacky <thomas.lendacky@amd.com>,
Brijesh Singh <brijesh.singh@amd.com>,
Jon Grimm <jon.grimm@amd.com>, Joerg Roedel <joro@8bytes.org>,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
x86@kernel.org
Subject: Re: [patch 1/7] dma-remap: separate DMA atomic pools from direct remap code
Date: Fri, 17 Apr 2020 09:06:20 +0200 [thread overview]
Message-ID: <20200417070620.GA19153@lst.de> (raw)
In-Reply-To: <alpine.DEB.2.22.394.2004141703030.68516@chino.kir.corp.google.com>
On Tue, Apr 14, 2020 at 05:04:52PM -0700, David Rientjes wrote:
> DMA atomic pools will be needed beyond only CONFIG_DMA_DIRECT_REMAP so
> separate them out into their own file.
>
> This also adds a new Kconfig option that can be subsequently used for
> options, such as CONFIG_AMD_MEM_ENCRYPT, that will utilize the coherent
> pools but do not have a dependency on direct remapping.
>
> For this patch alone, there is no functional change introduced.
>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> Signed-off-by: David Rientjes <rientjes@google.com>
> ---
> kernel/dma/Kconfig | 6 ++-
> kernel/dma/Makefile | 1 +
> kernel/dma/pool.c | 123 ++++++++++++++++++++++++++++++++++++++++++++
> kernel/dma/remap.c | 114 ----------------------------------------
> 4 files changed, 129 insertions(+), 115 deletions(-)
> create mode 100644 kernel/dma/pool.c
>
> diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
> index 4c103a24e380..d006668c0027 100644
> --- a/kernel/dma/Kconfig
> +++ b/kernel/dma/Kconfig
> @@ -79,10 +79,14 @@ config DMA_REMAP
> select DMA_NONCOHERENT_MMAP
> bool
>
> -config DMA_DIRECT_REMAP
> +config DMA_COHERENT_POOL
> bool
> select DMA_REMAP
>
> +config DMA_DIRECT_REMAP
> + bool
> + select DMA_COHERENT_POOL
> +
> config DMA_CMA
> bool "DMA Contiguous Memory Allocator"
> depends on HAVE_DMA_CONTIGUOUS && CMA
> diff --git a/kernel/dma/Makefile b/kernel/dma/Makefile
> index d237cf3dc181..370f63344e9c 100644
> --- a/kernel/dma/Makefile
> +++ b/kernel/dma/Makefile
> @@ -6,4 +6,5 @@ obj-$(CONFIG_DMA_DECLARE_COHERENT) += coherent.o
> obj-$(CONFIG_DMA_VIRT_OPS) += virt.o
> obj-$(CONFIG_DMA_API_DEBUG) += debug.o
> obj-$(CONFIG_SWIOTLB) += swiotlb.o
> +obj-$(CONFIG_DMA_COHERENT_POOL) += pool.o
> obj-$(CONFIG_DMA_REMAP) += remap.o
> diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
> new file mode 100644
> index 000000000000..6612c2d51d3c
> --- /dev/null
> +++ b/kernel/dma/pool.c
> @@ -0,0 +1,123 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2020 Google LLC
This now also lost the ARM copyright in addition to the Linuxfoundation
one, but I can fix that up. Otherwise it looks good to me.
next prev parent reply other threads:[~2020-04-17 7:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 0:04 [patch 0/7] unencrypted atomic DMA pools with dynamic expansion David Rientjes
2020-04-15 0:04 ` [patch 1/7] dma-remap: separate DMA atomic pools from direct remap code David Rientjes
2020-04-17 7:06 ` Christoph Hellwig [this message]
2020-04-15 0:04 ` [patch 2/7] dma-pool: add additional coherent pools to map to gfp mask David Rientjes
2020-04-15 0:04 ` [patch 3/7] dma-pool: dynamically expanding atomic pools David Rientjes
2020-04-15 0:04 ` [patch 4/7] dma-direct: atomic allocations must come from atomic coherent pools David Rientjes
2020-04-17 7:09 ` Christoph Hellwig
2020-04-15 0:04 ` [patch 5/7] dma-pool: add pool sizes to debugfs David Rientjes
2020-04-15 13:45 ` Tom Lendacky
2020-04-17 7:10 ` Christoph Hellwig
2020-04-15 0:05 ` [patch 6/7] x86/mm: unencrypted non-blocking DMA allocations use coherent pools David Rientjes
2020-04-15 0:05 ` [patch 7/7] dma-pool: scale the default DMA coherent pool size with memory capacity David Rientjes
2020-04-17 7:11 ` [patch 0/7] unencrypted atomic DMA pools with dynamic expansion Christoph Hellwig
2020-04-17 18:41 ` David Rientjes
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=20200417070620.GA19153@lst.de \
--to=hch@lst.de \
--cc=bp@alien8.de \
--cc=brijesh.singh@amd.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jon.grimm@amd.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rientjes@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=x86@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: 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).