From: Mark Rutland <mark.rutland@arm.com>
To: Marc Zyngier <maz@kernel.org>
Cc: Will Deacon <will@kernel.org>,
kernel-team@android.com, kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org
Subject: Re: [PATCH 09/11] KVM: arm64: Remove SPSR manipulation primitives
Date: Mon, 26 Oct 2020 14:30:19 +0000 [thread overview]
Message-ID: <20201026143019.GK12454@C02TD0UTHF1T.local> (raw)
In-Reply-To: <20201026133450.73304-10-maz@kernel.org>
On Mon, Oct 26, 2020 at 01:34:48PM +0000, Marc Zyngier wrote:
> The SPR setting code is now completely unused, including that dealing
> with banked AArch32 SPSRs. Cleanup time.
>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Mark.
> ---
> arch/arm64/include/asm/kvm_emulate.h | 26 --------
> arch/arm64/kvm/regmap.c | 96 ----------------------------
> 2 files changed, 122 deletions(-)
>
> diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
> index 736a342dadf7..5d957d0e7b69 100644
> --- a/arch/arm64/include/asm/kvm_emulate.h
> +++ b/arch/arm64/include/asm/kvm_emulate.h
> @@ -34,8 +34,6 @@ enum exception_type {
> };
>
> unsigned long *vcpu_reg32(const struct kvm_vcpu *vcpu, u8 reg_num);
> -unsigned long vcpu_read_spsr32(const struct kvm_vcpu *vcpu);
> -void vcpu_write_spsr32(struct kvm_vcpu *vcpu, unsigned long v);
>
> bool kvm_condition_valid32(const struct kvm_vcpu *vcpu);
> void kvm_skip_instr32(struct kvm_vcpu *vcpu);
> @@ -180,30 +178,6 @@ static __always_inline void vcpu_set_reg(struct kvm_vcpu *vcpu, u8 reg_num,
> vcpu_gp_regs(vcpu)->regs[reg_num] = val;
> }
>
> -static inline unsigned long vcpu_read_spsr(const struct kvm_vcpu *vcpu)
> -{
> - if (vcpu_mode_is_32bit(vcpu))
> - return vcpu_read_spsr32(vcpu);
> -
> - if (vcpu->arch.sysregs_loaded_on_cpu)
> - return read_sysreg_el1(SYS_SPSR);
> - else
> - return __vcpu_sys_reg(vcpu, SPSR_EL1);
> -}
> -
> -static inline void vcpu_write_spsr(struct kvm_vcpu *vcpu, unsigned long v)
> -{
> - if (vcpu_mode_is_32bit(vcpu)) {
> - vcpu_write_spsr32(vcpu, v);
> - return;
> - }
> -
> - if (vcpu->arch.sysregs_loaded_on_cpu)
> - write_sysreg_el1(v, SYS_SPSR);
> - else
> - __vcpu_sys_reg(vcpu, SPSR_EL1) = v;
> -}
> -
> /*
> * The layout of SPSR for an AArch32 state is different when observed from an
> * AArch64 SPSR_ELx or an AArch32 SPSR_*. This function generates the AArch32
> diff --git a/arch/arm64/kvm/regmap.c b/arch/arm64/kvm/regmap.c
> index accc1d5fba61..ae7e290bb017 100644
> --- a/arch/arm64/kvm/regmap.c
> +++ b/arch/arm64/kvm/regmap.c
> @@ -126,99 +126,3 @@ unsigned long *vcpu_reg32(const struct kvm_vcpu *vcpu, u8 reg_num)
>
> return reg_array + vcpu_reg_offsets[mode][reg_num];
> }
> -
> -/*
> - * Return the SPSR for the current mode of the virtual CPU.
> - */
> -static int vcpu_spsr32_mode(const struct kvm_vcpu *vcpu)
> -{
> - unsigned long mode = *vcpu_cpsr(vcpu) & PSR_AA32_MODE_MASK;
> - switch (mode) {
> - case PSR_AA32_MODE_SVC: return KVM_SPSR_SVC;
> - case PSR_AA32_MODE_ABT: return KVM_SPSR_ABT;
> - case PSR_AA32_MODE_UND: return KVM_SPSR_UND;
> - case PSR_AA32_MODE_IRQ: return KVM_SPSR_IRQ;
> - case PSR_AA32_MODE_FIQ: return KVM_SPSR_FIQ;
> - default: BUG();
> - }
> -}
> -
> -unsigned long vcpu_read_spsr32(const struct kvm_vcpu *vcpu)
> -{
> - int spsr_idx = vcpu_spsr32_mode(vcpu);
> -
> - if (!vcpu->arch.sysregs_loaded_on_cpu) {
> - switch (spsr_idx) {
> - case KVM_SPSR_SVC:
> - return __vcpu_sys_reg(vcpu, SPSR_EL1);
> - case KVM_SPSR_ABT:
> - return vcpu->arch.ctxt.spsr_abt;
> - case KVM_SPSR_UND:
> - return vcpu->arch.ctxt.spsr_und;
> - case KVM_SPSR_IRQ:
> - return vcpu->arch.ctxt.spsr_irq;
> - case KVM_SPSR_FIQ:
> - return vcpu->arch.ctxt.spsr_fiq;
> - }
> - }
> -
> - switch (spsr_idx) {
> - case KVM_SPSR_SVC:
> - return read_sysreg_el1(SYS_SPSR);
> - case KVM_SPSR_ABT:
> - return read_sysreg(spsr_abt);
> - case KVM_SPSR_UND:
> - return read_sysreg(spsr_und);
> - case KVM_SPSR_IRQ:
> - return read_sysreg(spsr_irq);
> - case KVM_SPSR_FIQ:
> - return read_sysreg(spsr_fiq);
> - default:
> - BUG();
> - }
> -}
> -
> -void vcpu_write_spsr32(struct kvm_vcpu *vcpu, unsigned long v)
> -{
> - int spsr_idx = vcpu_spsr32_mode(vcpu);
> -
> - if (!vcpu->arch.sysregs_loaded_on_cpu) {
> - switch (spsr_idx) {
> - case KVM_SPSR_SVC:
> - __vcpu_sys_reg(vcpu, SPSR_EL1) = v;
> - break;
> - case KVM_SPSR_ABT:
> - vcpu->arch.ctxt.spsr_abt = v;
> - break;
> - case KVM_SPSR_UND:
> - vcpu->arch.ctxt.spsr_und = v;
> - break;
> - case KVM_SPSR_IRQ:
> - vcpu->arch.ctxt.spsr_irq = v;
> - break;
> - case KVM_SPSR_FIQ:
> - vcpu->arch.ctxt.spsr_fiq = v;
> - break;
> - }
> -
> - return;
> - }
> -
> - switch (spsr_idx) {
> - case KVM_SPSR_SVC:
> - write_sysreg_el1(v, SYS_SPSR);
> - break;
> - case KVM_SPSR_ABT:
> - write_sysreg(v, spsr_abt);
> - break;
> - case KVM_SPSR_UND:
> - write_sysreg(v, spsr_und);
> - break;
> - case KVM_SPSR_IRQ:
> - write_sysreg(v, spsr_irq);
> - break;
> - case KVM_SPSR_FIQ:
> - write_sysreg(v, spsr_fiq);
> - break;
> - }
> -}
> --
> 2.28.0
>
> _______________________________________________
> kvmarm mailing list
> kvmarm@lists.cs.columbia.edu
> https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2020-10-26 14:30 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 13:34 [PATCH 00/11] KVM: arm64: Move PC/ELR/SPSR/PSTATE updatess to EL2 Marc Zyngier
2020-10-26 13:34 ` [PATCH 01/11] KVM: arm64: Don't adjust PC on SError during SMC trap Marc Zyngier
2020-10-26 13:53 ` Mark Rutland
2020-10-26 14:08 ` Marc Zyngier
2020-10-26 14:22 ` Mark Rutland
2020-10-26 13:34 ` [PATCH 02/11] KVM: arm64: Move kvm_vcpu_trap_il_is32bit into kvm_skip_instr32() Marc Zyngier
2020-10-26 13:55 ` Mark Rutland
2020-10-26 13:34 ` [PATCH 03/11] KVM: arm64: Make kvm_skip_instr() and co private to HYP Marc Zyngier
2020-10-26 14:04 ` Mark Rutland
2020-10-27 16:17 ` Marc Zyngier
2020-10-27 10:55 ` Suzuki K Poulose
2020-10-27 11:08 ` Marc Zyngier
2020-10-26 13:34 ` [PATCH 04/11] KVM: arm64: Move PC rollback on SError " Marc Zyngier
2020-10-26 14:06 ` Mark Rutland
2020-10-27 14:56 ` James Morse
2020-10-27 14:59 ` Marc Zyngier
2020-10-26 13:34 ` [PATCH 05/11] KVM: arm64: Move VHE direct sysreg accessors into kvm_host.h Marc Zyngier
2020-10-26 14:07 ` Mark Rutland
2020-10-26 13:34 ` [PATCH 06/11] KVM: arm64: Add basic hooks for injecting exceptions from EL2 Marc Zyngier
2020-10-26 13:34 ` [PATCH 07/11] KVM: arm64: Inject AArch64 exceptions from HYP Marc Zyngier
2020-10-26 14:22 ` Mark Rutland
2020-10-27 16:21 ` Marc Zyngier
2020-10-27 17:41 ` James Morse
2020-10-27 18:49 ` Marc Zyngier
2020-10-26 13:34 ` [PATCH 08/11] KVM: arm64: Inject AArch32 " Marc Zyngier
2020-10-26 14:26 ` Mark Rutland
2020-10-27 17:41 ` James Morse
2020-10-27 19:21 ` Marc Zyngier
2020-10-28 19:20 ` James Morse
2020-10-28 20:24 ` Marc Zyngier
2020-10-26 13:34 ` [PATCH 09/11] KVM: arm64: Remove SPSR manipulation primitives Marc Zyngier
2020-10-26 14:30 ` Mark Rutland [this message]
2020-10-26 13:34 ` [PATCH 10/11] KVM: arm64: Consolidate exception injection Marc Zyngier
2020-10-26 13:34 ` [PATCH 11/11] KVM: arm64: Get rid of the AArch32 register mapping code Marc Zyngier
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=20201026143019.GK12454@C02TD0UTHF1T.local \
--to=mark.rutland@arm.com \
--cc=kernel-team@android.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=will@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).