Skip to contentSkip to conversation

ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq

PATCH Superseded Anup Patel 3 participants 5 messages Apr 27, 2013 – Apr 28, 2013 Arm (32-bit)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Anup Patel

author
#0 lore raw

PATCH 1/1 ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq

The arch_timer irq numbers (or PPI numbers) are implementation dependent so, the host virtual timer irq number can be different from guest virtual timer irq number.

This patch ensures that host virtual timer irq number is read from DTB and guest virtual timer irq is determined based on vcpu target type.

---
 arch/arm/include/asm/kvm_arch_timer.h |    9 +++++++++
 arch/arm/kvm/arch_timer.c             |   35 ++++++++++++++++++++++++++-------
 arch/arm/kvm/reset.c                  |   11 ++++++++++-
 3 files changed, 47 insertions(+), 8 deletions(-)
arch/arm/include/asm/kvm_arch_timer.h +9 -0
index 68cb9e1..51b0316 100644
@@ -61,6 +61,8 @@ struct arch_timer_cpu {
 #ifdef CONFIG_KVM_ARM_TIMER
 int kvm_timer_hyp_init(void);
 int kvm_timer_init(struct kvm *kvm);
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
+			 const struct kvm_irq_level *irq);
 void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);
 void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu);
 void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu);
@@ -76,7 +78,14 @@ static inline int kvm_timer_init(struct kvm *kvm)
 	return 0;
 }
 
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
+			 const struct kvm_irq_level *irq)
+{
+	return 0;
+}
+
 static inline void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) {}
+
 static inline void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) {}
 static inline void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) {}
 static inline void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) {}
arch/arm/kvm/arch_timer.c +28 -7
index 49a7516..c07b63c 100644
@@ -30,7 +30,7 @@
 
 static struct timecounter *timecounter;
 static struct workqueue_struct *wqueue;
-static struct kvm_irq_level timer_irq = {
+static struct kvm_irq_level host_timer_irq = {
 	.level	= 1,
 };
 
@@ -67,8 +67,8 @@ static void kvm_timer_inject_irq(struct kvm_vcpu *vcpu)
 
 	timer->cntv_ctl |= ARCH_TIMER_CTRL_IT_MASK;
 	kvm_vgic_inject_irq(vcpu->kvm, vcpu->vcpu_id,
-			    vcpu->arch.timer_cpu.irq->irq,
-			    vcpu->arch.timer_cpu.irq->level);
+			    timer->irq->irq,
+			    timer->irq->level);
 }
 
 static irqreturn_t kvm_arch_timer_handler(int irq, void *dev_id)
@@ -156,6 +156,27 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu)
 	timer_arm(timer, ns);
 }
 
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
+			 const struct kvm_irq_level *irq)
+{
+	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
+
+	/*
+	 * The vcpu timer irq number cannot be determined in 
+	 * kvm_timer_vcpu_init() because it is called much before
+	 * kvm_vcpu_set_target(). To handle this, we determine
+	 * vcpu timer irq number when the vcpu is resetted.
+	 */
+	timer->irq = irq;
+
+	/*
+	 * Make sure timer is disarmed.
+	 */
+	timer_disarm(timer);
+
+	return 0;
+}
+
 void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
 {
 	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
@@ -163,12 +184,12 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
 	INIT_WORK(&timer->expired, kvm_timer_inject_irq_work);
 	hrtimer_init(&timer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
 	timer->timer.function = kvm_timer_expire;
-	timer->irq = &timer_irq;
+	timer->irq = NULL;
 }
 
 static void kvm_timer_init_interrupt(void *info)
 {
-	enable_percpu_irq(timer_irq.irq, 0);
+	enable_percpu_irq(host_timer_irq.irq, 0);
 }
 
 
@@ -182,7 +203,7 @@ static int kvm_timer_cpu_notify(struct notifier_block *self,
 		break;
 	case CPU_DYING:
 	case CPU_DYING_FROZEN:
-		disable_percpu_irq(timer_irq.irq);
+		disable_percpu_irq(host_timer_irq.irq);
 		break;
 	}
 
@@ -230,7 +251,7 @@ int kvm_timer_hyp_init(void)
 		goto out;
 	}
 
-	timer_irq.irq = ppi;
+	host_timer_irq.irq = ppi;
 
 	err = register_cpu_notifier(&kvm_timer_cpu_nb);
 	if (err) {
arch/arm/kvm/reset.c +10 -1
index b80256b..148397e 100644
@@ -26,6 +26,7 @@
 #include <asm/cputype.h>
 #include <asm/kvm_arm.h>
 #include <asm/kvm_coproc.h>
+#include <asm/kvm_arch_timer.h>
 
 /******************************************************************************
  * Cortex-A15 Reset Values
@@ -37,6 +38,11 @@ static struct kvm_regs a15_regs_reset = {
 	.usr_regs.ARM_cpsr = SVC_MODE | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT,
 };
 
+static struct kvm_irq_level a15_timer_irq = {
+	.irq = 27,
+	.level = 1,
+};
+
 
 /*******************************************************************************
  * Exported reset function
@@ -52,6 +58,7 @@ static struct kvm_regs a15_regs_reset = {
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 {
 	struct kvm_regs *cpu_reset;
+	const struct kvm_irq_level *cpu_irq;
 
 	switch (vcpu->arch.target) {
 	case KVM_ARM_TARGET_CORTEX_A15:
@@ -59,6 +66,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 			return -EINVAL;
 		cpu_reset = &a15_regs_reset;
 		vcpu->arch.midr = read_cpuid_id();
+		cpu_irq = &a15_timer_irq;
 		break;
 	default:
 		return -ENODEV;
@@ -70,5 +78,6 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 	/* Reset CP15 registers */
 	kvm_reset_coprocs(vcpu);
 
-	return 0;
+	/* Reset arch_timer context */
+	return kvm_timer_vcpu_reset(vcpu, cpu_irq);
 }
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq

Quoted 2 lines · Anup Patel

The arch_timer irq numbers (or PPI numbers) are implementation dependent so, the host virtual timer irq number can be different from guest

virtual

Quoted 3 lines

timer irq number.

This patch ensures that host virtual timer irq number is read from DTB

and

Quoted 1 line

guest virtual timer irq is determined based on vcpu target type.

Christoffer already commented on the width of your commit message. It doesn't show here as my stupid email client reformats it aumatically, but you may want to check in the archive:

https://lists.cs.columbia.edu/pipermail/kvmarm/2013-April/005616.html

Please make sure you insert newlines around position 70. Or use a half decent editor.

Quoted 24 lines
---
 arch/arm/include/asm/kvm_arch_timer.h |    9 +++++++++
 arch/arm/kvm/arch_timer.c             |   35
 ++++++++++++++++++++++++++-------
 arch/arm/kvm/reset.c                  |   11 ++++++++++-
 3 files changed, 47 insertions(+), 8 deletions(-)
arch/arm/include/asm/kvm_arch_timer.h +2 -0
index 68cb9e1..51b0316 100644
@@ -61,6 +61,8 @@ struct arch_timer_cpu {
 #ifdef CONFIG_KVM_ARM_TIMER
 int kvm_timer_hyp_init(void);
 int kvm_timer_init(struct kvm *kvm);
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
+			 const struct kvm_irq_level *irq);
 void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);
 void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu);
 void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu);

arch/arm/include/asm/kvm_arch_timer.h static inline int kvm_timer_init(struct kvm *kvm) · line 82

Quoted 5 lines
arch/arm/include/asm/kvm_arch_timer.h +2 -0
@@ -76,7 +78,14 @@ static inline int kvm_timer_init(struct kvm *kvm)
 	return 0;
 }
 
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
+			 const struct kvm_irq_level *irq)

static inline, please. This is an include file...

arch/arm/kvm/arch_timer.c static void kvm_timer_inject_irq(struct kvm_vcpu

Quoted 23 lines
arch/arm/include/asm/kvm_arch_timer.h +5 -0
+{
+	return 0;
+}
+
 static inline void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) {}
