[tip:x86/urgent] x86/mm: Unbreak modules that use the DMA API

From: tip-bot for Tom Lendacky
Date: Mon Dec 18 2017 - 07:12:34 EST

Commit-ID: 9d5f38ba6c82359b7cec31fb27fb78ecc02f3946
Gitweb: https://git.kernel.org/tip/9d5f38ba6c82359b7cec31fb27fb78ecc02f3946
Author: Tom Lendacky <thomas.lendacky@xxxxxxx>
AuthorDate: Fri, 15 Dec 2017 10:20:12 -0600
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Mon, 18 Dec 2017 13:06:13 +0100

x86/mm: Unbreak modules that use the DMA API

Commit d8aa7eea78a1 ("x86/mm: Add Secure Encrypted Virtualization (SEV)
support") changed sme_active() from an inline function that referenced
sme_me_mask to a non-inlined function in order to make the sev_enabled
variable a static variable. This function was marked EXPORT_SYMBOL_GPL
because at the time the patch was submitted, sme_me_mask was marked

Commit 87df26175e67 ("x86/mm: Unbreak modules that rely on external
PAGE_KERNEL availability") changed sme_me_mask variable from
EXPORT_SYMBOL_GPL to EXPORT_SYMBOL, allowing external modules the ability
to build with CONFIG_AMD_MEM_ENCRYPT=y. Now, however, with sev_active()
no longer an inline function and marked as EXPORT_SYMBOL_GPL, external
modules that use the DMA API are once again broken in 4.15. Since the DMA
API is meant to be used by external modules, this needs to be changed.

Change the sme_active() and sev_active() functions from EXPORT_SYMBOL_GPL

Signed-off-by: Tom Lendacky <thomas.lendacky@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: Brijesh Singh <brijesh.singh@xxxxxxx>
Link: https://lkml.kernel.org/r/20171215162011.14125.7113.stgit@xxxxxxxxxxxxxxxxxxxxxxxxx

arch/x86/mm/mem_encrypt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
index d9a9e9f..391b134 100644
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@ -405,13 +405,13 @@ bool sme_active(void)
return sme_me_mask && !sev_enabled;

bool sev_active(void)
return sme_me_mask && sev_enabled;

static const struct dma_map_ops sev_dma_ops = {
.alloc = sev_alloc,