[PATCH 07/17] KVM: arm64: Add system register reset framework for protected VMs
Joey Gouly
joey.gouly at arm.com
Wed Sep 2 08:14:15 PDT 2026
On Mon, Aug 31, 2026 at 05:34:11PM +0100, Fuad Tabba wrote:
> Reset a protected VM's system registers at EL2 rather than taking the
> host's values: add kvm_reset_pvm_sys_regs() and the
> pvm_sys_reg_reset_vals[] table that drives it, and call it from
> init_pkvm_hyp_vcpu() for protected vCPUs. The values follow the
> host-side reset in sys_regs.c, with a poison value where it resets to
> UNKNOWN, and for VBAR_EL1 and CONTEXTIDR_EL1 in place of the 0 it
> resets them to. MPIDR_EL1 is derived from vcpu_id, as for any KVM
> guest.
>
> Signed-off-by: Fuad Tabba <fuad.tabba at linux.dev>
The commit message says "rather than taking the host's values", but if I
understand correctly, at this point in the series, they still take the
hosts values because this is still present:
hyp_vcpu->vcpu.arch.ctxt = host_vcpu->arch.ctxt;
Not necessarily saying anything needs to change, just to write down what
I noticed while reviewing / reading this code!
The only other thing I was a bit unsure of was the actual list of
registers pvm_sys_reg_reset_vals. It's the EL1 registers, minus
unsupported FEATs (MTE, debug(?), GCS, etc)
Otherwise:
Acked-by: Joey Gouly <joey.gouly at arm.com>
Thanks,
Joey
> ---
> arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 1 +
> arch/arm64/kvm/hyp/nvhe/pkvm.c | 5 ++
> arch/arm64/kvm/hyp/nvhe/sys_regs.c | 91 ++++++++++++++++++++++++--
> 3 files changed, 93 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h
> index 49a0a992047ba..a04b7c04d5135 100644
> --- a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h
> +++ b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h
> @@ -95,6 +95,7 @@ bool kvm_handle_pvm_hvc64(struct kvm_vcpu *vcpu, u64 *exit_code);
> bool kvm_handle_pvm_sysreg(struct kvm_vcpu *vcpu, u64 *exit_code);
> bool kvm_handle_pvm_restricted(struct kvm_vcpu *vcpu, u64 *exit_code);
> void kvm_init_pvm_id_regs(struct kvm_vcpu *vcpu);
> +void kvm_reset_pvm_sys_regs(struct kvm_vcpu *vcpu);
> int kvm_check_pvm_sysreg_table(void);
>
> #endif /* __ARM64_KVM_NVHE_PKVM_H__ */
> diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c
> index e85f13233da08..af334318d0a03 100644
> --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c
> +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c
> @@ -551,6 +551,11 @@ static int init_pkvm_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu,
> goto done;
>
> ret = pkvm_vcpu_init_sve(hyp_vcpu, host_vcpu);
> + if (ret)
> + goto done;
> +
> + if (pkvm_hyp_vcpu_is_protected(hyp_vcpu))
> + kvm_reset_pvm_sys_regs(&hyp_vcpu->vcpu);
> done:
> if (ret)
> unpin_host_vcpu(host_vcpu);
> diff --git a/arch/arm64/kvm/hyp/nvhe/sys_regs.c b/arch/arm64/kvm/hyp/nvhe/sys_regs.c
> index 8758c68017765..ebfd48aa15b56 100644
> --- a/arch/arm64/kvm/hyp/nvhe/sys_regs.c
> +++ b/arch/arm64/kvm/hyp/nvhe/sys_regs.c
> @@ -525,6 +525,84 @@ static const struct sys_reg_desc pvm_sys_reg_descs[] = {
> /* Performance Monitoring Registers are restricted. */
> };
>
> +struct sys_reg_desc_reset {
> + int reg;
> + void (*reset)(struct kvm_vcpu *vcpu, const struct sys_reg_desc_reset *rd);
> + u64 value;
> +};
> +
> +/* Hardware value, as sys_regs.c's reset_actlr()/reset_amair_el1(). */
> +static void reset_actlr(struct kvm_vcpu *vcpu, const struct sys_reg_desc_reset *r)
> +{
> + __vcpu_assign_sys_reg(vcpu, r->reg, read_sysreg(actlr_el1));
> +}
> +
> +static void reset_amair_el1(struct kvm_vcpu *vcpu, const struct sys_reg_desc_reset *r)
> +{
> + __vcpu_assign_sys_reg(vcpu, r->reg, read_sysreg(amair_el1));
> +}
> +
> +static void reset_mpidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc_reset *r)
> +{
> + __vcpu_assign_sys_reg(vcpu, r->reg, kvm_calculate_mpidr(vcpu));
> +}
> +
> +static void reset_value(struct kvm_vcpu *vcpu, const struct sys_reg_desc_reset *r)
> +{
> + __vcpu_assign_sys_reg(vcpu, r->reg, r->value);
> +}
> +
> +#define RESET_VAL(REG, RESET_VAL) { REG, reset_value, RESET_VAL }
> +
> +#define RESET_ZERO(REG) RESET_VAL(REG, 0)
> +
> +#define RESET_UNKNOWN(REG) RESET_VAL(REG, 0x1de7ec7edbadc0deULL)
> +
> +#define RESET_FUNC(REG, RESET_FUNC) { REG, RESET_FUNC, 0 }
> +
> +/* Sorted ascending by reg; kvm_check_pvm_sysreg_table() enforces it. */
> +static const struct sys_reg_desc_reset pvm_sys_reg_reset_vals[] = {
> + RESET_FUNC(MPIDR_EL1, reset_mpidr),
> + RESET_UNKNOWN(TPIDR_EL0),
> + RESET_UNKNOWN(TPIDRRO_EL0),
> + RESET_UNKNOWN(TPIDR_EL1),
> + RESET_ZERO(CNTKCTL_EL1),
> + RESET_UNKNOWN(PAR_EL1),
> + RESET_ZERO(MDCCINT_EL1),
> + RESET_ZERO(DISR_EL1),
> + RESET_ZERO(PMCCFILTR_EL0),
> + RESET_ZERO(PMUSERENR_EL0),
> + RESET_ZERO(CPACR_EL1),
> + RESET_VAL(CONTEXTIDR_EL1, 0x00000000dbadc0deULL),
> + RESET_VAL(SCTLR_EL1, 0x00C50078ULL),
> + RESET_FUNC(ACTLR_EL1, reset_actlr),
> + RESET_ZERO(TCR_EL1),
> + RESET_UNKNOWN(AFSR0_EL1),
> + RESET_UNKNOWN(AFSR1_EL1),
> + RESET_UNKNOWN(ESR_EL1),
> + RESET_UNKNOWN(MAIR_EL1),
> + RESET_FUNC(AMAIR_EL1, reset_amair_el1),
> + RESET_ZERO(MDSCR_EL1),
> + RESET_ZERO(ZCR_EL1),
> + RESET_UNKNOWN(TTBR0_EL1),
> + RESET_UNKNOWN(TTBR1_EL1),
> + RESET_UNKNOWN(FAR_EL1),
> + RESET_VAL(VBAR_EL1, 0x1de7ec7edbadc000ULL),
> + RESET_UNKNOWN(PIRE0_EL1),
> + RESET_UNKNOWN(PIR_EL1),
> +};
> +
> +void kvm_reset_pvm_sys_regs(struct kvm_vcpu *vcpu)
> +{
> + unsigned long i;
> +
> + for (i = 0; i < ARRAY_SIZE(pvm_sys_reg_reset_vals); i++) {
> + const struct sys_reg_desc_reset *r = &pvm_sys_reg_reset_vals[i];
> +
> + r->reset(vcpu, r);
> + }
> +}
> +
> /*
> * Initializes feature registers for protected vms.
> */
> @@ -550,16 +628,21 @@ void kvm_init_pvm_id_regs(struct kvm_vcpu *vcpu)
> }
>
> /*
> - * Checks that the sysreg table is unique and in-order.
> - *
> - * Returns 0 if the table is consistent, or 1 otherwise.
> + * Both tables must be unique and sorted ascending. pvm_sys_reg_descs.reg is the
> + * sys_reg() encoding, pvm_sys_reg_reset_vals.reg the vcpu_sysreg index, so they
> + * compare differently. BUG_ON() at __pkvm_init: fatal at boot.
> */
> int kvm_check_pvm_sysreg_table(void)
> {
> unsigned int i;
>
> for (i = 1; i < ARRAY_SIZE(pvm_sys_reg_descs); i++) {
> - if (cmp_sys_reg(&pvm_sys_reg_descs[i-1], &pvm_sys_reg_descs[i]) >= 0)
> + if (cmp_sys_reg(&pvm_sys_reg_descs[i - 1], &pvm_sys_reg_descs[i]) >= 0)
> + return 1;
> + }
> +
> + for (i = 1; i < ARRAY_SIZE(pvm_sys_reg_reset_vals); i++) {
> + if (pvm_sys_reg_reset_vals[i - 1].reg >= pvm_sys_reg_reset_vals[i].reg)
> return 1;
> }
>
> --
> 2.39.5
>
More information about the linux-arm-kernel
mailing list