All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoffer Dall <cdall@linaro.org>
To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org
Cc: Marc Zyngier <marc.zyngier@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	kvm@vger.kernel.org, Christoffer Dall <cdall@linaro.org>
Subject: [PATCH v3 17/20] KVM: arm/arm64: Move phys_timer_emulate function
Date: Sat, 23 Sep 2017 02:42:04 +0200	[thread overview]
Message-ID: <20170923004207.22356-18-cdall@linaro.org> (raw)
In-Reply-To: <20170923004207.22356-1-cdall@linaro.org>

We are about to call phys_timer_emulate() from kvm_timer_update_state()
and modify phys_timer_emulate() at the same time.  Moving the function
and modifying it in a single patch makes the diff hard to read, so do
this separately first.

No functional change.

Signed-off-by: Christoffer Dall <cdall@linaro.org>
---
 virt/kvm/arm/arch_timer.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index d5b632d..1f82c21 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -252,6 +252,22 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level,
 	}
 }
 
+/* Schedule the background timer for the emulated timer. */
+static void phys_timer_emulate(struct kvm_vcpu *vcpu,
+			      struct arch_timer_context *timer_ctx)
+{
+	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
+
+	if (kvm_timer_should_fire(timer_ctx))
+		return;
+
+	if (!kvm_timer_irq_can_fire(timer_ctx))
+		return;
+
+	/*  The timer has not yet expired, schedule a background timer */
+	soft_timer_start(&timer->phys_timer, kvm_timer_compute_delta(timer_ctx));
+}
+
 /*
  * Check if there was a change in the timer state (should we raise or lower
  * the line level to the GIC).
@@ -278,22 +294,6 @@ static void kvm_timer_update_state(struct kvm_vcpu *vcpu)
 		kvm_timer_update_irq(vcpu, !ptimer->irq.level, ptimer);
 }
 
-/* Schedule the background timer for the emulated timer. */
-static void phys_timer_emulate(struct kvm_vcpu *vcpu,
-			      struct arch_timer_context *timer_ctx)
-{
-	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
-
-	if (kvm_timer_should_fire(timer_ctx))
-		return;
-
-	if (!kvm_timer_irq_can_fire(timer_ctx))
-		return;
-
-	/*  The timer has not yet expired, schedule a background timer */
-	soft_timer_start(&timer->phys_timer, kvm_timer_compute_delta(timer_ctx));
-}
-
 static void vtimer_save_state(struct kvm_vcpu *vcpu)
 {
 	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
-- 
2.9.0

WARNING: multiple messages have this Message-ID (diff)
From: cdall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 17/20] KVM: arm/arm64: Move phys_timer_emulate function
Date: Sat, 23 Sep 2017 02:42:04 +0200	[thread overview]
Message-ID: <20170923004207.22356-18-cdall@linaro.org> (raw)
In-Reply-To: <20170923004207.22356-1-cdall@linaro.org>

We are about to call phys_timer_emulate() from kvm_timer_update_state()
and modify phys_timer_emulate() at the same time.  Moving the function
and modifying it in a single patch makes the diff hard to read, so do
this separately first.

No functional change.

Signed-off-by: Christoffer Dall <cdall@linaro.org>
---
 virt/kvm/arm/arch_timer.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index d5b632d..1f82c21 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -252,6 +252,22 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level,
 	}
 }
 
