Commit 2aa9c199 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Move x86's version of struct kvm_mmu_memory_cache to common code 



Move x86's 'struct kvm_mmu_memory_cache' to common code in anticipation
of moving the entire x86 implementation code to common KVM and reusing
it for arm64 and MIPS.  Add a new architecture specific asm/kvm_types.h
to control the existence and parameters of the struct.  The new header
is needed to avoid a chicken-and-egg problem with asm/kvm_host.h as all
architectures define instances of the struct in their vCPU structs.

Add an asm-generic version of kvm_types.h to avoid having empty files on
PPC and s390 in the long term, and for arm64 and mips in the short term.

Suggested-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Reviewed-by: default avatarBen Gardon <bgardon@google.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200703023545.8771-15-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 94ce87ef

arch/arm64/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generic-y += early_ioremap.h

generic-y += kvm_types.h

generic-y += local64.h

generic-y += mcs_spinlock.h

generic-y += qrwlock.h

arch/mips/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ generated-y += syscall_table_64_n32.h 
generated-y += syscall_table_64_n64.h

generated-y += syscall_table_64_o32.h

generic-y += export.h

generic-y += kvm_types.h

generic-y += local64.h

generic-y += mcs_spinlock.h

generic-y += parport.h

arch/powerpc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ generated-y += syscall_table_64.h 
generated-y += syscall_table_c32.h

generated-y += syscall_table_spu.h

generic-y += export.h

generic-y += kvm_types.h

generic-y += local64.h

generic-y += mcs_spinlock.h

generic-y += vtime.h

arch/s390/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -6,5 +6,6 @@ generated-y += unistd_nr.h 


generic-y += asm-offsets.h

generic-y += export.h

generic-y += kvm_types.h

generic-y += local64.h

generic-y += mcs_spinlock.h

arch/x86/include/asm/kvm_host.h

+0 −13
Original line number Diff line number Diff line
@@ -193,8 +193,6 @@ struct x86_exception; 
enum x86_intercept;

enum x86_intercept_stage;



#define KVM_NR_MEM_OBJS 40



#define KVM_NR_DB_REGS	4



#define DR6_BD		(1 << 13)
@@ -245,17 +243,6 @@ enum x86_intercept_stage; 


struct kvm_kernel_irq_routing_entry;



/*

 * We don't want allocation failures within the mmu code, so we preallocate

 * enough memory for a single page fault in a cache.

 */

struct kvm_mmu_memory_cache {

	int nobjs;

	gfp_t gfp_zero;

	struct kmem_cache *kmem_cache;

	void *objects[KVM_NR_MEM_OBJS];

};



/*

 * the pages used as guest page table on soft mmu are tracked by

 * kvm_memory_slot.arch.gfn_track which is 16 bits, so the role bits used

CRA Git | Maintained and supported by SUSTech CRA and CCSE