Commit d30372d0 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: Bury kvm_{en,dis}able_virtualization() in kvm_main.c once more 



Now that TDX handles doing VMXON without KVM's involvement, bury the
top-level APIs to enable and disable virtualization back in kvm_main.c.

No functional change intended.

Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarChao Gao <chao.gao@intel.com>
Tested-by: default avatarChao Gao <chao.gao@intel.com>
Tested-by: default avatarSagi Shahar <sagis@google.com>
Link: https://patch.msgid.link/20260214012702.2368778-16-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent afe31de1

include/linux/kvm_host.h

+0 −8
Original line number Diff line number Diff line
@@ -2613,12 +2613,4 @@ long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, 
				    struct kvm_pre_fault_memory *range);

#endif



#ifdef CONFIG_KVM_GENERIC_HARDWARE_ENABLING

int kvm_enable_virtualization(void);

void kvm_disable_virtualization(void);

#else

static inline int kvm_enable_virtualization(void) { return 0; }

static inline void kvm_disable_virtualization(void) { }

#endif



#endif

virt/kvm/kvm_main.c

+13 −4
Original line number Diff line number Diff line
@@ -1102,6 +1102,9 @@ static inline struct kvm_io_bus *kvm_get_bus_for_destruction(struct kvm *kvm, 
					 !refcount_read(&kvm->users_count));

}



static int kvm_enable_virtualization(void);

static void kvm_disable_virtualization(void);



static struct kvm *kvm_create_vm(unsigned long type, const char *fdname)

{

	struct kvm *kvm = kvm_arch_alloc_vm();
@@ -5689,7 +5692,7 @@ static struct syscore kvm_syscore = { 
	.ops = &kvm_syscore_ops,

};



int kvm_enable_virtualization(void)

static int kvm_enable_virtualization(void)

{

	int r;
@@ -5734,9 +5737,8 @@ int kvm_enable_virtualization(void) 
	--kvm_usage_count;

	return r;

}

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_enable_virtualization);



void kvm_disable_virtualization(void)

static void kvm_disable_virtualization(void)

{

	guard(mutex)(&kvm_usage_lock);
@@ -5747,7 +5749,6 @@ void kvm_disable_virtualization(void) 
	cpuhp_remove_state(CPUHP_AP_KVM_ONLINE);

	kvm_arch_disable_virtualization();

}

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_disable_virtualization);



static int kvm_init_virtualization(void)

{
@@ -5763,6 +5764,14 @@ static void kvm_uninit_virtualization(void) 
		kvm_disable_virtualization();

}

#else /* CONFIG_KVM_GENERIC_HARDWARE_ENABLING */

static int kvm_enable_virtualization(void)

{

	return 0;

}

static void kvm_disable_virtualization(void)

{



}

static int kvm_init_virtualization(void)

{

	return 0;