tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
KVM: improve arch vcpu request defining
Marc Zyngier suggested that we define the arch specific VCPU request
base, rather than requiring each arch to remember to start from 8.
That suggestion, along with Radim Krcmar's recent VCPU request flag
addition, snowballed into defining something of an arch VCPU request
defining API.
No functional change.
(Looks like x86 is running out of arch VCPU request bits. Maybe
someday we'll need to extend to 64.)
Signed-off-by: Andrew Jones <drjones@redhat.com>
Acked-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
authored by
Andrew Jones
and committed by
Christoffer Dall
2387149e
0710f9a6
+41
-29
+2
-1
arch/arm/include/asm/kvm_host.h
+2
-1
arch/arm/include/asm/kvm_host.h
···
44
44
#define KVM_MAX_VCPUS VGIC_V2_MAX_CPUS
45
45
#endif
46
46
47
-
#define KVM_REQ_VCPU_EXIT (8 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
47
+
#define KVM_REQ_VCPU_EXIT \
48
+
KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
48
49
49
50
u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode);
50
51
int __attribute_const__ kvm_target_cpu(void);
+2
-1
arch/arm64/include/asm/kvm_host.h
+2
-1
arch/arm64/include/asm/kvm_host.h
···
41
41
42
42
#define KVM_VCPU_MAX_FEATURES 4
43
43
44
-
#define KVM_REQ_VCPU_EXIT (8 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
44
+
#define KVM_REQ_VCPU_EXIT \
45
+
KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
45
46
46
47
int __attribute_const__ kvm_target_cpu(void);
47
48
int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
+2
-2
arch/powerpc/include/asm/kvm_host.h
+2
-2
arch/powerpc/include/asm/kvm_host.h
···
52
52
#define KVM_IRQCHIP_NUM_PINS 256
53
53
54
54
/* PPC-specific vcpu->requests bit members */
55
-
#define KVM_REQ_WATCHDOG 8
56
-
#define KVM_REQ_EPR_EXIT 9
55
+
#define KVM_REQ_WATCHDOG KVM_ARCH_REQ(0)
56
+
#define KVM_REQ_EPR_EXIT KVM_ARCH_REQ(1)
57
57
58
58
#include <linux/mmu_notifier.h>
59
59
+3
-3
arch/s390/include/asm/kvm_host.h
+3
-3
arch/s390/include/asm/kvm_host.h
···
42
42
#define KVM_HALT_POLL_NS_DEFAULT 80000
43
43
44
44
/* s390-specific vcpu->requests bit members */
45
-
#define KVM_REQ_ENABLE_IBS 8
46
-
#define KVM_REQ_DISABLE_IBS 9
47
-
#define KVM_REQ_ICPT_OPEREXC 10
45
+
#define KVM_REQ_ENABLE_IBS KVM_ARCH_REQ(0)
46
+
#define KVM_REQ_DISABLE_IBS KVM_ARCH_REQ(1)
47
+
#define KVM_REQ_ICPT_OPEREXC KVM_ARCH_REQ(2)
48
48
49
49
#define SIGP_CTRL_C 0x80
50
50
#define SIGP_CTRL_SCN_MASK 0x3f
+25
-22
arch/x86/include/asm/kvm_host.h
+25
-22
arch/x86/include/asm/kvm_host.h
···
48
48
#define KVM_IRQCHIP_NUM_PINS KVM_IOAPIC_NUM_PINS
49
49
50
50
/* x86-specific vcpu->requests bit members */
51
-
#define KVM_REQ_MIGRATE_TIMER 8
52
-
#define KVM_REQ_REPORT_TPR_ACCESS 9
53
-
#define KVM_REQ_TRIPLE_FAULT 10
54
-
#define KVM_REQ_MMU_SYNC 11
55
-
#define KVM_REQ_CLOCK_UPDATE 12
56
-
#define KVM_REQ_EVENT 14
57
-
#define KVM_REQ_APF_HALT 15
58
-
#define KVM_REQ_STEAL_UPDATE 16
59
-
#define KVM_REQ_NMI 17
60
-
#define KVM_REQ_PMU 18
61
-
#define KVM_REQ_PMI 19
62
-
#define KVM_REQ_SMI 20
63
-
#define KVM_REQ_MASTERCLOCK_UPDATE 21
64
-
#define KVM_REQ_MCLOCK_INPROGRESS (22 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
65
-
#define KVM_REQ_SCAN_IOAPIC (23 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
66
-
#define KVM_REQ_GLOBAL_CLOCK_UPDATE 24
67
-
#define KVM_REQ_APIC_PAGE_RELOAD (25 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
68
-
#define KVM_REQ_HV_CRASH 26
69
-
#define KVM_REQ_IOAPIC_EOI_EXIT 27
70
-
#define KVM_REQ_HV_RESET 28
71
-
#define KVM_REQ_HV_EXIT 29
72
-
#define KVM_REQ_HV_STIMER 30
51
+
#define KVM_REQ_MIGRATE_TIMER KVM_ARCH_REQ(0)
52
+
#define KVM_REQ_REPORT_TPR_ACCESS KVM_ARCH_REQ(1)
53
+
#define KVM_REQ_TRIPLE_FAULT KVM_ARCH_REQ(2)
54
+
#define KVM_REQ_MMU_SYNC KVM_ARCH_REQ(3)
55
+
#define KVM_REQ_CLOCK_UPDATE KVM_ARCH_REQ(4)
56
+
#define KVM_REQ_EVENT KVM_ARCH_REQ(6)
57
+
#define KVM_REQ_APF_HALT KVM_ARCH_REQ(7)
58
+
#define KVM_REQ_STEAL_UPDATE KVM_ARCH_REQ(8)
59
+
#define KVM_REQ_NMI KVM_ARCH_REQ(9)
60
+
#define KVM_REQ_PMU KVM_ARCH_REQ(10)
61
+
#define KVM_REQ_PMI KVM_ARCH_REQ(11)
62
+
#define KVM_REQ_SMI KVM_ARCH_REQ(12)
63
+
#define KVM_REQ_MASTERCLOCK_UPDATE KVM_ARCH_REQ(13)
64
+
#define KVM_REQ_MCLOCK_INPROGRESS \
65
+
KVM_ARCH_REQ_FLAGS(14, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
66
+
#define KVM_REQ_SCAN_IOAPIC \
67
+
KVM_ARCH_REQ_FLAGS(15, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
68
+
#define KVM_REQ_GLOBAL_CLOCK_UPDATE KVM_ARCH_REQ(16)
69
+
#define KVM_REQ_APIC_PAGE_RELOAD \
70
+
KVM_ARCH_REQ_FLAGS(17, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
71
+
#define KVM_REQ_HV_CRASH KVM_ARCH_REQ(18)
72
+
#define KVM_REQ_IOAPIC_EOI_EXIT KVM_ARCH_REQ(19)
73
+
#define KVM_REQ_HV_RESET KVM_ARCH_REQ(20)
74
+
#define KVM_REQ_HV_EXIT KVM_ARCH_REQ(21)
75
+
#define KVM_REQ_HV_STIMER KVM_ARCH_REQ(22)
73
76
74
77
#define CR0_RESERVED_BITS \
75
78
(~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \
+7
include/linux/kvm_host.h
+7
include/linux/kvm_host.h
···
126
126
#define KVM_REQ_MMU_RELOAD (1 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
127
127
#define KVM_REQ_PENDING_TIMER 2
128
128
#define KVM_REQ_UNHALT 3
129
+
#define KVM_REQUEST_ARCH_BASE 8
130
+
131
+
#define KVM_ARCH_REQ_FLAGS(nr, flags) ({ \
132
+
BUILD_BUG_ON((unsigned)(nr) >= 32 - KVM_REQUEST_ARCH_BASE); \
133
+
(unsigned)(((nr) + KVM_REQUEST_ARCH_BASE) | (flags)); \
134
+
})
135
+
#define KVM_ARCH_REQ(nr) KVM_ARCH_REQ_FLAGS(nr, 0)
129
136
130
137
#define KVM_USERSPACE_IRQ_SOURCE_ID 0
131
138
#define KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID 1