From: Andrew Jones <drjones@redhat.com>
To: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Christoffer Dall <cdall@cs.columbia.edu>,
kvm@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>,
kvmarm@lists.cs.columbia.edu,
Yury Norov <ynorov@caviumnetworks.com>,
linux-arm-kernel@lists.infradead.org,
Dave Martin <Dave.Martin@arm.com>,
Shih-Wei Li <shihwei@cs.columbia.edu>
Subject: Re: [PATCH v4 24/40] KVM: arm64: Rewrite system register accessors to read/write functions
Date: Thu, 22 Feb 2018 14:34:21 +0100 [thread overview]
Message-ID: <20180222133421.tyingk5vzdgzoyh7@kamzik.brq.redhat.com> (raw)
In-Reply-To: <20180215210332.8648-25-christoffer.dall@linaro.org>
On Thu, Feb 15, 2018 at 10:03:16PM +0100, Christoffer Dall wrote:
> From: Christoffer Dall <cdall@cs.columbia.edu>
>
> Currently we access the system registers array via the vcpu_sys_reg()
> macro. However, we are about to change the behavior to some times
> modify the register file directly, so let's change this to two
> primitives:
>
> * Accessor macros vcpu_write_sys_reg() and vcpu_read_sys_reg()
> * Direct array access macro __vcpu_sys_reg()
>
> The first primitive should be used in places where the code needs to
> access the currently loaded VCPU's state as observed by the guest. For
> example, when trapping on cache related registers, a write to a system
> register should go directly to the VCPU version of the register.
>
> The second primitive can be used in places where the VCPU is known to
> never be running (for example userspace access) or for registers which
> are never context switched (for example all the PMU system registers).
>
> This rewrites all users of vcpu_sys_regs to one of the two primitives
> above.
>
> No functional change.
>
> Signed-off-by: Christoffer Dall <cdall@cs.columbia.edu>
> ---
>
> Notes:
> Changes since v2:
> - New patch (deferred register handling has been reworked)
>
> arch/arm64/include/asm/kvm_emulate.h | 13 ++++---
> arch/arm64/include/asm/kvm_host.h | 13 ++++++-
> arch/arm64/include/asm/kvm_mmu.h | 2 +-
> arch/arm64/kvm/debug.c | 27 +++++++++-----
> arch/arm64/kvm/inject_fault.c | 8 ++--
> arch/arm64/kvm/sys_regs.c | 71 ++++++++++++++++++------------------
> arch/arm64/kvm/sys_regs.h | 4 +-
> arch/arm64/kvm/sys_regs_generic_v8.c | 4 +-
> virt/kvm/arm/pmu.c | 37 ++++++++++---------
> 9 files changed, 102 insertions(+), 77 deletions(-)
>
> diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
> index 3cc535591bdf..d313aaae5c38 100644
> --- a/arch/arm64/include/asm/kvm_emulate.h
> +++ b/arch/arm64/include/asm/kvm_emulate.h
> @@ -290,15 +290,18 @@ static inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu)
>
> static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)
> {
> - return vcpu_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;
> + return vcpu_read_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;
> }
>
> static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)
> {
> - if (vcpu_mode_is_32bit(vcpu))
> + if (vcpu_mode_is_32bit(vcpu)) {
> *vcpu_cpsr(vcpu) |= COMPAT_PSR_E_BIT;
> - else
> - vcpu_sys_reg(vcpu, SCTLR_EL1) |= (1 << 25);
> + } else {
> + u64 sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1);
> + sctlr |= (1 << 25);
> + vcpu_write_sys_reg(vcpu, SCTLR_EL1, sctlr);
> + }
> }
>
> static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu)
> @@ -306,7 +309,7 @@ static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu)
> if (vcpu_mode_is_32bit(vcpu))
> return !!(*vcpu_cpsr(vcpu) & COMPAT_PSR_E_BIT);
>
> - return !!(vcpu_sys_reg(vcpu, SCTLR_EL1) & (1 << 25));
> + return !!(vcpu_read_sys_reg(vcpu, SCTLR_EL1) & (1 << 25));
> }
>
> static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu,
> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
> index f2a6f39aec87..68398bf7882f 100644
> --- a/arch/arm64/include/asm/kvm_host.h
> +++ b/arch/arm64/include/asm/kvm_host.h
> @@ -287,7 +287,18 @@ struct kvm_vcpu_arch {
> };
>
> #define vcpu_gp_regs(v) (&(v)->arch.ctxt.gp_regs)
> -#define vcpu_sys_reg(v,r) ((v)->arch.ctxt.sys_regs[(r)])
> +
> +/*
> + * Only use __vcpu_sys_reg if you know you want the memory backed version of a
> + * register, and not the one most recently accessed by a runnning VCPU. For
> + * example, for userpace access or for system registers that are never context
> + * switched, but only emulated.
> + */
> +#define __vcpu_sys_reg(v,r) ((v)->arch.ctxt.sys_regs[(r)])
> +
> +#define vcpu_read_sys_reg(v,r) __vcpu_sys_reg(v,r)
> +#define vcpu_write_sys_reg(v,r,n) do { __vcpu_sys_reg(v,r) = n; } while (0)
> +
> /*
> * CP14 and CP15 live in the same array, as they are backed by the
> * same system registers.
> diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
> index 9679067a1574..95f46e73c4dc 100644
> --- a/arch/arm64/include/asm/kvm_mmu.h
> +++ b/arch/arm64/include/asm/kvm_mmu.h
> @@ -249,7 +249,7 @@ struct kvm;
>
> static inline bool vcpu_has_cache_enabled(struct kvm_vcpu *vcpu)
> {
> - return (vcpu_sys_reg(vcpu, SCTLR_EL1) & 0b101) == 0b101;
> + return (vcpu_read_sys_reg(vcpu, SCTLR_EL1) & 0b101) == 0b101;
> }
>
> static inline void __clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size)
> diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c
> index feedb877cff8..db32d10a56a1 100644
> --- a/arch/arm64/kvm/debug.c
> +++ b/arch/arm64/kvm/debug.c
> @@ -46,7 +46,8 @@ static DEFINE_PER_CPU(u32, mdcr_el2);
> */
> static void save_guest_debug_regs(struct kvm_vcpu *vcpu)
> {
> - vcpu->arch.guest_debug_preserved.mdscr_el1 = vcpu_sys_reg(vcpu, MDSCR_EL1);
> + vcpu->arch.guest_debug_preserved.mdscr_el1 =
> + vcpu_read_sys_reg(vcpu, MDSCR_EL1);
>
> trace_kvm_arm_set_dreg32("Saved MDSCR_EL1",
> vcpu->arch.guest_debug_preserved.mdscr_el1);
> @@ -54,10 +55,11 @@ static void save_guest_debug_regs(struct kvm_vcpu *vcpu)
>
> static void restore_guest_debug_regs(struct kvm_vcpu *vcpu)
> {
> - vcpu_sys_reg(vcpu, MDSCR_EL1) = vcpu->arch.guest_debug_preserved.mdscr_el1;
> + vcpu_write_sys_reg(vcpu, MDSCR_EL1,
> + vcpu->arch.guest_debug_preserved.mdscr_el1);
>
> trace_kvm_arm_set_dreg32("Restored MDSCR_EL1",
> - vcpu_sys_reg(vcpu, MDSCR_EL1));
> + vcpu_read_sys_reg(vcpu, MDSCR_EL1));
> }
>
> /**
> @@ -108,6 +110,7 @@ void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu)
> void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)
> {
> bool trap_debug = !(vcpu->arch.debug_flags & KVM_ARM64_DEBUG_DIRTY);
> + unsigned long mdscr;
>
> trace_kvm_arm_setup_debug(vcpu, vcpu->guest_debug);
>
> @@ -152,9 +155,13 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)
> */
> if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) {
> *vcpu_cpsr(vcpu) |= DBG_SPSR_SS;
> - vcpu_sys_reg(vcpu, MDSCR_EL1) |= DBG_MDSCR_SS;
> + mdscr = vcpu_read_sys_reg(vcpu, MDSCR_EL1);
> + mdscr |= DBG_MDSCR_SS;
> + vcpu_write_sys_reg(vcpu, MDSCR_EL1, mdscr);
> } else {
> - vcpu_sys_reg(vcpu, MDSCR_EL1) &= ~DBG_MDSCR_SS;
> + mdscr = vcpu_read_sys_reg(vcpu, MDSCR_EL1);
> + mdscr &= ~DBG_MDSCR_SS;
> + vcpu_write_sys_reg(vcpu, MDSCR_EL1, mdscr);
> }
>
> trace_kvm_arm_set_dreg32("SPSR_EL2", *vcpu_cpsr(vcpu));
> @@ -170,7 +177,9 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)
> */
> if (vcpu->guest_debug & KVM_GUESTDBG_USE_HW) {
> /* Enable breakpoints/watchpoints */
> - vcpu_sys_reg(vcpu, MDSCR_EL1) |= DBG_MDSCR_MDE;
> + mdscr = vcpu_read_sys_reg(vcpu, MDSCR_EL1);
> + mdscr |= DBG_MDSCR_MDE;
> + vcpu_write_sys_reg(vcpu, MDSCR_EL1, mdscr);
>
> vcpu->arch.debug_ptr = &vcpu->arch.external_debug_state;
> vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY;
> @@ -194,12 +203,12 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)
> vcpu->arch.mdcr_el2 |= MDCR_EL2_TDA;
>
> /* If KDE or MDE are set, perform a full save/restore cycle. */
> - if ((vcpu_sys_reg(vcpu, MDSCR_EL1) & DBG_MDSCR_KDE) ||
> - (vcpu_sys_reg(vcpu, MDSCR_EL1) & DBG_MDSCR_MDE))
> + if (vcpu_read_sys_reg(vcpu, MDSCR_EL1) & (DBG_MDSCR_KDE | DBG_MDSCR_MDE))
> vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY;
>
> trace_kvm_arm_set_dreg32("MDCR_EL2", vcpu->arch.mdcr_el2);
> - trace_kvm_arm_set_dreg32("MDSCR_EL1", vcpu_sys_reg(vcpu, MDSCR_EL1));
> + trace_kvm_arm_set_dreg32("MDSCR_EL1",
> + vcpu_read_sys_reg(vcpu, MDSCR_EL1));
> }
>
> void kvm_arm_clear_debug(struct kvm_vcpu *vcpu)
> diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
> index 30a3f58cdb7b..e08db2f2dd75 100644
> --- a/arch/arm64/kvm/inject_fault.c
> +++ b/arch/arm64/kvm/inject_fault.c
> @@ -58,7 +58,7 @@ static u64 get_except_vector(struct kvm_vcpu *vcpu, enum exception_type type)
> exc_offset = LOWER_EL_AArch32_VECTOR;
> }
>
> - return vcpu_sys_reg(vcpu, VBAR_EL1) + exc_offset + type;
> + return vcpu_read_sys_reg(vcpu, VBAR_EL1) + exc_offset + type;
> }
>
> static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr)
> @@ -73,7 +73,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
> *vcpu_cpsr(vcpu) = PSTATE_FAULT_BITS_64;
> *vcpu_spsr(vcpu) = cpsr;
>
> - vcpu_sys_reg(vcpu, FAR_EL1) = addr;
> + vcpu_write_sys_reg(vcpu, FAR_EL1, addr);
>
> /*
> * Build an {i,d}abort, depending on the level and the
> @@ -94,7 +94,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
> if (!is_iabt)
> esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT;
>
> - vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT;
> + vcpu_write_sys_reg(vcpu, ESR_EL1, esr | ESR_ELx_FSC_EXTABT);
> }
>
> static void inject_undef64(struct kvm_vcpu *vcpu)
> @@ -115,7 +115,7 @@ static void inject_undef64(struct kvm_vcpu *vcpu)
> if (kvm_vcpu_trap_il_is32bit(vcpu))
> esr |= ESR_ELx_IL;
>
> - vcpu_sys_reg(vcpu, ESR_EL1) = esr;
> + vcpu_write_sys_reg(vcpu, ESR_EL1, esr);
> }
>
> /**
> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> index b48af790615e..a05d2c01c786 100644
> --- a/arch/arm64/kvm/sys_regs.c
> +++ b/arch/arm64/kvm/sys_regs.c
> @@ -133,14 +133,14 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu,
> if (!p->is_aarch32 || !p->is_32bit) {
> val = p->regval;
> } else {
> - val = vcpu_sys_reg(vcpu, reg);
> + val = vcpu_read_sys_reg(vcpu, reg);
> if (r->reg % 2)
> val = (p->regval << 32) | (u64)lower_32_bits(val);
> else
> val = ((u64)upper_32_bits(val) << 32) |
> lower_32_bits(p->regval);
> }
> - vcpu_sys_reg(vcpu, reg) = val;
> + vcpu_write_sys_reg(vcpu, reg, val);
>
> kvm_toggle_cache(vcpu, was_enabled);
> return true;
> @@ -241,10 +241,10 @@ static bool trap_debug_regs(struct kvm_vcpu *vcpu,
> const struct sys_reg_desc *r)
> {
> if (p->is_write) {
> - vcpu_sys_reg(vcpu, r->reg) = p->regval;
> + vcpu_write_sys_reg(vcpu, r->reg, p->regval);
> vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY;
> } else {
> - p->regval = vcpu_sys_reg(vcpu, r->reg);
> + p->regval = vcpu_read_sys_reg(vcpu, r->reg);
> }
>
> trace_trap_reg(__func__, r->reg, p->is_write, p->regval);
> @@ -457,7 +457,8 @@ static void reset_wcr(struct kvm_vcpu *vcpu,
>
> static void reset_amair_el1(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> {
> - vcpu_sys_reg(vcpu, AMAIR_EL1) = read_sysreg(amair_el1);
> + u64 amair = read_sysreg(amair_el1);
> + vcpu_write_sys_reg(vcpu, AMAIR_EL1, amair);
> }
>
> static void reset_mpidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> @@ -474,7 +475,7 @@ static void reset_mpidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> mpidr = (vcpu->vcpu_id & 0x0f) << MPIDR_LEVEL_SHIFT(0);
> mpidr |= ((vcpu->vcpu_id >> 4) & 0xff) << MPIDR_LEVEL_SHIFT(1);
> mpidr |= ((vcpu->vcpu_id >> 12) & 0xff) << MPIDR_LEVEL_SHIFT(2);
> - vcpu_sys_reg(vcpu, MPIDR_EL1) = (1ULL << 31) | mpidr;
> + vcpu_write_sys_reg(vcpu, MPIDR_EL1, (1ULL << 31) | mpidr);
> }
>
> static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> @@ -488,12 +489,12 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> */
> val = ((pmcr & ~ARMV8_PMU_PMCR_MASK)
> | (ARMV8_PMU_PMCR_MASK & 0xdecafbad)) & (~ARMV8_PMU_PMCR_E);
> - vcpu_sys_reg(vcpu, PMCR_EL0) = val;
> + __vcpu_sys_reg(vcpu, PMCR_EL0) = val;
> }
>
> static bool check_pmu_access_disabled(struct kvm_vcpu *vcpu, u64 flags)
> {
> - u64 reg = vcpu_sys_reg(vcpu, PMUSERENR_EL0);
> + u64 reg = __vcpu_sys_reg(vcpu, PMUSERENR_EL0);
> bool enabled = (reg & flags) || vcpu_mode_priv(vcpu);
>
> if (!enabled)
> @@ -535,14 +536,14 @@ static bool access_pmcr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
>
> if (p->is_write) {
> /* Only update writeable bits of PMCR */
> - val = vcpu_sys_reg(vcpu, PMCR_EL0);
> + val = __vcpu_sys_reg(vcpu, PMCR_EL0);
> val &= ~ARMV8_PMU_PMCR_MASK;
> val |= p->regval & ARMV8_PMU_PMCR_MASK;
> - vcpu_sys_reg(vcpu, PMCR_EL0) = val;
> + __vcpu_sys_reg(vcpu, PMCR_EL0) = val;
> kvm_pmu_handle_pmcr(vcpu, val);
> } else {
> /* PMCR.P & PMCR.C are RAZ */
> - val = vcpu_sys_reg(vcpu, PMCR_EL0)
> + val = __vcpu_sys_reg(vcpu, PMCR_EL0)
> & ~(ARMV8_PMU_PMCR_P | ARMV8_PMU_PMCR_C);
> p->regval = val;
> }
> @@ -560,10 +561,10 @@ static bool access_pmselr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> return false;
>
> if (p->is_write)
> - vcpu_sys_reg(vcpu, PMSELR_EL0) = p->regval;
> + __vcpu_sys_reg(vcpu, PMSELR_EL0) = p->regval;
> else
> /* return PMSELR.SEL field */
> - p->regval = vcpu_sys_reg(vcpu, PMSELR_EL0)
> + p->regval = __vcpu_sys_reg(vcpu, PMSELR_EL0)
> & ARMV8_PMU_COUNTER_MASK;
>
> return true;
> @@ -596,7 +597,7 @@ static bool pmu_counter_idx_valid(struct kvm_vcpu *vcpu, u64 idx)
> {
> u64 pmcr, val;
>
> - pmcr = vcpu_sys_reg(vcpu, PMCR_EL0);
> + pmcr = __vcpu_sys_reg(vcpu, PMCR_EL0);
> val = (pmcr >> ARMV8_PMU_PMCR_N_SHIFT) & ARMV8_PMU_PMCR_N_MASK;
> if (idx >= val && idx != ARMV8_PMU_CYCLE_IDX) {
> kvm_inject_undefined(vcpu);
> @@ -621,7 +622,7 @@ static bool access_pmu_evcntr(struct kvm_vcpu *vcpu,
> if (pmu_access_event_counter_el0_disabled(vcpu))
> return false;
>
> - idx = vcpu_sys_reg(vcpu, PMSELR_EL0)
> + idx = __vcpu_sys_reg(vcpu, PMSELR_EL0)
> & ARMV8_PMU_COUNTER_MASK;
> } else if (r->Op2 == 0) {
> /* PMCCNTR_EL0 */
> @@ -676,7 +677,7 @@ static bool access_pmu_evtyper(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
>
> if (r->CRn == 9 && r->CRm == 13 && r->Op2 == 1) {
> /* PMXEVTYPER_EL0 */
> - idx = vcpu_sys_reg(vcpu, PMSELR_EL0) & ARMV8_PMU_COUNTER_MASK;
> + idx = __vcpu_sys_reg(vcpu, PMSELR_EL0) & ARMV8_PMU_COUNTER_MASK;
> reg = PMEVTYPER0_EL0 + idx;
> } else if (r->CRn == 14 && (r->CRm & 12) == 12) {
> idx = ((r->CRm & 3) << 3) | (r->Op2 & 7);
> @@ -694,9 +695,9 @@ static bool access_pmu_evtyper(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
>
> if (p->is_write) {
> kvm_pmu_set_counter_event_type(vcpu, p->regval, idx);
> - vcpu_sys_reg(vcpu, reg) = p->regval & ARMV8_PMU_EVTYPE_MASK;
> + __vcpu_sys_reg(vcpu, reg) = p->regval & ARMV8_PMU_EVTYPE_MASK;
> } else {
> - p->regval = vcpu_sys_reg(vcpu, reg) & ARMV8_PMU_EVTYPE_MASK;
> + p->regval = __vcpu_sys_reg(vcpu, reg) & ARMV8_PMU_EVTYPE_MASK;
> }
>
> return true;
> @@ -718,15 +719,15 @@ static bool access_pmcnten(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> val = p->regval & mask;
> if (r->Op2 & 0x1) {
> /* accessing PMCNTENSET_EL0 */
> - vcpu_sys_reg(vcpu, PMCNTENSET_EL0) |= val;
> + __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) |= val;
> kvm_pmu_enable_counter(vcpu, val);
> } else {
> /* accessing PMCNTENCLR_EL0 */
> - vcpu_sys_reg(vcpu, PMCNTENSET_EL0) &= ~val;
> + __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) &= ~val;
> kvm_pmu_disable_counter(vcpu, val);
> }
> } else {
> - p->regval = vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask;
> + p->regval = __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask;
> }
>
> return true;
> @@ -750,12 +751,12 @@ static bool access_pminten(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
>
> if (r->Op2 & 0x1)
> /* accessing PMINTENSET_EL1 */
> - vcpu_sys_reg(vcpu, PMINTENSET_EL1) |= val;
> + __vcpu_sys_reg(vcpu, PMINTENSET_EL1) |= val;
> else
> /* accessing PMINTENCLR_EL1 */
> - vcpu_sys_reg(vcpu, PMINTENSET_EL1) &= ~val;
> + __vcpu_sys_reg(vcpu, PMINTENSET_EL1) &= ~val;
> } else {
> - p->regval = vcpu_sys_reg(vcpu, PMINTENSET_EL1) & mask;
> + p->regval = __vcpu_sys_reg(vcpu, PMINTENSET_EL1) & mask;
> }
>
> return true;
> @@ -775,12 +776,12 @@ static bool access_pmovs(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> if (p->is_write) {
> if (r->CRm & 0x2)
> /* accessing PMOVSSET_EL0 */
> - vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= (p->regval & mask);
> + __vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= (p->regval & mask);
> else
> /* accessing PMOVSCLR_EL0 */
> - vcpu_sys_reg(vcpu, PMOVSSET_EL0) &= ~(p->regval & mask);
> + __vcpu_sys_reg(vcpu, PMOVSSET_EL0) &= ~(p->regval & mask);
> } else {
> - p->regval = vcpu_sys_reg(vcpu, PMOVSSET_EL0) & mask;
> + p->regval = __vcpu_sys_reg(vcpu, PMOVSSET_EL0) & mask;
> }
>
> return true;
> @@ -817,10 +818,10 @@ static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> return false;
> }
>
> - vcpu_sys_reg(vcpu, PMUSERENR_EL0) = p->regval
> - & ARMV8_PMU_USERENR_MASK;
> - } else {
> - p->regval = vcpu_sys_reg(vcpu, PMUSERENR_EL0)
> + __vcpu_sys_reg(vcpu, PMUSERENR_EL0) =
> + p->regval & ARMV8_PMU_USERENR_MASK;
> + } else {
> + p->regval = __vcpu_sys_reg(vcpu, PMUSERENR_EL0)
> & ARMV8_PMU_USERENR_MASK;
> }
>
> @@ -2204,7 +2205,7 @@ int kvm_arm_sys_reg_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg
> if (r->get_user)
> return (r->get_user)(vcpu, r, reg, uaddr);
>
> - return reg_to_user(uaddr, &vcpu_sys_reg(vcpu, r->reg), reg->id);
> + return reg_to_user(uaddr, &__vcpu_sys_reg(vcpu, r->reg), reg->id);
> }
>
> int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
> @@ -2225,7 +2226,7 @@ int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg
> if (r->set_user)
> return (r->set_user)(vcpu, r, reg, uaddr);
>
> - return reg_from_user(&vcpu_sys_reg(vcpu, r->reg), uaddr, reg->id);
> + return reg_from_user(&__vcpu_sys_reg(vcpu, r->reg), uaddr, reg->id);
> }
>
> static unsigned int num_demux_regs(void)
> @@ -2431,6 +2432,6 @@ void kvm_reset_sys_regs(struct kvm_vcpu *vcpu)
> reset_sys_reg_descs(vcpu, table, num);
>
> for (num = 1; num < NR_SYS_REGS; num++)
> - if (vcpu_sys_reg(vcpu, num) == 0x4242424242424242)
> - panic("Didn't reset vcpu_sys_reg(%zi)", num);
> + if (__vcpu_sys_reg(vcpu, num) == 0x4242424242424242)
> + panic("Didn't reset __vcpu_sys_reg(%zi)", num);
The only direct access to vcpu->arch.ctxt.sys_regs outside a save-restore
file is in this function, a bit above this hunk. Copied below
/* Catch someone adding a register without putting in reset entry. */
memset(&vcpu->arch.ctxt.sys_regs, 0x42, sizeof(vcpu->arch.ctxt.sys_regs));
Maybe we should change it to
for (num = 0; num < NR_SYS_REGS; num++)
__vcpu_sys_reg(vcpu, num) == 0x4242424242424242;
just to pedantically use the API?
> }
> diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h
> index 060f5348ef25..cd710f8b63e0 100644
> --- a/arch/arm64/kvm/sys_regs.h
> +++ b/arch/arm64/kvm/sys_regs.h
> @@ -89,14 +89,14 @@ static inline void reset_unknown(struct kvm_vcpu *vcpu,
> {
> BUG_ON(!r->reg);
> BUG_ON(r->reg >= NR_SYS_REGS);
> - vcpu_sys_reg(vcpu, r->reg) = 0x1de7ec7edbadc0deULL;
> + __vcpu_sys_reg(vcpu, r->reg) = 0x1de7ec7edbadc0deULL;
> }
>
> static inline void reset_val(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> {
> BUG_ON(!r->reg);
> BUG_ON(r->reg >= NR_SYS_REGS);
> - vcpu_sys_reg(vcpu, r->reg) = r->val;
> + __vcpu_sys_reg(vcpu, r->reg) = r->val;
> }
>
> static inline int cmp_sys_reg(const struct sys_reg_desc *i1,
> diff --git a/arch/arm64/kvm/sys_regs_generic_v8.c b/arch/arm64/kvm/sys_regs_generic_v8.c
> index 969ade1d333d..ddb8497d18d6 100644
> --- a/arch/arm64/kvm/sys_regs_generic_v8.c
> +++ b/arch/arm64/kvm/sys_regs_generic_v8.c
> @@ -38,13 +38,13 @@ static bool access_actlr(struct kvm_vcpu *vcpu,
> if (p->is_write)
> return ignore_write(vcpu, p);
>
> - p->regval = vcpu_sys_reg(vcpu, ACTLR_EL1);
> + p->regval = vcpu_read_sys_reg(vcpu, ACTLR_EL1);
> return true;
> }
>
> static void reset_actlr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> {
> - vcpu_sys_reg(vcpu, ACTLR_EL1) = read_sysreg(actlr_el1);
> + __vcpu_sys_reg(vcpu, ACTLR_EL1) = read_sysreg(actlr_el1);
> }
>
> /*
> diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c
> index 8a9c42366db7..29cb4a1ff26b 100644
> --- a/virt/kvm/arm/pmu.c
> +++ b/virt/kvm/arm/pmu.c
> @@ -37,7 +37,7 @@ u64 kvm_pmu_get_counter_value(struct kvm_vcpu *vcpu, u64 select_idx)
>
> reg = (select_idx == ARMV8_PMU_CYCLE_IDX)
> ? PMCCNTR_EL0 : PMEVCNTR0_EL0 + select_idx;
> - counter = vcpu_sys_reg(vcpu, reg);
> + counter = __vcpu_sys_reg(vcpu, reg);
>
> /* The real counter value is equal to the value of counter register plus
> * the value perf event counts.
> @@ -61,7 +61,8 @@ void kvm_pmu_set_counter_value(struct kvm_vcpu *vcpu, u64 select_idx, u64 val)
>
> reg = (select_idx == ARMV8_PMU_CYCLE_IDX)
> ? PMCCNTR_EL0 : PMEVCNTR0_EL0 + select_idx;
> - vcpu_sys_reg(vcpu, reg) += (s64)val - kvm_pmu_get_counter_value(vcpu, select_idx);
> + __vcpu_sys_reg(vcpu, reg) +=
> + (s64)val - kvm_pmu_get_counter_value(vcpu, select_idx);
> }
>
> /**
> @@ -78,7 +79,7 @@ static void kvm_pmu_stop_counter(struct kvm_vcpu *vcpu, struct kvm_pmc *pmc)
> counter = kvm_pmu_get_counter_value(vcpu, pmc->idx);
> reg = (pmc->idx == ARMV8_PMU_CYCLE_IDX)
> ? PMCCNTR_EL0 : PMEVCNTR0_EL0 + pmc->idx;
> - vcpu_sys_reg(vcpu, reg) = counter;
> + __vcpu_sys_reg(vcpu, reg) = counter;
> perf_event_disable(pmc->perf_event);
> perf_event_release_kernel(pmc->perf_event);
> pmc->perf_event = NULL;
> @@ -125,7 +126,7 @@ void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu)
>
> u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu)
> {
> - u64 val = vcpu_sys_reg(vcpu, PMCR_EL0) >> ARMV8_PMU_PMCR_N_SHIFT;
> + u64 val = __vcpu_sys_reg(vcpu, PMCR_EL0) >> ARMV8_PMU_PMCR_N_SHIFT;
>
> val &= ARMV8_PMU_PMCR_N_MASK;
> if (val == 0)
> @@ -147,7 +148,7 @@ void kvm_pmu_enable_counter(struct kvm_vcpu *vcpu, u64 val)
> struct kvm_pmu *pmu = &vcpu->arch.pmu;
> struct kvm_pmc *pmc;
>
> - if (!(vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E) || !val)
> + if (!(__vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E) || !val)
> return;
>
> for (i = 0; i < ARMV8_PMU_MAX_COUNTERS; i++) {
> @@ -193,10 +194,10 @@ static u64 kvm_pmu_overflow_status(struct kvm_vcpu *vcpu)
> {
> u64 reg = 0;
>
> - if ((vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E)) {
> - reg = vcpu_sys_reg(vcpu, PMOVSSET_EL0);
> - reg &= vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
> - reg &= vcpu_sys_reg(vcpu, PMINTENSET_EL1);
> + if ((__vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E)) {
> + reg = __vcpu_sys_reg(vcpu, PMOVSSET_EL0);
> + reg &= __vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
> + reg &= __vcpu_sys_reg(vcpu, PMINTENSET_EL1);
> reg &= kvm_pmu_valid_counter_mask(vcpu);
> }
>
> @@ -295,7 +296,7 @@ static void kvm_pmu_perf_overflow(struct perf_event *perf_event,
> struct kvm_vcpu *vcpu = kvm_pmc_to_vcpu(pmc);
> int idx = pmc->idx;
>
> - vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= BIT(idx);
> + __vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= BIT(idx);
>
> if (kvm_pmu_overflow_status(vcpu)) {
> kvm_make_request(KVM_REQ_IRQ_PENDING, vcpu);
> @@ -316,19 +317,19 @@ void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val)
> if (val == 0)
> return;
>
> - enable = vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
> + enable = __vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
> for (i = 0; i < ARMV8_PMU_CYCLE_IDX; i++) {
> if (!(val & BIT(i)))
> continue;
> - type = vcpu_sys_reg(vcpu, PMEVTYPER0_EL0 + i)
> + type = __vcpu_sys_reg(vcpu, PMEVTYPER0_EL0 + i)
> & ARMV8_PMU_EVTYPE_EVENT;
> if ((type == ARMV8_PMUV3_PERFCTR_SW_INCR)
> && (enable & BIT(i))) {
> - reg = vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) + 1;
> + reg = __vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) + 1;
> reg = lower_32_bits(reg);
> - vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) = reg;
> + __vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) = reg;
> if (!reg)
> - vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= BIT(i);
> + __vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= BIT(i);
> }
> }
> }
> @@ -348,7 +349,7 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val)
> mask = kvm_pmu_valid_counter_mask(vcpu);
> if (val & ARMV8_PMU_PMCR_E) {
> kvm_pmu_enable_counter(vcpu,
> - vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask);
> + __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask);
> } else {
> kvm_pmu_disable_counter(vcpu, mask);
> }
> @@ -369,8 +370,8 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val)
>
> static bool kvm_pmu_counter_is_enabled(struct kvm_vcpu *vcpu, u64 select_idx)
> {
> - return (vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E) &&
> - (vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & BIT(select_idx));
> + return (__vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E) &&
> + (__vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & BIT(select_idx));
> }
>
> /**
> --
> 2.14.2
>
All the broken lines to honor the 80-char limit induces some sadness,
but at least people reading the code on their VT100's will be happy.
Reviewed-by: Andrew Jones <drjones@redhat.com>
WARNING: multiple messages have this Message-ID (diff)
From: drjones@redhat.com (Andrew Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 24/40] KVM: arm64: Rewrite system register accessors to read/write functions
Date: Thu, 22 Feb 2018 14:34:21 +0100 [thread overview]
Message-ID: <20180222133421.tyingk5vzdgzoyh7@kamzik.brq.redhat.com> (raw)
In-Reply-To: <20180215210332.8648-25-christoffer.dall@linaro.org>
On Thu, Feb 15, 2018 at 10:03:16PM +0100, Christoffer Dall wrote:
> From: Christoffer Dall <cdall@cs.columbia.edu>
>
> Currently we access the system registers array via the vcpu_sys_reg()
> macro. However, we are about to change the behavior to some times
> modify the register file directly, so let's change this to two
> primitives:
>
> * Accessor macros vcpu_write_sys_reg() and vcpu_read_sys_reg()
> * Direct array access macro __vcpu_sys_reg()
>
> The first primitive should be used in places where the code needs to
> access the currently loaded VCPU's state as observed by the guest. For
> example, when trapping on cache related registers, a write to a system
> register should go directly to the VCPU version of the register.
>
> The second primitive can be used in places where the VCPU is known to
> never be running (for example userspace access) or for registers which
> are never context switched (for example all the PMU system registers).
>
> This rewrites all users of vcpu_sys_regs to one of the two primitives
> above.
>
> No functional change.
>
> Signed-off-by: Christoffer Dall <cdall@cs.columbia.edu>
> ---
>
> Notes:
> Changes since v2:
> - New patch (deferred register handling has been reworked)
>
> arch/arm64/include/asm/kvm_emulate.h | 13 ++++---
> arch/arm64/include/asm/kvm_host.h | 13 ++++++-
> arch/arm64/include/asm/kvm_mmu.h | 2 +-
> arch/arm64/kvm/debug.c | 27 +++++++++-----
> arch/arm64/kvm/inject_fault.c | 8 ++--
> arch/arm64/kvm/sys_regs.c | 71 ++++++++++++++++++------------------
> arch/arm64/kvm/sys_regs.h | 4 +-
> arch/arm64/kvm/sys_regs_generic_v8.c | 4 +-
> virt/kvm/arm/pmu.c | 37 ++++++++++---------
> 9 files changed, 102 insertions(+), 77 deletions(-)
>
> diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
> index 3cc535591bdf..d313aaae5c38 100644
> --- a/arch/arm64/include/asm/kvm_emulate.h
> +++ b/arch/arm64/include/asm/kvm_emulate.h
> @@ -290,15 +290,18 @@ static inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu)
>
> static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)
> {
> - return vcpu_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;
> + return vcpu_read_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;
> }
>
> static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)
> {
> - if (vcpu_mode_is_32bit(vcpu))
> + if (vcpu_mode_is_32bit(vcpu)) {
> *vcpu_cpsr(vcpu) |= COMPAT_PSR_E_BIT;
> - else
> - vcpu_sys_reg(vcpu, SCTLR_EL1) |= (1 << 25);
> + } else {
> + u64 sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1);
> + sctlr |= (1 << 25);
> + vcpu_write_sys_reg(vcpu, SCTLR_EL1, sctlr);
> + }
> }
>
> static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu)
> @@ -306,7 +309,7 @@ static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu)
> if (vcpu_mode_is_32bit(vcpu))
> return !!(*vcpu_cpsr(vcpu) & COMPAT_PSR_E_BIT);
>
> - return !!(vcpu_sys_reg(vcpu, SCTLR_EL1) & (1 << 25));
> + return !!(vcpu_read_sys_reg(vcpu, SCTLR_EL1) & (1 << 25));
> }
>
> static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu,
> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
> index f2a6f39aec87..68398bf7882f 100644
> --- a/arch/arm64/include/asm/kvm_host.h
> +++ b/arch/arm64/include/asm/kvm_host.h
> @@ -287,7 +287,18 @@ struct kvm_vcpu_arch {
> };
>
> #define vcpu_gp_regs(v) (&(v)->arch.ctxt.gp_regs)
> -#define vcpu_sys_reg(v,r) ((v)->arch.ctxt.sys_regs[(r)])
> +
> +/*
> + * Only use __vcpu_sys_reg if you know you want the memory backed version of a
> + * register, and not the one most recently accessed by a runnning VCPU. For
> + * example, for userpace access or for system registers that are never context
> + * switched, but only emulated.
> + */
> +#define __vcpu_sys_reg(v,r) ((v)->arch.ctxt.sys_regs[(r)])
> +
> +#define vcpu_read_sys_reg(v,r) __vcpu_sys_reg(v,r)
> +#define vcpu_write_sys_reg(v,r,n) do { __vcpu_sys_reg(v,r) = n; } while (0)
> +
> /*
> * CP14 and CP15 live in the same array, as they are backed by the
> * same system registers.
> diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
> index 9679067a1574..95f46e73c4dc 100644
> --- a/arch/arm64/include/asm/kvm_mmu.h
> +++ b/arch/arm64/include/asm/kvm_mmu.h
> @@ -249,7 +249,7 @@ struct kvm;
>
> static inline bool vcpu_has_cache_enabled(struct kvm_vcpu *vcpu)
> {
> - return (vcpu_sys_reg(vcpu, SCTLR_EL1) & 0b101) == 0b101;
> + return (vcpu_read_sys_reg(vcpu, SCTLR_EL1) & 0b101) == 0b101;
> }
>
> static inline void __clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size)
> diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c
> index feedb877cff8..db32d10a56a1 100644
> --- a/arch/arm64/kvm/debug.c
> +++ b/arch/arm64/kvm/debug.c
> @@ -46,7 +46,8 @@ static DEFINE_PER_CPU(u32, mdcr_el2);
> */
> static void save_guest_debug_regs(struct kvm_vcpu *vcpu)
> {
> - vcpu->arch.guest_debug_preserved.mdscr_el1 = vcpu_sys_reg(vcpu, MDSCR_EL1);
> + vcpu->arch.guest_debug_preserved.mdscr_el1 =
> + vcpu_read_sys_reg(vcpu, MDSCR_EL1);
>
> trace_kvm_arm_set_dreg32("Saved MDSCR_EL1",
> vcpu->arch.guest_debug_preserved.mdscr_el1);
> @@ -54,10 +55,11 @@ static void save_guest_debug_regs(struct kvm_vcpu *vcpu)
>
> static void restore_guest_debug_regs(struct kvm_vcpu *vcpu)
> {
> - vcpu_sys_reg(vcpu, MDSCR_EL1) = vcpu->arch.guest_debug_preserved.mdscr_el1;
> + vcpu_write_sys_reg(vcpu, MDSCR_EL1,
> + vcpu->arch.guest_debug_preserved.mdscr_el1);
>
> trace_kvm_arm_set_dreg32("Restored MDSCR_EL1",
> - vcpu_sys_reg(vcpu, MDSCR_EL1));
> + vcpu_read_sys_reg(vcpu, MDSCR_EL1));
> }
>
> /**
> @@ -108,6 +110,7 @@ void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu)
> void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)
> {
> bool trap_debug = !(vcpu->arch.debug_flags & KVM_ARM64_DEBUG_DIRTY);
> + unsigned long mdscr;
>
> trace_kvm_arm_setup_debug(vcpu, vcpu->guest_debug);
>
> @@ -152,9 +155,13 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)
> */
> if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) {
> *vcpu_cpsr(vcpu) |= DBG_SPSR_SS;
> - vcpu_sys_reg(vcpu, MDSCR_EL1) |= DBG_MDSCR_SS;
> + mdscr = vcpu_read_sys_reg(vcpu, MDSCR_EL1);
> + mdscr |= DBG_MDSCR_SS;
> + vcpu_write_sys_reg(vcpu, MDSCR_EL1, mdscr);
> } else {
> - vcpu_sys_reg(vcpu, MDSCR_EL1) &= ~DBG_MDSCR_SS;
> + mdscr = vcpu_read_sys_reg(vcpu, MDSCR_EL1);
> + mdscr &= ~DBG_MDSCR_SS;
> + vcpu_write_sys_reg(vcpu, MDSCR_EL1, mdscr);
> }
>
> trace_kvm_arm_set_dreg32("SPSR_EL2", *vcpu_cpsr(vcpu));
> @@ -170,7 +177,9 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)
> */
> if (vcpu->guest_debug & KVM_GUESTDBG_USE_HW) {
> /* Enable breakpoints/watchpoints */
> - vcpu_sys_reg(vcpu, MDSCR_EL1) |= DBG_MDSCR_MDE;
> + mdscr = vcpu_read_sys_reg(vcpu, MDSCR_EL1);
> + mdscr |= DBG_MDSCR_MDE;
> + vcpu_write_sys_reg(vcpu, MDSCR_EL1, mdscr);
>
> vcpu->arch.debug_ptr = &vcpu->arch.external_debug_state;
> vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY;
> @@ -194,12 +203,12 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)
> vcpu->arch.mdcr_el2 |= MDCR_EL2_TDA;
>
> /* If KDE or MDE are set, perform a full save/restore cycle. */
> - if ((vcpu_sys_reg(vcpu, MDSCR_EL1) & DBG_MDSCR_KDE) ||
> - (vcpu_sys_reg(vcpu, MDSCR_EL1) & DBG_MDSCR_MDE))
> + if (vcpu_read_sys_reg(vcpu, MDSCR_EL1) & (DBG_MDSCR_KDE | DBG_MDSCR_MDE))
> vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY;
>
> trace_kvm_arm_set_dreg32("MDCR_EL2", vcpu->arch.mdcr_el2);
> - trace_kvm_arm_set_dreg32("MDSCR_EL1", vcpu_sys_reg(vcpu, MDSCR_EL1));
> + trace_kvm_arm_set_dreg32("MDSCR_EL1",
> + vcpu_read_sys_reg(vcpu, MDSCR_EL1));
> }
>
> void kvm_arm_clear_debug(struct kvm_vcpu *vcpu)
> diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
> index 30a3f58cdb7b..e08db2f2dd75 100644
> --- a/arch/arm64/kvm/inject_fault.c
> +++ b/arch/arm64/kvm/inject_fault.c
> @@ -58,7 +58,7 @@ static u64 get_except_vector(struct kvm_vcpu *vcpu, enum exception_type type)
> exc_offset = LOWER_EL_AArch32_VECTOR;
> }
>
> - return vcpu_sys_reg(vcpu, VBAR_EL1) + exc_offset + type;
> + return vcpu_read_sys_reg(vcpu, VBAR_EL1) + exc_offset + type;
> }
>
> static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr)
> @@ -73,7 +73,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
> *vcpu_cpsr(vcpu) = PSTATE_FAULT_BITS_64;
> *vcpu_spsr(vcpu) = cpsr;
>
> - vcpu_sys_reg(vcpu, FAR_EL1) = addr;
> + vcpu_write_sys_reg(vcpu, FAR_EL1, addr);
>
> /*
> * Build an {i,d}abort, depending on the level and the
> @@ -94,7 +94,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
> if (!is_iabt)
> esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT;
>
> - vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT;
> + vcpu_write_sys_reg(vcpu, ESR_EL1, esr | ESR_ELx_FSC_EXTABT);
> }
>
> static void inject_undef64(struct kvm_vcpu *vcpu)
> @@ -115,7 +115,7 @@ static void inject_undef64(struct kvm_vcpu *vcpu)
> if (kvm_vcpu_trap_il_is32bit(vcpu))
> esr |= ESR_ELx_IL;
>
> - vcpu_sys_reg(vcpu, ESR_EL1) = esr;
> + vcpu_write_sys_reg(vcpu, ESR_EL1, esr);
> }
>
> /**
> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> index b48af790615e..a05d2c01c786 100644
> --- a/arch/arm64/kvm/sys_regs.c
> +++ b/arch/arm64/kvm/sys_regs.c
> @@ -133,14 +133,14 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu,
> if (!p->is_aarch32 || !p->is_32bit) {
> val = p->regval;
> } else {
> - val = vcpu_sys_reg(vcpu, reg);
> + val = vcpu_read_sys_reg(vcpu, reg);
> if (r->reg % 2)
> val = (p->regval << 32) | (u64)lower_32_bits(val);
> else
> val = ((u64)upper_32_bits(val) << 32) |
> lower_32_bits(p->regval);
> }
> - vcpu_sys_reg(vcpu, reg) = val;
> + vcpu_write_sys_reg(vcpu, reg, val);
>
> kvm_toggle_cache(vcpu, was_enabled);
> return true;
> @@ -241,10 +241,10 @@ static bool trap_debug_regs(struct kvm_vcpu *vcpu,
> const struct sys_reg_desc *r)
> {
> if (p->is_write) {
> - vcpu_sys_reg(vcpu, r->reg) = p->regval;
> + vcpu_write_sys_reg(vcpu, r->reg, p->regval);
> vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY;
> } else {
> - p->regval = vcpu_sys_reg(vcpu, r->reg);
> + p->regval = vcpu_read_sys_reg(vcpu, r->reg);
> }
>
> trace_trap_reg(__func__, r->reg, p->is_write, p->regval);
> @@ -457,7 +457,8 @@ static void reset_wcr(struct kvm_vcpu *vcpu,
>
> static void reset_amair_el1(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> {
> - vcpu_sys_reg(vcpu, AMAIR_EL1) = read_sysreg(amair_el1);
> + u64 amair = read_sysreg(amair_el1);
> + vcpu_write_sys_reg(vcpu, AMAIR_EL1, amair);
> }
>
> static void reset_mpidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> @@ -474,7 +475,7 @@ static void reset_mpidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> mpidr = (vcpu->vcpu_id & 0x0f) << MPIDR_LEVEL_SHIFT(0);
> mpidr |= ((vcpu->vcpu_id >> 4) & 0xff) << MPIDR_LEVEL_SHIFT(1);
> mpidr |= ((vcpu->vcpu_id >> 12) & 0xff) << MPIDR_LEVEL_SHIFT(2);
> - vcpu_sys_reg(vcpu, MPIDR_EL1) = (1ULL << 31) | mpidr;
> + vcpu_write_sys_reg(vcpu, MPIDR_EL1, (1ULL << 31) | mpidr);
> }
>
> static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> @@ -488,12 +489,12 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> */
> val = ((pmcr & ~ARMV8_PMU_PMCR_MASK)
> | (ARMV8_PMU_PMCR_MASK & 0xdecafbad)) & (~ARMV8_PMU_PMCR_E);
> - vcpu_sys_reg(vcpu, PMCR_EL0) = val;
> + __vcpu_sys_reg(vcpu, PMCR_EL0) = val;
> }
>
> static bool check_pmu_access_disabled(struct kvm_vcpu *vcpu, u64 flags)
> {
> - u64 reg = vcpu_sys_reg(vcpu, PMUSERENR_EL0);
> + u64 reg = __vcpu_sys_reg(vcpu, PMUSERENR_EL0);
> bool enabled = (reg & flags) || vcpu_mode_priv(vcpu);
>
> if (!enabled)
> @@ -535,14 +536,14 @@ static bool access_pmcr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
>
> if (p->is_write) {
> /* Only update writeable bits of PMCR */
> - val = vcpu_sys_reg(vcpu, PMCR_EL0);
> + val = __vcpu_sys_reg(vcpu, PMCR_EL0);
> val &= ~ARMV8_PMU_PMCR_MASK;
> val |= p->regval & ARMV8_PMU_PMCR_MASK;
> - vcpu_sys_reg(vcpu, PMCR_EL0) = val;
> + __vcpu_sys_reg(vcpu, PMCR_EL0) = val;
> kvm_pmu_handle_pmcr(vcpu, val);
> } else {
> /* PMCR.P & PMCR.C are RAZ */
> - val = vcpu_sys_reg(vcpu, PMCR_EL0)
> + val = __vcpu_sys_reg(vcpu, PMCR_EL0)
> & ~(ARMV8_PMU_PMCR_P | ARMV8_PMU_PMCR_C);
> p->regval = val;
> }
> @@ -560,10 +561,10 @@ static bool access_pmselr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> return false;
>
> if (p->is_write)
> - vcpu_sys_reg(vcpu, PMSELR_EL0) = p->regval;
> + __vcpu_sys_reg(vcpu, PMSELR_EL0) = p->regval;
> else
> /* return PMSELR.SEL field */
> - p->regval = vcpu_sys_reg(vcpu, PMSELR_EL0)
> + p->regval = __vcpu_sys_reg(vcpu, PMSELR_EL0)
> & ARMV8_PMU_COUNTER_MASK;
>
> return true;
> @@ -596,7 +597,7 @@ static bool pmu_counter_idx_valid(struct kvm_vcpu *vcpu, u64 idx)
> {
> u64 pmcr, val;
>
> - pmcr = vcpu_sys_reg(vcpu, PMCR_EL0);
> + pmcr = __vcpu_sys_reg(vcpu, PMCR_EL0);
> val = (pmcr >> ARMV8_PMU_PMCR_N_SHIFT) & ARMV8_PMU_PMCR_N_MASK;
> if (idx >= val && idx != ARMV8_PMU_CYCLE_IDX) {
> kvm_inject_undefined(vcpu);
> @@ -621,7 +622,7 @@ static bool access_pmu_evcntr(struct kvm_vcpu *vcpu,
> if (pmu_access_event_counter_el0_disabled(vcpu))
> return false;
>
> - idx = vcpu_sys_reg(vcpu, PMSELR_EL0)
> + idx = __vcpu_sys_reg(vcpu, PMSELR_EL0)
> & ARMV8_PMU_COUNTER_MASK;
> } else if (r->Op2 == 0) {
> /* PMCCNTR_EL0 */
> @@ -676,7 +677,7 @@ static bool access_pmu_evtyper(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
>
> if (r->CRn == 9 && r->CRm == 13 && r->Op2 == 1) {
> /* PMXEVTYPER_EL0 */
> - idx = vcpu_sys_reg(vcpu, PMSELR_EL0) & ARMV8_PMU_COUNTER_MASK;
> + idx = __vcpu_sys_reg(vcpu, PMSELR_EL0) & ARMV8_PMU_COUNTER_MASK;
> reg = PMEVTYPER0_EL0 + idx;
> } else if (r->CRn == 14 && (r->CRm & 12) == 12) {
> idx = ((r->CRm & 3) << 3) | (r->Op2 & 7);
> @@ -694,9 +695,9 @@ static bool access_pmu_evtyper(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
>
> if (p->is_write) {
> kvm_pmu_set_counter_event_type(vcpu, p->regval, idx);
> - vcpu_sys_reg(vcpu, reg) = p->regval & ARMV8_PMU_EVTYPE_MASK;
> + __vcpu_sys_reg(vcpu, reg) = p->regval & ARMV8_PMU_EVTYPE_MASK;
> } else {
> - p->regval = vcpu_sys_reg(vcpu, reg) & ARMV8_PMU_EVTYPE_MASK;
> + p->regval = __vcpu_sys_reg(vcpu, reg) & ARMV8_PMU_EVTYPE_MASK;
> }
>
> return true;
> @@ -718,15 +719,15 @@ static bool access_pmcnten(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> val = p->regval & mask;
> if (r->Op2 & 0x1) {
> /* accessing PMCNTENSET_EL0 */
> - vcpu_sys_reg(vcpu, PMCNTENSET_EL0) |= val;
> + __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) |= val;
> kvm_pmu_enable_counter(vcpu, val);
> } else {
> /* accessing PMCNTENCLR_EL0 */
> - vcpu_sys_reg(vcpu, PMCNTENSET_EL0) &= ~val;
> + __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) &= ~val;
> kvm_pmu_disable_counter(vcpu, val);
> }
> } else {
> - p->regval = vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask;
> + p->regval = __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask;
> }
>
> return true;
> @@ -750,12 +751,12 @@ static bool access_pminten(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
>
> if (r->Op2 & 0x1)
> /* accessing PMINTENSET_EL1 */
> - vcpu_sys_reg(vcpu, PMINTENSET_EL1) |= val;
> + __vcpu_sys_reg(vcpu, PMINTENSET_EL1) |= val;
> else
> /* accessing PMINTENCLR_EL1 */
> - vcpu_sys_reg(vcpu, PMINTENSET_EL1) &= ~val;
> + __vcpu_sys_reg(vcpu, PMINTENSET_EL1) &= ~val;
> } else {
> - p->regval = vcpu_sys_reg(vcpu, PMINTENSET_EL1) & mask;
> + p->regval = __vcpu_sys_reg(vcpu, PMINTENSET_EL1) & mask;
> }
>
> return true;
> @@ -775,12 +776,12 @@ static bool access_pmovs(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> if (p->is_write) {
> if (r->CRm & 0x2)
> /* accessing PMOVSSET_EL0 */
> - vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= (p->regval & mask);
> + __vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= (p->regval & mask);
> else
> /* accessing PMOVSCLR_EL0 */
> - vcpu_sys_reg(vcpu, PMOVSSET_EL0) &= ~(p->regval & mask);
> + __vcpu_sys_reg(vcpu, PMOVSSET_EL0) &= ~(p->regval & mask);
> } else {
> - p->regval = vcpu_sys_reg(vcpu, PMOVSSET_EL0) & mask;
> + p->regval = __vcpu_sys_reg(vcpu, PMOVSSET_EL0) & mask;
> }
>
> return true;
> @@ -817,10 +818,10 @@ static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> return false;
> }
>
> - vcpu_sys_reg(vcpu, PMUSERENR_EL0) = p->regval
> - & ARMV8_PMU_USERENR_MASK;
> - } else {
> - p->regval = vcpu_sys_reg(vcpu, PMUSERENR_EL0)
> + __vcpu_sys_reg(vcpu, PMUSERENR_EL0) =
> + p->regval & ARMV8_PMU_USERENR_MASK;
> + } else {
> + p->regval = __vcpu_sys_reg(vcpu, PMUSERENR_EL0)
> & ARMV8_PMU_USERENR_MASK;
> }
>
> @@ -2204,7 +2205,7 @@ int kvm_arm_sys_reg_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg
> if (r->get_user)
> return (r->get_user)(vcpu, r, reg, uaddr);
>
> - return reg_to_user(uaddr, &vcpu_sys_reg(vcpu, r->reg), reg->id);
> + return reg_to_user(uaddr, &__vcpu_sys_reg(vcpu, r->reg), reg->id);
> }
>
> int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
> @@ -2225,7 +2226,7 @@ int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg
> if (r->set_user)
> return (r->set_user)(vcpu, r, reg, uaddr);
>
> - return reg_from_user(&vcpu_sys_reg(vcpu, r->reg), uaddr, reg->id);
> + return reg_from_user(&__vcpu_sys_reg(vcpu, r->reg), uaddr, reg->id);
> }
>
> static unsigned int num_demux_regs(void)
> @@ -2431,6 +2432,6 @@ void kvm_reset_sys_regs(struct kvm_vcpu *vcpu)
> reset_sys_reg_descs(vcpu, table, num);
>
> for (num = 1; num < NR_SYS_REGS; num++)
> - if (vcpu_sys_reg(vcpu, num) == 0x4242424242424242)
> - panic("Didn't reset vcpu_sys_reg(%zi)", num);
> + if (__vcpu_sys_reg(vcpu, num) == 0x4242424242424242)
> + panic("Didn't reset __vcpu_sys_reg(%zi)", num);
The only direct access to vcpu->arch.ctxt.sys_regs outside a save-restore
file is in this function, a bit above this hunk. Copied below
/* Catch someone adding a register without putting in reset entry. */
memset(&vcpu->arch.ctxt.sys_regs, 0x42, sizeof(vcpu->arch.ctxt.sys_regs));
Maybe we should change it to
for (num = 0; num < NR_SYS_REGS; num++)
__vcpu_sys_reg(vcpu, num) == 0x4242424242424242;
just to pedantically use the API?
> }
> diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h
> index 060f5348ef25..cd710f8b63e0 100644
> --- a/arch/arm64/kvm/sys_regs.h
> +++ b/arch/arm64/kvm/sys_regs.h
> @@ -89,14 +89,14 @@ static inline void reset_unknown(struct kvm_vcpu *vcpu,
> {
> BUG_ON(!r->reg);
> BUG_ON(r->reg >= NR_SYS_REGS);
> - vcpu_sys_reg(vcpu, r->reg) = 0x1de7ec7edbadc0deULL;
> + __vcpu_sys_reg(vcpu, r->reg) = 0x1de7ec7edbadc0deULL;
> }
>
> static inline void reset_val(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> {
> BUG_ON(!r->reg);
> BUG_ON(r->reg >= NR_SYS_REGS);
> - vcpu_sys_reg(vcpu, r->reg) = r->val;
> + __vcpu_sys_reg(vcpu, r->reg) = r->val;
> }
>
> static inline int cmp_sys_reg(const struct sys_reg_desc *i1,
> diff --git a/arch/arm64/kvm/sys_regs_generic_v8.c b/arch/arm64/kvm/sys_regs_generic_v8.c
> index 969ade1d333d..ddb8497d18d6 100644
> --- a/arch/arm64/kvm/sys_regs_generic_v8.c
> +++ b/arch/arm64/kvm/sys_regs_generic_v8.c
> @@ -38,13 +38,13 @@ static bool access_actlr(struct kvm_vcpu *vcpu,
> if (p->is_write)
> return ignore_write(vcpu, p);
>
> - p->regval = vcpu_sys_reg(vcpu, ACTLR_EL1);
> + p->regval = vcpu_read_sys_reg(vcpu, ACTLR_EL1);
> return true;
> }
>
> static void reset_actlr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> {
> - vcpu_sys_reg(vcpu, ACTLR_EL1) = read_sysreg(actlr_el1);
> + __vcpu_sys_reg(vcpu, ACTLR_EL1) = read_sysreg(actlr_el1);
> }
>
> /*
> diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c
> index 8a9c42366db7..29cb4a1ff26b 100644
> --- a/virt/kvm/arm/pmu.c
> +++ b/virt/kvm/arm/pmu.c
> @@ -37,7 +37,7 @@ u64 kvm_pmu_get_counter_value(struct kvm_vcpu *vcpu, u64 select_idx)
>
> reg = (select_idx == ARMV8_PMU_CYCLE_IDX)
> ? PMCCNTR_EL0 : PMEVCNTR0_EL0 + select_idx;
> - counter = vcpu_sys_reg(vcpu, reg);
> + counter = __vcpu_sys_reg(vcpu, reg);
>
> /* The real counter value is equal to the value of counter register plus
> * the value perf event counts.
> @@ -61,7 +61,8 @@ void kvm_pmu_set_counter_value(struct kvm_vcpu *vcpu, u64 select_idx, u64 val)
>
> reg = (select_idx == ARMV8_PMU_CYCLE_IDX)
> ? PMCCNTR_EL0 : PMEVCNTR0_EL0 + select_idx;
> - vcpu_sys_reg(vcpu, reg) += (s64)val - kvm_pmu_get_counter_value(vcpu, select_idx);
> + __vcpu_sys_reg(vcpu, reg) +=
> + (s64)val - kvm_pmu_get_counter_value(vcpu, select_idx);
> }
>
> /**
> @@ -78,7 +79,7 @@ static void kvm_pmu_stop_counter(struct kvm_vcpu *vcpu, struct kvm_pmc *pmc)
> counter = kvm_pmu_get_counter_value(vcpu, pmc->idx);
> reg = (pmc->idx == ARMV8_PMU_CYCLE_IDX)
> ? PMCCNTR_EL0 : PMEVCNTR0_EL0 + pmc->idx;
> - vcpu_sys_reg(vcpu, reg) = counter;
> + __vcpu_sys_reg(vcpu, reg) = counter;
> perf_event_disable(pmc->perf_event);
> perf_event_release_kernel(pmc->perf_event);
> pmc->perf_event = NULL;
> @@ -125,7 +126,7 @@ void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu)
>
> u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu)
> {
> - u64 val = vcpu_sys_reg(vcpu, PMCR_EL0) >> ARMV8_PMU_PMCR_N_SHIFT;
> + u64 val = __vcpu_sys_reg(vcpu, PMCR_EL0) >> ARMV8_PMU_PMCR_N_SHIFT;
>
> val &= ARMV8_PMU_PMCR_N_MASK;
> if (val == 0)
> @@ -147,7 +148,7 @@ void kvm_pmu_enable_counter(struct kvm_vcpu *vcpu, u64 val)
> struct kvm_pmu *pmu = &vcpu->arch.pmu;
> struct kvm_pmc *pmc;
>
> - if (!(vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E) || !val)
> + if (!(__vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E) || !val)
> return;
>
> for (i = 0; i < ARMV8_PMU_MAX_COUNTERS; i++) {
> @@ -193,10 +194,10 @@ static u64 kvm_pmu_overflow_status(struct kvm_vcpu *vcpu)
> {
> u64 reg = 0;
>
> - if ((vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E)) {
> - reg = vcpu_sys_reg(vcpu, PMOVSSET_EL0);
> - reg &= vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
> - reg &= vcpu_sys_reg(vcpu, PMINTENSET_EL1);
> + if ((__vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E)) {
> + reg = __vcpu_sys_reg(vcpu, PMOVSSET_EL0);
> + reg &= __vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
> + reg &= __vcpu_sys_reg(vcpu, PMINTENSET_EL1);
> reg &= kvm_pmu_valid_counter_mask(vcpu);
> }
>
> @@ -295,7 +296,7 @@ static void kvm_pmu_perf_overflow(struct perf_event *perf_event,
> struct kvm_vcpu *vcpu = kvm_pmc_to_vcpu(pmc);
> int idx = pmc->idx;
>
> - vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= BIT(idx);
> + __vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= BIT(idx);
>
> if (kvm_pmu_overflow_status(vcpu)) {
> kvm_make_request(KVM_REQ_IRQ_PENDING, vcpu);
> @@ -316,19 +317,19 @@ void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val)
> if (val == 0)
> return;
>
> - enable = vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
> + enable = __vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
> for (i = 0; i < ARMV8_PMU_CYCLE_IDX; i++) {
> if (!(val & BIT(i)))
> continue;
> - type = vcpu_sys_reg(vcpu, PMEVTYPER0_EL0 + i)
> + type = __vcpu_sys_reg(vcpu, PMEVTYPER0_EL0 + i)
> & ARMV8_PMU_EVTYPE_EVENT;
> if ((type == ARMV8_PMUV3_PERFCTR_SW_INCR)
> && (enable & BIT(i))) {
> - reg = vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) + 1;
> + reg = __vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) + 1;
> reg = lower_32_bits(reg);
> - vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) = reg;
> + __vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) = reg;
> if (!reg)
> - vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= BIT(i);
> + __vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= BIT(i);
> }
> }
> }
> @@ -348,7 +349,7 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val)
> mask = kvm_pmu_valid_counter_mask(vcpu);
> if (val & ARMV8_PMU_PMCR_E) {
> kvm_pmu_enable_counter(vcpu,
> - vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask);
> + __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask);
> } else {
> kvm_pmu_disable_counter(vcpu, mask);
> }
> @@ -369,8 +370,8 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val)
>
> static bool kvm_pmu_counter_is_enabled(struct kvm_vcpu *vcpu, u64 select_idx)
> {
> - return (vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E) &&
> - (vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & BIT(select_idx));
> + return (__vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E) &&
> + (__vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & BIT(select_idx));
> }
>
> /**
> --
> 2.14.2
>
All the broken lines to honor the 80-char limit induces some sadness,
but at least people reading the code on their VT100's will be happy.
Reviewed-by: Andrew Jones <drjones@redhat.com>
next prev parent reply other threads:[~2018-02-22 13:34 UTC|newest]
Thread overview: 276+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-15 21:02 [PATCH v4 00/40] Optimize KVM/ARM for VHE systems Christoffer Dall
2018-02-15 21:02 ` Christoffer Dall
2018-02-15 21:02 ` [PATCH v4 01/40] KVM: arm/arm64: Avoid vcpu_load for other vcpu ioctls than KVM_RUN Christoffer Dall
2018-02-15 21:02 ` Christoffer Dall
2018-02-21 9:32 ` Marc Zyngier
2018-02-21 9:32 ` Marc Zyngier
2018-02-21 17:05 ` Andrew Jones
2018-02-21 17:05 ` Andrew Jones
2018-02-15 21:02 ` [PATCH v4 02/40] KVM: arm/arm64: Move vcpu_load call after kvm_vcpu_first_run_init Christoffer Dall
2018-02-15 21:02 ` Christoffer Dall
2018-02-21 11:05 ` Marc Zyngier
2018-02-21 11:05 ` Marc Zyngier
2018-02-15 21:02 ` [PATCH v4 03/40] KVM: arm64: Avoid storing the vcpu pointer on the stack Christoffer Dall
2018-02-15 21:02 ` Christoffer Dall
2018-02-19 15:50 ` Julien Grall
2018-02-19 15:50 ` Julien Grall
2018-02-22 8:43 ` Christoffer Dall
2018-02-22 8:43 ` Christoffer Dall
2018-02-21 11:34 ` Marc Zyngier
2018-02-21 11:34 ` Marc Zyngier
2018-02-22 9:02 ` Christoffer Dall
2018-02-22 9:02 ` Christoffer Dall
2018-02-22 9:35 ` Marc Zyngier
2018-02-22 9:35 ` Marc Zyngier
2018-02-22 9:49 ` Andrew Jones
2018-02-22 9:49 ` Andrew Jones
2018-02-21 17:32 ` Andrew Jones
2018-02-21 17:32 ` Andrew Jones
2018-02-22 9:10 ` Christoffer Dall
2018-02-22 9:10 ` Christoffer Dall
2018-02-22 9:56 ` Andrew Jones
2018-02-22 9:56 ` Andrew Jones
2018-02-22 10:24 ` Christoffer Dall
2018-02-22 10:24 ` Christoffer Dall
2018-02-15 21:02 ` [PATCH v4 04/40] KVM: arm64: Rework hyp_panic for VHE and non-VHE Christoffer Dall
2018-02-15 21:02 ` Christoffer Dall
2018-02-21 17:32 ` Andrew Jones
2018-02-21 17:32 ` Andrew Jones
2018-02-15 21:02 ` [PATCH v4 05/40] KVM: arm64: Move HCR_INT_OVERRIDE to default HCR_EL2 guest flag Christoffer Dall
2018-02-15 21:02 ` Christoffer Dall
2018-02-15 21:02 ` [PATCH v4 06/40] KVM: arm/arm64: Get rid of vcpu->arch.irq_lines Christoffer Dall
2018-02-15 21:02 ` Christoffer Dall
2018-02-15 21:02 ` [PATCH v4 07/40] KVM: arm/arm64: Add kvm_vcpu_load_sysregs and kvm_vcpu_put_sysregs Christoffer Dall
2018-02-15 21:02 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 08/40] KVM: arm/arm64: Introduce vcpu_el1_is_32bit Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 12:05 ` Marc Zyngier
2018-02-21 12:05 ` Marc Zyngier
2018-02-22 9:11 ` Christoffer Dall
2018-02-22 9:11 ` Christoffer Dall
2018-02-21 17:34 ` Andrew Jones
2018-02-21 17:34 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 09/40] KVM: arm64: Move debug dirty flag calculation out of world switch Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 17:35 ` Andrew Jones
2018-02-21 17:35 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 10/40] KVM: arm64: Slightly improve debug save/restore functions Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 17:39 ` Andrew Jones
2018-02-21 17:39 ` Andrew Jones
2018-02-21 17:52 ` Marc Zyngier
2018-02-21 17:52 ` Marc Zyngier
2018-02-22 8:05 ` Andrew Jones
2018-02-22 8:05 ` Andrew Jones
2018-02-24 18:32 ` Christoffer Dall
2018-02-24 18:32 ` Christoffer Dall
2018-02-24 20:16 ` Marc Zyngier
2018-02-24 20:16 ` Marc Zyngier
2018-02-15 21:03 ` [PATCH v4 11/40] KVM: arm64: Improve debug register save/restore flow Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 17:40 ` Andrew Jones
2018-02-21 17:40 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 12/40] KVM: arm64: Factor out fault info population and gic workarounds Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 17:41 ` Andrew Jones
2018-02-21 17:41 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 13/40] KVM: arm64: Introduce VHE-specific kvm_vcpu_run Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 17:43 ` Andrew Jones
2018-02-21 17:43 ` Andrew Jones
2018-02-21 18:18 ` Andrew Jones
2018-02-21 18:18 ` Andrew Jones
2018-02-22 9:16 ` Christoffer Dall
2018-02-22 9:16 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 14/40] KVM: arm64: Remove kern_hyp_va() use in VHE switch function Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 15/40] KVM: arm64: Don't deactivate VM on VHE systems Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 16/40] KVM: arm64: Remove noop calls to timer save/restore from VHE switch Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 17:43 ` Andrew Jones
2018-02-21 17:43 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 17/40] KVM: arm64: Move userspace system registers into separate function Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-19 17:21 ` Julien Grall
2018-02-19 17:21 ` Julien Grall
2018-02-22 9:18 ` Christoffer Dall
2018-02-22 9:18 ` Christoffer Dall
2018-02-21 12:21 ` Marc Zyngier
2018-02-21 12:21 ` Marc Zyngier
2018-02-15 21:03 ` [PATCH v4 18/40] KVM: arm64: Rewrite sysreg alternatives to static keys Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 17:44 ` Andrew Jones
2018-02-21 17:44 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 19/40] KVM: arm64: Introduce separate VHE/non-VHE sysreg save/restore functions Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 20/40] KVM: arm/arm64: Remove leftover comment from kvm_vcpu_run_vhe Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 17:47 ` Andrew Jones
2018-02-21 17:47 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 21/40] KVM: arm64: Unify non-VHE host/guest sysreg save and restore functions Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 22/40] KVM: arm64: Don't save the host ELR_EL2 and SPSR_EL2 on VHE systems Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 17:49 ` Andrew Jones
2018-02-21 17:49 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 23/40] KVM: arm64: Change 32-bit handling of VM system registers Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 24/40] KVM: arm64: Rewrite system register accessors to read/write functions Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-19 18:12 ` Julien Grall
2018-02-19 18:12 ` Julien Grall
2018-02-22 9:18 ` Christoffer Dall
2018-02-22 9:18 ` Christoffer Dall
2018-02-21 13:32 ` Marc Zyngier
2018-02-21 13:32 ` Marc Zyngier
2018-02-22 9:22 ` Christoffer Dall
2018-02-22 9:22 ` Christoffer Dall
2018-02-22 10:48 ` Marc Zyngier
2018-02-22 10:48 ` Marc Zyngier
2018-02-22 11:10 ` Christoffer Dall
2018-02-22 11:10 ` Christoffer Dall
2018-02-22 13:26 ` Marc Zyngier
2018-02-22 13:26 ` Marc Zyngier
2018-02-22 13:34 ` Andrew Jones [this message]
2018-02-22 13:34 ` Andrew Jones
2018-02-22 14:35 ` Christoffer Dall
2018-02-22 14:35 ` Christoffer Dall
2018-02-22 15:11 ` Andrew Jones
2018-02-22 15:11 ` Andrew Jones
2018-02-22 15:58 ` Christoffer Dall
2018-02-22 15:58 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 25/40] KVM: arm64: Introduce framework for accessing deferred sysregs Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 14:16 ` Marc Zyngier
2018-02-21 14:16 ` Marc Zyngier
2018-02-22 13:40 ` Andrew Jones
2018-02-22 13:40 ` Andrew Jones
2018-02-22 14:56 ` Christoffer Dall
2018-02-22 14:56 ` Christoffer Dall
2018-02-22 17:40 ` Julien Grall
2018-02-22 17:40 ` Julien Grall
2018-02-15 21:03 ` [PATCH v4 26/40] KVM: arm/arm64: Prepare to handle deferred save/restore of SPSR_EL1 Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 14:47 ` Marc Zyngier
2018-02-21 14:47 ` Marc Zyngier
2018-02-22 9:25 ` Christoffer Dall
2018-02-22 9:25 ` Christoffer Dall
2018-02-22 13:49 ` Andrew Jones
2018-02-22 13:49 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 27/40] KVM: arm64: Prepare to handle deferred save/restore of ELR_EL1 Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 15:08 ` Marc Zyngier
2018-02-21 15:08 ` Marc Zyngier
2018-02-22 13:51 ` Andrew Jones
2018-02-22 13:51 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 28/40] KVM: arm64: Defer saving/restoring 64-bit sysregs to vcpu load/put on VHE Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 15:33 ` Marc Zyngier
2018-02-21 15:33 ` Marc Zyngier
2018-02-23 18:05 ` Christoffer Dall
2018-02-23 18:05 ` Christoffer Dall
2018-02-22 14:04 ` Andrew Jones
2018-02-22 14:04 ` Andrew Jones
2018-02-22 18:30 ` Julien Grall
2018-02-22 18:30 ` Julien Grall
2018-02-22 18:31 ` Julien Grall
2018-02-22 18:31 ` Julien Grall
2018-02-22 19:49 ` Christoffer Dall
2018-02-22 19:49 ` Christoffer Dall
2018-02-22 19:48 ` Christoffer Dall
2018-02-22 19:48 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 29/40] KVM: arm64: Prepare to handle deferred save/restore of 32-bit registers Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 15:44 ` Marc Zyngier
2018-02-21 15:44 ` Marc Zyngier
2018-02-22 14:30 ` Andrew Jones
2018-02-22 14:30 ` Andrew Jones
2018-02-23 11:35 ` Julien Grall
2018-02-23 11:35 ` Julien Grall
2018-02-15 21:03 ` [PATCH v4 30/40] KVM: arm64: Defer saving/restoring 32-bit sysregs to vcpu load/put Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 16:27 ` Marc Zyngier
2018-02-21 16:27 ` Marc Zyngier
2018-02-22 18:15 ` Christoffer Dall
2018-02-22 18:15 ` Christoffer Dall
2018-02-22 14:35 ` Andrew Jones
2018-02-22 14:35 ` Andrew Jones
2018-02-22 14:58 ` Christoffer Dall
2018-02-22 14:58 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 31/40] KVM: arm64: Move common VHE/non-VHE trap config in separate functions Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 17:59 ` Marc Zyngier
2018-02-21 17:59 ` Marc Zyngier
2018-02-22 18:17 ` Christoffer Dall
2018-02-22 18:17 ` Christoffer Dall
2018-02-25 21:27 ` Christoffer Dall
2018-02-25 21:27 ` Christoffer Dall
2018-02-22 15:34 ` Andrew Jones
2018-02-22 15:34 ` Andrew Jones
2018-02-23 14:30 ` Julien Grall
2018-02-23 14:30 ` Julien Grall
2018-02-23 17:48 ` Christoffer Dall
2018-02-23 17:48 ` Christoffer Dall
2018-02-25 21:29 ` Christoffer Dall
2018-02-25 21:29 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 32/40] KVM: arm64: Directly call VHE and non-VHE FPSIMD enabled functions Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 18:11 ` Marc Zyngier
2018-02-21 18:11 ` Marc Zyngier
2018-02-22 15:38 ` Andrew Jones
2018-02-22 15:38 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 33/40] KVM: arm64: Configure c15, PMU, and debug register traps on cpu load/put for VHE Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 18:20 ` Marc Zyngier
2018-02-21 18:20 ` Marc Zyngier
2018-02-22 18:57 ` Christoffer Dall
2018-02-22 18:57 ` Christoffer Dall
2018-02-22 15:51 ` Andrew Jones
2018-02-22 15:51 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 34/40] KVM: arm64: Cleanup __activate_traps and __deactive_traps for VHE and non-VHE Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-21 18:26 ` Marc Zyngier
2018-02-21 18:26 ` Marc Zyngier
2018-02-22 19:04 ` Christoffer Dall
2018-02-22 19:04 ` Christoffer Dall
2018-02-22 15:54 ` Andrew Jones
2018-02-22 15:54 ` Andrew Jones
2018-02-15 21:03 ` [PATCH v4 35/40] KVM: arm/arm64: Get rid of vgic_elrsr Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-22 9:45 ` Marc Zyngier
2018-02-22 9:45 ` Marc Zyngier
2018-02-23 14:44 ` Julien Grall
2018-02-23 14:44 ` Julien Grall
2018-02-23 17:50 ` Christoffer Dall
2018-02-23 17:50 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 36/40] KVM: arm/arm64: Handle VGICv2 save/restore from the main VGIC code Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 37/40] KVM: arm/arm64: Move arm64-only vgic-v2-sr.c file to arm64 Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-22 12:33 ` Marc Zyngier
2018-02-22 12:33 ` Marc Zyngier
2018-02-22 14:37 ` Christoffer Dall
2018-02-22 14:37 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 38/40] KVM: arm/arm64: Handle VGICv3 save/restore from the main VGIC code on VHE Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-22 12:32 ` Marc Zyngier
2018-02-22 12:32 ` Marc Zyngier
2018-02-22 14:42 ` Christoffer Dall
2018-02-22 14:42 ` Christoffer Dall
2018-02-22 15:01 ` Marc Zyngier
2018-02-22 15:01 ` Marc Zyngier
2018-02-22 16:02 ` Christoffer Dall
2018-02-22 16:02 ` Christoffer Dall
2018-02-22 17:21 ` Marc Zyngier
2018-02-22 17:21 ` Marc Zyngier
2018-02-22 19:28 ` Christoffer Dall
2018-02-22 19:28 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 39/40] KVM: arm/arm64: Move VGIC APR save/restore to vgic put/load Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
2018-02-22 13:11 ` Marc Zyngier
2018-02-22 13:11 ` Marc Zyngier
2018-02-22 14:44 ` Christoffer Dall
2018-02-22 14:44 ` Christoffer Dall
2018-02-15 21:03 ` [PATCH v4 40/40] KVM: arm/arm64: Avoid VGICv3 save/restore on VHE with no IRQs Christoffer Dall
2018-02-15 21:03 ` Christoffer Dall
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=20180222133421.tyingk5vzdgzoyh7@kamzik.brq.redhat.com \
--to=drjones@redhat.com \
--cc=Dave.Martin@arm.com \
--cc=cdall@cs.columbia.edu \
--cc=christoffer.dall@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=marc.zyngier@arm.com \
--cc=shihwei@cs.columbia.edu \
--cc=ynorov@caviumnetworks.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.