On Wed, Jun 10, 2026, Ritesh Harjani (IBM) wrote:
> From: Nicholas Piggin <[email protected]>
>
> powerpc will require this to allocate MMU tables in guest memory that
> are larger than guest base page size.
>
> Signed-off-by: Nicholas Piggin <[email protected]>
> [Rebased to latest mainline tree]
> Signed-off-by: Ritesh Harjani (IBM) <[email protected]>
> ---
> .../testing/selftests/kvm/include/kvm_util.h | 20 +++++++++--
> tools/testing/selftests/kvm/lib/kvm_util.c | 33 +++++++++----------
> 2 files changed, 33 insertions(+), 20 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/include/kvm_util.h
> b/tools/testing/selftests/kvm/include/kvm_util.h
> index 3666a8530f31..c515c918c2c9 100644
> --- a/tools/testing/selftests/kvm/include/kvm_util.h
> +++ b/tools/testing/selftests/kvm/include/kvm_util.h
> @@ -991,8 +991,8 @@ void kvm_gsi_routing_write(struct kvm_vm *vm, struct
> kvm_irq_routing *routing);
> const char *exit_reason_str(unsigned int exit_reason);
>
> gpa_t vm_phy_page_alloc(struct kvm_vm *vm, gpa_t min_gpa, u32 memslot);
> -gpa_t __vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, gpa_t min_gpa,
> - u32 memslot, bool protected);
> +gpa_t __vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, size_t align,
> + gpa_t min_gpa, u32 memslot, bool protected);
> gpa_t vm_alloc_page_table(struct kvm_vm *vm);
>
> static inline gpa_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,
> @@ -1003,10 +1003,24 @@ static inline gpa_t vm_phy_pages_alloc(struct kvm_vm
> *vm, size_t num,
> * protected memory, as the majority of memory for such VMs is
> * protected, i.e. using shared memory is effectively opt-in.
> */
> - return __vm_phy_pages_alloc(vm, num, min_gpa, memslot,
> + return __vm_phy_pages_alloc(vm, num, 1, min_gpa, memslot,
> vm_arch_has_protected_memory(vm));
> }
>
> +static inline gpa_t vm_phy_pages_alloc_align(struct kvm_vm *vm, size_t num,
> + size_t align, gpa_t min_gpa,
> + u32 memslot)
Given that the PPC usage is all for naturally aligned allocations, I think it
makes sense for that to be the API, i.e. have "bool naturally_aligned" instead
of an arbitrary alignment.
> +{
> + /*
> + * By default, allocate memory as protected for VMs that support
> + * protected memory, as the majority of memory for such VMs is
> + * protected, i.e. using shared memory is effectively opt-in.
> + */
Duplicating this big comment is very ugly. In general, these APIs could use
some love. E.g. taking in @memslot is essentially a historical wart that isn't
necessary except for literally just memslot_perf_test.c, which allocates memory
in a huge number of memslots.
If we rework the APIs to take the memory region type instead of the memslot,
then
we can kill many birds with one stone. It takes quite a bit of cleanup to throw
that one stone, but I think the end result can be quite nice.
Compile tested only at this point, but I now have a series of ~17 patches to
yield:
__weak bool kvm_arch_needs_naturally_aligned_page_tables(void)
{
return false;
}
gpa_t __vm_phy_pages_alloc(struct kvm_vm *vm, size_t nr_pages,
enum kvm_mem_region_type type, bool protected)
{
struct userspace_mem_region *region = vm_get_mem_region(vm, type);
bool naturally_aligned = false;
gpa_t min_gpa;
TEST_ASSERT(region, "No region for type '%u', memslot '%u'",
type, vm->memslots[type]);
switch (type) {
case MEM_REGION_CODE:
case MEM_REGION_DATA:
case MEM_REGION_TEST_DATA:
/*
* If the region is backed by the default memslot (id=0), use
* selftests' hardcoded minimum PFN, otherwise use the base of
* the custom memory slot that backs the region.
*/
if (!vm->memslots[type])
min_gpa = KVM_UTIL_MIN_PFN * vm->page_size;
else
min_gpa = region->region.guest_phys_addr;
break;
case MEM_REGION_PT:
min_gpa = KVM_GUEST_PAGE_TABLE_MIN_PADDR;
naturally_aligned =
kvm_arch_needs_naturally_aligned_page_tables();
break;
case MEM_REGION_TEST_EXTRA:
min_gpa = region->region.guest_phys_addr;
break;
default:
TEST_FAIL("Invalid memory region type '%u'", type);
break;
}
return ____vm_phy_pages_alloc(vm, nr_pages, min_gpa, vm->memslots[type],
protected, naturally_aligned);
}
with convenience wrappers:
static inline gpa_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t nr_pages,
enum kvm_mem_region_type type)
{
/*
* By default, allocate memory as protected for VMs that support
* protected memory, as the majority of memory for such VMs is
* protected, i.e. using shared memory is effectively opt-in.
*/
return __vm_phy_pages_alloc(vm, nr_pages, type,
vm_arch_has_protected_memory(vm));
}
static inline gpa_t vm_phy_page_alloc(struct kvm_vm *vm,
enum kvm_mem_region_type type)
{
return vm_phy_pages_alloc(vm, 1, type);
}
static inline gpa_t vm_alloc_page_table_pages(struct kvm_vm *vm, size_t
nr_pages)
{
return vm_phy_page_alloc(vm, MEM_REGION_PT);
}
static inline gpa_t vm_alloc_page_table(struct kvm_vm *vm)
{
return vm_alloc_page_table_pages(vm, 1);
}
That way we don't need to add yet another rarely used param to the APIs, and
PPC just needs to define kvm_arch_needs_naturally_aligned_page_tables(). The
bonus is that @min_gpa goes away too.
It'll probably take me a few days/weeks, but I'll try get a series posted before
the 7.2 merge window closes, so that you can build on top to get the PPC
selftests
support landed in 7.3.
> @@ -2039,23 +2039,22 @@ gpa_t __vm_phy_pages_alloc(struct kvm_vm *vm, size_t
> num,
> TEST_ASSERT(!protected || region->protected_phy_pages,
> "Region doesn't support protected memory");
>
> - base = pg = min_gpa >> 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;
> + base = min_gpa >> vm->page_shift;
> +again:
> + base = (base + align - 1) & ~(align - 1);
> + for (pg = base; pg < base + num; ++pg) {
> + if (!sparsebit_is_set(region->unused_phy_pages, pg)) {
> + base = sparsebit_next_set(region->unused_phy_pages, pg);
> + if (!base) {
> + fprintf(stderr, "No guest physical page
> available, "
> + "min_gpa: 0x%lx page_size: 0x%x
> memslot: %u\n",
> + min_gpa, vm->page_size, memslot);
> + fputs("---- vm dump ----\n", stderr);
> + vm_dump(stderr, vm, 2);
> + abort();
> }
> + goto again;
> }
> - } while (pg && pg != base + num);
> -
> - if (pg == 0) {
> - fprintf(stderr, "No guest physical page available, "
> - "min_gpa: 0x%lx page_size: 0x%x memslot: %u\n",
> - min_gpa, vm->page_size, memslot);
> - fputs("---- vm dump ----\n", stderr);
> - vm_dump(stderr, vm, 2);
> - abort();
> }
This is unnecessary churn. I'm not saying the current code is pretty or
anything,
but unless I'm missing something, this can simply be:
@@ -2025,7 +2027,7 @@ gpa_t __vm_phy_pages_alloc(struct kvm_vm *vm, size_t
nr_pages, gpa_t min_gpa,
TEST_ASSERT(!protected || region->protected_phy_pages,
"Region doesn't support protected memory");
- base = pg = min_gpa >> vm->page_shift;
+ base = pg = ALIGN(min_gpa >> vm->page_shift, alignment);
do {
for (; pg < base + nr_pages; ++pg) {
if (!sparsebit_is_set(region->unused_phy_pages, pg)) {
>
> for (pg = base; pg < base + num; ++pg) {
> --
> 2.50.1 (Apple Git-155)
>