+
 static inline void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) {}
 static inline void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) {}
 static inline void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) {}
arch/arm/kvm/arch_timer.c +1 -1
index 49a7516..c07b63c 100644
@@ -30,7 +30,7 @@
 
 static struct timecounter *timecounter;
 static struct workqueue_struct *wqueue;
-static struct kvm_irq_level timer_irq = {
+static struct kvm_irq_level host_timer_irq = {
 	.level	= 1,
 };
 
@@ -67,8 +67,8 @@ static void kvm_timer_inject_irq(struct kvm_vcpu

*vcpu)

Quoted 21 lines
arch/arm/kvm/arch_timer.c +9 -2
 	timer->cntv_ctl |= ARCH_TIMER_CTRL_IT_MASK;
 	kvm_vgic_inject_irq(vcpu->kvm, vcpu->vcpu_id,
-			    vcpu->arch.timer_cpu.irq->irq,
-			    vcpu->arch.timer_cpu.irq->level);
+			    timer->irq->irq,
+			    timer->irq->level);
 }
 
 static irqreturn_t kvm_arch_timer_handler(int irq, void *dev_id)
@@ -156,6 +156,27 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu)
 	timer_arm(timer, ns);
 }
 
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
+			 const struct kvm_irq_level *irq)
+{
+	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
+
+	/*
+	 * The vcpu timer irq number cannot be determined in 

arch/arm/kvm/arch_timer.c void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) · line 175

Quoted 10 lines
arch/arm/kvm/arch_timer.c +10 -0
+	 * kvm_timer_vcpu_init() because it is called much before
+	 * kvm_vcpu_set_target(). To handle this, we determine
+	 * vcpu timer irq number when the vcpu is resetted.
+	 */
+	timer->irq = irq;
+
+	/*
+	 * Make sure timer is disarmed.
+	 */
+	timer_disarm(timer);

What is that for? Timer has not been started yet, for the lack of an IRQ. Actually, the vcpu has never ran. Why would you need to disarm it?

arch/arm/kvm/arch_timer.c void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) · line 176

Quoted 1 line
arch/arm/kvm/arch_timer.c +1 -0
+	return 0;

If this function has no failure case, it can return void.

arch/arm/kvm/arch_timer.c void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) · line 187

