Commit 590e6948 authored by Oliver Upton's avatar Oliver Upton
Browse files

KVM: arm64: nv: Use pgtable definitions in stage-2 walk 



Use the existing page table definitions instead of magic numbers for the
stage-2 table walk.

Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Tested-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://msgid.link/20251124190158.177318-10-oupton@kernel.org


Signed-off-by: default avatarOliver Upton <oupton@kernel.org>
parent fabf321c

arch/arm64/kvm/nested.c

+15 −6
Original line number Diff line number Diff line
@@ -282,14 +282,23 @@ static int walk_nested_s2_pgd(struct kvm_vcpu *vcpu, phys_addr_t ipa, 
			return ret;



		/* Check for valid descriptor at this point */

		if (!(desc & 1) || ((desc & 3) == 1 && level == 3)) {

		if (!(desc & KVM_PTE_VALID)) {

			out->esr = compute_fsc(level, ESR_ELx_FSC_FAULT);

			out->desc = desc;

			return 1;

		}



		/* We're at the final level or block translation level */

		if ((desc & 3) == 1 || level == 3)

		if (FIELD_GET(KVM_PTE_TYPE, desc) == KVM_PTE_TYPE_BLOCK) {

			if (level < 3)

				break;



			out->esr = compute_fsc(level, ESR_ELx_FSC_FAULT);

			out->desc = desc;

			return 1;

		}



		/* We're at the final level */

		if (level == 3)

			break;



		if (check_output_size(wi, desc)) {
@@ -316,7 +325,7 @@ static int walk_nested_s2_pgd(struct kvm_vcpu *vcpu, phys_addr_t ipa, 
		return 1;

	}



	if (!(desc & BIT(10))) {

	if (!(desc & KVM_PTE_LEAF_ATTR_LO_S2_AF)) {

		out->esr = compute_fsc(level, ESR_ELx_FSC_ACCESS);

		out->desc = desc;

		return 1;
@@ -329,8 +338,8 @@ static int walk_nested_s2_pgd(struct kvm_vcpu *vcpu, phys_addr_t ipa, 
		(ipa & GENMASK_ULL(addr_bottom - 1, 0));

	out->output = paddr;

	out->block_size = 1UL << ((3 - level) * stride + wi->pgshift);

	out->readable = desc & (0b01 << 6);

	out->writable = desc & (0b10 << 6);

	out->readable = desc & KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R;

	out->writable = desc & KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W;

	out->level = level;

	out->desc = desc;

	return 0;