[PATCH v2 2/3] KVM: selftests: Add RISC-V Sv57 page table indexing

[Nutty.Liu]

On 8/12/2026 7:03 AM, Jinyu Tang wrote:
> RISC-V selftests can create guests with five page-table levels, for
> example when the selected guest mode is Sv57. The RISC-V page-table
> walker only had index arrays for levels 0 through 3, so
> virt_arch_pg_map() indexed past the end of the arrays when level 4 was
> used.
>
> Add the missing L4 index mask and shift so selftests can build guest
> page tables for Sv57 VMs.
>
> Signed-off-by: Jinyu Tang <jinyu.tang at linux.dev>
Reviewed-by: Nutty Liu <nutty.liu at hotmail.com>

Thanks,
Nutty
> ---
>   tools/testing/selftests/kvm/include/riscv/processor.h | 3 +++
>   tools/testing/selftests/kvm/lib/riscv/processor.c     | 2 ++
>   2 files changed, 5 insertions(+)
>
> diff --git a/tools/testing/selftests/kvm/include/riscv/processor.h b/tools/testing/selftests/kvm/include/riscv/processor.h
> index e3acf2ae9881..abde3c71c891 100644
> --- a/tools/testing/selftests/kvm/include/riscv/processor.h
> +++ b/tools/testing/selftests/kvm/include/riscv/processor.h
> @@ -127,6 +127,9 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector, exception_handl
>   
>   void vm_install_interrupt_handler(struct kvm_vm *vm, exception_handler_fn handler);
>   
> +/* L4 index Bit[56:48] */
> +#define PGTBL_L4_INDEX_MASK			0x01FF000000000000ULL
> +#define PGTBL_L4_INDEX_SHIFT			48
>   /* L3 index Bit[47:39] */
>   #define PGTBL_L3_INDEX_MASK			0x0000FF8000000000ULL
>   #define PGTBL_L3_INDEX_SHIFT			39
> diff --git a/tools/testing/selftests/kvm/lib/riscv/processor.c b/tools/testing/selftests/kvm/lib/riscv/processor.c
> index ded5429f3448..b4d41a407553 100644
> --- a/tools/testing/selftests/kvm/lib/riscv/processor.c
> +++ b/tools/testing/selftests/kvm/lib/riscv/processor.c
> @@ -43,6 +43,7 @@ static u64 pte_index_mask[] = {
>   	PGTBL_L1_INDEX_MASK,
>   	PGTBL_L2_INDEX_MASK,
>   	PGTBL_L3_INDEX_MASK,
> +	PGTBL_L4_INDEX_MASK,
>   };
>   
>   static u32 pte_index_shift[] = {
> @@ -50,6 +51,7 @@ static u32 pte_index_shift[] = {
>   	PGTBL_L1_INDEX_SHIFT,
>   	PGTBL_L2_INDEX_SHIFT,
>   	PGTBL_L3_INDEX_SHIFT,
> +	PGTBL_L4_INDEX_SHIFT,
>   };
>   
>   static u64 pte_index(struct kvm_vm *vm, gva_t gva, int level)