Quoted 11 lines
arch/arm/kvm/arch_timer.c +3 -1
+}
+
 void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
 {
 	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
@@ -163,12 +184,12 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
 	INIT_WORK(&timer->expired, kvm_timer_inject_irq_work);
 	hrtimer_init(&timer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
 	timer->timer.function = kvm_timer_expire;
-	timer->irq = &timer_irq;
+	timer->irq = NULL;

How useful is that? The vcpu has been kzalloc-ed anyway. Is there any case where this makes sense?

arch/arm/kvm/arch_timer.c static int kvm_timer_cpu_notify(struct

Quoted 10 lines
arch/arm/kvm/arch_timer.c +1 -1
 }
 
 static void kvm_timer_init_interrupt(void *info)
 {
-	enable_percpu_irq(timer_irq.irq, 0);
+	enable_percpu_irq(host_timer_irq.irq, 0);
 }
 
 
@@ -182,7 +203,7 @@ static int kvm_timer_cpu_notify(struct

notifier_block

Quoted 23 lines
arch/arm/kvm/arch_timer.c +2 -2
 *self,
 		break;
 	case CPU_DYING:
 	case CPU_DYING_FROZEN:
-		disable_percpu_irq(timer_irq.irq);
+		disable_percpu_irq(host_timer_irq.irq);
 		break;
 	}
@@ -230,7 +251,7 @@ int kvm_timer_hyp_init(void)
 		goto out;
 	}
 
-	timer_irq.irq = ppi;
+	host_timer_irq.irq = ppi;
 
 	err = register_cpu_notifier(&kvm_timer_cpu_nb);
 	if (err) {
arch/arm/kvm/reset.c +0 -0
index b80256b..148397e 100644

arch/arm/kvm/reset.c line 31

Quoted 6 lines
arch/arm/kvm/reset.c +1 -0
@@ -26,6 +26,7 @@
 #include <asm/cputype.h>
 #include <asm/kvm_arm.h>
 #include <asm/kvm_coproc.h>
+#include <asm/kvm_arch_timer.h>
 
 

/******************************************************************************

arch/arm/kvm/reset.c static struct kvm_regs a15_regs_reset = { · line 41

Quoted 6 lines
arch/arm/kvm/reset.c +1 -0
  * Cortex-A15 Reset Values
@@ -37,6 +38,11 @@ static struct kvm_regs a15_regs_reset = {
 	.usr_regs.ARM_cpsr = SVC_MODE | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT,
 };
 
+static struct kvm_irq_level a15_timer_irq = {

Please make this static const.

arch/arm/kvm/reset.c static struct kvm_regs a15_regs_reset = {

Quoted 6 lines
arch/arm/kvm/reset.c +4 -0
+	.irq = 27,
+	.level = 1,
+};
+
 
 

/*******************************************************************************

Quoted 18 lines
arch/arm/kvm/reset.c +2 -0
  * Exported reset function
@@ -52,6 +58,7 @@ static struct kvm_regs a15_regs_reset = {
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 {
 	struct kvm_regs *cpu_reset;
+	const struct kvm_irq_level *cpu_irq;
 
 	switch (vcpu->arch.target) {
 	case KVM_ARM_TARGET_CORTEX_A15:
@@ -59,6 +66,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 			return -EINVAL;
 		cpu_reset = &a15_regs_reset;
 		vcpu->arch.midr = read_cpuid_id();
+		cpu_irq = &a15_timer_irq;
 		break;
 	default:
 		return -ENODEV;

arch/arm/kvm/reset.c int kvm_reset_vcpu(struct kvm_vcpu *vcpu) · line 83

Quoted 7 lines
arch/arm/kvm/reset.c +2 -1
@@ -70,5 +78,6 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 	/* Reset CP15 registers */
 	kvm_reset_coprocs(vcpu);
 
-	return 0;
+	/* Reset arch_timer context */
+	return kvm_timer_vcpu_reset(vcpu, cpu_irq);
 }

Some of the above comments also apply to the arm64 you sent.

Thanks,

        M.
Signature · 1 line
Fast, cheap, reliable. Pick two.
#2 lore raw

PATCH 1/1 ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq

Quoted 11 lines · Marc Zyngier
Quoted 2 lines · Anup Patel

The arch_timer irq numbers (or PPI numbers) are implementation dependent so, the host virtual timer irq number can be different from guest

virtual

Quoted 3 lines

timer irq number.

This patch ensures that host virtual timer irq number is read from DTB

and

Quoted 1 line

guest virtual timer irq is determined based on vcpu target type.

Quoted 8 lines

Christoffer already commented on the width of your commit message. It doesn't show here as my stupid email client reformats it aumatically, but you may want to check in the archive:

https://lists.cs.columbia.edu/pipermail/kvmarm/2013-April/005616.html

Please make sure you insert newlines around position 70. Or use a half decent editor.

Ok, will do.

Quoted 28 lines
Quoted 28 lines
---
 arch/arm/include/asm/kvm_arch_timer.h |    9 +++++++++
 arch/arm/kvm/arch_timer.c             |   35
 ++++++++++++++++++++++++++-------
 arch/arm/kvm/reset.c                  |   11 ++++++++++-
 3 files changed, 47 insertions(+), 8 deletions(-)
arch/arm/include/asm/kvm_arch_timer.h +2 -0
index 68cb9e1..51b0316 100644
@@ -61,6 +61,8 @@ struct arch_timer_cpu {
 #ifdef CONFIG_KVM_ARM_TIMER
 int kvm_timer_hyp_init(void);
 int kvm_timer_init(struct kvm *kvm);
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,
+                      const struct kvm_irq_level *irq);
 void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);
 void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu);
 void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu);
