From: David Rientjes via iommu <iommu@lists.linux-foundation.org>
To: Christoph Hellwig <hch@lst.de>, Tom Lendacky <thomas.lendacky@amd.com>
Cc: "Singh, Brijesh" <brijesh.singh@amd.com>,
"Grimm, Jon" <jon.grimm@amd.com>,
baekhw@google.com,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"iommu@lists.linux-foundation.org"
<iommu@lists.linux-foundation.org>
Subject: [rfc 5/6] dma-direct: atomic allocations must come from unencrypted pools
Date: Sun, 1 Mar 2020 16:05:23 -0800 (PST) [thread overview]
Message-ID: <alpine.DEB.2.21.2003011538040.213582@chino.kir.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.21.2003011535510.213582@chino.kir.corp.google.com>
When AMD memory encryption is enabled, all non-blocking DMA allocations
must originate from the atomic pools depending on the device and the gfp
mask of the allocation.
Keep all memory in these pools unencrypted.
Signed-off-by: David Rientjes <rientjes@google.com>
---
arch/x86/Kconfig | 1 +
kernel/dma/direct.c | 9 ++++-----
kernel/dma/remap.c | 2 ++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1523,6 +1523,7 @@ config X86_CPA_STATISTICS
config AMD_MEM_ENCRYPT
bool "AMD Secure Memory Encryption (SME) support"
depends on X86_64 && CPU_SUP_AMD
+ select DMA_DIRECT_REMAP
select DYNAMIC_PHYSICAL_MASK
select ARCH_USE_MEMREMAP_PROT
select ARCH_HAS_FORCE_DMA_UNENCRYPTED
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -125,7 +125,6 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
void *ret;
if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) &&
- dma_alloc_need_uncached(dev, attrs) &&
!gfpflags_allow_blocking(gfp)) {
ret = dma_alloc_from_pool(dev, PAGE_ALIGN(size), &page, gfp);
if (!ret)
@@ -202,6 +201,10 @@ void dma_direct_free_pages(struct device *dev, size_t size, void *cpu_addr,
{
unsigned int page_order = get_order(size);
+ if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) &&
+ dma_free_from_pool(dev, cpu_addr, PAGE_ALIGN(size)))
+ return;
+
if ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) &&
!force_dma_unencrypted(dev)) {
/* cpu_addr is a struct page cookie, not a kernel address */
@@ -209,10 +212,6 @@ void dma_direct_free_pages(struct device *dev, size_t size, void *cpu_addr,
return;
}
- if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) &&
- dma_free_from_pool(dev, cpu_addr, PAGE_ALIGN(size)))
- return;
-
if (force_dma_unencrypted(dev))
set_memory_encrypted((unsigned long)cpu_addr, 1 << page_order);
diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c
--- a/kernel/dma/remap.c
+++ b/kernel/dma/remap.c
@@ -8,6 +8,7 @@
#include <linux/dma-contiguous.h>
#include <linux/init.h>
#include <linux/genalloc.h>
+#include <linux/set_memory.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/workqueue.h>
@@ -141,6 +142,7 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,
if (!addr)
goto free_page;
+ set_memory_decrypted((unsigned long)page_to_virt(page), nr_pages);
ret = gen_pool_add_virt(pool, (unsigned long)addr, page_to_phys(page),
pool_size, NUMA_NO_NODE);
if (ret)
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-03-02 0:05 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-01 1:54 [rfc] dma-mapping: preallocate unencrypted DMA atomic pool David Rientjes via iommu
2020-01-06 17:34 ` Robin Murphy
2020-01-07 10:54 ` Christoph Hellwig
2020-01-07 19:57 ` David Rientjes via iommu
2020-01-09 14:31 ` Christoph Hellwig
2020-01-09 18:58 ` David Rientjes via iommu
2020-01-17 15:28 ` Tom Lendacky
2020-02-28 9:27 ` David Rientjes via iommu
2020-03-02 0:05 ` [rfc 0/6] unencrypted atomic DMA pools with dynamic expansion David Rientjes via iommu
2020-03-02 0:05 ` [rfc 1/6] dma-mapping: pass device to atomic allocation functions David Rientjes via iommu
2020-03-02 0:05 ` [rfc 2/6] dma-remap: add additional atomic pools to map to gfp mask David Rientjes via iommu
2020-03-05 15:42 ` Christoph Hellwig
2020-03-02 0:05 ` [rfc 3/6] dma-remap: wire up the atomic pools depending on " David Rientjes via iommu
2020-03-05 15:43 ` Christoph Hellwig
2020-03-02 0:05 ` [rfc 4/6] dma-remap: dynamically expanding atomic pools David Rientjes via iommu
2020-03-03 22:29 ` David Rientjes via iommu
2020-03-02 0:05 ` David Rientjes via iommu [this message]
2020-03-05 15:44 ` [rfc 5/6] dma-direct: atomic allocations must come from unencrypted pools Christoph Hellwig
2020-03-07 0:36 ` David Rientjes via iommu
2020-03-10 18:47 ` Christoph Hellwig
2020-03-02 0:05 ` [rfc 6/6] dma-remap: double the default DMA coherent pool size David Rientjes via iommu
2020-03-05 15:45 ` Christoph Hellwig
2020-04-08 21:21 ` [rfc v2 0/6] unencrypted atomic DMA pools with dynamic expansion David Rientjes via iommu
2020-04-08 21:21 ` [rfc v2 1/6] dma-remap: separate DMA atomic pools from direct remap code David Rientjes via iommu
2020-04-14 6:35 ` Christoph Hellwig
2020-04-08 21:21 ` [rfc v2 2/6] dma-pool: add additional coherent pools to map to gfp mask David Rientjes via iommu
2020-04-08 21:21 ` [rfc v2 3/6] dma-pool: dynamically expanding atomic pools David Rientjes via iommu
2020-04-08 21:21 ` [rfc v2 4/6] dma-direct: atomic allocations must come from atomic coherent pools David Rientjes via iommu
2020-04-09 21:24 ` Tom Lendacky
2020-04-14 19:18 ` David Rientjes via iommu
2020-04-14 6:43 ` Christoph Hellwig
2020-04-14 19:20 ` David Rientjes via iommu
2020-04-08 21:21 ` [rfc v2 5/6] x86/mm: unencrypted non-blocking DMA allocations use " David Rientjes via iommu
2020-04-08 21:21 ` [rfc v2 6/6] dma-pool: scale the default DMA coherent pool size with memory capacity David Rientjes via iommu
2020-04-10 14:55 ` [rfc v2 3/6] dma-pool: dynamically expanding atomic pools Hillf Danton
2020-04-10 19:37 ` David Rientjes via iommu
2020-04-14 6:44 ` Christoph Hellwig
2020-04-14 19:23 ` David Rientjes via iommu
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=alpine.DEB.2.21.2003011538040.213582@chino.kir.corp.google.com \
--to=iommu@lists.linux-foundation.org \
--cc=baekhw@google.com \
--cc=brijesh.singh@amd.com \
--cc=hch@lst.de \
--cc=jon.grimm@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rientjes@google.com \
--cc=thomas.lendacky@amd.com \
/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).