From: Marc Zyngier <marc.zyngier@arm.com>
To: kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Will Deacon <will.deacon@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
eric.auger@linaro.org,
Christoffer Dall <christoffer.dall@linaro.org>
Subject: [RFC PATCH 8/9] arm: KVM: timer: move the timer switch into the non-preemptible section
Date: Wed, 25 Jun 2014 10:28:49 +0100 [thread overview]
Message-ID: <1403688530-23273-9-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1403688530-23273-1-git-send-email-marc.zyngier@arm.com>
In order to convert the timer code to the new interrupt save/restore API,
make sure the timer switch is done in a non-premtible section, so that
we save/restore the state on the right CPU.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/kvm/arm.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index a291e63..92875b2 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -554,9 +554,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
vcpu_pause(vcpu);
kvm_vgic_flush_hwstate(vcpu);
- kvm_timer_flush_hwstate(vcpu);
local_irq_disable();
+ kvm_timer_flush_hwstate(vcpu);
/*
* Re-check atomic conditions
@@ -567,8 +567,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
}
if (ret <= 0 || need_new_vmid_gen(vcpu->kvm)) {
- local_irq_enable();
kvm_timer_sync_hwstate(vcpu);
+ local_irq_enable();
kvm_vgic_sync_hwstate(vcpu);
continue;
}
@@ -586,6 +586,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
vcpu->arch.last_pcpu = smp_processor_id();
kvm_guest_exit();
trace_kvm_exit(*vcpu_pc(vcpu));
+ kvm_timer_sync_hwstate(vcpu);
+
/*
* We may have taken a host interrupt in HYP mode (ie
* while executing the guest). This interrupt is still
@@ -602,7 +604,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
* Back from guest
*************************************************************/
- kvm_timer_sync_hwstate(vcpu);
kvm_vgic_sync_hwstate(vcpu);
ret = handle_exit(vcpu, run, ret);
--
1.8.3.4
next prev parent reply other threads:[~2014-06-25 9:30 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-25 9:28 [RFC PATCH 0/9] ARM: Forwarding physical interrupts to a guest VM Marc Zyngier
2014-06-25 9:28 ` [RFC PATCH 1/9] genirq: Add IRQD_IRQ_FORWARDED flag and accessors Marc Zyngier
2014-06-25 9:28 ` [RFC PATCH 2/9] genirq: Allow the state of a forwarded irq to be save/restored Marc Zyngier
2014-06-27 13:10 ` Will Deacon
2014-07-07 8:40 ` Marc Zyngier
2014-06-25 9:28 ` [RFC PATCH 3/9] irqchip: GIC: Convert to EOImode == 1 Marc Zyngier
2014-06-25 12:50 ` Rob Herring
2014-06-25 13:03 ` Marc Zyngier
2014-06-25 13:18 ` Rob Herring
2014-06-25 13:56 ` Anup Patel
2014-06-25 14:03 ` Ian Campbell
2014-06-25 14:31 ` Marc Zyngier
2014-06-25 14:08 ` Rob Herring
2014-06-25 14:24 ` Marc Zyngier
2014-06-25 14:27 ` Ian Campbell
2014-06-25 20:14 ` Joel Schopp
2014-06-30 19:09 ` Stefano Stabellini
2014-07-01 8:24 ` Marc Zyngier
2014-07-01 16:34 ` Stefano Stabellini
2014-07-01 16:42 ` Marc Zyngier
2014-06-25 14:06 ` Peter Maydell
2014-06-25 14:46 ` Marc Zyngier
2014-08-06 11:30 ` Christoffer Dall
2014-07-25 12:42 ` Eric Auger
2014-06-25 9:28 ` [RFC PATCH 4/9] irqchip: GIC: add support for forwarded interrupts Marc Zyngier
2014-06-27 13:17 ` Will Deacon
2014-07-07 10:43 ` Marc Zyngier
2014-08-06 11:30 ` Christoffer Dall
2014-06-25 9:28 ` [RFC PATCH 5/9] irqchip: GICv3: Convert to EOImode == 1 Marc Zyngier
2014-06-25 9:28 ` [RFC PATCH 6/9] irqchip: GICv3: add support for forwarded interrupts Marc Zyngier
2014-06-25 9:28 ` [RFC PATCH 7/9] KVM: arm: vgic: allow dynamic mapping of physical/virtual interrupts Marc Zyngier
2014-08-03 9:48 ` Eric Auger
2014-08-04 13:13 ` Marc Zyngier
2014-08-07 15:47 ` Eric Auger
2014-08-11 8:01 ` Christoffer Dall
2014-08-11 13:22 ` Eric Auger
2014-06-25 9:28 ` Marc Zyngier [this message]
2014-06-25 9:28 ` [RFC PATCH 9/9] KVM: arm: timer: make the interrupt state part of the timer state Marc Zyngier
2014-06-25 14:52 ` [RFC PATCH 0/9] ARM: Forwarding physical interrupts to a guest VM Eric Auger
2014-06-26 9:31 ` Marc Zyngier
2014-06-26 12:58 ` Eric Auger
2014-06-26 14:12 ` 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=1403688530-23273-9-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@linaro.org \
--cc=eric.auger@linaro.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®