Skip to contentSkip to conversation

arm64: KVM: Add kvm_target_timer_irq() for arch_timer

PATCH New Anup Patel 3 participants 3 messages Apr 26, 2013

Subsystems (2)
lore
Share & tools
lore

Anup Patel

author
#0 lore raw

PATCH 1/1 arm64: KVM: Add kvm_target_timer_irq() for arch_timer

This patch adds kvm_target_timer_irq() for KVM ARM64 which determines guest virtual timer ppi number based on vcpu target type.

The patch also updates kvm_vcpu_reset() so that arch_timer is resetted on every vcpu reset.

---
 arch/arm64/include/asm/kvm_host.h |    1 +
 arch/arm64/kvm/guest.c            |   17 +++++++++++++++++
 arch/arm64/kvm/reset.c            |   13 +++++++++++++
 3 files changed, 31 insertions(+)
arch/arm64/include/asm/kvm_host.h +1 -0
index 77eec44..23e185d 100644
@@ -43,6 +43,7 @@
 
 struct kvm_vcpu;
 int kvm_target_cpu(void);
+struct kvm_irq_level *kvm_target_timer_irq(struct kvm_vcpu *vcpu);
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
 int kvm_arch_dev_ioctl_check_extension(long ext);
 
arch/arm64/kvm/guest.c +17 -0
index 8dc349b..ac9ec08 100644
@@ -36,6 +36,11 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
 	{ NULL }
 };
 
+static struct kvm_irq_level target_cortex_a57_timer_irq = {
+	.irq = 27,
+	.level = 1,
+};
+
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 {
 	vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;
@@ -224,6 +229,18 @@ int __attribute_const__ kvm_target_cpu(void)
 	}
 }
 
+struct kvm_irq_level *kvm_target_timer_irq(struct kvm_vcpu *vcpu)
+{
+	switch (vcpu->arch.target) {
+	case KVM_ARM_TARGET_AEM_V8:
+	case KVM_ARM_TARGET_FOUNDATION_V8:
+	case KVM_ARM_TARGET_CORTEX_A57:
+		return &target_cortex_a57_timer_irq;
+	default:
+		return NULL;
+	};
+}
+
 int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
 			const struct kvm_vcpu_init *init)
 {
arch/arm64/kvm/reset.c +13 -0
index 64e0740..45f1f10 100644
@@ -28,6 +28,14 @@
 #include <asm/kvm_arm.h>
 #include <asm/kvm_coproc.h>
 
+#ifdef CONFIG_KVM_ARM_TIMER
+/*
+ * We cannont directly include arm/include/asm/kvm_arch_timer.h here so,
+ * forward declaring required functions
+ */
+extern int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu);
+#endif
+
 /*
  * ARMv8 Reset Values
  */
@@ -95,5 +103,10 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 	/* Reset system registers */
 	kvm_reset_sys_regs(vcpu);
 
+#ifdef CONFIG_KVM_ARM_TIMER
+	/* Reset arch_timer context */
+	return kvm_timer_vcpu_reset(vcpu);
+#else
 	return 0;
+#endif
 }
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 arm64: KVM: Add kvm_target_timer_irq() for arch_timer

Quoted 6 lines · Anup Patel

This patch adds kvm_target_timer_irq() for KVM ARM64 which determines guest virtual timer ppi number based on vcpu target type.

The patch also updates kvm_vcpu_reset() so that arch_timer is resetted on every vcpu reset.

Same remarks as the 32bit version, plus...

Quoted 58 lines
---
 arch/arm64/include/asm/kvm_host.h |    1 +
 arch/arm64/kvm/guest.c            |   17 +++++++++++++++++
 arch/arm64/kvm/reset.c            |   13 +++++++++++++
 3 files changed, 31 insertions(+)
arch/arm64/include/asm/kvm_host.h +1 -0
index 77eec44..23e185d 100644
@@ -43,6 +43,7 @@
 
 struct kvm_vcpu;
 int kvm_target_cpu(void);
+struct kvm_irq_level *kvm_target_timer_irq(struct kvm_vcpu *vcpu);
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
 int kvm_arch_dev_ioctl_check_extension(long ext);
 
arch/arm64/kvm/guest.c +17 -0
index 8dc349b..ac9ec08 100644
@@ -36,6 +36,11 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
 	{ NULL }
 };
 
+static struct kvm_irq_level target_cortex_a57_timer_irq = {
+	.irq = 27,
+	.level = 1,
+};
+
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 {
 	vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;
@@ -224,6 +229,18 @@ int __attribute_const__ kvm_target_cpu(void)
 	}
 }
 
