Commit 2860c4b1 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: move architecture-dependent requests to arch/ 



Since the numbers now overlap, it makes sense to enumerate
them in asm/kvm_host.h rather than linux/kvm_host.h.  Functions
that refer to architecture-specific requests are also moved
to arch/.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6662ba34

arch/powerpc/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ 
#define KVM_NR_IRQCHIPS          1

#define KVM_IRQCHIP_NUM_PINS     256



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

#define KVM_REQ_WATCHDOG           8

#define KVM_REQ_EPR_EXIT           9



#include <linux/mmu_notifier.h>



#define KVM_ARCH_WANT_MMU_NOTIFIER

arch/s390/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ 
#define KVM_IRQCHIP_NUM_PINS 4096

#define KVM_HALT_POLL_NS_DEFAULT 0



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

#define KVM_REQ_ENABLE_IBS         8

#define KVM_REQ_DISABLE_IBS        9



#define SIGP_CTRL_C		0x80

#define SIGP_CTRL_SCN_MASK	0x3f

arch/x86/include/asm/kvm_host.h

+28 −0
Original line number Diff line number Diff line
@@ -46,6 +46,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_DEACTIVATE_FPU    13

#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

#define KVM_REQ_SCAN_IOAPIC       23

#define KVM_REQ_GLOBAL_CLOCK_UPDATE 24

#define KVM_REQ_APIC_PAGE_RELOAD  25

#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 CR0_RESERVED_BITS                                               \

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

			  | X86_CR0_ET | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM \
@@ -1268,6 +1293,9 @@ u64 kvm_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc); 
unsigned long kvm_get_linear_rip(struct kvm_vcpu *vcpu);

bool kvm_is_linear_rip(struct kvm_vcpu *vcpu, unsigned long linear_rip);



void kvm_make_mclock_inprogress_request(struct kvm *kvm);

void kvm_make_scan_ioapic_request(struct kvm *kvm);



void kvm_arch_async_page_not_present(struct kvm_vcpu *vcpu,

				     struct kvm_async_pf *work);

void kvm_arch_async_page_present(struct kvm_vcpu *vcpu,

arch/x86/kvm/x86.c

+15 −0
Original line number Diff line number Diff line
@@ -1686,6 +1686,11 @@ static void pvclock_update_vm_gtod_copy(struct kvm *kvm) 
#endif

}



void kvm_make_mclock_inprogress_request(struct kvm *kvm)

{

	kvm_make_all_cpus_request(kvm, KVM_REQ_MCLOCK_INPROGRESS);

}



static void kvm_gen_update_masterclock(struct kvm *kvm)

{

#ifdef CONFIG_X86_64
@@ -2699,6 +2704,11 @@ static bool need_emulate_wbinvd(struct kvm_vcpu *vcpu) 
	return kvm_arch_has_noncoherent_dma(vcpu->kvm);

}



static inline void kvm_migrate_timers(struct kvm_vcpu *vcpu)

{

	set_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests);

}



void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)

{

	/* Address WBINVD may be executed by guest */
@@ -6337,6 +6347,11 @@ static void process_smi(struct kvm_vcpu *vcpu) 
	kvm_mmu_reset_context(vcpu);

}



void kvm_make_scan_ioapic_request(struct kvm *kvm)

{

	kvm_make_all_cpus_request(kvm, KVM_REQ_SCAN_IOAPIC);

}



static void vcpu_scan_ioapic(struct kvm_vcpu *vcpu)

{

	u64 eoi_exit_bitmap[4];

include/linux/kvm_host.h

+2 −41
Original line number Diff line number Diff line
@@ -111,46 +111,14 @@ static inline bool is_error_page(struct page *page) 
}



/*

 * vcpu->requests bit members

 * Architecture-independent vcpu->requests bit members

 * Bits 4-7 are reserved for more arch-independent bits.

 */

#define KVM_REQ_TLB_FLUSH          0

#define KVM_REQ_MMU_RELOAD         1

#define KVM_REQ_PENDING_TIMER      2

#define KVM_REQ_UNHALT             3



/* x86-specific requests */

#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_DEACTIVATE_FPU    13

#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

#define KVM_REQ_SCAN_IOAPIC       23

#define KVM_REQ_GLOBAL_CLOCK_UPDATE 24

#define KVM_REQ_APIC_PAGE_RELOAD  25

#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



/* PPC-specific requests */

#define KVM_REQ_WATCHDOG           8

#define KVM_REQ_EPR_EXIT           9



/* s390-specific requests */

#define KVM_REQ_ENABLE_IBS         8

#define KVM_REQ_DISABLE_IBS        9



#define KVM_USERSPACE_IRQ_SOURCE_ID		0

#define KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID	1
@@ -689,8 +657,6 @@ void kvm_put_guest_fpu(struct kvm_vcpu *vcpu); 


void kvm_flush_remote_tlbs(struct kvm *kvm);

void kvm_reload_remote_mmus(struct kvm *kvm);

void kvm_make_mclock_inprogress_request(struct kvm *kvm);

void kvm_make_scan_ioapic_request(struct kvm *kvm);

bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req);



long kvm_arch_dev_ioctl(struct file *filp,
@@ -1011,11 +977,6 @@ static inline bool kvm_is_error_gpa(struct kvm *kvm, gpa_t gpa) 
	return kvm_is_error_hva(hva);

}



static inline void kvm_migrate_timers(struct kvm_vcpu *vcpu)

{

	set_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests);

}



enum kvm_stat_kind {

	KVM_STAT_VM,

	KVM_STAT_VCPU,

CRA Git | Maintained and supported by SUSTech CRA and CCSE