*** KVM: selftests: Add simple SEV test
Subsystems (4)
cover *** KVM: selftests: Add simple SEV test
This patch series combines the work Michael Roth has done in supporting SEV guests in selftests and the work Sean Christopherson suggested to allow ucalls from SEV guests. And the work Sean has sent to consolidate the ucall boilerplate code. Along with a very simple version of the SEV selftests Michael originally proposed.
Michael Roth (7):
KVM: selftests: move vm_phy_pages_alloc() earlier in file
KVM: selftests: sparsebit: add const where appropriate
KVM: selftests: add hooks for managing encrypted guest memory
KVM: selftests: handle encryption bits in page tables
KVM: selftests: add support for encrypted vm_vaddr_* allocations
KVM: selftests: add library for creating/interacting with SEV guests
KVM: selftests: Add simple sev vm testing
Sean Christopherson (1):
KVM: selftests: Consolidate boilerplate code in get_ucall()
Peter Gonda (2):
tools: Add atomic_test_and_set_bit()
KVM: selftests: Make ucall work with encrypted guests
tools/arch/x86/include/asm/atomic.h | 7 + tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 4 + .../selftests/kvm/include/kvm_util_base.h | 50 +++- .../testing/selftests/kvm/include/sparsebit.h | 36 +-- .../selftests/kvm/include/ucall_common.h | 15 +- .../selftests/kvm/include/x86_64/sev.h | 44 +++ .../testing/selftests/kvm/lib/aarch64/ucall.c | 36 +-- tools/testing/selftests/kvm/lib/kvm_util.c | 268 +++++++++++++----- .../selftests/kvm/lib/perf_test_util.c | 2 +- tools/testing/selftests/kvm/lib/riscv/ucall.c | 40 +-- tools/testing/selftests/kvm/lib/s390x/ucall.c | 37 +-- tools/testing/selftests/kvm/lib/sparsebit.c | 48 ++-- .../testing/selftests/kvm/lib/ucall_common.c | 140 +++++++++ .../selftests/kvm/lib/x86_64/processor.c | 15 +- tools/testing/selftests/kvm/lib/x86_64/sev.c | 251 ++++++++++++++++ .../testing/selftests/kvm/lib/x86_64/ucall.c | 37 +-- .../selftests/kvm/x86_64/sev_all_boot_test.c | 134 +++++++++ 18 files changed, 903 insertions(+), 262 deletions(-) create mode 100644 tools/testing/selftests/kvm/include/x86_64/sev.h create mode 100644 tools/testing/selftests/kvm/lib/ucall_common.c 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.37.0.170.g444d1eabd0-goog
PATCH v2 1/1 KVM: selftests: Add simple sev vm testing
From: Michael Roth <[email protected]>
A 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 | 1 + tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/x86_64/sev_all_boot_test.c | 134 ++++++++++++++++++ 3 files changed, 136 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86_64/sev_all_boot_test.c
tools/testing/selftests/kvm/.gitignore +1 -0
@@ -34,6 +34,7 @@ /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
tools/testing/selftests/kvm/Makefile +1 -0
@@ -123,6 +123,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 +134 -0
134 lines not on this page · raw message
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
RFC 1/10 KVM: selftests: move vm_phy_pages_alloc() earlier in file
In reply to Peter GondaFrom: Michael Roth <[email protected]>
Subsequent patches will break some of this code out into file-local helper functions, which will be used by functions like vm_vaddr_alloc(), which currently are defined earlier in the file, so a forward declaration would be needed.
Instead, move it earlier in the file, just above vm_vaddr_alloc() and and friends, which are the main users.
--- tools/testing/selftests/kvm/lib/kvm_util.c | 146 ++++++++++----------- 1 file changed, 73 insertions(+), 73 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +73 -73
@@ -1076,6 +1076,79 @@ struct kvm_vcpu *__vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id)return vcpu; } +/* +* Physical Contiguous Page Allocator +* +* Input Args: +* vm - Virtual Machine +* num - number of pages +* paddr_min - Physical address minimum +* memslot - Memory region to allocate page from +* +* Output Args: None +* +* Return: +* Starting physical address +* +* Within the VM specified by vm, locates a range of available physical +* pages at or above paddr_min. If found, the pages are marked as in use +* 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) +{ +struct userspace_mem_region *region; +sparsebit_idx_t pg, base; + +TEST_ASSERT (num >0 ,"Must allocate at least one page" ); + +TEST_ASSERT ((paddr_min % vm->page_size) ==0 ,"Min physical address " +"not divisible by page size.\n" +" paddr_min: 0x%lx page_size: 0x%x" , + paddr_min, vm->page_size); + + region =memslot2region (vm, memslot); + base = pg = paddr_min >> vm->page_shift; + +do { +for (; pg < base + num; ++pg) { +if (!sparsebit_is_set (region->unused_phy_pages, pg)) { + base = pg =sparsebit_next_set (region->unused_phy_pages, pg); +break ; + } + } + }while (pg && pg != base + num); + +if (pg ==0 ) { +fprintf (stderr,"No guest physical page available, " +"paddr_min: 0x%lx page_size: 0x%x memslot: %u\n" , + paddr_min, vm->page_size, memslot); +fputs ("---- vm dump ----\n" , stderr); +vm_dump (stderr, vm,2 ); +abort (); + } + +for (pg = base; pg < base + num; ++pg) +sparsebit_clear (region->unused_phy_pages, pg); + +return base * vm->page_size; +} + +vm_paddr_t vm_phy_page_alloc (struct kvm_vm *vm,vm_paddr_t paddr_min, +uint32_t memslot) +{ +return vm_phy_pages_alloc (vm,1 , paddr_min, memslot); +} + +/* Arbitrary minimum physical address used for virtual translation tables. */ +#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000 + +vm_paddr_t vm_alloc_page_table (struct kvm_vm *vm) +{ +return vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); +} +/* * VM Virtual Address Unused Gap *
@@ -1722,79 +1795,6 @@ const char *exit_reason_str(unsigned int exit_reason)return "Unknown" ; } -/* -* Physical Contiguous Page Allocator -* -* Input Args: -* vm - Virtual Machine -* num - number of pages -* paddr_min - Physical address minimum -* memslot - Memory region to allocate page from -* -* Output Args: None -* -* Return: -* Starting physical address -* -* Within the VM specified by vm, locates a range of available physical -* pages at or above paddr_min. If found, the pages are marked as in use -* 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) -{ -struct userspace_mem_region *region; -sparsebit_idx_t pg, base; - -TEST_ASSERT (num >0 ,"Must allocate at least one page" ); - -TEST_ASSERT ((paddr_min % vm->page_size) ==0 ,"Min physical address " -"not divisible by page size.\n" -" paddr_min: 0x%lx page_size: 0x%x" , - paddr_min, vm->page_size); - - region =memslot2region (vm, memslot); - base = pg = paddr_min >> vm->page_shift; - -do { -for (; pg < base + num; ++pg) { -if (!sparsebit_is_set (region->unused_phy_pages, pg)) { - base = pg =sparsebit_next_set (region->unused_phy_pages, pg); -break ; - } - } - }while (pg && pg != base + num); - -if (pg ==0 ) { -fprintf (stderr,"No guest physical page available, " -"paddr_min: 0x%lx page_size: 0x%x memslot: %u\n" , - paddr_min, vm->page_size, memslot); -fputs ("---- vm dump ----\n" , stderr); -vm_dump (stderr, vm,2 ); -abort (); - } - -for (pg = base; pg < base + num; ++pg) -sparsebit_clear (region->unused_phy_pages, pg); - -return base * vm->page_size; -} - -vm_paddr_t vm_phy_page_alloc (struct kvm_vm *vm,vm_paddr_t paddr_min, -uint32_t memslot) -{ -return vm_phy_pages_alloc (vm,1 , paddr_min, memslot); -} - -/* Arbitrary minimum physical address used for virtual translation tables. */ -#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000 - -vm_paddr_t vm_alloc_page_table (struct kvm_vm *vm) -{ -return vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); -} -/* * Address Guest Virtual to Host Virtual *
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
RFC 2/10 KVM: selftests: sparsebit: add const where appropriate
In reply to Peter GondaFrom: 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.37.0.170.g444d1eabd0-goog
RFC 3/10 KVM: selftests: add hooks for managing encrypted guest memory
In reply to Peter GondaFrom: Michael Roth <[email protected]>
VM implementations that make use of encrypted memory need a way to configure things like the encryption/shared bit position for page table handling, the default encryption policy for internal allocations made by the core library, and a way to fetch the list/bitmap of encrypted pages to do the actual memory encryption. Add an interface to configure these parameters. Also introduce a sparsebit map to track allocations/mappings that should be treated as encrypted, and provide a way for VM implementations to retrieve it to handle operations related memory encryption.
--- .../selftests/kvm/include/kvm_util_base.h | 17 ++++++ tools/testing/selftests/kvm/lib/kvm_util.c | 52 +++++++++++++++++-- 2 files changed, 66 insertions(+), 3 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +17 -0
@@ -32,6 +32,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 *encrypted_phy_pages;int fd;off_t offset;void *host_mem;
@@ -61,6 +62,14 @@ struct userspace_mem_regions {DECLARE_HASHTABLE (slot_hash,9 ); }; +/* Memory encryption policy/configuration. */ +struct vm_memcrypt { +bool enabled; +int8_t enc_by_default; +bool has_enc_bit; +int8_t enc_bit; +}; +struct kvm_vm {int mode;unsigned long type;
@@ -84,6 +93,7 @@ struct kvm_vm {vm_vaddr_t idt;vm_vaddr_t handlers;uint32_t dirty_ring_size; +struct vm_memcrypt memcrypt;/* Cache of information for binary stats interface */ int stats_fd;
@@ -820,4 +830,11 @@ static inline int __vm_disable_nx_huge_pages(struct kvm_vm *vm) return __vm_enable_cap(vm, KVM_CAP_VM_DISABLE_NX_HUGE_PAGES, 0); } +void vm_set_memory_encryption (struct kvm_vm *vm,bool enc_by_default,bool has_enc_bit, +uint8_t enc_bit); + +const struct sparsebit *vm_get_encrypted_phy_pages (struct kvm_vm *vm,int slot, +vm_paddr_t *gpa_start, +uint64_t *size); +#endif /* SELFTEST_KVM_UTIL_BASE_H */
tools/testing/selftests/kvm/lib/kvm_util.c +49 -3
96 lines not on this page · raw message
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
RFC 4/10 KVM: selftests: handle encryption bits in page tables
In reply to Peter GondaFrom: Michael Roth <[email protected]>
SEV 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 addr_gpa2raw()/addr_raw2gpa() to add/remove these bits, then use them where appropriate.
--- .../selftests/kvm/include/kvm_util_base.h | 2 + tools/testing/selftests/kvm/lib/kvm_util.c | 55 ++++++++++++++++++- .../selftests/kvm/lib/x86_64/processor.c | 15 +++-- 3 files changed, 66 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +2 -0
@@ -396,6 +396,8 @@ void *addr_gpa2hva(struct kvm_vm *vm, vm_paddr_t gpa);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); +vm_paddr_t addr_raw2gpa (struct kvm_vm *vm,vm_vaddr_t gpa_raw); +vm_paddr_t addr_gpa2raw (struct kvm_vm *vm,vm_vaddr_t gpa);void vcpu_run (struct kvm_vcpu *vcpu);int _vcpu_run (struct kvm_vcpu *vcpu);
tools/testing/selftests/kvm/lib/kvm_util.c +54 -1
69 lines not on this page · raw message
tools/testing/selftests/kvm/lib/x86_64/processor.c +10 -5
@@ -116,7 +116,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 =addr_gpa2raw (vm,vm_alloc_page_table (vm)); vm->pgd_created = true; } }
@@ -138,13 +138,15 @@ static uint64_t *virt_create_upper_pte(struct kvm_vm *vm, int target_level) {uint64_t *pte =virt_get_pte (vm, pt_pfn, vaddr, current_level); +uint64_t paddr_raw =addr_gpa2raw (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 ); + *pte |=PTE_LARGE_MASK | (paddr_raw &PHYSICAL_PAGE_MASK );else - *pte |=vm_alloc_page_table (vm) &PHYSICAL_PAGE_MASK ; + *pte |=addr_gpa2raw (vm,vm_alloc_page_table (vm)) &PHYSICAL_PAGE_MASK ; + }else {/* * Entry already present. Assert that the caller doesn't want
@@ -182,6 +184,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 (addr_raw2gpa (vm, paddr) == paddr, +"Unexpected bits in paddr: %lx" , paddr);/* * Allocate upper level page tables, if not already present. Return
@@ -204,7 +208,8 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level) pte =virt_get_pte (vm,PTE_GET_PFN (*pde), vaddr,PG_LEVEL_4K );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 ); + *pte =PTE_PRESENT_MASK |PTE_WRITABLE_MASK | + (addr_gpa2raw (vm, paddr) &PHYSICAL_PAGE_MASK ); }void virt_arch_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr)
@@ -517,7 +522,7 @@ vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)if (!(pte[index[0 ]] &PTE_PRESENT_MASK )) goto unmapped_gva; -return (PTE_GET_PFN (pte[index[0 ]]) * vm->page_size) + (gva & ~PAGE_MASK ); +return addr_raw2gpa (vm,PTE_GET_PFN (pte[index[0 ]]) * vm->page_size) + (gva & ~PAGE_MASK ); unmapped_gva:TEST_FAIL ("No mapping for vm virtual address, gva: 0x%lx" , gva);
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
RFC 5/10 KVM: selftests: add support for encrypted vm_vaddr_* allocations
In reply to Peter GondaFrom: Michael Roth <[email protected]>
The default policy for whether to handle allocations as encrypted or shared pages is currently determined by vm_phy_pages_alloc(), which in turn uses the policy defined by vm->memcrypt.enc_by_default.
Test programs may wish to allocate shared vaddrs for things like sharing memory with the guest. Since enc_by_default will be true in the case of SEV guests (since it's required in order to have the initial ELF binary and page table become part of the initial guest payload), 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
@@ -387,6 +387,7 @@ void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa);void vm_mem_region_delete (struct kvm_vm *vm,uint32_t slot);struct kvm_vcpu *__vm_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id);vm_vaddr_t vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min); +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);
tools/testing/selftests/kvm/lib/kvm_util.c +17 -4
@@ -1250,12 +1250,13 @@ static vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz, }/* -* VM Virtual Address Allocate +* VM Virtual Address Allocate Shared/Encrypted * * Input Args: * vm - Virtual Machine * sz - Size in bytes * vaddr_min - Minimum starting virtual address +* encrypt - Whether the region should be handled as encrypted * * Output Args: None *
@@ -1268,13 +1269,15 @@ static vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz,* a unique set of pages, with the minimum real allocation being at least * a page. */ -vm_vaddr_t vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min) +static vm_vaddr_t +_vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min,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, -KVM_UTIL_MIN_PFN * vm->page_size,0 ); +vm_paddr_t paddr =_vm_phy_pages_alloc (vm, pages, +KVM_UTIL_MIN_PFN * vm->page_size, +0 , encrypt);/* * Find an unused range of virtual page addresses of at least
@@ -1295,6 +1298,16 @@ 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) +{ +return _vm_vaddr_alloc (vm, sz, vaddr_min, vm->memcrypt.enc_by_default); +} + +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, false); +} +/* * VM Virtual Address Allocate Pages *
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
RFC 6/10 KVM: selftests: Consolidate boilerplate code in get_ucall()
In reply to Peter GondaFrom: Sean Christopherson <[email protected]>
Consolidate the actual copying of a ucall struct from guest=>host into the common get_ucall(). Return a host virtual address instead of a guest virtual address even though the addr_gva2hva() part could be moved to get_ucall() too. Conceptually, get_ucall() is invoked from the host and should return a host virtual address (and returning NULL for "nothing to see here" is far superior to returning 0).
Use pointer shenanigans instead of an unnecessary bounce buffer when the caller of get_ucall() provides a valid pointer.
--- tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/ucall_common.h | 17 +++++++- .../testing/selftests/kvm/lib/aarch64/ucall.c | 36 ++++------------- .../selftests/kvm/lib/perf_test_util.c | 2 +- tools/testing/selftests/kvm/lib/riscv/ucall.c | 40 ++++--------------- tools/testing/selftests/kvm/lib/s390x/ucall.c | 37 ++++------------- .../testing/selftests/kvm/lib/ucall_common.c | 39 ++++++++++++++++++ .../testing/selftests/kvm/lib/x86_64/ucall.c | 37 ++++------------- 8 files changed, 84 insertions(+), 125 deletions(-) create mode 100644 tools/testing/selftests/kvm/lib/ucall_common.c
tools/testing/selftests/kvm/Makefile +1 -0
@@ -46,6 +46,7 @@ LIBKVM += lib/perf_test_util.c LIBKVM += lib/rbtree.c LIBKVM += lib/sparsebit.c LIBKVM += lib/test_util.c +LIBKVM += lib/ucall_common.c LIBKVM_x86_64 += lib/x86_64/apic.c LIBKVM_x86_64 += lib/x86_64/handlers.S
tools/testing/selftests/kvm/include/ucall_common.h +15 -2
@@ -23,11 +23,24 @@ struct ucall {uint64_t args[UCALL_MAX_ARGS ]; }; -void ucall_init (struct kvm_vm *vm,void *arg); -void ucall_uninit (struct kvm_vm *vm); +void ucall_arch_init (struct kvm_vm *vm,void *arg); +void ucall_arch_uninit (struct kvm_vm *vm); +void ucall_arch_do_ucall (vm_vaddr_t uc); +void *ucall_arch_get_ucall (struct kvm_vcpu *vcpu); +void ucall (uint64_t cmd,int nargs, ...);uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc); +static inline void ucall_init (struct kvm_vm *vm,void *arg) +{ +ucall_arch_init (vm, arg); +} + +static inline void ucall_uninit (struct kvm_vm *vm) +{ +ucall_arch_uninit (vm); +} +#define GUEST_SYNC_ARGS (stage, arg1, arg2, arg3, arg4) \ ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4)#define GUEST_SYNC (stage) ucall(UCALL_SYNC, 2, "hello", stage)
tools/testing/selftests/kvm/lib/aarch64/ucall.c +7 -29
@@ -21,7 +21,7 @@ static bool ucall_mmio_init(struct kvm_vm *vm, vm_paddr_t gpa)return true; } -void ucall_init (struct kvm_vm *vm,void *arg) +void ucall_arch_init (struct kvm_vm *vm,void *arg) {vm_paddr_t gpa, start, end, step, offset;unsigned int bits;
@@ -64,37 +64,20 @@ void ucall_init(struct kvm_vm *vm, void *arg)TEST_FAIL ("Can't find a ucall mmio address" ); } -void ucall_uninit (struct kvm_vm *vm) +void ucall_arch_uninit (struct kvm_vm *vm) { ucall_exit_mmio_addr =0 ;sync_global_to_guest (vm, ucall_exit_mmio_addr); } -void ucall (uint64_t cmd,int nargs, ...) +void ucall_arch_do_ucall (vm_vaddr_t uc) { -struct ucall uc = { - .cmd = cmd, - }; -va_list va; -int i; - - nargs =min (nargs,UCALL_MAX_ARGS ); - -va_start (va, nargs); -for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); -va_end (va); - - *ucall_exit_mmio_addr = (vm_vaddr_t)&uc; + *ucall_exit_mmio_addr = uc; } -uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) +void *ucall_arch_get_ucall (struct kvm_vcpu *vcpu) {struct kvm_run *run = vcpu->run; -struct ucall ucall = {}; - -if (uc) -memset (uc,0 ,sizeof (*uc));if (run->exit_reason ==KVM_EXIT_MMIO && run->mmio.phys_addr == (uint64_t )ucall_exit_mmio_addr) {
@@ -103,12 +86,7 @@ uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc)TEST_ASSERT (run->mmio.is_write && run->mmio.len ==8 ,"Unexpected ucall exit mmio address access" );memcpy (&gva, run->mmio.data,sizeof (gva)); -memcpy (&ucall,addr_gva2hva (vcpu->vm, gva),sizeof (ucall)); - -vcpu_run_complete_io (vcpu); -if (uc) -memcpy (uc, &ucall,sizeof (ucall)); +return addr_gva2hva (vcpu->vm, gva); } - -return ucall.cmd; +return NULL ; }
tools/testing/selftests/kvm/lib/perf_test_util.c +1 -1
@@ -209,7 +209,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_vcpus,perf_test_setup_nested (vm, nr_vcpus, vcpus); } -ucall_init (vm,NULL ); +ucall_arch_init (vm,NULL );/* Export the shared variables to the guest. */ sync_global_to_guest (vm, perf_test_args);
tools/testing/selftests/kvm/lib/riscv/ucall.c +7 -33
@@ -10,11 +10,11 @@#include "kvm_util.h" #include "processor.h" -void ucall_init (struct kvm_vm *vm,void *arg) +void ucall_arch_init (struct kvm_vm *vm,void *arg) { } -void ucall_uninit (struct kvm_vm *vm) +void ucall_arch_uninit (struct kvm_vm *vm) { }
@@ -44,47 +44,22 @@ struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0,return ret; } -void ucall (uint64_t cmd,int nargs, ...) +void ucall_arch_do_ucall (vm_vaddr_t uc) { -struct ucall uc = { - .cmd = cmd, - }; -va_list va; -int i; - - nargs =min (nargs,UCALL_MAX_ARGS ); - -va_start (va, nargs); -for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); -va_end (va); -sbi_ecall (KVM_RISCV_SELFTESTS_SBI_EXT ,KVM_RISCV_SELFTESTS_SBI_UCALL , - (vm_vaddr_t)&uc,0 ,0 ,0 ,0 ,0 ); + uc,0 ,0 ,0 ,0 ,0 ); } -uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) +void *ucall_arch_get_ucall (struct kvm_vcpu *vcpu) {struct kvm_run *run = vcpu->run; -struct ucall ucall = {}; - -if (uc) -memset (uc,0 ,sizeof (*uc));if (run->exit_reason ==KVM_EXIT_RISCV_SBI && run->riscv_sbi.extension_id ==KVM_RISCV_SELFTESTS_SBI_EXT ) {switch (run->riscv_sbi.function_id) {case KVM_RISCV_SELFTESTS_SBI_UCALL : -memcpy (&ucall, -addr_gva2hva (vcpu->vm, run->riscv_sbi.args[0 ]), -sizeof (ucall)); - -vcpu_run_complete_io (vcpu); -if (uc) -memcpy (uc, &ucall,sizeof (ucall)); - -break ; +return addr_gva2hva (vcpu->vm, run->riscv_sbi.args[0 ]);case KVM_RISCV_SELFTESTS_SBI_UNEXP :vcpu_dump (stderr, vcpu,2 );TEST_ASSERT (0 ,"Unexpected trap taken by guest" );
@@ -93,6 +68,5 @@ uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc)break ; } } - -return ucall.cmd; +return NULL ; }
tools/testing/selftests/kvm/lib/s390x/ucall.c +7 -30
@@ -6,40 +6,23 @@*/ #include "kvm_util.h" -void ucall_init (struct kvm_vm *vm,void *arg) +void ucall_arch_init (struct kvm_vm *vm,void *arg) { } -void ucall_uninit (struct kvm_vm *vm) +void ucall_arch_uninit (struct kvm_vm *vm) { } -void ucall (uint64_t cmd,int nargs, ...) +void ucall_arch_do_ucall (vm_vaddr_t uc) { -struct ucall uc = { - .cmd = cmd, - }; -va_list va; -int i; - - nargs =min (nargs,UCALL_MAX_ARGS ); - -va_start (va, nargs); -for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); -va_end (va); -/* Exit via DIAGNOSE 0x501 (normally used for breakpoints) */ - asmvolatile ("diag 0,%0,0x501" : :"a" (&uc) :"memory" ); + asmvolatile ("diag 0,%0,0x501" : :"a" (uc) :"memory" ); } -uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) +void *ucall_arch_get_ucall (struct kvm_vcpu *vcpu) {struct kvm_run *run = vcpu->run; -struct ucall ucall = {}; - -if (uc) -memset (uc,0 ,sizeof (*uc)); if (run->exit_reason == KVM_EXIT_S390_SIEIC && run->s390_sieic.icptcode == 4 &&
@@ -47,13 +30,7 @@ uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc) (run->s390_sieic.ipb >> 16) == 0x501) {int reg = run->s390_sieic.ipa &0xf ; -memcpy (&ucall,addr_gva2hva (vcpu->vm, run->s.regs.gprs[reg]), -sizeof (ucall)); - -vcpu_run_complete_io (vcpu); -if (uc) -memcpy (uc, &ucall,sizeof (ucall)); +return addr_gva2hva (vcpu->vm, run->s.regs.gprs[reg]); } - -return ucall.cmd; +return NULL ; }
tools/testing/selftests/kvm/lib/ucall_common.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include "kvm_util.h" + +void ucall (uint64_t cmd,int nargs, ...) +{ +struct ucall uc = { + .cmd = cmd, + }; +va_list va; +int i; + + nargs =min (nargs,UCALL_MAX_ARGS ); + +va_start (va, nargs); +for (i =0 ; i < nargs; ++i) + uc.args[i] =va_arg (va, uint64_t); +va_end (va); + +ucall_arch_do_ucall ((vm_vaddr_t)&uc); +} + +uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) +{ +struct ucall ucall; +void *addr; + +if (!uc) + uc = &ucall; + + addr =ucall_arch_get_ucall (vcpu); +if (addr) { +memcpy (uc, addr,sizeof (*uc)); +vcpu_run_complete_io (vcpu); + }else { +memset (uc,0 ,sizeof (*uc)); + } + +return uc->cmd; +}
tools/testing/selftests/kvm/lib/x86_64/ucall.c +7 -30
@@ -8,52 +8,29 @@#define UCALL_PIO_PORT ((uint16_t)0x1000) -void ucall_init (struct kvm_vm *vm,void *arg) +void ucall_arch_init (struct kvm_vm *vm,void *arg) { } -void ucall_uninit (struct kvm_vm *vm) +void ucall_arch_uninit (struct kvm_vm *vm) { } -void ucall (uint64_t cmd,int nargs, ...) +void ucall_arch_do_ucall (vm_vaddr_t uc) { -struct ucall uc = { - .cmd = cmd, - }; -va_list va; -int i; - - nargs =min (nargs,UCALL_MAX_ARGS ); - -va_start (va, nargs); -for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); -va_end (va); - asmvolatile ("in %[port], %%al" - : : [port]"d" (UCALL_PIO_PORT ),"D" (&uc) :"rax" ,"memory" ); + : : [port]"d" (UCALL_PIO_PORT ),"D" (uc) :"rax" ,"memory" ); } -uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) +void *ucall_arch_get_ucall (struct kvm_vcpu *vcpu) {struct kvm_run *run = vcpu->run; -struct ucall ucall = {}; - -if (uc) -memset (uc,0 ,sizeof (*uc));if (run->exit_reason ==KVM_EXIT_IO && run->io.port ==UCALL_PIO_PORT ) {struct kvm_regs regs;vcpu_regs_get (vcpu, ®s); -memcpy (&ucall,addr_gva2hva (vcpu->vm, (vm_vaddr_t )regs.rdi), -sizeof (ucall)); - -vcpu_run_complete_io (vcpu); -if (uc) -memcpy (uc, &ucall,sizeof (ucall)); +return addr_gva2hva (vcpu->vm, (vm_vaddr_t )regs.rdi); } - -return ucall.cmd; +return NULL ; }
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
Re: [RFC V1 06/10] KVM: selftests: Consolidate boilerplate code in get_ucall()
Quoted 145 lines · Peter Gonda
From: Sean Christopherson <[email protected]>
Consolidate the actual copying of a ucall struct from guest=>host into the common
get_ucall(). Return a host virtual address instead of a guest virtual address even though theaddr_gva2hva()part could be moved toget_ucall()too. Conceptually,get_ucall()is invoked from the host and should return a host virtual address (and returning NULL for "nothing to see here" is far superior to returning 0).Use pointer shenanigans instead of an unnecessary bounce buffer when the caller of
get_ucall()provides a valid pointer.Signed-off-by Sean Christopherson <[email protected]>Signed-off-by Peter Gonda <[email protected]>--- tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/ucall_common.h | 17 +++++++- .../testing/selftests/kvm/lib/aarch64/ucall.c | 36 ++++------------- .../selftests/kvm/lib/perf_test_util.c | 2 +- tools/testing/selftests/kvm/lib/riscv/ucall.c | 40 ++++--------------- tools/testing/selftests/kvm/lib/s390x/ucall.c | 37 ++++------------- .../testing/selftests/kvm/lib/ucall_common.c | 39 ++++++++++++++++++ .../testing/selftests/kvm/lib/x86_64/ucall.c | 37 ++++------------- 8 files changed, 84 insertions(+), 125 deletions(-) create mode 100644 tools/testing/selftests/kvm/lib/ucall_common.ctools/testing/selftests/kvm/Makefile +1
-0@@ -46,6 +46,7 @@ LIBKVM += lib/perf_test_util.c LIBKVM += lib/rbtree.c LIBKVM += lib/sparsebit.c LIBKVM += lib/test_util.c +LIBKVM += lib/ucall_common.c LIBKVM_x86_64 += lib/x86_64/apic.c LIBKVM_x86_64 += lib/x86_64/handlers.Stools/testing/selftests/kvm/include/ucall_common.h +15
-2@@ -23,11 +23,24 @@ struct ucall {uint64_t args[UCALL_MAX_ARGS ]; }; -void ucall_init (struct kvm_vm *vm,void *arg); -void ucall_uninit (struct kvm_vm *vm); +void ucall_arch_init (struct kvm_vm *vm,void *arg); +void ucall_arch_uninit (struct kvm_vm *vm); +void ucall_arch_do_ucall (vm_vaddr_t uc); +void *ucall_arch_get_ucall (struct kvm_vcpu *vcpu); +void ucall (uint64_t cmd,int nargs, ...);uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc); +static inline void ucall_init (struct kvm_vm *vm,void *arg) +{ +ucall_arch_init (vm, arg); +} + +static inline void ucall_uninit (struct kvm_vm *vm) +{ +ucall_arch_uninit (vm); +} +#define GUEST_SYNC_ARGS (stage, arg1, arg2, arg3, arg4) \ ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4)#define GUEST_SYNC (stage) ucall(UCALL_SYNC, 2, "hello", stage)tools/testing/selftests/kvm/lib/aarch64/ucall.c +7
-29@@ -21,7 +21,7 @@ static bool ucall_mmio_init(struct kvm_vm *vm, vm_paddr_t gpa)return true; } -void ucall_init (struct kvm_vm *vm,void *arg) +void ucall_arch_init (struct kvm_vm *vm,void *arg) {vm_paddr_t gpa, start, end, step, offset;unsigned int bits;@@ -64,37 +64,20 @@ void ucall_init(struct kvm_vm *vm, void *arg)TEST_FAIL ("Can't find a ucall mmio address" ); } -void ucall_uninit (struct kvm_vm *vm) +void ucall_arch_uninit (struct kvm_vm *vm) { ucall_exit_mmio_addr =0 ;sync_global_to_guest (vm, ucall_exit_mmio_addr); } -void ucall (uint64_t cmd,int nargs, ...) +void ucall_arch_do_ucall (vm_vaddr_t uc) { -struct ucall uc = { - .cmd = cmd, - }; -va_list va; -int i; - - nargs =min (nargs,UCALL_MAX_ARGS ); - -va_start (va, nargs); -for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); -va_end (va); - - *ucall_exit_mmio_addr = (vm_vaddr_t)&uc; + *ucall_exit_mmio_addr = uc; } -uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) +void *ucall_arch_get_ucall (struct kvm_vcpu *vcpu) {struct kvm_run *run = vcpu->run; -struct ucall ucall = {}; - -if (uc) -memset (uc,0 ,sizeof (*uc));if (run->exit_reason ==KVM_EXIT_MMIO && run->mmio.phys_addr == (uint64_t )ucall_exit_mmio_addr) {@@ -103,12 +86,7 @@ uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc)TEST_ASSERT (run->mmio.is_write && run->mmio.len ==8 ,"Unexpected ucall exit mmio address access" );memcpy (&gva, run->mmio.data,sizeof (gva)); -memcpy (&ucall,addr_gva2hva (vcpu->vm, gva),sizeof (ucall)); - -vcpu_run_complete_io (vcpu); -if (uc) -memcpy (uc, &ucall,sizeof (ucall)); +return addr_gva2hva (vcpu->vm, gva); } - -return ucall.cmd; +return NULL ; }tools/testing/selftests/kvm/lib/perf_test_util.c +0
-0
tools/testing/selftests/kvm/lib/perf_test_util.c struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_vcpus, · line 212
Quoted 5 lines
tools/testing/selftests/kvm/lib/perf_test_util.c +1
-1@@ -209,7 +209,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_vcpus,perf_test_setup_nested (vm, nr_vcpus, vcpus); } -ucall_init (vm,NULL ); +ucall_arch_init (vm,NULL );
This change shouldn't be necessary since we have the ucall_init() wrapper in ucall_common.h
Quoted 259 lines
tools/testing/selftests/kvm/lib/perf_test_util.c +0
-0/* Export the shared variables to the guest. */ sync_global_to_guest (vm, perf_test_args);tools/testing/selftests/kvm/lib/riscv/ucall.c +7
-33@@ -10,11 +10,11 @@#include "kvm_util.h" #include "processor.h" -void ucall_init (struct kvm_vm *vm,void *arg) +void ucall_arch_init (struct kvm_vm *vm,void *arg) { } -void ucall_uninit (struct kvm_vm *vm) +void ucall_arch_uninit (struct kvm_vm *vm) { }@@ -44,47 +44,22 @@ struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0,return ret; } -void ucall (uint64_t cmd,int nargs, ...) +void ucall_arch_do_ucall (vm_vaddr_t uc) { -struct ucall uc = { - .cmd = cmd, - }; -va_list va; -int i; - - nargs =min (nargs,UCALL_MAX_ARGS ); - -va_start (va, nargs); -for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); -va_end (va); -sbi_ecall (KVM_RISCV_SELFTESTS_SBI_EXT ,KVM_RISCV_SELFTESTS_SBI_UCALL , - (vm_vaddr_t)&uc,0 ,0 ,0 ,0 ,0 ); + uc,0 ,0 ,0 ,0 ,0 ); } -uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) +void *ucall_arch_get_ucall (struct kvm_vcpu *vcpu) {struct kvm_run *run = vcpu->run; -struct ucall ucall = {}; - -if (uc) -memset (uc,0 ,sizeof (*uc));if (run->exit_reason ==KVM_EXIT_RISCV_SBI && run->riscv_sbi.extension_id ==KVM_RISCV_SELFTESTS_SBI_EXT ) {switch (run->riscv_sbi.function_id) {case KVM_RISCV_SELFTESTS_SBI_UCALL : -memcpy (&ucall, -addr_gva2hva (vcpu->vm, run->riscv_sbi.args[0 ]), -sizeof (ucall)); - -vcpu_run_complete_io (vcpu); -if (uc) -memcpy (uc, &ucall,sizeof (ucall)); - -break ; +return addr_gva2hva (vcpu->vm, run->riscv_sbi.args[0 ]);case KVM_RISCV_SELFTESTS_SBI_UNEXP :vcpu_dump (stderr, vcpu,2 );TEST_ASSERT (0 ,"Unexpected trap taken by guest" );@@ -93,6 +68,5 @@ uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc)break ; } } - -return ucall.cmd; +return NULL ; }tools/testing/selftests/kvm/lib/s390x/ucall.c +7
-30@@ -6,40 +6,23 @@*/ #include "kvm_util.h" -void ucall_init (struct kvm_vm *vm,void *arg) +void ucall_arch_init (struct kvm_vm *vm,void *arg) { } -void ucall_uninit (struct kvm_vm *vm) +void ucall_arch_uninit (struct kvm_vm *vm) { } -void ucall (uint64_t cmd,int nargs, ...) +void ucall_arch_do_ucall (vm_vaddr_t uc) { -struct ucall uc = { - .cmd = cmd, - }; -va_list va; -int i; - - nargs =min (nargs,UCALL_MAX_ARGS ); - -va_start (va, nargs); -for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); -va_end (va); -/* Exit via DIAGNOSE 0x501 (normally used for breakpoints) */ - asmvolatile ("diag 0,%0,0x501" : :"a" (&uc) :"memory" ); + asmvolatile ("diag 0,%0,0x501" : :"a" (uc) :"memory" ); } -uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) +void *ucall_arch_get_ucall (struct kvm_vcpu *vcpu) {struct kvm_run *run = vcpu->run; -struct ucall ucall = {}; - -if (uc) -memset (uc,0 ,sizeof (*uc)); if (run->exit_reason == KVM_EXIT_S390_SIEIC && run->s390_sieic.icptcode == 4 &&@@ -47,13 +30,7 @@ uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc) (run->s390_sieic.ipb >> 16) == 0x501) {int reg = run->s390_sieic.ipa &0xf ; -memcpy (&ucall,addr_gva2hva (vcpu->vm, run->s.regs.gprs[reg]), -sizeof (ucall)); - -vcpu_run_complete_io (vcpu); -if (uc) -memcpy (uc, &ucall,sizeof (ucall)); +return addr_gva2hva (vcpu->vm, run->s.regs.gprs[reg]); } - -return ucall.cmd; +return NULL ; }tools/testing/selftests/kvm/lib/ucall_common.c new file +39
-0@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include "kvm_util.h" + +void ucall (uint64_t cmd,int nargs, ...) +{ +struct ucall uc = { + .cmd = cmd, + }; +va_list va; +int i; + + nargs =min (nargs,UCALL_MAX_ARGS ); + +va_start (va, nargs); +for (i =0 ; i < nargs; ++i) + uc.args[i] =va_arg (va, uint64_t); +va_end (va); + +ucall_arch_do_ucall ((vm_vaddr_t)&uc); +} + +uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) +{ +struct ucall ucall; +void *addr; + +if (!uc) + uc = &ucall; + + addr =ucall_arch_get_ucall (vcpu); +if (addr) { +memcpy (uc, addr,sizeof (*uc)); +vcpu_run_complete_io (vcpu); + }else { +memset (uc,0 ,sizeof (*uc)); + } + +return uc->cmd; +}tools/testing/selftests/kvm/lib/x86_64/ucall.c +7
-30@@ -8,52 +8,29 @@#define UCALL_PIO_PORT ((uint16_t)0x1000) -void ucall_init (struct kvm_vm *vm,void *arg) +void ucall_arch_init (struct kvm_vm *vm,void *arg) { } -void ucall_uninit (struct kvm_vm *vm) +void ucall_arch_uninit (struct kvm_vm *vm) { } -void ucall (uint64_t cmd,int nargs, ...) +void ucall_arch_do_ucall (vm_vaddr_t uc) { -struct ucall uc = { - .cmd = cmd, - }; -va_list va; -int i; - - nargs =min (nargs,UCALL_MAX_ARGS ); - -va_start (va, nargs); -for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); -va_end (va); - asmvolatile ("in %[port], %%al" - : : [port]"d" (UCALL_PIO_PORT ),"D" (&uc) :"rax" ,"memory" ); + : : [port]"d" (UCALL_PIO_PORT ),"D" (uc) :"rax" ,"memory" ); } -uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) +void *ucall_arch_get_ucall (struct kvm_vcpu *vcpu) {struct kvm_run *run = vcpu->run; -struct ucall ucall = {}; - -if (uc) -memset (uc,0 ,sizeof (*uc));if (run->exit_reason ==KVM_EXIT_IO && run->io.port ==UCALL_PIO_PORT ) {struct kvm_regs regs;vcpu_regs_get (vcpu, ®s); -memcpy (&ucall,addr_gva2hva (vcpu->vm, (vm_vaddr_t )regs.rdi), -sizeof (ucall)); - -vcpu_run_complete_io (vcpu); -if (uc) -memcpy (uc, &ucall,sizeof (ucall)); +return addr_gva2hva (vcpu->vm, (vm_vaddr_t )regs.rdi); } - -return ucall.cmd; +return NULL ; }Signature · 1 line
2.37.0.170.g444d1eabd0-goog
Other than the ucall_init() wrapper comment
RFC 7/10 tools: Add atomic_test_and_set_bit()
In reply to Peter Gondaatomic_test_and_set_bit() allows for atomic bitmap usage from KVM selftests.
--- tools/arch/x86/include/asm/atomic.h | 7 +++++++ 1 file changed, 7 insertions(+)
tools/arch/x86/include/asm/atomic.h +7 -0
@@ -8,6 +8,7 @@#define LOCK_PREFIX "\n\tlock; " +#include <asm/asm.h> #include <asm/cmpxchg.h> /*
@@ -70,4 +71,10 @@ static __always_inline int atomic_cmpxchg(atomic_t *v, int old, int new) return cmpxchg(&v->counter, old, new); } +static inline int atomic_test_and_set_bit(long nr, volatile unsigned long *addr) +{ + GEN_BINARY_RMWcc(LOCK_PREFIX __ASM_SIZE(bts), *addr, "Ir", nr, "%0", "c"); + +} + #endif /* _TOOLS_LINUX_ASM_X86_ATOMIC_H */
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
RFC 8/10 KVM: selftests: Make ucall work with encrypted guests
In reply to Peter GondaAdd support for encrypted, SEV, guests in the ucall framework. If encryption is enabled set up a pool of ucall structs in the guests' shared memory region. This was suggested in the thread on "[RFC PATCH 00/10] KVM: selftests: Add support for test-selectable ucall implementations". Using a listed as suggested there doesn't work well because the list is setup using HVAs not GVAs so use a bitmap + array solution instead to get the same pool result.
--- tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/kvm_util_base.h | 30 +++-- .../selftests/kvm/include/ucall_common.h | 14 +-- .../testing/selftests/kvm/lib/ucall_common.c | 115 ++++++++++++++++-- .../testing/selftests/kvm/lib/x86_64/ucall.c | 2 +- 5 files changed, 134 insertions(+), 28 deletions(-)
tools/testing/selftests/kvm/Makefile +1 -0
@@ -47,6 +47,7 @@ LIBKVM += lib/rbtree.c LIBKVM += lib/sparsebit.c LIBKVM += lib/test_util.c LIBKVM += lib/ucall_common.c +LIBKVM += $(top_srcdir)/tools/lib/find_bit.c LIBKVM_x86_64 += lib/x86_64/apic.c LIBKVM_x86_64 += lib/x86_64/handlers.S
tools/testing/selftests/kvm/include/kvm_util_base.h +18 -12
@@ -65,6 +65,7 @@ struct userspace_mem_regions {/* Memory encryption policy/configuration. */ struct vm_memcrypt {bool enabled; +bool encrypted;int8_t enc_by_default;bool has_enc_bit;int8_t enc_bit;
@@ -99,6 +100,8 @@ struct kvm_vm {int stats_fd;struct kvm_stats_header stats_header;struct kvm_stats_desc *stats_desc; + +struct list_head ucall_list; };
@@ -141,21 +144,21 @@ enum vm_guest_mode {extern enum vm_guest_mode vm_mode_default; -#define VM_MODE_DEFAULT vm_mode_default -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 8) +#define VM_MODE_DEFAULT vm_mode_default +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 8)#elif defined(__x86_64__) -#define VM_MODE_DEFAULT VM_MODE_PXXV48_4K -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 8) +#define VM_MODE_DEFAULT VM_MODE_PXXV48_4K +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 8)#elif defined(__s390x__) -#define VM_MODE_DEFAULT VM_MODE_P44V64_4K -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 16) +#define VM_MODE_DEFAULT VM_MODE_P44V64_4K +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 16)#elif defined(__riscv)
@@ -163,9 +166,9 @@ extern enum vm_guest_mode vm_mode_default;#error "RISC-V 32-bit kvm selftests not supported"#endif -#define VM_MODE_DEFAULT VM_MODE_P40V48_4K -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 8) +#define VM_MODE_DEFAULT VM_MODE_P40V48_4K +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 8)#endif
@@ -802,6 +805,9 @@ vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva);static inline vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) { +TEST_ASSERT ( + !vm->memcrypt.encrypted, +"Encrypted guests have their page tables encrypted so gva2* conversions are not possible." );return addr_arch_gva2gpa (vm, gva); }
tools/testing/selftests/kvm/include/ucall_common.h +6 -8
@@ -21,6 +21,10 @@ enum {struct ucall {uint64_t cmd;uint64_t args[UCALL_MAX_ARGS ]; + +/* For encrypted guests. */ +uint64_t idx; +struct ucall *hva; };void ucall_arch_init (struct kvm_vm *vm,void *arg);
@@ -31,15 +35,9 @@ void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu);void ucall (uint64_t cmd,int nargs, ...);uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc); -static inline void ucall_init (struct kvm_vm *vm,void *arg) -{ -ucall_arch_init (vm, arg); -} +void ucall_init (struct kvm_vm *vm,void *arg); -static inline void ucall_uninit (struct kvm_vm *vm) -{ -ucall_arch_uninit (vm); -} +void ucall_uninit (struct kvm_vm *vm);#define GUEST_SYNC_ARGS (stage, arg1, arg2, arg3, arg4) \ ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4)
tools/testing/selftests/kvm/lib/ucall_common.c +108 -7
139 lines not on this page · raw message
tools/testing/selftests/kvm/lib/x86_64/ucall.c +1 -1
@@ -30,7 +30,7 @@ void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu)struct kvm_regs regs;vcpu_regs_get (vcpu, ®s); -return addr_gva2hva (vcpu->vm, (vm_vaddr_t )regs.rdi); +return (void *)regs.rdi; }return NULL ; }
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
Re: [RFC V1 08/10] KVM: selftests: Make ucall work with encrypted guests
Quoted 5 lines · Peter Gonda
Add support for encrypted, SEV, guests in the ucall framework. If encryption is enabled set up a pool of ucall structs in the guests' shared memory region. This was suggested in the thread on "[RFC PATCH 00/10] KVM: selftests: Add support for test-selectable ucall implementations". Using a listed as suggested there doesn't work well
list
Quoted 19 lines
because the list is setup using HVAs not GVAs so use a bitmap + array solution instead to get the same pool result.
Suggested-by Sean Christopherson <[email protected]>Signed-off-by Peter Gonda <[email protected]>--- tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/kvm_util_base.h | 30 +++-- .../selftests/kvm/include/ucall_common.h | 14 +-- .../testing/selftests/kvm/lib/ucall_common.c | 115 ++++++++++++++++-- .../testing/selftests/kvm/lib/x86_64/ucall.c | 2 +- 5 files changed, 134 insertions(+), 28 deletions(-)tools/testing/selftests/kvm/Makefile +0
-0
tools/testing/selftests/kvm/Makefile LIBKVM += lib/rbtree.c · line 50
Quoted 4 lines
tools/testing/selftests/kvm/Makefile +1
-0@@ -47,6 +47,7 @@ LIBKVM += lib/rbtree.c LIBKVM += lib/sparsebit.c LIBKVM += lib/test_util.c LIBKVM += lib/ucall_common.c +LIBKVM += $(top_srcdir)/tools/lib/find_bit.c
Why is this file being added?
Quoted 56 lines
tools/testing/selftests/kvm/Makefile +0
-0LIBKVM_x86_64 += lib/x86_64/apic.c LIBKVM_x86_64 += lib/x86_64/handlers.Stools/testing/selftests/kvm/include/kvm_util_base.h +12
-9@@ -65,6 +65,7 @@ struct userspace_mem_regions {/* Memory encryption policy/configuration. */ struct vm_memcrypt {bool enabled; +bool encrypted;int8_t enc_by_default;bool has_enc_bit;int8_t enc_bit;@@ -99,6 +100,8 @@ struct kvm_vm {int stats_fd;struct kvm_stats_header stats_header;struct kvm_stats_desc *stats_desc; + +struct list_head ucall_list; };@@ -141,21 +144,21 @@ enum vm_guest_mode {extern enum vm_guest_mode vm_mode_default; -#define VM_MODE_DEFAULT vm_mode_default -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 8) +#define VM_MODE_DEFAULT vm_mode_default +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 8)#elif defined(__x86_64__) -#define VM_MODE_DEFAULT VM_MODE_PXXV48_4K -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 8) +#define VM_MODE_DEFAULT VM_MODE_PXXV48_4K +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 8)#elif defined(__s390x__) -#define VM_MODE_DEFAULT VM_MODE_P44V64_4K -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 16) +#define VM_MODE_DEFAULT VM_MODE_P44V64_4K +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 16)#elif defined(__riscv)
tools/testing/selftests/kvm/include/kvm_util_base.h extern enum vm_guest_mode vm_mode_default; · line 171
Quoted 9 lines
tools/testing/selftests/kvm/include/kvm_util_base.h +3
-3@@ -163,9 +166,9 @@ extern enum vm_guest_mode vm_mode_default;#error "RISC-V 32-bit kvm selftests not supported"#endif -#define VM_MODE_DEFAULT VM_MODE_P40V48_4K -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 8) +#define VM_MODE_DEFAULT VM_MODE_P40V48_4K +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 8)
Looks like your editor decided to change all the above defines to use spaces instead of tabs. You might want to double check the other patches as well to ensure lines added use tabs vs. spaces and that there are no other random whitespace changes.
Quoted 51 lines
tools/testing/selftests/kvm/include/kvm_util_base.h +3
-0#endif @@ -802,6 +805,9 @@ vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva);static inline vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) { +TEST_ASSERT ( + !vm->memcrypt.encrypted, +"Encrypted guests have their page tables encrypted so gva2* conversions are not possible." );return addr_arch_gva2gpa (vm, gva); }tools/testing/selftests/kvm/include/ucall_common.h +6
-8@@ -21,6 +21,10 @@ enum {struct ucall {uint64_t cmd;uint64_t args[UCALL_MAX_ARGS ]; + +/* For encrypted guests. */ +uint64_t idx; +struct ucall *hva; };void ucall_arch_init (struct kvm_vm *vm,void *arg);@@ -31,15 +35,9 @@ void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu);void ucall (uint64_t cmd,int nargs, ...);uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc); -static inline void ucall_init (struct kvm_vm *vm,void *arg) -{ -ucall_arch_init (vm, arg); -} +void ucall_init (struct kvm_vm *vm,void *arg); -static inline void ucall_uninit (struct kvm_vm *vm) -{ -ucall_arch_uninit (vm); -} +void ucall_uninit (struct kvm_vm *vm);#define GUEST_SYNC_ARGS (stage, arg1, arg2, arg3, arg4) \ ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4)tools/testing/selftests/kvm/lib/ucall_common.c +0
-0
tools/testing/selftests/kvm/lib/ucall_common.c line 6
Quoted 6 lines
tools/testing/selftests/kvm/lib/ucall_common.c +4
-0@@ -1,22 +1,123 @@// SPDX-License-Identifier: GPL-2.0-only #include "kvm_util.h" +#include "linux/types.h" +#include "linux/bitmap.h" +#include "linux/bitops.h" +#include "linux/atomic.h"
Do we really need bitmap.h, bitops.h, and atomic.h? I see we use clear_bit(), which I think is from atomic.h, and atomic_test_and_set_bit(), which I have no idea where it comes from...
Quoted 51 lines
tools/testing/selftests/kvm/lib/ucall_common.c +51
-0+ +struct ucall_header { + DECLARE_BITMAP(in_use, KVM_MAX_VCPUS); +struct ucall ucalls[KVM_MAX_VCPUS ]; +}; + +static bool encrypted_guest; +static struct ucall_header *ucall_hdr; + +void ucall_init (struct kvm_vm *vm,void *arg) +{ +struct ucall *uc; +struct ucall_header *hdr; +vm_vaddr_t vaddr; +int i; + + encrypted_guest = vm->memcrypt.enabled; +sync_global_to_guest (vm, encrypted_guest); +if (!encrypted_guest) + goto out; + +TEST_ASSERT (!ucall_hdr, +"Only a single encrypted guest at a time for ucalls." ); + vaddr =vm_vaddr_alloc_shared (vm,sizeof (*hdr), vm->page_size); + hdr = (struct ucall_header *)addr_gva2hva (vm, vaddr); +memset (hdr,0 ,sizeof (*hdr)); + +for (i =0 ; i <KVM_MAX_VCPUS ; ++i) { + uc = &hdr->ucalls[i]; + uc->hva = uc; + uc->idx = i; + } + + ucall_hdr = (struct ucall_header *)vaddr; +sync_global_to_guest (vm, ucall_hdr); + +out: +ucall_arch_init (vm, arg); +} + +void ucall_uninit (struct kvm_vm *vm) +{ + encrypted_guest = false; + ucall_hdr =NULL ; + +ucall_arch_uninit (vm); +} + +static struct ucall *ucall_alloc (void ) +{ +struct ucall *uc =NULL ;
tools/testing/selftests/kvm/lib/ucall_common.c line 67
Quoted 10 lines
tools/testing/selftests/kvm/lib/ucall_common.c +10
-0+int i; + +if (!encrypted_guest) + goto out; + +for (i =0 ; i <KVM_MAX_VCPUS ; ++i) { +if (atomic_test_and_set_bit (i, ucall_hdr->in_use)) +continue ; + + uc = &ucall_hdr->ucalls[i];
Doesn't this just mark all buffers as in-use and return the last one? I think we want
for (i = 0; i < KVM_MAX_VCPUS; ++i) {
if (!atomic_test_and_set_bit(i, ucall_hdr->in_use)) {
uc = &ucall_hdr->ucalls[i];
break;
}
}Quoted 62 lines
tools/testing/selftests/kvm/lib/ucall_common.c +41
-5+ } + +out: +return uc; +} + +static void ucall_free (struct ucall *uc) +{ +if (!encrypted_guest) +return ; + +clear_bit (uc->idx, ucall_hdr->in_use); +} + +static vm_vaddr_t get_ucall_addr (struct ucall *uc) +{ +if (encrypted_guest) +return (vm_vaddr_t )uc->hva; + +return (vm_vaddr_t )uc; +}void ucall (uint64_t cmd,int nargs, ...) { -struct ucall uc = { - .cmd = cmd, - }; +struct ucall *uc; +struct ucall tmp;va_list va;int i; + uc =ucall_alloc (); +if (!uc) + uc = &tmp; + + uc->cmd = cmd; + nargs =min (nargs,UCALL_MAX_ARGS );va_start (va, nargs);for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); + uc->args[i] =va_arg (va, uint64_t);va_end (va); -ucall_arch_do_ucall ((vm_vaddr_t)&uc); +ucall_arch_do_ucall (get_ucall_addr (uc)); + +ucall_free (uc); +} + +void *get_ucall_hva (struct kvm_vm *vm,void *uc) +{ +if (encrypted_guest) +return uc; + +return addr_gva2hva (vm, (vm_vaddr_t )uc); }uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc)
tools/testing/selftests/kvm/lib/ucall_common.c uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc) · line 131
Quoted 5 lines
tools/testing/selftests/kvm/lib/ucall_common.c +1
-1@@ -27,9 +128,9 @@ uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc)if (!uc) uc = &ucall; - addr =ucall_arch_get_ucall (vcpu); + addr =get_ucall_hva (vcpu->vm,ucall_arch_get_ucall (vcpu));
Hmm... so now it's expected that ucall_arch_get_ucall() returns a gva...
tools/testing/selftests/kvm/lib/ucall_common.c uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc) · line 133
Quoted 3 lines
tools/testing/selftests/kvm/lib/ucall_common.c +1
-1if (addr) { -memcpy (uc, addr,sizeof (*uc)); +memcpy (uc, addr,sizeof (struct ucall ));
Why make this change?
tools/testing/selftests/kvm/lib/x86_64/ucall.c void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu) · line 33
Quoted 13 lines
tools/testing/selftests/kvm/lib/ucall_common.c +0
-0vcpu_run_complete_io (vcpu); }else {memset (uc,0 ,sizeof (*uc));tools/testing/selftests/kvm/lib/x86_64/ucall.c +1
-1@@ -30,7 +30,7 @@ void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu)struct kvm_regs regs;vcpu_regs_get (vcpu, ®s); -return addr_gva2hva (vcpu->vm, (vm_vaddr_t )regs.rdi); +return (void *)regs.rdi;
...we're only updating x86's ucall_arch_get_ucall() to return gvas. What about the other architectures? Anyway, I'd rather we don't change ucall_arch_get_ucall() to return gvas. They should continue returning hvas and any trickery needed to translate a pool uc to an hva should be put inside ucall_arch_get_ucall().
Quoted 6 lines
tools/testing/selftests/kvm/lib/x86_64/ucall.c +0
-0}return NULL ; }Signature · 1 line
2.37.0.170.g444d1eabd0-goog
I'm not a big fan of mixing the concept of encrypted guests into ucalls. I think we should have two types of ucalls, those have a uc pool in memory shared with the host and those that don't. Encrypted guests pick the pool version.
Thanks,
drew
Re: [RFC V1 08/10] KVM: selftests: Make ucall work with encrypted guests
Quoted 24 lines · Andrew Jones
Quoted 5 lines · Peter Gonda
Add support for encrypted, SEV, guests in the ucall framework. If encryption is enabled set up a pool of ucall structs in the guests' shared memory region. This was suggested in the thread on "[RFC PATCH 00/10] KVM: selftests: Add support for test-selectable ucall implementations". Using a listed as suggested there doesn't work well
list
Quoted 14 lines
because the list is setup using HVAs not GVAs so use a bitmap + array solution instead to get the same pool result.
Suggested-by Sean Christopherson <[email protected]>Signed-off-by Peter Gonda <[email protected]>--- tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/kvm_util_base.h | 30 +++-- .../selftests/kvm/include/ucall_common.h | 14 +-- .../testing/selftests/kvm/lib/ucall_common.c | 115 ++++++++++++++++-- .../testing/selftests/kvm/lib/x86_64/ucall.c | 2 +- 5 files changed, 134 insertions(+), 28 deletions(-)
Quoted 11 lines
tools/testing/selftests/kvm/Makefile LIBKVM += lib/rbtree.c · line 50
Quoted 9 lines
tools/testing/selftests/kvm/Makefile +1
-0@@ -47,6 +47,7 @@ LIBKVM += lib/rbtree.c LIBKVM += lib/sparsebit.c LIBKVM += lib/test_util.c LIBKVM += lib/ucall_common.c +LIBKVM += $(top_srcdir)/tools/lib/find_bit.cWhy is this file being added?
This is a mistake, I'll revert. I was originally trying to use find_first_zero_bit().
Quoted 60 lines
Quoted 60 lines
tools/testing/selftests/kvm/Makefile +0
-0LIBKVM_x86_64 += lib/x86_64/apic.c LIBKVM_x86_64 += lib/x86_64/handlers.Stools/testing/selftests/kvm/include/kvm_util_base.h +12
-9@@ -65,6 +65,7 @@ struct userspace_mem_regions {/* Memory encryption policy/configuration. */ struct vm_memcrypt {bool enabled; +bool encrypted;int8_t enc_by_default;bool has_enc_bit;int8_t enc_bit;@@ -99,6 +100,8 @@ struct kvm_vm {int stats_fd;struct kvm_stats_header stats_header;struct kvm_stats_desc *stats_desc; + +struct list_head ucall_list; };@@ -141,21 +144,21 @@ enum vm_guest_mode {extern enum vm_guest_mode vm_mode_default; -#define VM_MODE_DEFAULT vm_mode_default -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 8) +#define VM_MODE_DEFAULT vm_mode_default +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 8)#elif defined(__x86_64__) -#define VM_MODE_DEFAULT VM_MODE_PXXV48_4K -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 8) +#define VM_MODE_DEFAULT VM_MODE_PXXV48_4K +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 8)#elif defined(__s390x__) -#define VM_MODE_DEFAULT VM_MODE_P44V64_4K -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 16) +#define VM_MODE_DEFAULT VM_MODE_P44V64_4K +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 16)#elif defined(__riscv)@@ -163,9 +166,9 @@ extern enum vm_guest_mode vm_mode_default;#error "RISC-V 32-bit kvm selftests not supported"#endif
Quoted 11 lines
tools/testing/selftests/kvm/include/kvm_util_base.h extern enum vm_guest_mode vm_mode_default; · line 171
Quoted 6 lines
tools/testing/selftests/kvm/include/kvm_util_base.h +3
-3-#define VM_MODE_DEFAULT VM_MODE_P40V48_4K -#define MIN_PAGE_SHIFT 12U -#define ptes_per_page (page_size) ((page_size) / 8) +#define VM_MODE_DEFAULT VM_MODE_P40V48_4K +#define MIN_PAGE_SHIFT 12U +#define ptes_per_page (page_size) ((page_size) / 8)Looks like your editor decided to change all the above defines to use spaces instead of tabs. You might want to double check the other patches as well to ensure lines added use tabs vs. spaces and that there are no other random whitespace changes.
Will fix.
Quoted 54 lines
Quoted 54 lines
tools/testing/selftests/kvm/include/kvm_util_base.h +3
-0#endif @@ -802,6 +805,9 @@ vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva);static inline vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) { +TEST_ASSERT ( + !vm->memcrypt.encrypted, +"Encrypted guests have their page tables encrypted so gva2* conversions are not possible." );return addr_arch_gva2gpa (vm, gva); }tools/testing/selftests/kvm/include/ucall_common.h +6
-8@@ -21,6 +21,10 @@ enum {struct ucall {uint64_t cmd;uint64_t args[UCALL_MAX_ARGS ]; + +/* For encrypted guests. */ +uint64_t idx; +struct ucall *hva; };void ucall_arch_init (struct kvm_vm *vm,void *arg);@@ -31,15 +35,9 @@ void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu);void ucall (uint64_t cmd,int nargs, ...);uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc); -static inline void ucall_init (struct kvm_vm *vm,void *arg) -{ -ucall_arch_init (vm, arg); -} +void ucall_init (struct kvm_vm *vm,void *arg); -static inline void ucall_uninit (struct kvm_vm *vm) -{ -ucall_arch_uninit (vm); -} +void ucall_uninit (struct kvm_vm *vm);#define GUEST_SYNC_ARGS (stage, arg1, arg2, arg3, arg4) \ ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4)tools/testing/selftests/kvm/lib/ucall_common.c +0
-0@@ -1,22 +1,123 @@// SPDX-License-Identifier: GPL-2.0-only #include "kvm_util.h"
Quoted 8 lines
tools/testing/selftests/kvm/lib/ucall_common.c line 6
Quoted 4 lines
tools/testing/selftests/kvm/lib/ucall_common.c +4
-0+#include "linux/types.h" +#include "linux/bitmap.h" +#include "linux/bitops.h" +#include "linux/atomic.h" Do we really need
bitmap.h,bitops.h, andatomic.h? I see we useclear_bit(), which I think is fromatomic.h, andatomic_test_and_set_bit(), which I have no idea where it comes from...
I added that function to atomic.h in "RFC V1 07/10] tools: Add atomic_test_and_set_bit()". You are right, I should revert the other header additions.
Quoted 66 lines
Quoted 52 lines
tools/testing/selftests/kvm/lib/ucall_common.c +51
-0+ +struct ucall_header { + DECLARE_BITMAP(in_use, KVM_MAX_VCPUS); +struct ucall ucalls[KVM_MAX_VCPUS ]; +}; + +static bool encrypted_guest; +static struct ucall_header *ucall_hdr; + +void ucall_init (struct kvm_vm *vm,void *arg) +{ +struct ucall *uc; +struct ucall_header *hdr; +vm_vaddr_t vaddr; +int i; + + encrypted_guest = vm->memcrypt.enabled; +sync_global_to_guest (vm, encrypted_guest); +if (!encrypted_guest) + goto out; + +TEST_ASSERT (!ucall_hdr, +"Only a single encrypted guest at a time for ucalls." ); + vaddr =vm_vaddr_alloc_shared (vm,sizeof (*hdr), vm->page_size); + hdr = (struct ucall_header *)addr_gva2hva (vm, vaddr); +memset (hdr,0 ,sizeof (*hdr)); + +for (i =0 ; i <KVM_MAX_VCPUS ; ++i) { + uc = &hdr->ucalls[i]; + uc->hva = uc; + uc->idx = i; + } + + ucall_hdr = (struct ucall_header *)vaddr; +sync_global_to_guest (vm, ucall_hdr); + +out: +ucall_arch_init (vm, arg); +} + +void ucall_uninit (struct kvm_vm *vm) +{ + encrypted_guest = false; + ucall_hdr =NULL ; + +ucall_arch_uninit (vm); +} + +static struct ucall *ucall_alloc (void ) +{ +struct ucall *uc =NULL ;tools/testing/selftests/kvm/lib/ucall_common.c line 67
Quoted 10 lines
tools/testing/selftests/kvm/lib/ucall_common.c +10
-0+int i; + +if (!encrypted_guest) + goto out; + +for (i =0 ; i <KVM_MAX_VCPUS ; ++i) { +if (atomic_test_and_set_bit (i, ucall_hdr->in_use)) +continue ; + + uc = &ucall_hdr->ucalls[i];Doesn't this just mark all buffers as in-use and return the last one? I think we want
Quoted 6 lines
for (i = 0; i < KVM_MAX_VCPUS; ++i) {
if (!atomic_test_and_set_bit(i, ucall_hdr->in_use)) {
uc = &ucall_hdr->ucalls[i];
break;
}
}Yes, that looks correct. I'll update this.
Quoted 71 lines
Quoted 63 lines
tools/testing/selftests/kvm/lib/ucall_common.c +41
-5+ } + +out: +return uc; +} + +static void ucall_free (struct ucall *uc) +{ +if (!encrypted_guest) +return ; + +clear_bit (uc->idx, ucall_hdr->in_use); +} + +static vm_vaddr_t get_ucall_addr (struct ucall *uc) +{ +if (encrypted_guest) +return (vm_vaddr_t )uc->hva; + +return (vm_vaddr_t )uc; +}void ucall (uint64_t cmd,int nargs, ...) { -struct ucall uc = { - .cmd = cmd, - }; +struct ucall *uc; +struct ucall tmp;va_list va;int i; + uc =ucall_alloc (); +if (!uc) + uc = &tmp; + + uc->cmd = cmd; + nargs =min (nargs,UCALL_MAX_ARGS );va_start (va, nargs);for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); + uc->args[i] =va_arg (va, uint64_t);va_end (va); -ucall_arch_do_ucall ((vm_vaddr_t)&uc); +ucall_arch_do_ucall (get_ucall_addr (uc)); + +ucall_free (uc); +} + +void *get_ucall_hva (struct kvm_vm *vm,void *uc) +{ +if (encrypted_guest) +return uc; + +return addr_gva2hva (vm, (vm_vaddr_t )uc); }uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc)tools/testing/selftests/kvm/lib/ucall_common.c uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc) · line 131
Quoted 5 lines
tools/testing/selftests/kvm/lib/ucall_common.c +1
-1@@ -27,9 +128,9 @@ uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc)if (!uc) uc = &ucall; - addr =ucall_arch_get_ucall (vcpu); + addr =get_ucall_hva (vcpu->vm,ucall_arch_get_ucall (vcpu));Hmm... so now it's expected that
ucall_arch_get_ucall()returns a gva...
Quoted 5 lines
tools/testing/selftests/kvm/lib/ucall_common.c uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc) · line 133
Quoted 3 lines
tools/testing/selftests/kvm/lib/ucall_common.c +1
-1if (addr) { -memcpy (uc, addr,sizeof (*uc)); +memcpy (uc, addr,sizeof (struct ucall ));Why make this change?
I'll revert this.
Quoted 11 lines
Quoted 11 lines
tools/testing/selftests/kvm/lib/ucall_common.c +0
-0vcpu_run_complete_io (vcpu); }else {memset (uc,0 ,sizeof (*uc));tools/testing/selftests/kvm/lib/x86_64/ucall.c +0
-0@@ -30,7 +30,7 @@ void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu)struct kvm_regs regs;
Quoted 9 lines
tools/testing/selftests/kvm/lib/x86_64/ucall.c void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu) · line 33
Quoted 3 lines
tools/testing/selftests/kvm/lib/x86_64/ucall.c +1
-1vcpu_regs_get (vcpu, ®s); -return addr_gva2hva (vcpu->vm, (vm_vaddr_t )regs.rdi); +return (void *)regs.rdi;...we're only updating x86's
ucall_arch_get_ucall()to return gvas. What about the other architectures? Anyway, I'd rather we don't changeucall_arch_get_ucall()to return gvas. They should continue returning hvas and any trickery needed to translate a pool uc to an hva should be put insideucall_arch_get_ucall().
Makes sense. I'll maintain returning HVAs in both cases and let the _arch_ calls handle the translations.
Quoted 8 lines
Quoted 7 lines
tools/testing/selftests/kvm/lib/x86_64/ucall.c +0
-1}return NULL ; } --2.37.0.170.g444d1eabd0-goog
Quoted 4 lines
I'm not a big fan of mixing the concept of encrypted guests into ucalls. I think we should have two types of ucalls, those have a uc pool in memory shared with the host and those that don't. Encrypted guests pick the pool version.
Sean suggested this version where encrypted guests and normal guests used the same ucall macros/functions. I am fine with adding a second interface for encrypted VM ucall, do you think macros like ENCRYPTED_GUEST_SYNC, ENCRYPTED_GUEST_ASSERT, and get_encrypted_ucall() ?
Quoted 3 lines
Thanks,
drew
Re: [RFC V1 08/10] KVM: selftests: Make ucall work with encrypted guests
Quoted 6 lines · Peter Gonda
Quoted 4 lines · Andrew Jones
I'm not a big fan of mixing the concept of encrypted guests into ucalls. I think we should have two types of ucalls, those have a uc pool in memory shared with the host and those that don't. Encrypted guests pick the pool version.
Quoted 6 lines
Sean suggested this version where encrypted guests and normal guests used the same ucall macros/functions. I am fine with adding a second interface for encrypted VM ucall, do you think macros like
ENCRYPTED_GUEST_SYNC,ENCRYPTED_GUEST_ASSERT, andget_encrypted_ucall()?
It's fine to add new functionality to ucall in order to keep the interfaces the same, except for initializing with some sort of indication that the "uc pool" version is needed. I just don't like all the references to encrypted guests inside ucall. ucall should implement uc pools without the current motivation for uc pools creeping into its implementation.
Thanks,
drew
Re: [RFC V1 08/10] KVM: selftests: Make ucall work with encrypted guests
Quoted 15 lines · Andrew Jones
Quoted 6 lines · Peter Gonda
Quoted 4 lines · Andrew Jones
I'm not a big fan of mixing the concept of encrypted guests into ucalls. I think we should have two types of ucalls, those have a uc pool in memory shared with the host and those that don't. Encrypted guests pick the pool version.
Quoted 6 lines
Sean suggested this version where encrypted guests and normal guests used the same ucall macros/functions. I am fine with adding a second interface for encrypted VM ucall, do you think macros like
ENCRYPTED_GUEST_SYNC,ENCRYPTED_GUEST_ASSERT, andget_encrypted_ucall()?
Quoted 5 lines
It's fine to add new functionality to ucall in order to keep the interfaces the same, except for initializing with some sort of indication that the "uc pool" version is needed. I just don't like all the references to encrypted guests inside ucall. ucall should implement uc pools without the current motivation for uc pools creeping into its implementation.
Ah that makes sense. So maybe instead of checking for 'if (vm->memcrypt.enabled)' I should just add a new field in kvm_vm to select for use of the uc pool? Something like kvm_vm.enable_uc_pool?
Thanks Drew!
RFC 9/10 KVM: selftests: add library for creating/interacting with SEV guests
In reply to Peter GondaFrom: Michael Roth <[email protected]>
Add interfaces to allow tests to create/manage SEV guests. The additional state associated with these guests is encapsulated in a new struct sev_vm, which is a light wrapper around struct kvm_vm. These VMs will use vm_set_memory_encryption() and vm_get_encrypted_phy_pages() under the covers to configure and sync up with the core kvm_util library on what should/shouldn't be treated as encrypted memory.
--- tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/x86_64/sev.h | 44 +++ tools/testing/selftests/kvm/lib/x86_64/sev.c | 251 ++++++++++++++++++ 3 files changed, 296 insertions(+) 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/testing/selftests/kvm/Makefile +1 -0
@@ -56,6 +56,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
tools/testing/selftests/kvm/include/x86_64/sev.h new file +44 -0
44 lines not on this page · raw message
tools/testing/selftests/kvm/lib/x86_64/sev.c new file +251 -0
251 lines not on this page · raw message
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
RFC 10/10 KVM: selftests: Add simple sev vm testing
In reply to Peter GondaFrom: Michael Roth <[email protected]>
A 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 | 1 + tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/x86_64/sev_all_boot_test.c | 134 ++++++++++++++++++ 3 files changed, 136 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86_64/sev_all_boot_test.c
tools/testing/selftests/kvm/.gitignore +1 -0
@@ -34,6 +34,7 @@ /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
tools/testing/selftests/kvm/Makefile +1 -0
@@ -123,6 +123,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 +134 -0
134 lines not on this page · raw message
Signature · 1 line
2.37.0.170.g444d1eabd0-goog