+struct kvm_irq_level *kvm_target_timer_irq(struct kvm_vcpu *vcpu)
+{
+	switch (vcpu->arch.target) {
+	case KVM_ARM_TARGET_AEM_V8:
+	case KVM_ARM_TARGET_FOUNDATION_V8:
+	case KVM_ARM_TARGET_CORTEX_A57:
+		return &target_cortex_a57_timer_irq;
+	default:
+		return NULL;
+	};
+}
+
 int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
 			const struct kvm_vcpu_init *init)
 {
arch/arm64/kvm/reset.c +0 -0
index 64e0740..45f1f10 100644

arch/arm64/kvm/reset.c line 31

Quoted 4 lines
arch/arm64/kvm/reset.c +1 -0
@@ -28,6 +28,14 @@
 #include <asm/kvm_arm.h>
 #include <asm/kvm_coproc.h>
 
+#ifdef CONFIG_KVM_ARM_TIMER

arm64 mandates the architected timers, so no need to #ifdef anything.

arch/arm64/kvm/reset.c line 33

Quoted 2 lines
arch/arm64/kvm/reset.c +2 -0
+/*
+ * We cannont directly include arm/include/asm/kvm_arch_timer.h here so,

What's wrong with arch/arm64/include/asm/kvm_arch_timer.h???

Quoted 20 lines
arch/arm64/kvm/reset.c +10 -0
+ * forward declaring required functions
+ */
+extern int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu);
+#endif
+
 /*
  * ARMv8 Reset Values
  */
@@ -95,5 +103,10 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
 	/* Reset system registers */
 	kvm_reset_sys_regs(vcpu);
 
+#ifdef CONFIG_KVM_ARM_TIMER
+	/* Reset arch_timer context */
+	return kvm_timer_vcpu_reset(vcpu);
+#else
 	return 0;
+#endif
 }
Signature · 1 line
Jazz is not dead. It just smells funny...
#2 lore raw

PATCH 1/1 arm64: KVM: Add kvm_target_timer_irq() for arch_timer

Quoted 9 lines · Marc Zyngier
Quoted 6 lines · Anup Patel

This patch adds kvm_target_timer_irq() for KVM ARM64 which determines guest virtual timer ppi number based on vcpu target type.

The patch also updates kvm_vcpu_reset() so that arch_timer is resetted on every vcpu reset.

Same remarks as the 32bit version, plus...

Sure, I incorporate previous comments here too.

Quoted 62 lines
Quoted 62 lines
---
 arch/arm64/include/asm/kvm_host.h |    1 +
 arch/arm64/kvm/guest.c            |   17 +++++++++++++++++
 arch/arm64/kvm/reset.c            |   13 +++++++++++++
 3 files changed, 31 insertions(+)
arch/arm64/include/asm/kvm_host.h +1 -0
index 77eec44..23e185d 100644
@@ -43,6 +43,7 @@
 
 struct kvm_vcpu;
 int kvm_target_cpu(void);
+struct kvm_irq_level *kvm_target_timer_irq(struct kvm_vcpu *vcpu);
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
 int kvm_arch_dev_ioctl_check_extension(long ext);
 
arch/arm64/kvm/guest.c +17 -0
index 8dc349b..ac9ec08 100644
@@ -36,6 +36,11 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
      { NULL }
 };
 
+static struct kvm_irq_level target_cortex_a57_timer_irq = {
+     .irq = 27,
+     .level = 1,
+};
+
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 {
      vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;
@@ -224,6 +229,18 @@ int __attribute_const__ kvm_target_cpu(void)
      }
 }
 
+struct kvm_irq_level *kvm_target_timer_irq(struct kvm_vcpu *vcpu)
+{
+     switch (vcpu->arch.target) {
+     case KVM_ARM_TARGET_AEM_V8:
+     case KVM_ARM_TARGET_FOUNDATION_V8:
+     case KVM_ARM_TARGET_CORTEX_A57:
+             return &target_cortex_a57_timer_irq;
+     default:
+             return NULL;
+     };
+}
+
 int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
                      const struct kvm_vcpu_init *init)
 {
arch/arm64/kvm/reset.c +0 -0
index 64e0740..45f1f10 100644
@@ -28,6 +28,14 @@
 #include <asm/kvm_arm.h>
 #include <asm/kvm_coproc.h>
 
Quoted 3 lines

arch/arm64/kvm/reset.c line 31

Quoted 1 line
arch/arm64/kvm/reset.c +1 -0
+#ifdef CONFIG_KVM_ARM_TIMER

arm64 mandates the architected timers, so no need to #ifdef anything.

Ok, will remove this #if

Quoted 6 lines

arch/arm64/kvm/reset.c line 33

Quoted 3 lines
arch/arm64/kvm/reset.c +2 -0
+/*
+ * We cannont directly include arm/include/asm/kvm_arch_timer.h here so,

What's wrong with arch/arm64/include/asm/kvm_arch_timer.h???

Actually, I was getting "undefined kvm_timer_vcpu_reset()" error by including asm/kvm_arch_timer.h
I really thought asm/kvm_arch_timer.h is shared by KVM ARM32 and KVM ARM64.

I will again try including asm/kvm_arch_timer.h in reset.c

Quoted 26 lines
Quoted 10 lines
arch/arm64/kvm/reset.c +5 -0
+ * forward declaring required functions
+ */
+extern int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu);
+#endif
+
 /*
  * ARMv8 Reset Values
  */

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

Quoted 10 lines
arch/arm64/kvm/reset.c +5 -0
@@ -95,5 +103,10 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
      /* Reset system registers */
      kvm_reset_sys_regs(vcpu);
 
+#ifdef CONFIG_KVM_ARM_TIMER
+     /* Reset arch_timer context */
+     return kvm_timer_vcpu_reset(vcpu);
+#else
      return 0;
+#endif
 }

--
Jazz is not dead. It just smells funny...

Quoted 4 lines

_______________________________________________
kvmarm mailing list
kvmarm at lists.cs.columbia.edu
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm

--Anup