Commit 4d96f910 authored by Tom Lendacky's avatar Tom Lendacky Committed by Borislav Petkov
Browse files

x86/sev: Replace occurrences of sev_active() with cc_platform_has() 



Replace uses of sev_active() with the more generic cc_platform_has()
using CC_ATTR_GUEST_MEM_ENCRYPT. If future support is added for other
memory encryption technologies, the use of CC_ATTR_GUEST_MEM_ENCRYPT
can be updated, as required.

Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210928191009.32551-7-bp@alien8.de
parent 32cb4d02

arch/x86/include/asm/mem_encrypt.h

+0 −2
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ void __init mem_encrypt_free_decrypted_mem(void); 
void __init mem_encrypt_init(void);



void __init sev_es_init_vc_handling(void);

bool sev_active(void);

bool sev_es_active(void);



#define __bss_decrypted __section(".bss..decrypted")
@@ -75,7 +74,6 @@ static inline void __init sme_encrypt_kernel(struct boot_params *bp) { } 
static inline void __init sme_enable(struct boot_params *bp) { }



static inline void sev_es_init_vc_handling(void) { }

static inline bool sev_active(void) { return false; }

static inline bool sev_es_active(void) { return false; }



static inline int __init

arch/x86/kernel/crash_dump_64.c

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/crash_dump.h>

#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/cc_platform.h>



static ssize_t __copy_oldmem_page(unsigned long pfn, char *buf, size_t csize,

				  unsigned long offset, int userbuf,
@@ -73,5 +74,6 @@ ssize_t copy_oldmem_page_encrypted(unsigned long pfn, char *buf, size_t csize, 


ssize_t elfcorehdr_read(char *buf, size_t count, u64 *ppos)

{

	return read_from_oldmem(buf, count, ppos, 0, sev_active());

	return read_from_oldmem(buf, count, ppos, 0,

				cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT));

}

arch/x86/kernel/kvm.c

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/nmi.h>

#include <linux/swait.h>

#include <linux/syscore_ops.h>

#include <linux/cc_platform.h>

#include <asm/timer.h>

#include <asm/cpu.h>

#include <asm/traps.h>
@@ -418,7 +419,7 @@ static void __init sev_map_percpu_data(void) 
{

	int cpu;



	if (!sev_active())

	if (!cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT))

		return;



	for_each_possible_cpu(cpu) {

arch/x86/kernel/kvmclock.c

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
#include <linux/mm.h>

#include <linux/slab.h>

#include <linux/set_memory.h>

#include <linux/cc_platform.h>



#include <asm/hypervisor.h>

#include <asm/mem_encrypt.h>

#include <asm/x86_init.h>

#include <asm/kvmclock.h>
@@ -223,7 +223,7 @@ static void __init kvmclock_init_mem(void) 
	 * hvclock is shared between the guest and the hypervisor, must

	 * be mapped decrypted.

	 */

	if (sev_active()) {

	if (cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT)) {

		r = set_memory_decrypted((unsigned long) hvclock_mem,

					 1UL << order);

		if (r) {

arch/x86/kernel/machine_kexec_64.c

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int init_transition_pgtable(struct kimage *image, pgd_t *pgd) 
	}

	pte = pte_offset_kernel(pmd, vaddr);



	if (sev_active())

	if (cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT))

		prot = PAGE_KERNEL_EXEC;



	set_pte(pte, pfn_pte(paddr >> PAGE_SHIFT, prot));
@@ -207,7 +207,7 @@ static int init_pgtable(struct kimage *image, unsigned long start_pgtable) 
	level4p = (pgd_t *)__va(start_pgtable);

	clear_page(level4p);



	if (sev_active()) {

	if (cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT)) {

		info.page_flag   |= _PAGE_ENC;

		info.kernpg_flag |= _PAGE_ENC;

	}