@@ -76,7 +78,14 @@ static inline int kvm_timer_init(struct kvm *kvm)
      return 0;
 }
 
Quoted 4 lines

arch/arm/include/asm/kvm_arch_timer.h static inline int kvm_timer_init(struct kvm *kvm) · line 82

Quoted 2 lines
arch/arm/include/asm/kvm_arch_timer.h +2 -0
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,
+                      const struct kvm_irq_level *irq)

static inline, please. This is an include file...

This one is accidental. I had it static inlined.

Quoted 51 lines

arch/arm/kvm/arch_timer.c static void kvm_timer_inject_irq(struct kvm_vcpu

Quoted 24 lines
arch/arm/include/asm/kvm_arch_timer.h +5 -0
+{
+     return 0;
+}
+
 static inline void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) {}
+
 static inline void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) {}
 static inline void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) {}
 static inline void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) {}
arch/arm/kvm/arch_timer.c +1 -1
index 49a7516..c07b63c 100644
@@ -30,7 +30,7 @@
 
 static struct timecounter *timecounter;
 static struct workqueue_struct *wqueue;
-static struct kvm_irq_level timer_irq = {
+static struct kvm_irq_level host_timer_irq = {
      .level  = 1,
 };
 
@@ -67,8 +67,8 @@ static void kvm_timer_inject_irq(struct kvm_vcpu

*vcpu)

Quoted 26 lines
arch/arm/kvm/arch_timer.c +14 -2
      timer->cntv_ctl |= ARCH_TIMER_CTRL_IT_MASK;
      kvm_vgic_inject_irq(vcpu->kvm, vcpu->vcpu_id,
-                         vcpu->arch.timer_cpu.irq->irq,
-                         vcpu->arch.timer_cpu.irq->level);
+                         timer->irq->irq,
+                         timer->irq->level);
 }
 
 static irqreturn_t kvm_arch_timer_handler(int irq, void *dev_id)
@@ -156,6 +156,27 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu)
      timer_arm(timer, ns);
 }
 
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,
+                      const struct kvm_irq_level *irq)
+{
+     struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
+
+     /*
+      * The vcpu timer irq number cannot be determined in
+      * kvm_timer_vcpu_init() because it is called much before
+      * kvm_vcpu_set_target(). To handle this, we determine
+      * vcpu timer irq number when the vcpu is resetted.
+      */
+     timer->irq = irq;
Quoted 8 lines

arch/arm/kvm/arch_timer.c void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) · line 175

Quoted 5 lines
arch/arm/kvm/arch_timer.c +5 -0
+
+     /*
+      * Make sure timer is disarmed.
+      */
+     timer_disarm(timer);

What is that for? Timer has not been started yet, for the lack of an IRQ. Actually, the vcpu has never ran. Why would you need to disarm it?

This is in case a vcpu is resetted at runtime from user space or psci. Also, since we have named it timer_vcpu_reset(), it made sense to atleast disarm the timer.

Quoted 4 lines

arch/arm/kvm/arch_timer.c void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) · line 176

Quoted 2 lines
arch/arm/kvm/arch_timer.c +1 -0
+     return 0;

If this function has no failure case, it can return void.

Ok, will make it return void.

Quoted 15 lines

arch/arm/kvm/arch_timer.c void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) · line 187

