Commit 76ab8161 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

x86/virt: KVM: Move "disable SVM" helper into KVM SVM 



Move cpu_svm_disable() into KVM proper now that all hardware
virtualization management is routed through KVM.  Remove the now-empty
virtext.h.

No functional change intended.

Reviewed-by: default avatarKai Huang <kai.huang@intel.com>
Link: https://lore.kernel.org/r/20230721201859.2307736-17-seanjc@google.com


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

arch/x86/include/asm/virtext.h

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* CPU virtualization extensions handling

 *

 * This should carry the code for handling CPU virtualization extensions

 * that needs to live in the kernel core.

 *

 * Author: Eduardo Habkost <ehabkost@redhat.com>

 *

 * Copyright (C) 2008, Red Hat Inc.

 *

 * Contains code from KVM, Copyright (C) 2006 Qumranet, Inc.

 */

#ifndef _ASM_X86_VIRTEX_H

#define _ASM_X86_VIRTEX_H



#include <asm/processor.h>



#include <asm/vmx.h>

#include <asm/svm.h>

#include <asm/tlbflush.h>



/*

 * SVM functions:

 */

/** Disable SVM on the current CPU

 */

static inline void cpu_svm_disable(void)

{

	uint64_t efer;



	wrmsrl(MSR_VM_HSAVE_PA, 0);

	rdmsrl(MSR_EFER, efer);

	if (efer & EFER_SVME) {

		/*

		 * Force GIF=1 prior to disabling SVM to ensure INIT and NMI

		 * aren't blocked, e.g. if a fatal error occurred between CLGI

		 * and STGI.  Note, STGI may #UD if SVM is disabled from NMI

		 * context between reading EFER and executing STGI.  In that

		 * case, GIF must already be set, otherwise the NMI would have

		 * been blocked, so just eat the fault.

		 */

		asm_volatile_goto("1: stgi\n\t"

				  _ASM_EXTABLE(1b, %l[fault])

				  ::: "memory" : fault);

fault:

		wrmsrl(MSR_EFER, efer & ~EFER_SVME);

	}

}



#endif /* _ASM_X86_VIRTEX_H */

arch/x86/kvm/svm/svm.c

+25 −4
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
#include <asm/reboot.h>

#include <asm/fpu/api.h>



#include <asm/virtext.h>



#include <trace/events/ipi.h>



#include "trace.h"
@@ -582,9 +580,32 @@ void __svm_write_tsc_multiplier(u64 multiplier) 
	preempt_enable();

}



static inline void kvm_cpu_svm_disable(void)

{

	uint64_t efer;



	wrmsrl(MSR_VM_HSAVE_PA, 0);

	rdmsrl(MSR_EFER, efer);

	if (efer & EFER_SVME) {

		/*

		 * Force GIF=1 prior to disabling SVM to ensure INIT and NMI

		 * aren't blocked, e.g. if a fatal error occurred between CLGI

		 * and STGI.  Note, STGI may #UD if SVM is disabled from NMI

		 * context between reading EFER and executing STGI.  In that

		 * case, GIF must already be set, otherwise the NMI would have

		 * been blocked, so just eat the fault.

		 */

		asm_volatile_goto("1: stgi\n\t"

				  _ASM_EXTABLE(1b, %l[fault])

				  ::: "memory" : fault);

fault:

		wrmsrl(MSR_EFER, efer & ~EFER_SVME);

	}

}



static void svm_emergency_disable(void)

{

	cpu_svm_disable();

	kvm_cpu_svm_disable();

}



static void svm_hardware_disable(void)
@@ -593,7 +614,7 @@ static void svm_hardware_disable(void) 
	if (tsc_scaling)

		__svm_write_tsc_multiplier(SVM_TSC_RATIO_DEFAULT);



	cpu_svm_disable();

	kvm_cpu_svm_disable();



	amd_pmu_disable_virt();

}