From: Peter Gonda <[email protected]> Add helper functions for guest code to check the status of SEV and SEV-ES.
Cc: Paolo Bonzini <[email protected]> Cc: Claudio Imbrenda <[email protected]> Cc: Sean Christopherson <[email protected]> Cc: Carlos Bilbao <[email protected]> Cc: Tom Lendacky <[email protected]> Cc: Michael Roth <[email protected]> Signed-off-by: Peter Gonda <[email protected]> Signed-off-by: Neeraj Upadhyay <[email protected]> --- tools/testing/selftests/kvm/include/x86/sev.h | 17 +++++++++++++++++ .../testing/selftests/kvm/x86/sev_smoke_test.c | 11 +++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86/sev.h b/tools/testing/selftests/kvm/include/x86/sev.h index 6cda0acd22e4..2c1bd27345f4 100644 --- a/tools/testing/selftests/kvm/include/x86/sev.h +++ b/tools/testing/selftests/kvm/include/x86/sev.h @@ -46,6 +46,23 @@ static inline bool is_sev_vm(struct kvm_vm *vm) return is_sev_es_vm(vm) || vm->type == KVM_X86_SEV_VM; } +static inline bool is_sev_enabled(void) +{ + return rdmsr(MSR_AMD64_SEV) & MSR_AMD64_SEV_ENABLED; +} + +static inline bool is_sev_es_enabled(void) +{ + return is_sev_enabled() && + rdmsr(MSR_AMD64_SEV) & MSR_AMD64_SEV_ES_ENABLED; +} + +static inline bool is_sev_snp_enabled(void) +{ + return is_sev_es_enabled() && + rdmsr(MSR_AMD64_SEV) & MSR_AMD64_SEV_SNP_ENABLED; +} + int ghcb_nr_pages_required(uint64_t page_size); void sev_vm_launch(struct kvm_vm *vm, uint32_t policy); diff --git a/tools/testing/selftests/kvm/x86/sev_smoke_test.c b/tools/testing/selftests/kvm/x86/sev_smoke_test.c index 77256c89bb8d..3316427eee46 100644 --- a/tools/testing/selftests/kvm/x86/sev_smoke_test.c +++ b/tools/testing/selftests/kvm/x86/sev_smoke_test.c @@ -18,11 +18,7 @@ static void guest_snp_code(void) { - uint64_t sev_msr = rdmsr(MSR_AMD64_SEV); - - GUEST_ASSERT(sev_msr & MSR_AMD64_SEV_ENABLED); - GUEST_ASSERT(sev_msr & MSR_AMD64_SEV_ES_ENABLED); - GUEST_ASSERT(sev_msr & MSR_AMD64_SEV_SNP_ENABLED); + GUEST_ASSERT(is_sev_snp_enabled()); wrmsr(MSR_AMD64_SEV_ES_GHCB, GHCB_MSR_TERM_REQ); vmgexit(); @@ -31,8 +27,7 @@ static void guest_snp_code(void) static void guest_sev_es_code(void) { /* TODO: Check CPUID after GHCB-based hypercall support is added. */ - GUEST_ASSERT(rdmsr(MSR_AMD64_SEV) & MSR_AMD64_SEV_ENABLED); - GUEST_ASSERT(rdmsr(MSR_AMD64_SEV) & MSR_AMD64_SEV_ES_ENABLED); + GUEST_ASSERT(is_sev_es_enabled()); /* * TODO: Add GHCB and ucall support for SEV-ES guests. For now, simply @@ -45,7 +40,7 @@ static void guest_sev_es_code(void) static void guest_sev_code(void) { GUEST_ASSERT(this_cpu_has(X86_FEATURE_SEV)); - GUEST_ASSERT(rdmsr(MSR_AMD64_SEV) & MSR_AMD64_SEV_ENABLED); + GUEST_ASSERT(is_sev_enabled()); GUEST_DONE(); } -- 2.34.1
