On Mon, Sep 26, 2022, David Matlack wrote:
> +void virt_map_2m(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
> + uint64_t nr_2m_pages)
Gah, the selftest APIs are so frustrating. Taking the number of pages in virt_map()
and vm_userspace_mem_region_add() is asinine. Tests either assume a specific page
size, e.g. x86 tests, or manually calculate the number of pages from the number of
bytes, only for those calculations to be reversed. E.g. set_memory_region_test's
usage of getpagesize().
As a baby step toward providing sane APIs and being able to create huge mappings
in common tests, what about refactoring virt_map() to take the size in bytes (see
below), and then assert in arch code that the page size matches vm->page_size,
except for x86, which translates back to its page "levels".
Then max_guest_memory_test can use virt_map() and __virt_map(), and we could even
delete vm_calc_num_guest_pages(). aarch64's usage in steal_time_init() can be
hardcoded to a single page, the size of the allocation is hardcoded to 64 bytes,
I see no reason to dance around that and pretend that page sizes can be smaller
than 64 bytes.
Then for proper support, we can figure out how to enumerate the allowed page sizes
in the guest for use in common tests.
And in parallel, we can cajole someone into refactoring vm_userspace_mem_region_add()
to take the size in bytes.
E.g.
void __virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
uint64_t nr_bytes, size_t page_size)
{
uint64_t nr_pages = DIV_ROUND_UP(nr_bytes, page_size);
TEST_ASSERT(vaddr + size > vaddr, "Vaddr overflow");
TEST_ASSERT(paddr + size > paddr, "Paddr overflow");
while (npages--) {
virt_pg_map(vm, vaddr, paddr);
vaddr += page_size;
paddr += page_size;
}
}
void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
uint64_t nr_bytes)
{
__virt_map(vm, vaddr, paddr, nr_bytes, vm->page_size);
}
and in max_guest_memory_test:
#ifdef __x86_64__
/* TODO: use huge pages for other architectures. */
__virt_map(vm, gpa, gpa, slot_size, PG_SIZE_1G);
#else
virt_map(vm, gpa, gpa, slot_size);
#endif
> +{
> + int i;
> +
> + for (i = 0; i < nr_2m_pages; i++) {
> + __virt_pg_map(vm, vaddr, paddr, PG_LEVEL_2M);
> +
> + vaddr += PG_SIZE_2M;
> + paddr += PG_SIZE_2M;
> + }
> +}
> +
> static uint64_t *_vm_get_page_table_entry(struct kvm_vm *vm,
> struct kvm_vcpu *vcpu,
> uint64_t vaddr)
> diff --git a/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c b/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c
> index cc6421716400..a850769692b7 100644
> --- a/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c
> @@ -22,7 +22,8 @@
> #define HPAGE_GPA (4UL << 30) /* 4G prevents collision w/ slot 0 */
> #define HPAGE_GVA HPAGE_GPA /* GVA is arbitrary, so use GPA. */
> #define PAGES_PER_2MB_HUGE_PAGE 512
> -#define HPAGE_SLOT_NPAGES (3 * PAGES_PER_2MB_HUGE_PAGE)
> +#define HPAGE_SLOT_2MB_PAGES 3
> +#define HPAGE_SLOT_NPAGES (HPAGE_SLOT_2MB_PAGES * PAGES_PER_2MB_HUGE_PAGE)
>
> /*
> * Passed by nx_huge_pages_test.sh to provide an easy warning if this test is
> @@ -141,7 +142,11 @@ void run_test(int reclaim_period_ms, bool disable_nx_huge_pages,
> HPAGE_GPA, HPAGE_SLOT,
> HPAGE_SLOT_NPAGES, 0);
>
> - virt_map(vm, HPAGE_GVA, HPAGE_GPA, HPAGE_SLOT_NPAGES);
> + /*
> + * Use 2MiB virtual mappings so that KVM can map the region with huge
> + * pages even if TDP is disabled.
> + */
> + virt_map_2m(vm, HPAGE_GVA, HPAGE_GPA, HPAGE_SLOT_2MB_PAGES);
Hmm, what about probing TDP support and deliberately using 4KiB pages when TDP is
enabled? That would give a bit of bonus coverage by verifying that KVM creates
huge pages irrespective of guest mapping level.
