KVM: selftests: Add simple SEV test
v6 cover KVM: selftests: Add simple SEV test
This patch series continues the work Michael Roth has done in supporting SEV guests in selftests. It continues on top of the work Sean Christopherson has sent to support ucalls from SEV guests. Along with a very simple version of the SEV selftests Michael originally proposed.
V6
* Updated SEV VM create function based on Seanjc's feedback and new changes to VM creation functions.
* Removed pte_me_mask based on feedback.
* Fixed s_bit usage based on TDX
* Fixed bugs and took Ackerly's code for enc_region setup code.
V5
* Rebase onto seanjc@'s latest ucall pool series.
* More review changes based on seanjc:
** use protected instead of encrypted outside of SEV specific files ** Swap memcrypt struct for kvm_vm_arch arch specific struct
** Make protected page table data agnostic of address bit stealing specifics
of SEV
** Further clean up for SEV library to just vm_sev_create_one_vcpu()
* Due to large changes moved more authorships from mroth@ to pgonda@. Gave originally-by tags to mroth@ as suggested by Seanjc for this.
V4
* Rebase ontop of seanjc@'s latest Ucall Pool series:
https://lore.kernel.org/linux-arm-kernel/[email protected]/
* Fix up review comments from seanjc
* Switch authorship on 2 patches because of significant changes, added
* Michael as suggested-by or originally-by.
V3
* Addressed more of andrew.jones@ in ucall patches.
* Fix build in non-x86 archs.
V2
* Dropped RFC tag
* Correctly separated Sean's ucall patches into 2 as originally intended.
* Addressed andrew.jones@ in ucall patches.
* Fixed ucall pool usage to work for other archs
V1
* https://lore.kernel.org/all/[email protected]/
Michael Roth (2):
KVM: selftests: sparsebit: add const where appropriate
KVM: selftests: add support for protected vm_vaddr_* allocations
Peter Gonda (5):
KVM: selftests: add hooks for managing protected guest memory
KVM: selftests: handle protected bits in page tables
KVM: selftests: add library for creating/interacting with SEV guests
KVM: selftests: Update ucall pool to allocate from shared memory
KVM: selftests: Add simple sev vm testing
tools/arch/arm64/include/asm/kvm_host.h | 7 + tools/arch/riscv/include/asm/kvm_host.h | 7 + tools/arch/s390/include/asm/kvm_host.h | 7 + tools/arch/x86/include/asm/kvm_host.h | 14 + tools/testing/selftests/kvm/.gitignore | 84 ++++++ tools/testing/selftests/kvm/Makefile | 4 +- .../selftests/kvm/include/kvm_util_base.h | 49 +++- .../testing/selftests/kvm/include/sparsebit.h | 36 +-- .../selftests/kvm/include/x86_64/processor.h | 1 + .../selftests/kvm/include/x86_64/sev.h | 27 ++ tools/testing/selftests/kvm/lib/kvm_util.c | 66 ++++- tools/testing/selftests/kvm/lib/sparsebit.c | 48 ++-- .../testing/selftests/kvm/lib/ucall_common.c | 2 +- .../selftests/kvm/lib/x86_64/processor.c | 62 ++++- tools/testing/selftests/kvm/lib/x86_64/sev.c | 254 ++++++++++++++++++ .../selftests/kvm/x86_64/sev_all_boot_test.c | 84 ++++++ 16 files changed, 685 insertions(+), 67 deletions(-) create mode 100644 tools/arch/arm64/include/asm/kvm_host.h create mode 100644 tools/arch/riscv/include/asm/kvm_host.h create mode 100644 tools/arch/s390/include/asm/kvm_host.h create mode 100644 tools/arch/x86/include/asm/kvm_host.h create mode 100644 tools/testing/selftests/kvm/include/x86_64/sev.h create mode 100644 tools/testing/selftests/kvm/lib/x86_64/sev.c create mode 100644 tools/testing/selftests/kvm/x86_64/sev_all_boot_test.c
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
PATCH v6 1/7 KVM: selftests: sparsebit: add const where appropriate
From: Michael Roth <[email protected]>
Subsequent patches will introduce an encryption bitmap in kvm_util that would be useful to allow tests to access in read-only fashion. This will be done via a const sparsebit*. To avoid warnings or the need to add casts everywhere, add const to the various sparsebit functions that are applicable for read-only usage of sparsebit.
--- .../testing/selftests/kvm/include/sparsebit.h | 36 +++++++------- tools/testing/selftests/kvm/lib/sparsebit.c | 48 +++++++++---------- 2 files changed, 42 insertions(+), 42 deletions(-)
tools/testing/selftests/kvm/include/sparsebit.h +18 -18
@@ -30,26 +30,26 @@ typedef uint64_t sparsebit_num_t;struct sparsebit *sparsebit_alloc (void );void sparsebit_free (struct sparsebit **sbitp); -void sparsebit_copy (struct sparsebit *dstp,struct sparsebit *src); +void sparsebit_copy (struct sparsebit *dstp,const struct sparsebit *src); -bool sparsebit_is_set (struct sparsebit *sbit,sparsebit_idx_t idx); -bool sparsebit_is_set_num (struct sparsebit *sbit, +bool sparsebit_is_set (const struct sparsebit *sbit,sparsebit_idx_t idx); +bool sparsebit_is_set_num (const struct sparsebit *sbit,sparsebit_idx_t idx,sparsebit_num_t num); -bool sparsebit_is_clear (struct sparsebit *sbit,sparsebit_idx_t idx); -bool sparsebit_is_clear_num (struct sparsebit *sbit, +bool sparsebit_is_clear (const struct sparsebit *sbit,sparsebit_idx_t idx); +bool sparsebit_is_clear_num (const struct sparsebit *sbit,sparsebit_idx_t idx,sparsebit_num_t num); -sparsebit_num_t sparsebit_num_set (struct sparsebit *sbit); -bool sparsebit_any_set (struct sparsebit *sbit); -bool sparsebit_any_clear (struct sparsebit *sbit); -bool sparsebit_all_set (struct sparsebit *sbit); -bool sparsebit_all_clear (struct sparsebit *sbit); -sparsebit_idx_t sparsebit_first_set (struct sparsebit *sbit); -sparsebit_idx_t sparsebit_first_clear (struct sparsebit *sbit); -sparsebit_idx_t sparsebit_next_set (struct sparsebit *sbit,sparsebit_idx_t prev); -sparsebit_idx_t sparsebit_next_clear (struct sparsebit *sbit,sparsebit_idx_t prev); -sparsebit_idx_t sparsebit_next_set_num (struct sparsebit *sbit, +sparsebit_num_t sparsebit_num_set (const struct sparsebit *sbit); +bool sparsebit_any_set (const struct sparsebit *sbit); +bool sparsebit_any_clear (const struct sparsebit *sbit); +bool sparsebit_all_set (const struct sparsebit *sbit); +bool sparsebit_all_clear (const struct sparsebit *sbit); +sparsebit_idx_t sparsebit_first_set (const struct sparsebit *sbit); +sparsebit_idx_t sparsebit_first_clear (const struct sparsebit *sbit); +sparsebit_idx_t sparsebit_next_set (const struct sparsebit *sbit,sparsebit_idx_t prev); +sparsebit_idx_t sparsebit_next_clear (const struct sparsebit *sbit,sparsebit_idx_t prev); +sparsebit_idx_t sparsebit_next_set_num (const struct sparsebit *sbit,sparsebit_idx_t start,sparsebit_num_t num); -sparsebit_idx_t sparsebit_next_clear_num (struct sparsebit *sbit, +sparsebit_idx_t sparsebit_next_clear_num (const struct sparsebit *sbit,sparsebit_idx_t start,sparsebit_num_t num);void sparsebit_set (struct sparsebit *sbitp,sparsebit_idx_t idx);
@@ -62,9 +62,9 @@ void sparsebit_clear_num(struct sparsebit *sbitp, sparsebit_idx_t start, sparsebit_num_t num);void sparsebit_clear_all (struct sparsebit *sbitp); -void sparsebit_dump (FILE *stream,struct sparsebit *sbit, +void sparsebit_dump (FILE *stream,const struct sparsebit *sbit,unsigned int indent); -void sparsebit_validate_internal (struct sparsebit *sbit); +void sparsebit_validate_internal (const struct sparsebit *sbit); #ifdef __cplusplus }
tools/testing/selftests/kvm/lib/sparsebit.c +24 -24
190 lines not on this page · raw message
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
PATCH v6 2/7 KVM: selftests: add hooks for managing protected guest memory
In reply to Peter GondaAdd kvm_vm.protected metadata. Protected VMs memory, potentially register and other state may not be accessible to KVM. This combined with a new protected_phy_pages bitmap will allow the selftests to check if a given pages is accessible.
--- .../selftests/kvm/include/kvm_util_base.h | 14 ++++++++++++-- tools/testing/selftests/kvm/lib/kvm_util.c | 16 +++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +12 -2
@@ -45,6 +45,7 @@ typedef uint64_t vm_vaddr_t; /* Virtual Machine (Guest) virtual address */struct userspace_mem_region {struct kvm_userspace_memory_region region;struct sparsebit *unused_phy_pages; +struct sparsebit *protected_phy_pages;int fd;off_t offset;enum vm_mem_backing_src_type backing_src_type;
@@ -111,6 +112,9 @@ struct kvm_vm {vm_vaddr_t handlers;uint32_t dirty_ring_size; +/* VM protection enabled: SEV, etc*/ +bool protected; +/* Cache of information for binary stats interface */ int stats_fd;struct kvm_stats_header stats_header;
@@ -679,10 +683,16 @@ const char *exit_reason_str(unsigned int exit_reason);vm_paddr_t vm_phy_page_alloc (struct kvm_vm *vm,vm_paddr_t paddr_min,uint32_t memslot); -vm_paddr_t vm_phy_pages_alloc (struct kvm_vm *vm,size_t num, -vm_paddr_t paddr_min,uint32_t memslot); +vm_paddr_t _vm_phy_pages_alloc (struct kvm_vm *vm,size_t num, +vm_paddr_t paddr_min,uint32_t memslot,bool protected);vm_paddr_t vm_alloc_page_table (struct kvm_vm *vm); +static inline vm_paddr_t vm_phy_pages_alloc (struct kvm_vm *vm,size_t num, +vm_paddr_t paddr_min,uint32_t memslot) +{ +return _vm_phy_pages_alloc (vm, num, paddr_min, memslot, vm->protected); +} +/* * ____vm_create() does KVM_CREATE_VM and little else. __vm_create() also * loads the test binary into guest memory and creates an IRQ chip (x86 only).
tools/testing/selftests/kvm/lib/kvm_util.c +13 -3
@@ -663,6 +663,7 @@ static void __vm_mem_region_delete(struct kvm_vm *vm,vm_ioctl (vm,KVM_SET_USER_MEMORY_REGION , ®ion->region);sparsebit_free (®ion->unused_phy_pages); +sparsebit_free (®ion->protected_phy_pages); ret =munmap (region->mmap_start, region->mmap_size);TEST_ASSERT (!ret,__KVM_SYSCALL_ERROR ("munmap()" , ret));if (region->fd >=0 ) {
@@ -1010,6 +1011,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, region->backing_src_type = src_type; region->unused_phy_pages =sparsebit_alloc (); + region->protected_phy_pages =sparsebit_alloc ();sparsebit_set_num (region->unused_phy_pages, guest_paddr >> vm->page_shift, npages); region->region.slot = slot;
@@ -1799,6 +1801,10 @@ void vm_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent) region->host_mem);fprintf (stream,"%*sunused_phy_pages: " , indent +2 ,"" );sparsebit_dump (stream, region->unused_phy_pages,0 ); +if (vm->protected) { +fprintf (stream,"%*sprotected_phy_pages: " , indent +2 ,"" ); +sparsebit_dump (stream, region->protected_phy_pages,0 ); + } }fprintf (stream,"%*sMapped Virtual Pages:\n" , indent,"" );sparsebit_dump (stream, vm->vpages_mapped, indent +2 );
@@ -1895,8 +1901,9 @@ const char *exit_reason_str(unsigned int exit_reason)* and their base address is returned. A TEST_ASSERT failure occurs if * not enough pages are available at or above paddr_min. */ -vm_paddr_t vm_phy_pages_alloc (struct kvm_vm *vm,size_t num, -vm_paddr_t paddr_min,uint32_t memslot) +vm_paddr_t _vm_phy_pages_alloc (struct kvm_vm *vm,size_t num, +vm_paddr_t paddr_min,uint32_t memslot, +bool protected) {struct userspace_mem_region *region;sparsebit_idx_t pg, base;
@@ -1929,8 +1936,11 @@ vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,abort (); } -for (pg = base; pg < base + num; ++pg) +for (pg = base; pg < base + num; ++pg) {sparsebit_clear (region->unused_phy_pages, pg); +if (protected) +sparsebit_set (region->protected_phy_pages, pg); + }return base * vm->page_size; }
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
PATCH v6 3/7 KVM: selftests: handle protected bits in page tables
In reply to Peter GondaSEV guests rely on an encyption bit which resides within the range that current code treats as address bits. Guest code will expect these bits to be set appropriately in their page tables, whereas the rest of the kvm_util functions will generally expect these bits to not be present. Introduce pte_me_mask and struct kvm_vm_arch to allow for arch specific address tagging. Currently just adding x86 c_bit and s_bit support for SEV and TDX.
--- tools/arch/arm64/include/asm/kvm_host.h | 7 +++++++ tools/arch/riscv/include/asm/kvm_host.h | 7 +++++++ tools/arch/s390/include/asm/kvm_host.h | 7 +++++++ tools/arch/x86/include/asm/kvm_host.h | 13 ++++++++++++ .../selftests/kvm/include/kvm_util_base.h | 19 +++++++++++++++++ tools/testing/selftests/kvm/lib/kvm_util.c | 21 ++++++++++++++++++- .../selftests/kvm/lib/x86_64/processor.c | 17 ++++++++++++--- 7 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 tools/arch/arm64/include/asm/kvm_host.h create mode 100644 tools/arch/riscv/include/asm/kvm_host.h create mode 100644 tools/arch/s390/include/asm/kvm_host.h create mode 100644 tools/arch/x86/include/asm/kvm_host.h
tools/arch/arm64/include/asm/kvm_host.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _TOOLS_LINUX_ASM_ARM64_KVM_HOST_H +#define _TOOLS_LINUX_ASM_ARM64_KVM_HOST_H + +struct kvm_vm_arch {}; + +#endif // _TOOLS_LINUX_ASM_ARM64_KVM_HOST_H
tools/arch/riscv/include/asm/kvm_host.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _TOOLS_LINUX_ASM_RISCV_KVM_HOST_H +#define _TOOLS_LINUX_ASM_RISCV_KVM_HOST_H + +struct kvm_vm_arch {}; + +#endif // _TOOLS_LINUX_ASM_RISCV_KVM_HOST_H
tools/arch/s390/include/asm/kvm_host.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _TOOLS_LINUX_ASM_S390_KVM_HOST_H +#define _TOOLS_LINUX_ASM_S390_KVM_HOST_H + +struct kvm_vm_arch {}; + +#endif // _TOOLS_LINUX_ASM_S390_KVM_HOST_H
tools/arch/x86/include/asm/kvm_host.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _TOOLS_LINUX_ASM_X86_KVM_HOST_H +#define _TOOLS_LINUX_ASM_X86_KVM_HOST_H + +#include <stdbool.h> +#include <stdint.h> + +struct kvm_vm_arch { +uint64_t c_bit; +uint64_t s_bit; +}; + +#endif // _TOOLS_LINUX_ASM_X86_KVM_HOST_H
tools/testing/selftests/kvm/include/kvm_util_base.h +19 -0
@@ -17,6 +17,8 @@#include "linux/rbtree.h" #include <asm/atomic.h> +#include <asm/kvm.h> +#include <asm/kvm_host.h> #include <sys/ioctl.h>
@@ -111,6 +113,9 @@ struct kvm_vm {vm_vaddr_t idt;vm_vaddr_t handlers;uint32_t dirty_ring_size; +uint64_t gpa_protected_mask; + +struct kvm_vm_arch arch;/* VM protection enabled: SEV, etc*/ bool protected;
@@ -162,6 +167,7 @@ enum vm_guest_mode {VM_MODE_P40V48_16K ,VM_MODE_P40V48_64K ,VM_MODE_PXXV48_4K ,/* For 48bits VA but ANY bits PA */ +VM_MODE_PXXV48_4K_SEV ,/* For 48bits VA but ANY bits PA */ VM_MODE_P47V64_4K ,VM_MODE_P44V64_4K , VM_MODE_P36V48_4K,
@@ -441,6 +447,17 @@ void *addr_gva2hva(struct kvm_vm *vm, vm_vaddr_t gva);vm_paddr_t addr_hva2gpa (struct kvm_vm *vm,void *hva);void *addr_gpa2alias (struct kvm_vm *vm,vm_paddr_t gpa); + +static inline vm_paddr_t vm_untag_gpa (struct kvm_vm *vm,vm_paddr_t gpa) +{ +return gpa & ~vm->gpa_protected_mask; +} + +static inline vm_paddr_t vm_tag_gpa (struct kvm_vm *vm,vm_paddr_t gpa) +{ +return gpa | vm->gpa_protected_mask; +} +void vcpu_run (struct kvm_vcpu *vcpu);int _vcpu_run (struct kvm_vcpu *vcpu);
@@ -917,4 +934,6 @@ void kvm_selftest_arch_init(void);void kvm_arch_vm_post_create (struct kvm_vm *vm); +bool vm_is_gpa_protected (struct kvm_vm *vm,vm_paddr_t paddr); +#endif /* SELFTEST_KVM_UTIL_BASE_H */
tools/testing/selftests/kvm/lib/kvm_util.c +20 -1
@@ -1451,9 +1451,10 @@ void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,* address providing the memory to the vm physical address is returned. * A TEST_ASSERT failure occurs if no region containing gpa exists. */ -void *addr_gpa2hva (struct kvm_vm *vm,vm_paddr_t gpa) +void *addr_gpa2hva (struct kvm_vm *vm,vm_paddr_t gpa_tagged) {struct userspace_mem_region *region; +vm_paddr_t gpa =vm_untag_gpa (vm, gpa_tagged); region =userspace_mem_region_find (vm, gpa, gpa);if (!region) {
@@ -2147,3 +2148,21 @@ void __attribute((constructor)) kvm_selftest_init(void)kvm_selftest_arch_init (); } + +bool vm_is_gpa_protected (struct kvm_vm *vm,vm_paddr_t paddr) +{ +sparsebit_idx_t pg =0 ; +struct userspace_mem_region *region; + +if (!vm->protected) +return false; + + region =userspace_mem_region_find (vm, paddr, paddr); +if (!region) { +TEST_FAIL ("No vm physical memory at 0x%lx" , paddr); +return false; + } + + pg = paddr >> vm->page_shift; +return sparsebit_is_set (region->protected_phy_pages, pg); +}
tools/testing/selftests/kvm/lib/x86_64/processor.c +14 -3
@@ -127,6 +127,7 @@ void virt_arch_pgd_alloc(struct kvm_vm *vm)/* If needed, create page map l4 table. */ if (!vm->pgd_created) { vm->pgd =vm_alloc_page_table (vm); + vm->pgd_created = true; } }
@@ -153,13 +154,16 @@ static uint64_t *virt_create_upper_pte(struct kvm_vm *vm, int target_level) {uint64_t *pte =virt_get_pte (vm, parent_pte, vaddr, current_level); +uint64_t paddr_raw =vm_untag_gpa (vm, paddr);if (!(*pte &PTE_PRESENT_MASK )) { *pte =PTE_PRESENT_MASK |PTE_WRITABLE_MASK ;if (current_level == target_level) - *pte |=PTE_LARGE_MASK | (paddr &PHYSICAL_PAGE_MASK ); -else + *pte |=PTE_LARGE_MASK | (paddr_raw &PHYSICAL_PAGE_MASK ); +else { *pte |=vm_alloc_page_table (vm) &PHYSICAL_PAGE_MASK ; + } + }else {/* * Entry already present. Assert that the caller doesn't want
@@ -197,6 +201,8 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level)"Physical address beyond maximum supported,\n" " paddr: 0x%lx vm->max_gfn: 0x%lx vm->page_size: 0x%x" , paddr, vm->max_gfn, vm->page_size); +TEST_ASSERT (vm_untag_gpa (vm, paddr) == paddr, +"Unexpected bits in paddr: %lx" , paddr);/* * Allocate upper level page tables, if not already present. Return
@@ -219,6 +225,11 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level)TEST_ASSERT (!(*pte &PTE_PRESENT_MASK ),"PTE already present for 4k page at vaddr: 0x%lx\n" , vaddr); *pte =PTE_PRESENT_MASK |PTE_WRITABLE_MASK | (paddr &PHYSICAL_PAGE_MASK ); + +if (vm_is_gpa_protected (vm, paddr)) + *pte |= vm->arch.c_bit; +else + *pte |= vm->arch.s_bit; }void virt_arch_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr)
@@ -493,7 +504,7 @@ vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)* No need for a hugepage mask on the PTE, x86-64 requires the "unused" * address bits to be zero. */ -return PTE_GET_PA (*pte) | (gva & ~HUGEPAGE_MASK (level)); +return vm_untag_gpa (vm,PTE_GET_PA (*pte)) | (gva & ~HUGEPAGE_MASK (level)); }static void kvm_setup_gdt (struct kvm_vm *vm,struct kvm_dtable *dt)
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
PATCH v6 4/7 KVM: selftests: add support for protected vm_vaddr_* allocations
In reply to Peter GondaFrom: Michael Roth <[email protected]>
Test programs may wish to allocate shared vaddrs for things like sharing memory with the guest. Since protected vms will have their memory encrypted by default an interface is needed to explicitly request shared pages.
Implement this by splitting the common code out from vm_vaddr_alloc() and introducing a new vm_vaddr_alloc_shared().
--- .../selftests/kvm/include/kvm_util_base.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 21 +++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -0
@@ -435,6 +435,7 @@ vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_mivm_vaddr_t vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min);vm_vaddr_t __vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min,enum kvm_mem_region_type type); +vm_vaddr_t vm_vaddr_alloc_shared (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min);vm_vaddr_t vm_vaddr_alloc_pages (struct kvm_vm *vm,int nr_pages);vm_vaddr_t __vm_vaddr_alloc_page (struct kvm_vm *vm,enum kvm_mem_region_type type);
tools/testing/selftests/kvm/lib/kvm_util.c +17 -4
@@ -1305,15 +1305,17 @@ vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz,return pgidx_start * vm->page_size; } -vm_vaddr_t __vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min, -enum kvm_mem_region_type type) +static vm_vaddr_t ____vm_vaddr_alloc (struct kvm_vm *vm,size_t sz, +vm_vaddr_t vaddr_min, +enum kvm_mem_region_type type, +bool encrypt) {uint64_t pages = (sz >> vm->page_shift) + ((sz % vm->page_size) !=0 );virt_pgd_alloc (vm); -vm_paddr_t paddr =vm_phy_pages_alloc (vm, pages, +vm_paddr_t paddr =_vm_phy_pages_alloc (vm, pages,KVM_UTIL_MIN_PFN * vm->page_size, - vm->memslots[type]); + vm->memslots[type], encrypt);/* * Find an unused range of virtual page addresses of at least
@@ -1333,6 +1335,17 @@ vm_vaddr_t __vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,return vaddr_start; } +vm_vaddr_t __vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min, +enum kvm_mem_region_type type) +{ +return ____vm_vaddr_alloc (vm, sz, vaddr_min, type, vm->protected); +} + +vm_vaddr_t vm_vaddr_alloc_shared (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min) +{ +return ____vm_vaddr_alloc (vm, sz, vaddr_min,MEM_REGION_TEST_DATA , false); +} +/* * VM Virtual Address Allocate *
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
PATCH v6 5/7 KVM: selftests: add library for creating/interacting with SEV guests
In reply to Peter GondaAdd interfaces to allow tests to create SEV guests. The additional requirements for SEV guests PTs and other state is encapsulated by the new vm_sev_create_with_one_vcpu() function. This can future be generalized for more vCPUs but the first set of SEV selftests in this series only uses a single vCPU.
--- tools/arch/x86/include/asm/kvm_host.h | 1 + tools/testing/selftests/kvm/Makefile | 3 +- .../selftests/kvm/include/kvm_util_base.h | 15 +- .../selftests/kvm/include/x86_64/processor.h | 1 + .../selftests/kvm/include/x86_64/sev.h | 27 ++ tools/testing/selftests/kvm/lib/kvm_util.c | 8 +- .../selftests/kvm/lib/x86_64/processor.c | 45 +++- tools/testing/selftests/kvm/lib/x86_64/sev.c | 254 ++++++++++++++++++ 8 files changed, 343 insertions(+), 11 deletions(-) create mode 100644 tools/testing/selftests/kvm/include/x86_64/sev.h create mode 100644 tools/testing/selftests/kvm/lib/x86_64/sev.c
tools/arch/x86/include/asm/kvm_host.h +1 -0
@@ -8,6 +8,7 @@struct kvm_vm_arch {uint64_t c_bit;uint64_t s_bit; +bool is_pt_protected; };#endif // _TOOLS_LINUX_ASM_X86_KVM_HOST_H
tools/testing/selftests/kvm/Makefile +2 -1
@@ -39,6 +39,7 @@ LIBKVM_x86_64 += lib/x86_64/processor.c LIBKVM_x86_64 += lib/x86_64/svm.c LIBKVM_x86_64 += lib/x86_64/ucall.c LIBKVM_x86_64 += lib/x86_64/vmx.c +LIBKVM_x86_64 += lib/x86_64/sev.c LIBKVM_aarch64 += lib/aarch64/gic.c LIBKVM_aarch64 += lib/aarch64/gic_v3.c
@@ -199,7 +200,7 @@ CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \ -fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \ -I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \ -I$(<D) -Iinclude/$(ARCH_DIR) -I ../rseq -I.. $(EXTRA_CFLAGS) \ - $(KHDR_INCLUDES) + $(KHDR_INCLUDES) -static -gdwarf-4 no-pie-option := $(call try-run, echo 'int main(void) { return 0; }' | \ $(CC) -Werror $(CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie)
tools/testing/selftests/kvm/include/kvm_util_base.h +13 -2
@@ -89,6 +89,13 @@ enum kvm_mem_region_type { NR_MEM_REGIONS, }; +/* VM protection policy/configuration. */ +struct protected_vm { +bool enabled; +bool has_protected_bit; +int8_t protected_bit; +}; +struct kvm_vm {int mode;unsigned long type;
@@ -711,6 +718,10 @@ static inline vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,return _vm_phy_pages_alloc (vm, num, paddr_min, memslot, vm->protected); } +uint64_t vm_nr_pages_required (enum vm_guest_mode mode, +uint32_t nr_runnable_vcpus, +uint64_t extra_mem_pages); +/* * ____vm_create() does KVM_CREATE_VM and little else. __vm_create() also * loads the test binary into guest memory and creates an IRQ chip (x86 only).
@@ -767,8 +778,8 @@ unsigned long vm_compute_max_gfn(struct kvm_vm *vm);unsigned int vm_calc_num_guest_pages (enum vm_guest_mode mode,size_t size);unsigned int vm_num_host_pages (enum vm_guest_mode mode,unsigned int num_guest_pages);unsigned int vm_num_guest_pages (enum vm_guest_mode mode,unsigned int num_host_pages); -static inline unsigned int -vm_adjust_num_guest_pages (enum vm_guest_mode mode,unsigned int num_guest_pages) +static inline unsigned int vm_adjust_num_guest_pages (enum vm_guest_mode mode, +unsigned int num_guest_pages) {unsigned int n; n =vm_num_guest_pages (mode,vm_num_host_pages (mode, num_guest_pages));
tools/testing/selftests/kvm/include/x86_64/processor.h +1 -0
@@ -916,6 +916,7 @@ static inline void vcpu_set_msr(struct kvm_vcpu *vcpu, uint64_t msr_index,void kvm_get_cpu_address_width (unsigned int *pa_bits,unsigned int *va_bits); +void kvm_init_vm_address_properties (struct kvm_vm *vm);bool vm_is_unrestricted_guest (struct kvm_vm *vm);struct ex_regs {
tools/testing/selftests/kvm/include/x86_64/sev.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Helpers used for SEV guests +* +*/ +#ifndef SELFTEST_KVM_SEV_H +#define SELFTEST_KVM_SEV_H + +#include <stdint.h> +#include <stdbool.h> + +#include "kvm_util.h" + +#define CPUID_MEM_ENC_LEAF 0x8000001f +#define CPUID_EBX_CBIT_MASK 0x3f + +#define SEV_POLICY_NO_DBG (1UL << 0) +#define SEV_POLICY_ES (1UL << 2) + +bool is_kvm_sev_supported (void ); + +void sev_vm_init (struct kvm_vm *vm); + +struct kvm_vm *vm_sev_create_with_one_vcpu (uint32_t policy,void *guest_code, +struct kvm_vcpu **cpu); + +#endif /* SELFTEST_KVM_SEV_H */
tools/testing/selftests/kvm/lib/kvm_util.c +6 -2
@@ -151,6 +151,7 @@ const char *vm_guest_mode_string(uint32_t i) [VM_MODE_P40V48_16K] = "PA-bits:40, VA-bits:48, 16K pages", [VM_MODE_P40V48_64K] = "PA-bits:40, VA-bits:48, 64K pages", [VM_MODE_PXXV48_4K] = "PA-bits:ANY, VA-bits:48, 4K pages", + [VM_MODE_PXXV48_4K_SEV] = "PA-bits:ANY, VA-bits:48, 4K pages", [VM_MODE_P47V64_4K] = "PA-bits:47, VA-bits:64, 4K pages", [VM_MODE_P44V64_4K] = "PA-bits:44, VA-bits:64, 4K pages", [VM_MODE_P36V48_4K] = "PA-bits:36, VA-bits:48, 4K pages",
@@ -176,6 +177,7 @@ const struct vm_guest_mode_params vm_guest_mode_params[] = { [VM_MODE_P40V48_16K] = { 40, 48, 0x4000, 14 }, [VM_MODE_P40V48_64K] = { 40, 48, 0x10000, 16 }, [VM_MODE_PXXV48_4K] = { 0, 0, 0x1000, 12 }, + [VM_MODE_PXXV48_4K_SEV] = { 0, 0, 0x1000, 12 }, [VM_MODE_P47V64_4K] = { 47, 64, 0x1000, 12 }, [VM_MODE_P44V64_4K] = { 44, 64, 0x1000, 12 }, [VM_MODE_P36V48_4K] = { 36, 48, 0x1000, 12 },
@@ -254,9 +256,11 @@ struct kvm_vm *____vm_create(enum vm_guest_mode mode)case VM_MODE_P36V47_16K : vm->pgtable_levels =3 ;break ; +case VM_MODE_PXXV48_4K_SEV :case VM_MODE_PXXV48_4K :#ifdef __x86_64__kvm_get_cpu_address_width (&vm->pa_bits, &vm->va_bits); +kvm_init_vm_address_properties (vm);/* * Ignore KVM support for 5-level paging (vm->va_bits == 57), * it doesn't take effect unless a CR4.LA57 is set, which it
@@ -270,7 +274,7 @@ struct kvm_vm *____vm_create(enum vm_guest_mode mode) vm->pgtable_levels =4 ; vm->va_bits =48 ;#else -TEST_FAIL ("VM_MODE_PXXV48_4K not supported on non-x86 platforms" ); +TEST_FAIL ("VM_MODE_PXXV48_4K* not supported on non-x86 platforms" );#endif break ;case VM_MODE_P47V64_4K :
@@ -303,7 +307,7 @@ struct kvm_vm *____vm_create(enum vm_guest_mode mode)return vm; } -static uint64_t vm_nr_pages_required (enum vm_guest_mode mode, +uint64_t vm_nr_pages_required (enum vm_guest_mode mode,uint32_t nr_runnable_vcpus,uint64_t extra_mem_pages) {
tools/testing/selftests/kvm/lib/x86_64/processor.c +39 -6
92 lines not on this page · raw message
tools/testing/selftests/kvm/lib/x86_64/sev.c new file +254 -0
254 lines not on this page · raw message
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
PATCH v6 6/7 KVM: selftests: Update ucall pool to allocate from shared memory
In reply to Peter GondaUpdate the per VM ucall_header allocation from vm_vaddr_alloc() to vm_vaddr_alloc_shared(). This allows encrypted guests to use ucall pools by placing their shared ucall structures in unencrypted (shared) memory. No behavior change for non encrypted guests.
--- tools/testing/selftests/kvm/lib/ucall_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/lib/ucall_common.c +1 -1
@@ -24,7 +24,7 @@ void ucall_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa)vm_vaddr_t vaddr;int i; - vaddr =__vm_vaddr_alloc (vm,sizeof (*hdr),KVM_UTIL_MIN_VADDR ,MEM_REGION_DATA ); + vaddr =vm_vaddr_alloc_shared (vm,sizeof (*hdr),KVM_UTIL_MIN_VADDR ); hdr = (struct ucall_header *)addr_gva2hva (vm, vaddr);memset (hdr,0 ,sizeof (*hdr));
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
PATCH v6 7/7 KVM: selftests: Add simple sev vm testing
In reply to Peter GondaA very simple of booting SEV guests that checks related CPUID bits. This is a stripped down version of "[PATCH v2 08/13] KVM: selftests: add SEV boot tests" from Michael but much simpler.
--- tools/testing/selftests/kvm/.gitignore | 84 +++++++++++++++++++ tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/x86_64/sev_all_boot_test.c | 84 +++++++++++++++++++ 3 files changed, 169 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86_64/sev_all_boot_test.c
tools/testing/selftests/kvm/.gitignore +84 -0
@@ -1,7 +1,91 @@ # SPDX-License-Identifier: GPL-2.0-only +<<<<<<< HEAD * !/**/ !*.c !*.h !*.S !*.sh +======= +/aarch64/aarch32_id_regs +/aarch64/arch_timer +/aarch64/debug-exceptions +/aarch64/get-reg-list +/aarch64/hypercalls +/aarch64/psci_test +/aarch64/vcpu_width_config +/aarch64/vgic_init +/aarch64/vgic_irq +/s390x/memop +/s390x/resets +/s390x/sync_regs_test +/s390x/tprot +/x86_64/amx_test +/x86_64/cpuid_test +/x86_64/cr4_cpuid_sync_test +/x86_64/debug_regs +/x86_64/evmcs_test +/x86_64/emulator_error_test +/x86_64/fix_hypercall_test +/x86_64/get_msr_index_features +/x86_64/kvm_clock_test +/x86_64/kvm_pv_test +/x86_64/hyperv_clock +/x86_64/hyperv_cpuid +/x86_64/hyperv_features +/x86_64/hyperv_svm_test +/x86_64/max_vcpuid_cap_test +/x86_64/mmio_warning_test +/x86_64/monitor_mwait_test +/x86_64/nested_exceptions_test +/x86_64/nx_huge_pages_test +/x86_64/platform_info_test +/x86_64/pmu_event_filter_test +/x86_64/set_boot_cpu_id +/x86_64/set_sregs_test +/x86_64/sev_all_boot_test +/x86_64/sev_migrate_tests +/x86_64/smm_test +/x86_64/state_test +/x86_64/svm_vmcall_test +/x86_64/svm_int_ctl_test +/x86_64/svm_nested_soft_inject_test +/x86_64/sync_regs_test +/x86_64/tsc_msrs_test +/x86_64/tsc_scaling_sync +/x86_64/ucna_injection_test +/x86_64/userspace_io_test +/x86_64/userspace_msr_exit_test +/x86_64/vmx_apic_access_test +/x86_64/vmx_close_while_nested_test +/x86_64/vmx_dirty_log_test +/x86_64/vmx_exception_with_invalid_guest_state +/x86_64/vmx_invalid_nested_guest_state +/x86_64/vmx_msrs_test +/x86_64/vmx_preemption_timer_test +/x86_64/vmx_set_nested_state_test +/x86_64/vmx_tsc_adjust_test +/x86_64/vmx_nested_tsc_scaling_test +/x86_64/xapic_ipi_test +/x86_64/xapic_state_test +/x86_64/xen_shinfo_test +/x86_64/xen_vmcall_test +/x86_64/xss_msr_test +/x86_64/vmx_pmu_caps_test +/x86_64/triple_fault_event_test +/access_tracking_perf_test +/demand_paging_test +/dirty_log_test +/dirty_log_perf_test +/hardware_disable_test +/kvm_create_max_vcpus +/kvm_page_table_test +/max_guest_memory_test +/memslot_modification_stress_test +/memslot_perf_test +/rseq_test +/set_memory_region_test +/steal_time +/kvm_binary_stats_test +/system_counter_offset_test +>>>>>>> KVM: selftests: Add simple sev vm testing
tools/testing/selftests/kvm/Makefile +1 -0
@@ -111,6 +111,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/tsc_msrs_test TEST_GEN_PROGS_x86_64 += x86_64/vmx_pmu_caps_test TEST_GEN_PROGS_x86_64 += x86_64/xen_shinfo_test TEST_GEN_PROGS_x86_64 += x86_64/xen_vmcall_test +TEST_GEN_PROGS_x86_64 += x86_64/sev_all_boot_test TEST_GEN_PROGS_x86_64 += x86_64/sev_migrate_tests TEST_GEN_PROGS_x86_64 += x86_64/amx_test TEST_GEN_PROGS_x86_64 += x86_64/max_vcpuid_cap_test
tools/testing/selftests/kvm/x86_64/sev_all_boot_test.c new file +84 -0
84 lines not on this page · raw message
Signature · 1 line
2.39.0.314.g84b9a713c41-goog