Commit 2387149e authored by Andrew Jones's avatar Andrew Jones Committed by Christoffer Dall
Browse files

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: default avatarAndrew Jones <drjones@redhat.com>
Acked-by: default avatarChristoffer Dall <cdall@linaro.org>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent 0710f9a6

arch/arm/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ 
#define KVM_MAX_VCPUS VGIC_V2_MAX_CPUS

#endif



#define KVM_REQ_VCPU_EXIT	(8 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_VCPU_EXIT \

	KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)



u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode);

int __attribute_const__ kvm_target_cpu(void);

arch/arm64/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ 


#define KVM_VCPU_MAX_FEATURES 4



#define KVM_REQ_VCPU_EXIT	(8 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_VCPU_EXIT \

	KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)



int __attribute_const__ kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);

arch/powerpc/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ 
#define KVM_IRQCHIP_NUM_PINS     256



/* PPC-specific vcpu->requests bit members */

#define KVM_REQ_WATCHDOG           8

#define KVM_REQ_EPR_EXIT           9

#define KVM_REQ_WATCHDOG	KVM_ARCH_REQ(0)

#define KVM_REQ_EPR_EXIT	KVM_ARCH_REQ(1)



#include <linux/mmu_notifier.h>

arch/s390/include/asm/kvm_host.h

+3 −3
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ 
#define KVM_HALT_POLL_NS_DEFAULT 80000



/* s390-specific vcpu->requests bit members */

#define KVM_REQ_ENABLE_IBS         8

#define KVM_REQ_DISABLE_IBS        9

#define KVM_REQ_ICPT_OPEREXC       10

#define KVM_REQ_ENABLE_IBS	KVM_ARCH_REQ(0)

#define KVM_REQ_DISABLE_IBS	KVM_ARCH_REQ(1)

#define KVM_REQ_ICPT_OPEREXC	KVM_ARCH_REQ(2)



#define SIGP_CTRL_C		0x80

#define SIGP_CTRL_SCN_MASK	0x3f

arch/x86/include/asm/kvm_host.h

+25 −22
Original line number Diff line number Diff line
@@ -48,28 +48,31 @@ 
#define KVM_IRQCHIP_NUM_PINS  KVM_IOAPIC_NUM_PINS



/* x86-specific vcpu->requests bit members */

#define KVM_REQ_MIGRATE_TIMER      8

#define KVM_REQ_REPORT_TPR_ACCESS  9

#define KVM_REQ_TRIPLE_FAULT      10

#define KVM_REQ_MMU_SYNC          11

#define KVM_REQ_CLOCK_UPDATE      12

#define KVM_REQ_EVENT             14

#define KVM_REQ_APF_HALT          15

#define KVM_REQ_STEAL_UPDATE      16

#define KVM_REQ_NMI               17

#define KVM_REQ_PMU               18

#define KVM_REQ_PMI               19

#define KVM_REQ_SMI               20

#define KVM_REQ_MASTERCLOCK_UPDATE 21

#define KVM_REQ_MCLOCK_INPROGRESS (22 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_SCAN_IOAPIC       (23 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_GLOBAL_CLOCK_UPDATE 24

#define KVM_REQ_APIC_PAGE_RELOAD  (25 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_HV_CRASH          26

#define KVM_REQ_IOAPIC_EOI_EXIT   27

#define KVM_REQ_HV_RESET          28

#define KVM_REQ_HV_EXIT           29

#define KVM_REQ_HV_STIMER         30

#define KVM_REQ_MIGRATE_TIMER		KVM_ARCH_REQ(0)

#define KVM_REQ_REPORT_TPR_ACCESS	KVM_ARCH_REQ(1)

#define KVM_REQ_TRIPLE_FAULT		KVM_ARCH_REQ(2)

#define KVM_REQ_MMU_SYNC		KVM_ARCH_REQ(3)

#define KVM_REQ_CLOCK_UPDATE		KVM_ARCH_REQ(4)

#define KVM_REQ_EVENT			KVM_ARCH_REQ(6)

#define KVM_REQ_APF_HALT		KVM_ARCH_REQ(7)

#define KVM_REQ_STEAL_UPDATE		KVM_ARCH_REQ(8)

#define KVM_REQ_NMI			KVM_ARCH_REQ(9)

#define KVM_REQ_PMU			KVM_ARCH_REQ(10)

#define KVM_REQ_PMI			KVM_ARCH_REQ(11)

#define KVM_REQ_SMI			KVM_ARCH_REQ(12)

#define KVM_REQ_MASTERCLOCK_UPDATE	KVM_ARCH_REQ(13)

#define KVM_REQ_MCLOCK_INPROGRESS \

	KVM_ARCH_REQ_FLAGS(14, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_SCAN_IOAPIC \

	KVM_ARCH_REQ_FLAGS(15, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_GLOBAL_CLOCK_UPDATE	KVM_ARCH_REQ(16)

#define KVM_REQ_APIC_PAGE_RELOAD \

	KVM_ARCH_REQ_FLAGS(17, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_HV_CRASH		KVM_ARCH_REQ(18)

#define KVM_REQ_IOAPIC_EOI_EXIT		KVM_ARCH_REQ(19)

#define KVM_REQ_HV_RESET		KVM_ARCH_REQ(20)

#define KVM_REQ_HV_EXIT			KVM_ARCH_REQ(21)

#define KVM_REQ_HV_STIMER		KVM_ARCH_REQ(22)



#define CR0_RESERVED_BITS                                               \

	(~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \

CRA Git | Maintained and supported by SUSTech CRA and CCSE