+/* Schedule the background timer for the emulated timer. */
+static void phys_timer_emulate(struct kvm_vcpu *vcpu,
+			      struct arch_timer_context *timer_ctx)
+{
+	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
+
+	if (kvm_timer_should_fire(timer_ctx))
+		return;
+
+	if (!kvm_timer_irq_can_fire(timer_ctx))
+		return;
+
+	/*  The timer has not yet expired, schedule a background timer */
+	soft_timer_start(&timer->phys_timer, kvm_timer_compute_delta(timer_ctx));
+}
+
 /*
  * Check if there was a change in the timer state (should we raise or lower
  * the line level to the GIC).
@@ -278,22 +294,6 @@ static void kvm_timer_update_state(struct kvm_vcpu *vcpu)
 		kvm_timer_update_irq(vcpu, !ptimer->irq.level, ptimer);
 }
 
-/* Schedule the background timer for the emulated timer. */
-static void phys_timer_emulate(struct kvm_vcpu *vcpu,
-			      struct arch_timer_context *timer_ctx)
-{
-	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
-
-	if (kvm_timer_should_fire(timer_ctx))
-		return;
-
-	if (!kvm_timer_irq_can_fire(timer_ctx))
-		return;
-
-	/*  The timer has not yet expired, schedule a background timer */
-	soft_timer_start(&timer->phys_timer, kvm_timer_compute_delta(timer_ctx));
-}
-
 static void vtimer_save_state(struct kvm_vcpu *vcpu)
 {
 	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
-- 
2.9.0

  parent reply	other threads:[~2017-09-23  0:42 UTC|newest]

Thread overview: 110+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-23  0:41 [PATCH v3 00/20] KVM: arm/arm64: Optimize arch timer register handling Christoffer Dall
2017-09-23  0:41 ` Christoffer Dall
2017-09-23  0:41 ` [PATCH v3 01/20] irqchip/gic: Deal with broken firmware exposing only 4kB of GICv2 CPU interface Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-09-23  0:41 ` [PATCH v3 02/20] arm64: Use physical counter for in-kernel reads Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 16:10   ` Marc Zyngier
2017-10-09 16:10     ` Marc Zyngier
2017-10-17 15:33   ` Will Deacon
2017-10-17 15:33     ` Will Deacon
2017-10-18 10:00     ` Christoffer Dall
2017-10-18 10:00       ` Christoffer Dall
2017-09-23  0:41 ` [PATCH v3 03/20] arm64: Use the physical counter when available for read_cycles Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 16:21   ` Marc Zyngier
2017-10-09 16:21     ` Marc Zyngier
2017-10-18 11:34     ` Christoffer Dall
2017-10-18 11:34       ` Christoffer Dall
2017-10-18 15:52       ` Marc Zyngier
2017-10-18 15:52         ` Marc Zyngier
2017-09-23  0:41 ` [PATCH v3 04/20] KVM: arm/arm64: Guard kvm_vgic_map_is_active against !vgic_initialized Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 16:22   ` Marc Zyngier
2017-10-09 16:22     ` Marc Zyngier
2017-09-23  0:41 ` [PATCH v3 05/20] KVM: arm/arm64: Support calling vgic_update_irq_pending from irq context Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 16:37   ` Marc Zyngier
2017-10-09 16:37     ` Marc Zyngier
2017-10-18 11:54     ` Christoffer Dall
2017-10-18 11:54       ` Christoffer Dall
2017-09-23  0:41 ` [PATCH v3 06/20] KVM: arm/arm64: Check that system supports split eoi/deactivate Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 16:47   ` Marc Zyngier
2017-10-09 16:47     ` Marc Zyngier
2017-10-18 13:41     ` Christoffer Dall
2017-10-18 13:41       ` Christoffer Dall
2017-10-18 16:03       ` Marc Zyngier
2017-10-18 16:03         ` Marc Zyngier
2017-10-18 19:16         ` Christoffer Dall
2017-10-18 19:16           ` Christoffer Dall
2017-09-23  0:41 ` [PATCH v3 07/20] KVM: arm/arm64: Make timer_arm and timer_disarm helpers more generic Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 17:05   ` Marc Zyngier
2017-10-09 17:05     ` Marc Zyngier
2017-10-18 16:47     ` Christoffer Dall
2017-10-18 16:47       ` Christoffer Dall
2017-10-18 16:53       ` Marc Zyngier
2017-10-18 16:53         ` Marc Zyngier
2017-09-23  0:41 ` [PATCH v3 08/20] KVM: arm/arm64: Rename soft timer to bg_timer Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 17:06   ` Marc Zyngier
2017-10-09 17:06     ` Marc Zyngier
2017-09-23  0:41 ` [PATCH v3 09/20] KVM: arm/arm64: Use separate timer for phys timer emulation Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 17:23   ` Marc Zyngier
2017-10-09 17:23     ` Marc Zyngier
2017-10-19  7:38     ` Christoffer Dall
2017-10-19  7:38       ` Christoffer Dall
2017-09-23  0:41 ` [PATCH v3 10/20] KVM: arm/arm64: Move timer/vgic flush/sync under disabled irq Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 17:34   ` Marc Zyngier
2017-10-09 17:34     ` Marc Zyngier
2017-09-23  0:41 ` [PATCH v3 11/20] KVM: arm/arm64: Move timer save/restore out of the hyp code Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 17:47   ` Marc Zyngier
2017-10-09 17:47     ` Marc Zyngier
2017-10-19  7:46     ` Christoffer Dall
2017-10-19  7:46       ` Christoffer Dall
2017-09-23  0:41 ` [PATCH v3 12/20] genirq: Document vcpu_info usage for percpu_devid interrupts Christoffer Dall
2017-09-23  0:41   ` Christoffer Dall
2017-10-09 17:48   ` Marc Zyngier
2017-10-09 17:48     ` Marc Zyngier
2017-09-23  0:42 ` [PATCH v3 13/20] KVM: arm/arm64: Set VCPU affinity for virt timer irq Christoffer Dall
2017-09-23  0:42   ` Christoffer Dall
2017-10-09 17:52   ` Marc Zyngier
2017-10-09 17:52     ` Marc Zyngier
2017-09-23  0:42 ` [PATCH v3 14/20] KVM: arm/arm64: Avoid timer save/restore in vcpu entry/exit Christoffer Dall
2017-09-23  0:42   ` Christoffer Dall
2017-10-10  8:47   ` Marc Zyngier
2017-10-10  8:47     ` Marc Zyngier
2017-10-19  8:15     ` Christoffer Dall
2017-10-19  8:15       ` Christoffer Dall
2017-09-23  0:42 ` [PATCH v3 15/20] KVM: arm/arm64: Support EL1 phys timer register access in set/get reg Christoffer Dall
2017-09-23  0:42   ` Christoffer Dall
2017-10-10  9:10   ` Marc Zyngier
2017-10-10  9:10     ` Marc Zyngier
2017-10-19  8:32     ` Christoffer Dall
2017-10-19  8:32       ` Christoffer Dall
2017-09-23  0:42 ` [PATCH v3 16/20] KVM: arm/arm64: Use kvm_arm_timer_set/get_reg for guest register traps Christoffer Dall
2017-09-23  0:42   ` Christoffer Dall
2017-10-10  9:12   ` Marc Zyngier
2017-10-10  9:12     ` Marc Zyngier
2017-09-23  0:42 ` Christoffer Dall [this message]
2017-09-23  0:42   ` [PATCH v3 17/20] KVM: arm/arm64: Move phys_timer_emulate function Christoffer Dall
2017-10-10  9:21   ` Marc Zyngier
2017-10-10  9:21     ` Marc Zyngier
2017-09-23  0:42 ` [PATCH v3 18/20] KVM: arm/arm64: Avoid phys timer emulation in vcpu entry/exit Christoffer Dall
2017-09-23  0:42   ` Christoffer Dall
2017-10-10  9:45   ` Marc Zyngier
2017-10-10  9:45     ` Marc Zyngier
2017-10-19  8:44     ` Christoffer Dall
2017-10-19  8:44       ` Christoffer Dall
2017-09-23  0:42 ` [PATCH v3 19/20] KVM: arm/arm64: Get rid of kvm_timer_flush_hwstate Christoffer Dall
2017-09-23  0:42   ` Christoffer Dall
2017-10-10  9:46   ` Marc Zyngier
2017-10-10  9:46     ` Marc Zyngier
2017-09-23  0:42 ` [PATCH v3 20/20] KVM: arm/arm64: Rework kvm_timer_should_fire Christoffer Dall
2017-09-23  0:42   ` Christoffer Dall
2017-10-10  9:59   ` Marc Zyngier
2017-10-10  9:59     ` 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=20170923004207.22356-18-cdall@linaro.org \
    --to=cdall@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=marc.zyngier@arm.com \
    --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 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.