From: Oliver Upton <oupton@kernel.org>
To: kvmarm@lists.linux.dev
Cc: Marc Zyngier <maz@kernel.org>, Joey Gouly <joey.gouly@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
Wei-Lin Chang <weilin.chang@arm.com>,
Steffen Eiden <seiden@linux.ibm.com>,
Fuad Tabba <fuad.tabba@linux.dev>,
Leonardo Bras <leo.bras@arm.com>,
Oliver Upton <oupton@kernel.org>
Subject: [PATCH v2 09/28] KVM: arm64: Compute S1 permissions as part of s1_walk()
Date: Fri, 23 Oct 2026 13:55:51 -0700 [thread overview]
Message-ID: <20261023205610.1044532-10-oupton@kernel.org> (raw)
In-Reply-To: <20261023205610.1044532-1-oupton@kernel.org>
Implementing support for hardware dirty state means that the table
walker needs to have visibility into the permissions on the final
translation.
Compute the S1 permissions as part of s1_walk() and initialize
s1_walk_result before checking all fault conditions. The appropriate
fields will be reinitialized if the walk happens to fail at a later
point.
Reviewed-by: Leonardo Bras <leo.bras@arm.com>
Signed-off-by: Oliver Upton <oupton@kernel.org>
---
arch/arm64/kvm/at.c | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/arch/arm64/kvm/at.c b/arch/arm64/kvm/at.c
index 32d2e57b017c..3031f5855316 100644
--- a/arch/arm64/kvm/at.c
+++ b/arch/arm64/kvm/at.c
@@ -459,6 +459,10 @@ static int kvm_swap_s1_desc(struct kvm_vcpu *vcpu, u64 pa, u64 old, u64 new,
return __kvm_at_swap_desc(vcpu->kvm, pa, old, new);
}
+static void compute_s1_permissions(struct kvm_vcpu *vcpu,
+ struct s1_walk_info *wi,
+ struct s1_walk_result *wr);
+
static int walk_s1(struct kvm_vcpu *vcpu, struct s1_walk_info *wi,
struct s1_walk_result *wr, u64 va)
{
@@ -588,6 +592,20 @@ static int walk_s1(struct kvm_vcpu *vcpu, struct s1_walk_info *wi,
if (check_output_size(baddr & GENMASK(52, va_bottom), wi))
goto addrsz;
+ va_bottom += contiguous_bit_shift(desc, wi, level);
+
+ wr->failed = false;
+ wr->level = level;
+ wr->desc = desc;
+ wr->pa = baddr & GENMASK(52, va_bottom);
+ wr->pa |= va & GENMASK_ULL(va_bottom - 1, 0);
+
+ wr->nG = (wi->regime != TR_EL2) && (desc & PTE_NG);
+ if (wr->nG)
+ wr->asid = get_asid_by_regime(vcpu, wi->regime);
+
+ compute_s1_permissions(vcpu, wi, wr);
+
if (wi->ha)
new_desc |= PTE_AF;
@@ -613,18 +631,6 @@ static int walk_s1(struct kvm_vcpu *vcpu, struct s1_walk_info *wi,
return -EACCES;
}
- va_bottom += contiguous_bit_shift(desc, wi, level);
-
- wr->failed = false;
- wr->level = level;
- wr->desc = desc;
- wr->pa = baddr & GENMASK(52, va_bottom);
- wr->pa |= va & GENMASK_ULL(va_bottom - 1, 0);
-
- wr->nG = (wi->regime != TR_EL2) && (desc & PTE_NG);
- if (wr->nG)
- wr->asid = get_asid_by_regime(vcpu, wi->regime);
-
return 0;
addrsz:
@@ -1363,8 +1369,6 @@ static int handle_at_slow(struct kvm_vcpu *vcpu, u32 op, u64 vaddr, u64 *par)
if (ret)
goto compute_par;
- compute_s1_permissions(vcpu, &wi, &wr);
-
switch (op) {
case OP_AT_S1E1RP:
case OP_AT_S1E1R:
@@ -1689,15 +1693,10 @@ int __kvm_translate_va(struct kvm_vcpu *vcpu, struct s1_walk_info *wi,
wr->ur = wr->uw = wr->ux = true;
wr->pr = wr->pw = wr->px = true;
wr->dirty = true;
- } else {
- ret = walk_s1(vcpu, wi, wr, va);
- if (ret)
- return ret;
-
- compute_s1_permissions(vcpu, wi, wr);
+ return 0;
}
- return 0;
+ return walk_s1(vcpu, wi, wr, va);
}
struct desc_match {
--
2.47.3
next prev parent reply other threads:[~2026-10-23 20:56 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-23 20:55 [PATCH v2 00/28] KVM: arm64: nv: Implement FEAT_HAFDBS, FEAT_HAFT Oliver Upton
2026-10-23 20:55 ` [PATCH v2 01/28] KVM: arm64: nv: Introduce struct for stage-2 walk step Oliver Upton
2026-10-23 20:55 ` [PATCH v2 02/28] KVM: arm64: nv: Consolidate computation of stage-2 permissions Oliver Upton
2026-10-23 20:55 ` [PATCH v2 03/28] KVM: arm64: nv: Get rid of kvm_s2_trans*() accessors Oliver Upton
2026-10-23 20:55 ` [PATCH v2 04/28] KVM: arm64: nv: Only shadow writable-dirty guest descs as writable Oliver Upton
2026-10-23 21:25 ` sashiko-bot
2026-10-24 6:26 ` Oliver Upton
2026-10-23 20:55 ` [PATCH v2 05/28] KVM: arm64: nv: Pass an access descriptor for stage-2 walks Oliver Upton
2026-10-23 20:55 ` [PATCH v2 06/28] KVM: arm64: nv: Use a helper for stage-2 descriptor updates Oliver Upton
2026-10-23 20:55 ` [PATCH v2 07/28] KVM: arm64: nv: Set dirty state at stage-2 Oliver Upton
2026-10-23 20:55 ` [PATCH v2 08/28] KVM: arm64: nv: Treat DBM as writable " Oliver Upton
2026-10-23 20:55 ` Oliver Upton [this message]
2026-10-23 20:55 ` [PATCH v2 10/28] KVM: arm64: Plumb through access descriptor for stage-1 Oliver Upton
2026-10-23 21:06 ` sashiko-bot
2026-10-23 20:55 ` [PATCH v2 11/28] KVM: arm64: Use a struct for stage-1 walk context Oliver Upton
2026-10-23 20:55 ` [PATCH v2 12/28] KVM: arm64: Create helper for stage-1 descriptor updates Oliver Upton
2026-10-23 20:55 ` [PATCH v2 13/28] KVM: arm64: Set dirty state at stage-1 Oliver Upton
2026-10-23 20:55 ` [PATCH v2 14/28] KVM: arm64: nv: Respect HA when computing translated TCR Oliver Upton
2026-10-23 20:55 ` [PATCH v2 15/28] KVM: arm64: nv: Respect HD " Oliver Upton
2026-10-23 20:55 ` [PATCH v2 16/28] KVM: arm64: Grant write permission when DBM is set at S1 Oliver Upton
2026-10-23 20:55 ` [PATCH v2 17/28] KVM: arm64: Don't update descriptors for "non-arch" access Oliver Upton
2026-10-23 20:56 ` [PATCH v2 18/28] KVM: arm64: nv: Emulate CMOs via writable-clean translations as NOPs Oliver Upton
2026-10-23 20:56 ` [PATCH v2 19/28] arm64: Add command line switch to disable FEAT_S2FWB Oliver Upton
2026-10-23 20:56 ` [PATCH v2 20/28] KVM: arm64: Reject non-coherent DMA when using forced writeback Oliver Upton
2026-10-23 21:16 ` sashiko-bot
2026-10-23 20:56 ` [PATCH v2 21/28] KVM: arm64: nv: Expose FEAT_HAFDBS Oliver Upton
2026-10-23 20:56 ` [PATCH v2 22/28] KVM: arm64: Set Access flag on table descriptors at stage-1 Oliver Upton
2026-10-23 21:22 ` sashiko-bot
2026-10-24 6:24 ` Oliver Upton
2026-10-23 20:56 ` [PATCH v2 23/28] KVM: arm64: nv: Set access flag on table descriptors at stage-2 Oliver Upton
2026-10-23 20:56 ` [PATCH v2 24/28] KVM: arm64: nv: Expose FEAT_HAFT Oliver Upton
2026-10-23 20:56 ` [PATCH v2 25/28] KVM: arm64: selftests: Only test AF behavior for emulated AT insns Oliver Upton
2026-10-23 20:56 ` [PATCH v2 26/28] KVM: arm64: selftests: Test AT emulation for FEAT_HAFT Oliver Upton
2026-10-23 20:56 ` [PATCH v2 27/28] KVM: arm64: Add tracepoints for S1 page table walk Oliver Upton
2026-10-23 20:56 ` [PATCH v2 28/28] KVM: arm64: Add tracepoints for S2 " Oliver Upton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261023205610.1044532-10-oupton@kernel.org \
--to=oupton@kernel.org \
--cc=fuad.tabba@linux.dev \
--cc=joey.gouly@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=leo.bras@arm.com \
--cc=maz@kernel.org \
--cc=seiden@linux.ibm.com \
--cc=suzuki.poulose@arm.com \
--cc=weilin.chang@arm.com \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox