Commit 982bae43 authored Aug 03, 2022 by Sean Christopherson Committed by Paolo Bonzini Aug 10, 2022

KVM: x86: Tag kvm_mmu_x86_module_init() with __init



Mark kvm_mmu_x86_module_init() with __init, the entire reason it exists
is to initialize variables when kvm.ko is loaded, i.e. it must never be
called after module initialization.

Fixes: 1d0e8480 ("KVM: x86/mmu: Resolve nx_huge_pages when kvm.ko is loaded")
Cc: stable@vger.kernel.org
Reviewed-by: Kai Huang <kai.huang@intel.com>
Tested-by: Michael Roth <michael.roth@amd.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20220803224957.1285926-2-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 4ac5b423

arch/x86/include/asm/kvm_host.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1704,7 +1704,7 @@ static inline int kvm_arch_flush_remote_tlb(struct kvm *kvm)
		#define kvm_arch_pmi_in_guest(vcpu) \
		((vcpu) && (vcpu)->arch.handling_intr_from_guest)

		void kvm_mmu_x86_module_init(void);
		void __init kvm_mmu_x86_module_init(void);
		int kvm_mmu_vendor_module_init(void);
		void kvm_mmu_vendor_module_exit(void);

arch/x86/kvm/mmu/mmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -6698,7 +6698,7 @@ static int set_nx_huge_pages(const char val, const struct kernel_param kp)
		* nx_huge_pages needs to be resolved to true/false when kvm.ko is loaded, as
		* its default value of -1 is technically undefined behavior for a boolean.
		*/
		void kvm_mmu_x86_module_init(void)
		void __init kvm_mmu_x86_module_init(void)
		{
		if (nx_huge_pages == -1)
		__set_nx_huge_pages(get_nx_auto_mode());