Skip to content

Commit d2ea4ff

Browse files
sean-jcbonzini
authored andcommitted
KVM: selftests: Verify SEV+ guests can read and write EFER, CR0, CR4, and CR8
Add "do no harm" testing of EFER, CR0, CR4, and CR8 for SEV+ guests to verify that the guest can read and write the registers, without hitting e.g. a #VC on SEV-ES guests due to KVM incorrectly trying to intercept a register. Signed-off-by: Sean Christopherson <seanjc@google.com> Message-ID: <20260310211841.2552361-3-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent dca01b0 commit d2ea4ff

2 files changed

Lines changed: 53 additions & 0 deletions

File tree

tools/testing/selftests/kvm/include/x86/processor.h

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,11 @@ static inline uint64_t get_cr0(void)
557557
return cr0;
558558
}
559559

560+
static inline void set_cr0(uint64_t val)
561+
{
562+
__asm__ __volatile__("mov %0, %%cr0" : : "r" (val) : "memory");
563+
}
564+
560565
static inline uint64_t get_cr3(void)
561566
{
562567
uint64_t cr3;
@@ -566,6 +571,11 @@ static inline uint64_t get_cr3(void)
566571
return cr3;
567572
}
568573

574+
static inline void set_cr3(uint64_t val)
575+
{
576+
__asm__ __volatile__("mov %0, %%cr3" : : "r" (val) : "memory");
577+
}
578+
569579
static inline uint64_t get_cr4(void)
570580
{
571581
uint64_t cr4;
@@ -580,6 +590,19 @@ static inline void set_cr4(uint64_t val)
580590
__asm__ __volatile__("mov %0, %%cr4" : : "r" (val) : "memory");
581591
}
582592

593+
static inline uint64_t get_cr8(void)
594+
{
595+
uint64_t cr8;
596+
597+
__asm__ __volatile__("mov %%cr8, %[cr8]" : [cr8]"=r"(cr8));
598+
return cr8;
599+
}
600+
601+
static inline void set_cr8(uint64_t val)
602+
{
603+
__asm__ __volatile__("mov %0, %%cr8" : : "r" (val) : "memory");
604+
}
605+
583606
static inline void set_idt(const struct desc_ptr *idt_desc)
584607
{
585608
__asm__ __volatile__("lidt %0"::"m"(*idt_desc));

tools/testing/selftests/kvm/x86/sev_smoke_test.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,30 @@
1313
#include "linux/psp-sev.h"
1414
#include "sev.h"
1515

16+
static void guest_sev_test_msr(uint32_t msr)
17+
{
18+
uint64_t val = rdmsr(msr);
19+
20+
wrmsr(msr, val);
21+
GUEST_ASSERT(val == rdmsr(msr));
22+
}
23+
24+
#define guest_sev_test_reg(reg) \
25+
do { \
26+
uint64_t val = get_##reg(); \
27+
\
28+
set_##reg(val); \
29+
GUEST_ASSERT(val == get_##reg()); \
30+
} while (0)
31+
32+
static void guest_sev_test_regs(void)
33+
{
34+
guest_sev_test_msr(MSR_EFER);
35+
guest_sev_test_reg(cr0);
36+
guest_sev_test_reg(cr3);
37+
guest_sev_test_reg(cr4);
38+
guest_sev_test_reg(cr8);
39+
}
1640

1741
#define XFEATURE_MASK_X87_AVX (XFEATURE_MASK_FP | XFEATURE_MASK_SSE | XFEATURE_MASK_YMM)
1842

@@ -24,6 +48,8 @@ static void guest_snp_code(void)
2448
GUEST_ASSERT(sev_msr & MSR_AMD64_SEV_ES_ENABLED);
2549
GUEST_ASSERT(sev_msr & MSR_AMD64_SEV_SNP_ENABLED);
2650

51+
guest_sev_test_regs();
52+
2753
wrmsr(MSR_AMD64_SEV_ES_GHCB, GHCB_MSR_TERM_REQ);
2854
vmgexit();
2955
}
@@ -34,6 +60,8 @@ static void guest_sev_es_code(void)
3460
GUEST_ASSERT(rdmsr(MSR_AMD64_SEV) & MSR_AMD64_SEV_ENABLED);
3561
GUEST_ASSERT(rdmsr(MSR_AMD64_SEV) & MSR_AMD64_SEV_ES_ENABLED);
3662

63+
guest_sev_test_regs();
64+
3765
/*
3866
* TODO: Add GHCB and ucall support for SEV-ES guests. For now, simply
3967
* force "termination" to signal "done" via the GHCB MSR protocol.
@@ -47,6 +75,8 @@ static void guest_sev_code(void)
4775
GUEST_ASSERT(this_cpu_has(X86_FEATURE_SEV));
4876
GUEST_ASSERT(rdmsr(MSR_AMD64_SEV) & MSR_AMD64_SEV_ENABLED);
4977

78+
guest_sev_test_regs();
79+
5080
GUEST_DONE();
5181
}
5282

0 commit comments

Comments
 (0)