KVM: arm64: nv: Respect stage-2 write permssion when setting stage-1 AF
Oliver Upton
maintainerPATCH 1/1 KVM: arm64: nv: Respect stage-2 write permssion when setting stage-1 AF
Naturally, updating the Access Flag in a stage-1 descriptor requires write permission at stage-2, although this isn't actually enforced in KVM's software PTW.
Generate a stage-2 permission fault if the stage-1 walk attempts to update the descriptor and its corresponding stage-2 translation lacks write permission.
--- arch/arm64/kvm/at.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm64/kvm/at.c +6 -2
@@ -403,6 +403,7 @@ static int walk_s1(struct kvm_vcpu *vcpu, struct s1_walk_info *wi, struct s1_walk_result *wr, u64 va) {u64 va_top, va_bottom, baddr, desc, new_desc, ipa; +struct kvm_s2_trans s2_trans = {};int level, stride, ret; level = wi->sl;
@@ -420,8 +421,6 @@ static int walk_s1(struct kvm_vcpu *vcpu, struct s1_walk_info *wi, ipa = baddr | index;if (wi->s2) { -struct kvm_s2_trans s2_trans = {}; - ret =kvm_walk_nested_s2 (vcpu, ipa, &s2_trans);if (ret) { fail_s1_walk(wr,
@@ -515,6 +514,11 @@ static int walk_s1(struct kvm_vcpu *vcpu, struct s1_walk_info *wi, new_desc |=PTE_AF ;if (new_desc != desc) { +if (wi->s2 && !kvm_s2_trans_writable (&s2_trans)) { +fail_s1_walk (wr,ESR_ELx_FSC_PERM_L (level), true); +return -EPERM ; + } + ret =kvm_swap_s1_desc (vcpu, ipa, desc, new_desc, wi);if (ret)return ret;
base-commit: 9448598b22c50c8a5bb77a9103e2d49f134c9578
Signature · 1 line
2.47.3
Quoted 11 lines · Oliver Upton
Naturally, updating the Access Flag in a stage-1 descriptor requires write permission at stage-2, although this isn't actually enforced in KVM's software PTW.
Generate a stage-2 permission fault if the stage-1 walk attempts to update the descriptor and its corresponding stage-2 translation lacks write permission.
Fixes bff8aa213dee ("KVM: arm64: Implement HW access flag management in stage-1 SW PTW")Signed-off-by Oliver Upton <[email protected]>
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Quoted 9 lines · Oliver Upton
Naturally, updating the Access Flag in a stage-1 descriptor requires write permission at stage-2, although this isn't actually enforced in KVM's software PTW.
Generate a stage-2 permission fault if the stage-1 walk attempts to update the descriptor and its corresponding stage-2 translation lacks write permission.
[...]
Applied to fixes, thanks!
[1/1] KVM: arm64: nv: Respect stage-2 write permssion when setting stage-1 AF
https://git.kernel.org/kvmarm/kvmarm/c/9e27085c33cc
--
Best,
Oliver