KVM: SVM: Move AVIC code to separate file (ef0f6496) · Commits · 戴 / test

arch/x86/kvm/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \
		hyperv.o debugfs.o mmu/mmu.o mmu/page_track.o

		kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o vmx/evmcs.o vmx/nested.o
		kvm-amd-y += svm/svm.o svm/pmu.o svm/nested.o
		kvm-amd-y += svm/svm.o svm/pmu.o svm/nested.o svm/avic.o

		obj-$(CONFIG_KVM) += kvm.o
		obj-$(CONFIG_KVM_INTEL) += kvm-intel.o

arch/x86/kvm/svm/avic.c

0 → 100644

+1027 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/x86/kvm/svm/svm.c

+1 −1049

File changed.

Preview size limit exceeded, changes collapsed.

arch/x86/kvm/svm/svm.h

+62 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,11 @@ struct vcpu_svm {

		void recalc_intercepts(struct vcpu_svm *svm);

		static inline struct kvm_svm to_kvm_svm(struct kvm kvm)
		{
		return container_of(kvm, struct kvm_svm, kvm);
		}

		static inline void mark_all_dirty(struct vmcb *vmcb)
		{
		vmcb->control.clean = 0;
		@@ -378,4 +383,61 @@ int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr,
		int svm_check_nested_events(struct kvm_vcpu *vcpu);
		int nested_svm_exit_special(struct vcpu_svm *svm);

		/* avic.c */

		#define AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK (0xFF)
		#define AVIC_LOGICAL_ID_ENTRY_VALID_BIT 31
		#define AVIC_LOGICAL_ID_ENTRY_VALID_MASK (1 << 31)

		#define AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK (0xFFULL)
		#define AVIC_PHYSICAL_ID_ENTRY_BACKING_PAGE_MASK (0xFFFFFFFFFFULL << 12)
		#define AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK (1ULL << 62)
		#define AVIC_PHYSICAL_ID_ENTRY_VALID_MASK (1ULL << 63)

		#define VMCB_AVIC_APIC_BAR_MASK 0xFFFFFFFFFF000ULL

		extern int avic;

		static inline void avic_update_vapic_bar(struct vcpu_svm *svm, u64 data)
		{
		svm->vmcb->control.avic_vapic_bar = data & VMCB_AVIC_APIC_BAR_MASK;
		mark_dirty(svm->vmcb, VMCB_AVIC);
		}

		static inline bool avic_vcpu_is_running(struct kvm_vcpu *vcpu)
		{
		struct vcpu_svm *svm = to_svm(vcpu);
		u64 *entry = svm->avic_physical_id_cache;

		if (!entry)
		return false;

		return (READ_ONCE(*entry) & AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK);
		}

		int avic_ga_log_notifier(u32 ga_tag);
		void avic_vm_destroy(struct kvm *kvm);
		int avic_vm_init(struct kvm *kvm);
		void avic_init_vmcb(struct vcpu_svm *svm);
		void svm_toggle_avic_for_irq_window(struct kvm_vcpu *vcpu, bool activate);
		int avic_incomplete_ipi_interception(struct vcpu_svm *svm);
		int avic_unaccelerated_access_interception(struct vcpu_svm *svm);
		int avic_init_vcpu(struct vcpu_svm *svm);
		void avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu);
		void avic_vcpu_put(struct kvm_vcpu *vcpu);
		void avic_post_state_restore(struct kvm_vcpu *vcpu);
		void svm_set_virtual_apic_mode(struct kvm_vcpu *vcpu);
		void svm_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu);
		bool svm_check_apicv_inhibit_reasons(ulong bit);
		void svm_pre_update_apicv_exec_ctrl(struct kvm *kvm, bool activate);
		void svm_load_eoi_exitmap(struct kvm_vcpu vcpu, u64 eoi_exit_bitmap);
		void svm_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr);
		void svm_hwapic_isr_update(struct kvm_vcpu *vcpu, int max_isr);
		int svm_deliver_avic_intr(struct kvm_vcpu *vcpu, int vec);
		bool svm_dy_apicv_has_pending_interrupt(struct kvm_vcpu *vcpu);
		int svm_update_pi_irte(struct kvm *kvm, unsigned int host_irq,
		uint32_t guest_irq, bool set);
		void svm_vcpu_blocking(struct kvm_vcpu *vcpu);
		void svm_vcpu_unblocking(struct kvm_vcpu *vcpu);

		#endif

Admin message