Skip to contentSkip to conversation

arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host

PATCH Superseded Anup Patel 4 participants 8 messages Jul 22, 2013 – Nov 14, 2013

Subsystems (2)
lore
Share & tools
lore

Anup Patel

author
#0 lore raw

PATCH v4 1/1 arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host

This patch allows us to have X-Gene guest VCPU when using KVM arm64 on APM X-Gene host.

We add KVM_ARM_TARGET_XGENE_POTENZA for X-Gene Potenza compatible guest VCPU and we return KVM_ARM_TARGET_XGENE_POTENZA in kvm_target_cpu() when running on X-Gene host with Potenza core.

V4:
- Remove default case from switch statments in kvm_target_cpu()

V3:
- Reduce multiple "return -EINVAL" in kvm_target_cpu()

V2:
- Renamed KVM_ARM_TARGET_XGENE_V8 to KVM_ARM_TARGET_XGENE_POTENZA

V1:
- Initial patch with target named as KVM_ARM_TARGET_XGENE_V8

---
 arch/arm64/include/uapi/asm/kvm.h    |    3 ++-
 arch/arm64/kvm/guest.c               |   32 +++++++++++++++++++-------------
 arch/arm64/kvm/sys_regs_generic_v8.c |    3 +++
 3 files changed, 24 insertions(+), 14 deletions(-)
arch/arm64/include/uapi/asm/kvm.h +2 -1
index 5031f42..d9f026b 100644
@@ -55,8 +55,9 @@ struct kvm_regs {
 #define KVM_ARM_TARGET_AEM_V8		0
 #define KVM_ARM_TARGET_FOUNDATION_V8	1
 #define KVM_ARM_TARGET_CORTEX_A57	2
+#define KVM_ARM_TARGET_XGENE_POTENZA	3
 
-#define KVM_ARM_NUM_TARGETS		3
+#define KVM_ARM_NUM_TARGETS		4
 
 /* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */
 #define KVM_ARM_DEVICE_TYPE_SHIFT	0
arch/arm64/kvm/guest.c +19 -13
index 2c3ff67..d7bf7d6 100644
@@ -207,20 +207,26 @@ int __attribute_const__ kvm_target_cpu(void)
 	unsigned long implementor = read_cpuid_implementor();
 	unsigned long part_number = read_cpuid_part_number();
 
-	if (implementor != ARM_CPU_IMP_ARM)
-		return -EINVAL;
+	switch (implementor) {
+	case ARM_CPU_IMP_ARM:
+		switch (part_number) {
+		case ARM_CPU_PART_AEM_V8:
+			return KVM_ARM_TARGET_AEM_V8;
+		case ARM_CPU_PART_FOUNDATION:
+			return KVM_ARM_TARGET_FOUNDATION_V8;
+		case ARM_CPU_PART_CORTEX_A57:
+			return KVM_ARM_TARGET_CORTEX_A57;
+		};
+		break;
+	case ARM_CPU_IMP_APM:
+		switch (part_number) {
+		case APM_CPU_PART_POTENZA:
+			return KVM_ARM_TARGET_XGENE_POTENZA;
+		};
+		break;
+	};
 
-	switch (part_number) {
-	case ARM_CPU_PART_AEM_V8:
-		return KVM_ARM_TARGET_AEM_V8;
-	case ARM_CPU_PART_FOUNDATION:
-		return KVM_ARM_TARGET_FOUNDATION_V8;
-	case ARM_CPU_PART_CORTEX_A57:
-		/* Currently handled by the generic backend */
-		return KVM_ARM_TARGET_CORTEX_A57;
-	default:
-		return -EINVAL;
-	}
+	return -EINVAL;
 }
 
 int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
arch/arm64/kvm/sys_regs_generic_v8.c +3 -0
index 4268ab9..8fe6f76 100644
@@ -90,6 +90,9 @@ static int __init sys_reg_genericv8_init(void)
 					  &genericv8_target_table);
 	kvm_register_target_sys_reg_table(KVM_ARM_TARGET_CORTEX_A57,
 					  &genericv8_target_table);
+	kvm_register_target_sys_reg_table(KVM_ARM_TARGET_XGENE_POTENZA,
+					  &genericv8_target_table);
+
 	return 0;
 }
 late_initcall(sys_reg_genericv8_init);
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v4 1/1 arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host

Quoted 103 lines · Anup Patel

This patch allows us to have X-Gene guest VCPU when using KVM arm64 on APM X-Gene host.

We add KVM_ARM_TARGET_XGENE_POTENZA for X-Gene Potenza compatible guest VCPU and we return KVM_ARM_TARGET_XGENE_POTENZA in kvm_target_cpu() when running on X-Gene host with Potenza core.

V4:
- Remove default case from switch statments in kvm_target_cpu()

V3:
- Reduce multiple "return -EINVAL" in kvm_target_cpu()

V2:
- Renamed KVM_ARM_TARGET_XGENE_V8 to KVM_ARM_TARGET_XGENE_POTENZA

V1:
- Initial patch with target named as KVM_ARM_TARGET_XGENE_V8

---
 arch/arm64/include/uapi/asm/kvm.h    |    3 ++-
 arch/arm64/kvm/guest.c               |   32 +++++++++++++++++++-------------
 arch/arm64/kvm/sys_regs_generic_v8.c |    3 +++
 3 files changed, 24 insertions(+), 14 deletions(-)
arch/arm64/include/uapi/asm/kvm.h +2 -1
index 5031f42..d9f026b 100644
@@ -55,8 +55,9 @@ struct kvm_regs {
 #define KVM_ARM_TARGET_AEM_V8          0
 #define KVM_ARM_TARGET_FOUNDATION_V8   1
 #define KVM_ARM_TARGET_CORTEX_A57      2
+#define KVM_ARM_TARGET_XGENE_POTENZA   3
 
-#define KVM_ARM_NUM_TARGETS            3
+#define KVM_ARM_NUM_TARGETS            4
 
 /* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */
 #define KVM_ARM_DEVICE_TYPE_SHIFT      0
arch/arm64/kvm/guest.c +19 -13
index 2c3ff67..d7bf7d6 100644
@@ -207,20 +207,26 @@ int __attribute_const__ kvm_target_cpu(void)
        unsigned long implementor = read_cpuid_implementor();
        unsigned long part_number = read_cpuid_part_number();
 
-       if (implementor != ARM_CPU_IMP_ARM)
-               return -EINVAL;
+       switch (implementor) {
+       case ARM_CPU_IMP_ARM:
+               switch (part_number) {
+               case ARM_CPU_PART_AEM_V8:
+                       return KVM_ARM_TARGET_AEM_V8;
+               case ARM_CPU_PART_FOUNDATION:
+                       return KVM_ARM_TARGET_FOUNDATION_V8;
+               case ARM_CPU_PART_CORTEX_A57:
+                       return KVM_ARM_TARGET_CORTEX_A57;
+               };
+               break;
+       case ARM_CPU_IMP_APM:
+               switch (part_number) {
+               case APM_CPU_PART_POTENZA:
+                       return KVM_ARM_TARGET_XGENE_POTENZA;
+               };
+               break;
+       };
 
-       switch (part_number) {
-       case ARM_CPU_PART_AEM_V8:
-               return KVM_ARM_TARGET_AEM_V8;
-       case ARM_CPU_PART_FOUNDATION:
-               return KVM_ARM_TARGET_FOUNDATION_V8;
-       case ARM_CPU_PART_CORTEX_A57:
-               /* Currently handled by the generic backend */
-               return KVM_ARM_TARGET_CORTEX_A57;
-       default:
-               return -EINVAL;
-       }
+       return -EINVAL;
 }
 
 int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
arch/arm64/kvm/sys_regs_generic_v8.c +3 -1
index 4268ab9..8fe6f76 100644
@@ -90,6 +90,9 @@ static int __init sys_reg_genericv8_init(void)
                                          &genericv8_target_table);
        kvm_register_target_sys_reg_table(KVM_ARM_TARGET_CORTEX_A57,
                                          &genericv8_target_table);
+       kvm_register_target_sys_reg_table(KVM_ARM_TARGET_XGENE_POTENZA,
+                                         &genericv8_target_table);
+
        return 0;
 }
 late_initcall(sys_reg_genericv8_init);
--

1.7.9.5

Quoted 4 lines

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

Hi Marc,

Do you think more changes are required to this patch ?

Regards,
Anup

#2 lore raw

PATCH v4 1/1 arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host

Quoted 7 lines · Anup Patel
Quoted 6 lines · Anup Patel

This patch allows us to have X-Gene guest VCPU when using KVM arm64 on APM X-Gene host.

We add KVM_ARM_TARGET_XGENE_POTENZA for X-Gene Potenza compatible guest VCPU and we return KVM_ARM_TARGET_XGENE_POTENZA in kvm_target_cpu() when running on X-Gene host with Potenza core.

[...]

Quoted 3 lines

Hi Marc,

Do you think more changes are required to this patch ?

Hi Anup,

It looks OK to me as it is. I'll queue it for 3.12.

Thanks,

	M.
Signature · 1 line
Jazz is not dead. It just smells funny...
author
#3 lore raw

PATCH v4 1/1 arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host

Quoted 11 lines · Marc Zyngier
Quoted 7 lines · Anup Patel
Quoted 6 lines · Anup Patel

This patch allows us to have X-Gene guest VCPU when using KVM arm64 on APM X-Gene host.

We add KVM_ARM_TARGET_XGENE_POTENZA for X-Gene Potenza compatible guest VCPU and we return KVM_ARM_TARGET_XGENE_POTENZA in kvm_target_cpu() when running on X-Gene host with Potenza core.

[...]

Quoted 7 lines
Quoted 3 lines

Hi Marc,

Do you think more changes are required to this patch ?

Hi Anup,

It looks OK to me as it is. I'll queue it for 3.12.

Hi Marc,

I think this patch was missed for 3.12

Do you want me to resend this patch ??

Regards,
Anup

Quoted 7 lines

Thanks,

        M.

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

author
#4 lore raw

PATCH v4 1/1 arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host

Quoted 18 lines · Anup Patel
Quoted 17 lines · Marc Zyngier
Quoted 7 lines · Anup Patel
Quoted 6 lines · Anup Patel

This patch allows us to have X-Gene guest VCPU when using KVM arm64 on APM X-Gene host.

We add KVM_ARM_TARGET_XGENE_POTENZA for X-Gene Potenza compatible guest VCPU and we return KVM_ARM_TARGET_XGENE_POTENZA in kvm_target_cpu() when running on X-Gene host with Potenza core.

[...]

Quoted 3 lines

Hi Marc,

Do you think more changes are required to this patch ?

Hi Anup,

Quoted 7 lines
Quoted 1 line

It looks OK to me as it is. I'll queue it for 3.12.

Hi Marc,

I think this patch was missed for 3.12

Do you want me to resend this patch ??

Hi Marc,

What is missing in this patch ??

Do you want me to resend this patch ??

Regards,
Anup

Quoted 11 lines

Regards,
Anup

Quoted 7 lines

Thanks,

        M.

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

#5 lore raw

PATCH v4 1/1 arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host

Quoted 25 lines · Anup Patel
Quoted 24 lines · Anup Patel
Quoted 11 lines · Marc Zyngier
Quoted 7 lines · Anup Patel
Quoted 6 lines · Anup Patel

This patch allows us to have X-Gene guest VCPU when using KVM arm64 on APM X-Gene host.

We add KVM_ARM_TARGET_XGENE_POTENZA for X-Gene Potenza compatible guest VCPU and we return KVM_ARM_TARGET_XGENE_POTENZA in kvm_target_cpu() when running on X-Gene host with Potenza core.

[...]

Quoted 7 lines
Quoted 3 lines

Hi Marc,

Do you think more changes are required to this patch ?

Hi Anup,

It looks OK to me as it is. I'll queue it for 3.12.

Hi Marc,

I think this patch was missed for 3.12

Quoted 7 lines
Quoted 1 line

Do you want me to resend this patch ??

Hi Marc,

What is missing in this patch ??

Do you want me to resend this patch ??

I appear to have misplaced it somehow.
Please resend it .

Thanks,

	M.
Signature · 1 line
Jazz is not dead. It just smells funny...
author
#6 lore raw

PATCH v4 1/1 arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host

Quoted 28 lines · Marc Zyngier
Quoted 27 lines · Anup Patel
Quoted 25 lines · Anup Patel
Quoted 11 lines · Marc Zyngier
Quoted 7 lines · Anup Patel
Quoted 6 lines · Anup Patel

This patch allows us to have X-Gene guest VCPU when using KVM arm64 on APM X-Gene host.

We add KVM_ARM_TARGET_XGENE_POTENZA for X-Gene Potenza compatible guest VCPU and we return KVM_ARM_TARGET_XGENE_POTENZA in kvm_target_cpu() when running on X-Gene host with Potenza core.

[...]

Quoted 7 lines
Quoted 3 lines

Hi Marc,

Do you think more changes are required to this patch ?

Hi Anup,

It looks OK to me as it is. I'll queue it for 3.12.

Hi Marc,

I think this patch was missed for 3.12

Do you want me to resend this patch ??

Quoted 8 lines
Quoted 5 lines

Hi Marc,

What is missing in this patch ??

Do you want me to resend this patch ??

I appear to have misplaced it somehow.
Please resend it .

I have rechecked this patch against latest Linux stable tree. It still applies on latest Linux stable tree hence no need to re-base this patch on latest code.

Please get the patch from this mail thread itself.

Is it possible to merge this patch for 3.13 ??

Regards,
Anup

Quoted 7 lines

Thanks,

        M.

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

#7 lore raw

PATCH v4 1/1 arm64: KVM: Support X-Gene guest VCPU on APM X-Gene host

Quoted 33 lines · Anup Patel
Quoted 32 lines · Marc Zyngier
Quoted 31 lines · Anup Patel
Quoted 18 lines · Anup Patel
Quoted 17 lines · Marc Zyngier
Quoted 7 lines · Anup Patel
Quoted 6 lines · Anup Patel

This patch allows us to have X-Gene guest VCPU when using KVM arm64 on APM X-Gene host.

We add KVM_ARM_TARGET_XGENE_POTENZA for X-Gene Potenza compatible guest VCPU and we return KVM_ARM_TARGET_XGENE_POTENZA in kvm_target_cpu() when running on X-Gene host with Potenza core.

[...]

Quoted 3 lines

Hi Marc,

Do you think more changes are required to this patch ?

Hi Anup,

Quoted 7 lines
Quoted 1 line

It looks OK to me as it is. I'll queue it for 3.12.

Hi Marc,

I think this patch was missed for 3.12

Do you want me to resend this patch ??

Hi Marc,

What is missing in this patch ??

Quoted 9 lines
Quoted 4 lines
Quoted 1 line

Do you want me to resend this patch ??

I appear to have misplaced it somehow.
Please resend it .

I have rechecked this patch against latest Linux stable tree. It still applies on latest Linux stable tree hence no need to re-base this patch on latest code.

FYI: a better test is to make sure it applies to kvm/next.

-Christoffer