From: Mark Rutland <mark.rutland@arm•com>
To: linux-arm-kernel@lists•infradead.org, kvmarm@lists•linux.dev
Cc: broonie@kernel•org, catalin.marinas@arm•com, james.morse@arm•com,
mark.rutland@arm•com, maz@kernel•org, oupton@kernel•org,
tabba@google•com, vladimir.murzin@arm•com, will@kernel•org
Subject: [PATCH v3 03/18] KVM: arm64: pkvm: Save host FPMR in host cpu context
Date: Tue, 2 Jun 2026 16:11:35 +0100 [thread overview]
Message-ID: <20260602151150.925126-4-mark.rutland@arm.com> (raw)
In-Reply-To: <20260602151150.925126-1-mark.rutland@arm.com>
Protected KVM stores most of the host's system register state in
kvm_host_data::host_ctxt, which is an instance of struct
kvm_cpu_context. As kvm_cpu_context::sys_regs[] has a slot for FPMR, we
can store the host's FPMR there.
Do so, and remove kvm_host_data::fpmr.
Signed-off-by: Mark Rutland <mark.rutland@arm•com>
Reviewed-by: Vladimir Murzin <vladimir.murzin@arm•com>
Cc: Catalin Marinas <catalin.marinas@arm•com>
Cc: Fuad Tabba <tabba@google•com>
Cc: James Morse <james.morse@arm•com>
Cc: Marc Zyngier <maz@kernel•org>
Cc: Mark Brown <broonie@kernel•org>
Cc: Oliver Upton <oupton@kernel•org>
Cc: Will Deacon <will@kernel•org>
---
arch/arm64/include/asm/kvm_host.h | 3 ---
arch/arm64/kvm/hyp/include/hyp/switch.h | 6 ++++--
arch/arm64/kvm/hyp/nvhe/hyp-main.c | 5 +++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 65eead8362e0b..42b1c4764a4bf 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -775,9 +775,6 @@ struct kvm_host_data {
*/
struct cpu_sve_state *sve_state;
- /* Used by pKVM only. */
- u64 fpmr;
-
/* Ownership of the FP regs */
enum {
FP_STATE_FREE,
diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h
index 98b2976837b11..cc4d011a2b380 100644
--- a/arch/arm64/kvm/hyp/include/hyp/switch.h
+++ b/arch/arm64/kvm/hyp/include/hyp/switch.h
@@ -554,6 +554,8 @@ static inline void fpsimd_lazy_switch_to_host(struct kvm_vcpu *vcpu)
static void kvm_hyp_save_fpsimd_host(struct kvm_vcpu *vcpu)
{
+ struct kvm_cpu_context *hctxt = host_data_ptr(host_ctxt);
+
/*
* Non-protected kvm relies on the host restoring its sve state.
* Protected kvm restores the host's sve state as not to reveal that
@@ -562,11 +564,11 @@ static void kvm_hyp_save_fpsimd_host(struct kvm_vcpu *vcpu)
if (system_supports_sve()) {
__hyp_sve_save_host();
} else {
- __fpsimd_save_state(host_data_ptr(host_ctxt.fp_regs));
+ __fpsimd_save_state(&hctxt->fp_regs);
}
if (kvm_has_fpmr(kern_hyp_va(vcpu->kvm)))
- *host_data_ptr(fpmr) = read_sysreg_s(SYS_FPMR);
+ ctxt_sys_reg(hctxt, FPMR) = read_sysreg_s(SYS_FPMR);
}
diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
index 06db299c37a89..db60f770060e5 100644
--- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c
+++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
@@ -66,6 +66,7 @@ static void fpsimd_sve_flush(void)
static void fpsimd_sve_sync(struct kvm_vcpu *vcpu)
{
+ struct kvm_cpu_context *hctxt = host_data_ptr(host_ctxt);
bool has_fpmr;
if (!guest_owns_fp_regs())
@@ -89,10 +90,10 @@ static void fpsimd_sve_sync(struct kvm_vcpu *vcpu)
if (system_supports_sve())
__hyp_sve_restore_host();
else
- __fpsimd_restore_state(host_data_ptr(host_ctxt.fp_regs));
+ __fpsimd_restore_state(&hctxt->fp_regs);
if (has_fpmr)
- write_sysreg_s(*host_data_ptr(fpmr), SYS_FPMR);
+ write_sysreg_s(ctxt_sys_reg(hctxt, FPMR), SYS_FPMR);
*host_data_ptr(fp_owner) = FP_STATE_HOST_OWNED;
}
--
2.30.2
next prev parent reply other threads:[~2026-06-02 15:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-02 15:11 [PATCH v3 00/18] arm64+KVM: FPSIMD/SVE/SME cleanups Mark Rutland
2026-06-02 15:11 ` [PATCH v3 01/18] KVM: arm64: Don't include <asm/fpsimdmacros.h> Mark Rutland
2026-06-02 15:11 ` [PATCH v3 02/18] KVM: arm64: Don't override FFR save/restore argument Mark Rutland
2026-06-02 15:36 ` Mark Brown
2026-06-03 9:25 ` Mark Rutland
2026-06-02 15:11 ` Mark Rutland [this message]
2026-06-02 15:11 ` [PATCH v3 04/18] KVM: arm64: pkvm: Remove struct cpu_sve_state Mark Rutland
2026-06-02 15:11 ` [PATCH v3 05/18] arm64: fpsimd: Fold sve_init_regs() into do_sve_acc() Mark Rutland
2026-06-02 15:11 ` [PATCH v3 06/18] arm64: fpsimd: Remove sve_set_vq() and sme_set_vq() Mark Rutland
2026-06-02 15:11 ` [PATCH v3 07/18] arm64: fpsimd: Use assembler for SVE instructions Mark Rutland
2026-06-02 15:11 ` [PATCH v3 08/18] arm64: fpsimd: Use assembler for baseline SME instructions Mark Rutland
2026-06-02 15:11 ` [PATCH v3 09/18] arm64: fpsimd: Move sve_get_vl() and sme_get_vl() inline Mark Rutland
2026-06-02 15:11 ` [PATCH v3 10/18] arm64: sysreg: Add FPCR and FPSR Mark Rutland
2026-06-02 15:11 ` [PATCH v3 11/18] arm64: fpsimd: Split FPSR/FPCR from SVE save/restore Mark Rutland
2026-06-02 15:11 ` [PATCH v3 12/18] arm64: fpsimd: Move fpsimd save/restore inline Mark Rutland
2026-06-02 15:11 ` [PATCH v3 13/18] arm64: fpsimd: Use opaque type for SVE state Mark Rutland
2026-06-02 15:11 ` [PATCH v3 14/18] arm64: fpsimd: Use opaque type for SME state Mark Rutland
2026-06-02 15:11 ` [PATCH v3 15/18] arm64: fpsimd: Move SVE save/restore inline Mark Rutland
2026-06-02 15:11 ` [PATCH v3 16/18] arm64: fpsimd: Move sve_flush_live() inline Mark Rutland
2026-06-02 15:11 ` [PATCH v3 17/18] arm64: fpsimd: Move SME save/restore inline Mark Rutland
2026-06-02 15:30 ` Mark Brown
2026-06-02 15:11 ` [PATCH v3 18/18] arm64: fpsimd: Remove <asm/fpsimdmacros.h> Mark Rutland
2026-06-02 15:33 ` Mark Brown
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=20260602151150.925126-4-mark.rutland@arm.com \
--to=mark.rutland@arm$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=james.morse@arm$(echo .)com \
--cc=kvmarm@lists$(echo .)linux.dev \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=maz@kernel$(echo .)org \
--cc=oupton@kernel$(echo .)org \
--cc=tabba@google$(echo .)com \
--cc=vladimir.murzin@arm$(echo .)com \
--cc=will@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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