Skip to content

Commit 87df261

Browse files
Jiri Kosinatorvalds
authored andcommitted
x86/mm: Unbreak modules that rely on external PAGE_KERNEL availability
Commit 7744ccd ("x86/mm: Add Secure Memory Encryption (SME) support") as a side-effect made PAGE_KERNEL all of a sudden unavailable to modules which can't make use of EXPORT_SYMBOL_GPL() symbols. This is because once SME is enabled, sme_me_mask (which is introduced as EXPORT_SYMBOL_GPL) makes its way to PAGE_KERNEL through _PAGE_ENC, causing imminent build failure for all the modules which make use of all the EXPORT-SYMBOL()-exported API (such as vmap(), __vmalloc(), remap_pfn_range(), ...). Exporting (as EXPORT_SYMBOL()) interfaces (and having done so for ages) that take pgprot_t argument, while making it impossible to -- all of a sudden -- pass PAGE_KERNEL to it, feels rather incosistent. Restore the original behavior and make it possible to pass PAGE_KERNEL to all its EXPORT_SYMBOL() consumers. [ This is all so not wonderful. We shouldn't need that "sme_me_mask" access at all in all those places that really don't care about that level of detail, and just want _PAGE_KERNEL or whatever. We have some similar issues with _PAGE_CACHE_WP and _PAGE_NOCACHE, both of which hide a "cachemode2protval()" call, and which also ends up using another EXPORT_SYMBOL(), but at least that only triggers for the much more rare cases. Maybe we could move these dynamic page table bits to be generated much deeper down in the VM layer, instead of hiding them in the macros that everybody uses. So this all would merit some cleanup. But not today. - Linus ] Cc: Tom Lendacky <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Despised-by: Thomas Gleixner <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent d6a2cf0 commit 87df261

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/mm/mem_encrypt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static char sme_cmdline_off[] __initdata = "off";
4040
* section is later cleared.
4141
*/
4242
u64 sme_me_mask __section(.data) = 0;
43-
EXPORT_SYMBOL_GPL(sme_me_mask);
43+
EXPORT_SYMBOL(sme_me_mask);
4444

4545
/* Buffer used for early in-place encryption by BSP, no locking needed */
4646
static char sme_early_buffer[PAGE_SIZE] __aligned(PAGE_SIZE);

0 commit comments

Comments
 (0)