Commit 99419b25 authored by Tom Lendacky's avatar Tom Lendacky Committed by Borislav Petkov
Browse files

x86/kvm: Add KVM-specific VMMCALL handling under SEV-ES 



Implement the callbacks to copy the processor state required by KVM to
the GHCB.

Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
[ jroedel@suse.de: - Split out of a larger patch
                   - Adapt to different callback functions ]
Co-developed-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200907131613.12703-64-joro@8bytes.org
parent f6a9f8a4

arch/x86/kernel/kvm.c

+29 −6
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#include <asm/hypervisor.h>

#include <asm/tlb.h>

#include <asm/cpuidle_haltpoll.h>

#include <asm/ptrace.h>

#include <asm/svm.h>



DEFINE_STATIC_KEY_FALSE(kvm_async_pf_enabled);
@@ -746,6 +748,23 @@ static void __init kvm_init_platform(void) 
	x86_platform.apic_post_init = kvm_apic_init;

}



#if defined(CONFIG_AMD_MEM_ENCRYPT)

static void kvm_sev_es_hcall_prepare(struct ghcb *ghcb, struct pt_regs *regs)

{

	/* RAX and CPL are already in the GHCB */

	ghcb_set_rbx(ghcb, regs->bx);

	ghcb_set_rcx(ghcb, regs->cx);

	ghcb_set_rdx(ghcb, regs->dx);

	ghcb_set_rsi(ghcb, regs->si);

}



static bool kvm_sev_es_hcall_finish(struct ghcb *ghcb, struct pt_regs *regs)

{

	/* No checking of the return state needed */

	return true;

}

#endif



const __initconst struct hypervisor_x86 x86_hyper_kvm = {

	.name				= "KVM",

	.detect				= kvm_detect,
@@ -753,6 +772,10 @@ const __initconst struct hypervisor_x86 x86_hyper_kvm = { 
	.init.guest_late_init		= kvm_guest_init,

	.init.x2apic_available		= kvm_para_available,

	.init.init_platform		= kvm_init_platform,

#if defined(CONFIG_AMD_MEM_ENCRYPT)

	.runtime.sev_es_hcall_prepare	= kvm_sev_es_hcall_prepare,

	.runtime.sev_es_hcall_finish	= kvm_sev_es_hcall_finish,

#endif

};



static __init int activate_jump_labels(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE