928b70e2d1
Without this serial, we can't start VM with more than 256 vcpus, this is limited by kvm API, backport this serial to fix the bug. With this patches, it can supports up to 512 vcpus. Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 896b9892d4df316b85836daa973e442c0c64cec6 Mon Sep 17 00:00:00 2001
|
|
From: Zenghui Yu <yuzenghui@huawei.com>
|
|
Date: Fri, 3 Jan 2020 17:16:55 +0800
|
|
Subject: [PATCH 1/3] linux headers: update against "KVM/ARM: Fix >256 vcpus"
|
|
|
|
This is part of upstream commit f363d039e883 ("linux headers: update
|
|
against v5.4-rc1"), authored by Eric Auger <eric.auger@redhat.com>.
|
|
|
|
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
|
|
---
|
|
linux-headers/asm-arm/kvm.h | 4 +++-
|
|
linux-headers/asm-arm64/kvm.h | 4 +++-
|
|
linux-headers/linux/kvm.h | 1 +
|
|
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h
|
|
index e1f8b745..137a2730 100644
|
|
--- a/linux-headers/asm-arm/kvm.h
|
|
+++ b/linux-headers/asm-arm/kvm.h
|
|
@@ -254,8 +254,10 @@ struct kvm_vcpu_events {
|
|
#define KVM_DEV_ARM_ITS_CTRL_RESET 4
|
|
|
|
/* KVM_IRQ_LINE irq field index values */
|
|
+#define KVM_ARM_IRQ_VCPU2_SHIFT 28
|
|
+#define KVM_ARM_IRQ_VCPU2_MASK 0xf
|
|
#define KVM_ARM_IRQ_TYPE_SHIFT 24
|
|
-#define KVM_ARM_IRQ_TYPE_MASK 0xff
|
|
+#define KVM_ARM_IRQ_TYPE_MASK 0xf
|
|
#define KVM_ARM_IRQ_VCPU_SHIFT 16
|
|
#define KVM_ARM_IRQ_VCPU_MASK 0xff
|
|
#define KVM_ARM_IRQ_NUM_SHIFT 0
|
|
diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h
|
|
index e6a98c14..dfd3a028 100644
|
|
--- a/linux-headers/asm-arm64/kvm.h
|
|
+++ b/linux-headers/asm-arm64/kvm.h
|
|
@@ -265,8 +265,10 @@ struct kvm_vcpu_events {
|
|
#define KVM_ARM_VCPU_TIMER_IRQ_PTIMER 1
|
|
|
|
/* KVM_IRQ_LINE irq field index values */
|
|
+#define KVM_ARM_IRQ_VCPU2_SHIFT 28
|
|
+#define KVM_ARM_IRQ_VCPU2_MASK 0xf
|
|
#define KVM_ARM_IRQ_TYPE_SHIFT 24
|
|
-#define KVM_ARM_IRQ_TYPE_MASK 0xff
|
|
+#define KVM_ARM_IRQ_TYPE_MASK 0xf
|
|
#define KVM_ARM_IRQ_VCPU_SHIFT 16
|
|
#define KVM_ARM_IRQ_VCPU_MASK 0xff
|
|
#define KVM_ARM_IRQ_NUM_SHIFT 0
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
|
index b53ee597..086cea4d 100644
|
|
--- a/linux-headers/linux/kvm.h
|
|
+++ b/linux-headers/linux/kvm.h
|
|
@@ -988,6 +988,7 @@ struct kvm_ppc_resize_hpt {
|
|
#define KVM_CAP_ARM_VM_IPA_SIZE 165
|
|
#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166
|
|
#define KVM_CAP_HYPERV_CPUID 167
|
|
+#define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174
|
|
|
|
#ifdef KVM_CAP_IRQ_ROUTING
|
|
|
|
--
|
|
2.19.1
|
|
|