Quoted 12 lines
arch/arm/kvm/arch_timer.c +3 -1
+}
+
 void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
 {
      struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
@@ -163,12 +184,12 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
      INIT_WORK(&timer->expired, kvm_timer_inject_irq_work);
      hrtimer_init(&timer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
      timer->timer.function = kvm_timer_expire;
-     timer->irq = &timer_irq;
+     timer->irq = NULL;

How useful is that? The vcpu has been kzalloc-ed anyway. Is there any case where this makes sense?

Ok, will remove this.

Quoted 42 lines

arch/arm/kvm/arch_timer.c static int kvm_timer_cpu_notify(struct

Quoted 11 lines
arch/arm/kvm/arch_timer.c +1 -1
 }
 
 static void kvm_timer_init_interrupt(void *info)
 {
-     enable_percpu_irq(timer_irq.irq, 0);
+     enable_percpu_irq(host_timer_irq.irq, 0);
 }
 
 
@@ -182,7 +203,7 @@ static int kvm_timer_cpu_notify(struct

notifier_block

Quoted 23 lines
arch/arm/kvm/arch_timer.c +2 -2
 *self,
              break;
      case CPU_DYING:
      case CPU_DYING_FROZEN:
-             disable_percpu_irq(timer_irq.irq);
+             disable_percpu_irq(host_timer_irq.irq);
              break;
      }
@@ -230,7 +251,7 @@ int kvm_timer_hyp_init(void)
              goto out;
      }
 
-     timer_irq.irq = ppi;
+     host_timer_irq.irq = ppi;
 
      err = register_cpu_notifier(&kvm_timer_cpu_nb);
      if (err) {
arch/arm/kvm/reset.c +0 -0
index b80256b..148397e 100644

arch/arm/kvm/reset.c line 31

Quoted 6 lines
arch/arm/kvm/reset.c +1 -0
@@ -26,6 +26,7 @@
 #include <asm/cputype.h>
 #include <asm/kvm_arm.h>
 #include <asm/kvm_coproc.h>
+#include <asm/kvm_arch_timer.h>
 
 

/******************************************************************************

Quoted 8 lines

arch/arm/kvm/reset.c static struct kvm_regs a15_regs_reset = { · line 41

Quoted 6 lines
arch/arm/kvm/reset.c +1 -0
  * Cortex-A15 Reset Values
@@ -37,6 +38,11 @@ static struct kvm_regs a15_regs_reset = {
      .usr_regs.ARM_cpsr = SVC_MODE | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT,
 };
 
+static struct kvm_irq_level a15_timer_irq = {

Please make this static const.

Ok, will make it static const.

Quoted 29 lines

arch/arm/kvm/reset.c static struct kvm_regs a15_regs_reset = {

Quoted 7 lines
arch/arm/kvm/reset.c +4 -0
+     .irq = 27,
+     .level = 1,
+};
+
 
 

/*******************************************************************************

Quoted 21 lines
arch/arm/kvm/reset.c +2 -0
  * Exported reset function
@@ -52,6 +58,7 @@ static struct kvm_regs a15_regs_reset = {
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 {
      struct kvm_regs *cpu_reset;
+     const struct kvm_irq_level *cpu_irq;
 
      switch (vcpu->arch.target) {
      case KVM_ARM_TARGET_CORTEX_A15:
@@ -59,6 +66,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
                      return -EINVAL;
              cpu_reset = &a15_regs_reset;
              vcpu->arch.midr = read_cpuid_id();
+             cpu_irq = &a15_timer_irq;
              break;
      default:
              return -ENODEV;
@@ -70,5 +78,6 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
      /* Reset CP15 registers */
      kvm_reset_coprocs(vcpu);
 
Quoted 6 lines

arch/arm/kvm/reset.c int kvm_reset_vcpu(struct kvm_vcpu *vcpu) · line 83

Quoted 4 lines
arch/arm/kvm/reset.c +2 -1
-     return 0;
+     /* Reset arch_timer context */
+     return kvm_timer_vcpu_reset(vcpu, cpu_irq);
 }

Some of the above comments also apply to the arm64 you sent.

Sure, I will update that patch too.

Quoted 10 lines

Thanks,

        M.

--
Fast, cheap, reliable. Pick two.
_______________________________________________
kvmarm mailing list
kvmarm at lists.cs.columbia.edu
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm

--Anup

#3 lore raw

PATCH 1/1 ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq

Quoted 1 line · Anup Patel

On Sat, Apr 27, 2013 at 2:49 PM, Marc Zyngier <[email protected]>

Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 1 line · Anup Patel

The arch_timer irq numbers (or PPI numbers) are implementation

dependent

Quoted 7 lines
Quoted 7 lines
Quoted 1 line

so, the host virtual timer irq number can be different from guest

virtual

Quoted 3 lines

timer irq number.

This patch ensures that host virtual timer irq number is read from DTB

and

Quoted 1 line

guest virtual timer irq is determined based on vcpu target type.

[...]

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
arch/arm/kvm/arch_timer.c +11 -0
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,
+                      const struct kvm_irq_level *irq)
+{
+     struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
+
+     /*
+      * The vcpu timer irq number cannot be determined in
+      * kvm_timer_vcpu_init() because it is called much before
+      * kvm_vcpu_set_target(). To handle this, we determine
+      * vcpu timer irq number when the vcpu is resetted.
+      */
Quoted 8 lines
Quoted 8 lines

arch/arm/kvm/arch_timer.c void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) · line 175

