Commit b0b42197 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: start moving SMM-related functions to new files 



Create a new header and source with code related to system management
mode emulation.  Entry and exit will move there too; for now,
opportunistically rename put_smstate to PUT_SMSTATE while moving
it to smm.h, and adjust the SMM state saving code.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20220929172016.319443-2-pbonzini@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d08b4858

arch/x86/include/asm/kvm_host.h

+0 −6
Original line number Diff line number Diff line
@@ -2087,12 +2087,6 @@ static inline int kvm_cpu_get_apicid(int mps_cpu) 
#endif

}



#define put_smstate(type, buf, offset, val)                      \

	*(type *)((buf) + (offset) - 0x7e00) = val



#define GET_SMSTATE(type, buf, offset)		\

	(*(type *)((buf) + (offset) - 0x7e00))



int kvm_cpu_dirty_log_size(void);



int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages);

arch/x86/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ endif 


kvm-$(CONFIG_X86_64) += mmu/tdp_iter.o mmu/tdp_mmu.o

kvm-$(CONFIG_KVM_XEN)	+= xen.o

kvm-y			+= smm.o



kvm-intel-y		+= vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \

			   vmx/evmcs.o vmx/nested.o vmx/posted_intr.o

arch/x86/kvm/emulate.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "tss.h"

#include "mmu.h"

#include "pmu.h"

#include "smm.h"



/*

 * Operand types

arch/x86/kvm/kvm_cache_regs.h

+0 −5
Original line number Diff line number Diff line
@@ -200,9 +200,4 @@ static inline bool is_guest_mode(struct kvm_vcpu *vcpu) 
	return vcpu->arch.hflags & HF_GUEST_MASK;

}



static inline bool is_smm(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.hflags & HF_SMM_MASK;

}



#endif

arch/x86/kvm/lapic.c

+5 −3
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "x86.h"

#include "cpuid.h"

#include "hyperv.h"

#include "smm.h"



#ifndef CONFIG_X86_64

#define mod_64(x, y) ((x) - (y) * div64_u64(x, y))
@@ -1170,9 +1171,10 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, 
		break;



	case APIC_DM_SMI:

		result = 1;

		kvm_make_request(KVM_REQ_SMI, vcpu);

		if (!kvm_inject_smi(vcpu)) {

			kvm_vcpu_kick(vcpu);

			result = 1;

		}

		break;



	case APIC_DM_NMI: