From: cdall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/37] KVM: arm/arm64: Get rid of vcpu->arch.irq_lines
Date: Sun, 26 Nov 2017 17:04:23 +0100 [thread overview]
Message-ID: <20171126160423.GJ28855@cbox> (raw)
In-Reply-To: <9315cfbb-fe23-6443-01be-ac376c457a14@arm.com>
On Tue, Nov 14, 2017 at 12:17:44PM +0000, Julien Thierry wrote:
> Hi Christoffer,
>
> On 12/10/17 11:41, Christoffer Dall wrote:
> >We currently have a separate read-modify-write of the HCR_EL2 on entry
> >to the guest for the sole purpose of setting the VF and VI bits, if set.
> >Since this is most rarely the case (only when using userspace IRQ chip
> >and interrupts are in flight), let's get rid of this operation and
> >instead modify the bits in the vcpu->arch.hcr[_el2] directly when
> >needed.
> >
> >Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
> >---
> > arch/arm/include/asm/kvm_emulate.h | 9 ++-------
> > arch/arm/include/asm/kvm_host.h | 3 ---
> > arch/arm/kvm/emulate.c | 2 +-
> > arch/arm/kvm/hyp/switch.c | 2 +-
> > arch/arm64/include/asm/kvm_emulate.h | 9 ++-------
> > arch/arm64/include/asm/kvm_host.h | 3 ---
> > arch/arm64/kvm/hyp/switch.c | 6 ------
> > arch/arm64/kvm/inject_fault.c | 2 +-
> > virt/kvm/arm/arm.c | 11 ++++++-----
> > virt/kvm/arm/mmu.c | 6 +++---
> > 10 files changed, 16 insertions(+), 37 deletions(-)
> >
> >diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
> >index 98089ff..34663a8 100644
> >--- a/arch/arm/include/asm/kvm_emulate.h
> >+++ b/arch/arm/include/asm/kvm_emulate.h
> >@@ -62,14 +62,9 @@ static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)
> > vcpu->arch.hcr = HCR_GUEST_MASK;
> > }
> >-static inline unsigned long vcpu_get_hcr(const struct kvm_vcpu *vcpu)
> >+static inline unsigned long *vcpu_hcr(const struct kvm_vcpu *vcpu)
> > {
> >- return vcpu->arch.hcr;
> >-}
> >-
> >-static inline void vcpu_set_hcr(struct kvm_vcpu *vcpu, unsigned long hcr)
> >-{
> >- vcpu->arch.hcr = hcr;
> >+ return (unsigned long *)&vcpu->arch.hcr;
> > }
> > static inline bool vcpu_mode_is_32bit(const struct kvm_vcpu *vcpu)
> >diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
> >index 4a879f6..1100170 100644
> >--- a/arch/arm/include/asm/kvm_host.h
> >+++ b/arch/arm/include/asm/kvm_host.h
> >@@ -153,9 +153,6 @@ struct kvm_vcpu_arch {
> > /* HYP trapping configuration */
> > u32 hcr;
> >- /* Interrupt related fields */
> >- u32 irq_lines; /* IRQ and FIQ levels */
> >-
> > /* Exception Information */
> > struct kvm_vcpu_fault_info fault;
> >diff --git a/arch/arm/kvm/emulate.c b/arch/arm/kvm/emulate.c
> >index 0064b86..4286a89 100644
> >--- a/arch/arm/kvm/emulate.c
> >+++ b/arch/arm/kvm/emulate.c
> >@@ -313,5 +313,5 @@ void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr)
> > */
> > void kvm_inject_vabt(struct kvm_vcpu *vcpu)
> > {
> >- vcpu_set_hcr(vcpu, vcpu_get_hcr(vcpu) | HCR_VA);
> >+ *vcpu_hcr(vcpu) |= HCR_VA;
> > }
> >diff --git a/arch/arm/kvm/hyp/switch.c b/arch/arm/kvm/hyp/switch.c
> >index 330c9ce..c3b9799 100644
> >--- a/arch/arm/kvm/hyp/switch.c
> >+++ b/arch/arm/kvm/hyp/switch.c
> >@@ -43,7 +43,7 @@ static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu, u32 *fpexc_host)
> > isb();
> > }
> >- write_sysreg(vcpu->arch.hcr | vcpu->arch.irq_lines, HCR);
> >+ write_sysreg(vcpu->arch.hcr, HCR);
> > /* Trap on AArch32 cp15 c15 accesses (EL1 or EL0) */
> > write_sysreg(HSTR_T(15), HSTR);
> > write_sysreg(HCPTR_TTA | HCPTR_TCP(10) | HCPTR_TCP(11), HCPTR);
> >diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
> >index e5df3fc..1fbfe96 100644
> >--- a/arch/arm64/include/asm/kvm_emulate.h
> >+++ b/arch/arm64/include/asm/kvm_emulate.h
> >@@ -51,14 +51,9 @@ static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)
> > vcpu->arch.hcr_el2 &= ~HCR_RW;
> > }
> >-static inline unsigned long vcpu_get_hcr(struct kvm_vcpu *vcpu)
> >+static inline unsigned long *vcpu_hcr(struct kvm_vcpu *vcpu)
> > {
> >- return vcpu->arch.hcr_el2;
> >-}
> >-
> >-static inline void vcpu_set_hcr(struct kvm_vcpu *vcpu, unsigned long hcr)
> >-{
> >- vcpu->arch.hcr_el2 = hcr;
> >+ return (unsigned long *)&vcpu->arch.hcr_el2;
> > }
> > static inline unsigned long *vcpu_pc(const struct kvm_vcpu *vcpu)
> >diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
> >index 806ccef..27305e7 100644
> >--- a/arch/arm64/include/asm/kvm_host.h
> >+++ b/arch/arm64/include/asm/kvm_host.h
> >@@ -266,9 +266,6 @@ struct kvm_vcpu_arch {
> > /* IO related fields */
> > struct kvm_decode mmio_decode;
> >- /* Interrupt related fields */
> >- u64 irq_lines; /* IRQ and FIQ levels */
> >-
> > /* Cache some mmu pages needed inside spinlock regions */
> > struct kvm_mmu_memory_cache mmu_page_cache;
> >diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c
> >index bcf1a79..7703d63 100644
> >--- a/arch/arm64/kvm/hyp/switch.c
> >+++ b/arch/arm64/kvm/hyp/switch.c
> >@@ -168,12 +168,6 @@ static void __hyp_text __vgic_save_state(struct kvm_vcpu *vcpu)
> > static void __hyp_text __vgic_restore_state(struct kvm_vcpu *vcpu)
> > {
> >- u64 val;
> >-
> >- val = read_sysreg(hcr_el2);
> >- val |= vcpu->arch.irq_lines;
> >- write_sysreg(val, hcr_el2);
> >-
> > if (static_branch_unlikely(&kvm_vgic_global_state.gicv3_cpuif))
> > __vgic_v3_restore_state(vcpu);
> > else
> >diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
> >index da6a8cf..45c7026 100644
> >--- a/arch/arm64/kvm/inject_fault.c
> >+++ b/arch/arm64/kvm/inject_fault.c
> >@@ -241,5 +241,5 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu)
> > */
> > void kvm_inject_vabt(struct kvm_vcpu *vcpu)
> > {
> >- vcpu_set_hcr(vcpu, vcpu_get_hcr(vcpu) | HCR_VSE);
> >+ *vcpu_hcr(vcpu) |= HCR_VSE;
> > }
> >diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
> >index 7f9296a..6e9513e 100644
> >--- a/virt/kvm/arm/arm.c
> >+++ b/virt/kvm/arm/arm.c
> >@@ -411,7 +411,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
> > */
> > int kvm_arch_vcpu_runnable(struct kvm_vcpu *v)
> > {
> >- return ((!!v->arch.irq_lines || kvm_vgic_vcpu_pending_irq(v))
> >+ bool irq_lines = *vcpu_hcr(v) & (HCR_VI | HCR_VF);
>
> Hmmm, I might be nitpicking here, but in my mind bool should be used
> only to contain true (1) or false (0) values.
> Here the non-false values are never 1.
>
> Not sure if the definition of _Bool guaranties to be able to contain
> other values than 1 and 0, although I agree it is unlikely it will
> be less than a byte which works in your case.
As you found out, this is fine as long as we use _Bool. If we had used
an integer type, it would be bad practice indeed.
>
> Other than that:
>
> Reviewed-by: Julien Thierry <julien.thierry@arm.com>
>
Thanks for the review!
-Christoffer
next prev parent reply other threads:[~2017-11-26 16:04 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 10:41 [PATCH 00/37] Optimize KVM/ARM for VHE systems Christoffer Dall
2017-10-12 10:41 ` [PATCH 01/37] KVM: arm64: Avoid storing the vcpu pointer on the stack Christoffer Dall
2017-10-12 15:49 ` Marc Zyngier
2017-10-12 17:02 ` Christoffer Dall
2017-10-13 11:31 ` Marc Zyngier
2017-11-23 20:59 ` Christoffer Dall
2017-11-27 11:11 ` James Morse
2017-11-29 18:20 ` Christoffer Dall
2017-11-06 17:22 ` Andrew Jones
2017-11-07 8:24 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 02/37] KVM: arm64: Rework hyp_panic for VHE and non-VHE Christoffer Dall
2017-10-12 15:55 ` Marc Zyngier
2017-10-12 17:06 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 03/37] KVM: arm64: Move HCR_INT_OVERRIDE to default HCR_EL2 guest flag Christoffer Dall
2017-10-12 16:20 ` Marc Zyngier
2017-10-12 10:41 ` [PATCH 04/37] KVM: arm/arm64: Get rid of vcpu->arch.irq_lines Christoffer Dall
2017-10-12 16:24 ` Marc Zyngier
2017-11-06 17:58 ` Andrew Jones
2017-11-14 12:17 ` Julien Thierry
2017-11-16 16:11 ` Julien Thierry
2017-11-26 16:04 ` Christoffer Dall [this message]
2017-10-12 10:41 ` [PATCH 05/37] KVM: Record the executing ioctl number on the vcpu struct Christoffer Dall
2017-10-13 17:13 ` Radim Krčmář
2017-10-13 17:31 ` Christoffer Dall
2017-10-13 18:38 ` Radim Krčmář
2017-10-13 18:51 ` Christoffer Dall
2017-11-07 10:45 ` Andrew Jones
2017-11-22 20:28 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 06/37] KVM: arm/arm64: Only load/put VCPU state for KVM_RUN Christoffer Dall
2017-10-12 10:41 ` [PATCH 07/37] KVM: arm/arm64: Add kvm_vcpu_load_sysregs and kvm_vcpu_put_sysregs Christoffer Dall
2017-11-07 10:56 ` Andrew Jones
2017-11-07 11:10 ` Andrew Jones
2017-11-22 20:34 ` Christoffer Dall
2017-11-23 11:08 ` Andrew Jones
2017-10-12 10:41 ` [PATCH 08/37] KVM: arm64: Defer restoring host VFP state to vcpu_put Christoffer Dall
2017-11-07 13:15 ` Andrew Jones
2017-11-26 16:24 ` Christoffer Dall
2017-11-15 16:04 ` Andrew Jones
2017-11-26 16:17 ` Christoffer Dall
2017-11-27 8:32 ` Andrew Jones
2017-11-25 7:52 ` Yury Norov
2017-11-26 16:17 ` Christoffer Dall
2017-11-26 18:58 ` Yury Norov
2017-11-26 19:18 ` Christoffer Dall
2017-11-27 6:25 ` Yury Norov
2017-11-30 19:07 ` Marc Zyngier
2017-10-12 10:41 ` [PATCH 09/37] KVM: arm64: Move debug dirty flag calculation out of world switch Christoffer Dall
2017-11-07 14:09 ` Andrew Jones
2017-11-25 8:09 ` Yury Norov
2017-12-01 17:25 ` Christoffer Dall
2017-12-03 13:17 ` Andrew Jones
2017-10-12 10:41 ` [PATCH 10/37] KVM: arm64: Slightly improve debug save/restore functions Christoffer Dall
2017-11-07 14:22 ` Andrew Jones
2017-12-01 17:51 ` Christoffer Dall
2017-11-14 16:42 ` Julien Thierry
2017-12-01 15:19 ` Christoffer Dall
2017-12-06 15:38 ` Julien Thierry
2017-10-12 10:41 ` [PATCH 11/37] KVM: arm64: Improve debug register save/restore flow Christoffer Dall
2017-11-07 14:48 ` Andrew Jones
2017-12-01 17:52 ` Christoffer Dall
2017-12-03 13:49 ` Andrew Jones
2017-12-03 20:47 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 12/37] KVM: arm64: Factor out fault info population and gic workarounds Christoffer Dall
2017-11-07 15:12 ` Andrew Jones
2017-10-12 10:41 ` [PATCH 13/37] KVM: arm64: Introduce VHE-specific kvm_vcpu_run Christoffer Dall
2017-11-07 15:25 ` Andrew Jones
2017-12-01 18:10 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 14/37] KVM: arm64: Remove kern_hyp_va() use in VHE switch function Christoffer Dall
2017-11-07 16:07 ` Andrew Jones
2017-10-12 10:41 ` [PATCH 15/37] KVM: arm64: Don't deactivate VM on VHE systems Christoffer Dall
2017-11-07 16:14 ` Andrew Jones
2017-12-03 19:27 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 16/37] KVM: arm64: Remove noop calls to timer save/restore from VHE switch Christoffer Dall
2017-11-07 16:25 ` Andrew Jones
2017-12-03 19:27 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 17/37] KVM: arm64: Move userspace system registers into separate function Christoffer Dall
2017-11-08 9:32 ` Andrew Jones
2017-12-03 19:36 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 18/37] KVM: arm64: Rewrite sysreg alternatives to static keys Christoffer Dall
2017-10-12 10:41 ` [PATCH 19/37] KVM: arm64: Introduce separate VHE/non-VHE sysreg save/restore functions Christoffer Dall
2017-11-08 10:31 ` Andrew Jones
2017-10-12 10:41 ` [PATCH 20/37] KVM: arm64: Unify non-VHE host/guest sysreg save and restore functions Christoffer Dall
2017-11-08 10:39 ` Andrew Jones
2017-12-03 19:41 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 21/37] KVM: arm64: Don't save the host ELR_EL2 and SPSR_EL2 on VHE systems Christoffer Dall
2017-11-08 17:03 ` Andrew Jones
2017-12-03 19:45 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 22/37] KVM: arm64: Change 32-bit handling of VM system registers Christoffer Dall
2017-11-13 16:25 ` Andrew Jones
2017-10-12 10:41 ` [PATCH 23/37] KVM: arm64: Prepare to handle traps on deferred VM sysregs Christoffer Dall
2017-11-13 17:54 ` Andrew Jones
2017-12-03 19:50 ` Christoffer Dall
2017-12-04 10:05 ` Andrew Jones
2017-10-12 10:41 ` [PATCH 24/37] KVM: arm64: Prepare to handle traps on deferred EL0 sysregs Christoffer Dall
2017-11-15 9:25 ` Julien Thierry
2017-12-03 19:51 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 25/37] KVM: arm64: Prepare to handle traps on remaining deferred EL1 sysregs Christoffer Dall
2017-11-13 18:56 ` Andrew Jones
2017-12-03 20:29 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 26/37] KVM: arm64: Prepare to handle traps on deferred AArch32 sysregs Christoffer Dall
2017-11-13 19:07 ` Andrew Jones
2017-12-03 20:35 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 27/37] KVM: arm64: Defer saving/restoring system registers to vcpu load/put on VHE Christoffer Dall
2017-10-12 10:41 ` [PATCH 28/37] KVM: arm64: Move common VHE/non-VHE trap config in separate functions Christoffer Dall
2017-11-25 10:43 ` Yury Norov
2017-11-25 10:49 ` Russell King - ARM Linux
2017-10-12 10:41 ` [PATCH 29/37] KVM: arm64: Configure FPSIMD traps on vcpu load/put for VHE Christoffer Dall
2017-10-12 10:41 ` [PATCH 30/37] KVM: arm64: Configure c15, PMU, and debug register traps on cpu " Christoffer Dall
2017-10-12 10:41 ` [PATCH 31/37] KVM: arm64: Separate activate_traps and deactive_traps for VHE and non-VHE Christoffer Dall
2017-10-12 10:41 ` [PATCH 32/37] KVM: arm/arm64: Handle VGICv2 save/restore from the main VGIC code Christoffer Dall
2017-11-15 17:50 ` Andre Przywara
2017-11-26 10:29 ` Yury Norov
2017-11-26 19:46 ` Christoffer Dall
2017-11-30 12:09 ` Yury Norov
2017-11-26 19:37 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 33/37] KVM: arm/arm64: Move arm64-only vgic-v2-sr.c file to arm64 Christoffer Dall
2017-11-15 17:52 ` Andre Przywara
2017-10-12 10:41 ` [PATCH 34/37] KVM: arm/arm64: Handle VGICv3 save/restore from the main VGIC code on VHE Christoffer Dall
2017-10-12 10:41 ` [PATCH 35/37] KVM: arm/arm64: Get rid of vgic_elrsr Christoffer Dall
2017-11-26 14:39 ` Yury Norov
2017-11-26 19:53 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 36/37] KVM: arm/arm64: Move VGIC APR save/restore to vgic put/load Christoffer Dall
2017-11-26 15:09 ` Yury Norov
2017-11-26 19:55 ` Christoffer Dall
2017-10-12 10:41 ` [PATCH 37/37] KVM: arm/arm64: Avoid VGICv3 save/restore on VHE with no IRQs Christoffer Dall
2017-11-30 18:33 ` Yury Norov
2017-12-03 20:38 ` 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=20171126160423.GJ28855@cbox \
--to=cdall@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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).