Quoted 6 lines
arch/arm/kvm/arch_timer.c +6 -0
+     timer->irq = irq;
+
+     /*
+      * Make sure timer is disarmed.
+      */
+     timer_disarm(timer);

What is that for? Timer has not been started yet, for the lack of an

IRQ.

Quoted 5 lines
Quoted 1 line

Actually, the vcpu has never ran. Why would you need to disarm it?

This is in case a vcpu is resetted at runtime from user space or psci. Also, since we have named it timer_vcpu_reset(), it made sense to atleast disarm the timer.

I would agree if the timer had a clearly defined reset state. The ARM ARM says that the timer register reset values are UNKNOWN. So at CPU reset, the timer is allowed to be in any possible state, including having a pending interrupt.

This means the guest already has to deal with the situation, and I'd rather not give additional guarantees. Please remove this call from your next version of this patch.

Thanks,

        M.
Signature · 1 line
Fast, cheap, reliable. Pick two.
#4 lore raw

PATCH 1/1 ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq

Quoted 45 lines · Marc Zyngier
Quoted 1 line · Anup Patel

On Sat, Apr 27, 2013 at 2:49 PM, Marc Zyngier <[email protected]>

Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 1 line · Anup Patel

The arch_timer irq numbers (or PPI numbers) are implementation

dependent

Quoted 7 lines
Quoted 7 lines
Quoted 1 line

so, the host virtual timer irq number can be different from guest

virtual

Quoted 3 lines

timer irq number.

This patch ensures that host virtual timer irq number is read from DTB

and

Quoted 1 line

guest virtual timer irq is determined based on vcpu target type.

[...]

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
arch/arm/kvm/arch_timer.c +11 -0
+int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,
+                      const struct kvm_irq_level *irq)
+{
+     struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
+
+     /*
+      * The vcpu timer irq number cannot be determined in
+      * kvm_timer_vcpu_init() because it is called much before
+      * kvm_vcpu_set_target(). To handle this, we determine
+      * vcpu timer irq number when the vcpu is resetted.
+      */
Quoted 8 lines
Quoted 8 lines

arch/arm/kvm/arch_timer.c void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) · line 175

Quoted 6 lines
arch/arm/kvm/arch_timer.c +6 -0
+     timer->irq = irq;
+
+     /*
+      * Make sure timer is disarmed.
+      */
+     timer_disarm(timer);

What is that for? Timer has not been started yet, for the lack of an

IRQ.

Quoted 5 lines
Quoted 1 line

Actually, the vcpu has never ran. Why would you need to disarm it?

This is in case a vcpu is resetted at runtime from user space or psci. Also, since we have named it timer_vcpu_reset(), it made sense to atleast disarm the timer.

Quoted 8 lines

I would agree if the timer had a clearly defined reset state. The ARM ARM says that the timer register reset values are UNKNOWN. So at CPU reset, the timer is allowed to be in any possible state, including having a pending interrupt.

This means the guest already has to deal with the situation, and I'd rather not give additional guarantees. Please remove this call from your next version of this patch.

Ok, I will remove it.

Quoted 6 lines

Thanks,

        M.

--
Fast, cheap, reliable. Pick two.

--Anup