Commit 6b36119b authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Export KVM-internal symbols for sub-modules only 

Rework almost all of KVM x86's exports to expose symbols only to KVM's
vendor modules, i.e. to kvm-{amd,intel}.ko.  Keep the generic exports that
are guarded by CONFIG_KVM_EXTERNAL_WRITE_TRACKING=y, as they're explicitly
designed/intended for external usage.

Link: https://lore.kernel.org/r/20250919003303.1355064-6-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 65604683

arch/x86/kvm/cpuid.c

+5 −5
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
 * aligned to sizeof(unsigned long) because it's not accessed via bitops.

 */

u32 kvm_cpu_caps[NR_KVM_CPU_CAPS] __read_mostly;

EXPORT_SYMBOL_GPL(kvm_cpu_caps);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_cpu_caps);



struct cpuid_xstate_sizes {

	u32 eax;
@@ -131,7 +131,7 @@ struct kvm_cpuid_entry2 *kvm_find_cpuid_entry2( 


	return NULL;

}

EXPORT_SYMBOL_GPL(kvm_find_cpuid_entry2);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_find_cpuid_entry2);



static int kvm_check_cpuid(struct kvm_vcpu *vcpu)

{
@@ -1261,7 +1261,7 @@ void kvm_set_cpu_caps(void) 
		kvm_cpu_cap_clear(X86_FEATURE_RDPID);

	}

}

EXPORT_SYMBOL_GPL(kvm_set_cpu_caps);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_set_cpu_caps);



#undef F

#undef SCATTERED_F
@@ -2085,7 +2085,7 @@ bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx, 
			used_max_basic);

	return exact;

}

EXPORT_SYMBOL_GPL(kvm_cpuid);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_cpuid);



int kvm_emulate_cpuid(struct kvm_vcpu *vcpu)

{
@@ -2103,4 +2103,4 @@ int kvm_emulate_cpuid(struct kvm_vcpu *vcpu) 
	kvm_rdx_write(vcpu, edx);

	return kvm_skip_emulated_instruction(vcpu);

}

EXPORT_SYMBOL_GPL(kvm_emulate_cpuid);
 
EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_emulate_cpuid);

arch/x86/kvm/hyperv.c

+2 −2
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ bool kvm_hv_assist_page_enabled(struct kvm_vcpu *vcpu) 
		return false;

	return vcpu->arch.pv_eoi.msr_val & KVM_MSR_ENABLED;

}

EXPORT_SYMBOL_GPL(kvm_hv_assist_page_enabled);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_hv_assist_page_enabled);



int kvm_hv_get_assist_page(struct kvm_vcpu *vcpu)

{
@@ -935,7 +935,7 @@ int kvm_hv_get_assist_page(struct kvm_vcpu *vcpu) 
	return kvm_read_guest_cached(vcpu->kvm, &vcpu->arch.pv_eoi.data,

				     &hv_vcpu->vp_assist_page, sizeof(struct hv_vp_assist_page));

}

EXPORT_SYMBOL_GPL(kvm_hv_get_assist_page);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_hv_get_assist_page);



static void stimer_prepare_msg(struct kvm_vcpu_hv_stimer *stimer)

{

arch/x86/kvm/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ int kvm_cpu_has_injectable_intr(struct kvm_vcpu *v) 


	return kvm_apic_has_interrupt(v) != -1; /* LAPIC */

}

EXPORT_SYMBOL_GPL(kvm_cpu_has_injectable_intr);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_cpu_has_injectable_intr);



/*

 * check if there is pending interrupt without
@@ -119,7 +119,7 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *v) 


	return kvm_apic_has_interrupt(v) != -1;	/* LAPIC */

}

EXPORT_SYMBOL_GPL(kvm_cpu_has_interrupt);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_cpu_has_interrupt);



/*

 * Read pending interrupt(from non-APIC source)
@@ -148,7 +148,7 @@ int kvm_cpu_get_extint(struct kvm_vcpu *v) 
	WARN_ON_ONCE(!irqchip_split(v->kvm));

	return get_userspace_extint(v);

}

EXPORT_SYMBOL_GPL(kvm_cpu_get_extint);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_cpu_get_extint);



/*

 * Read pending interrupt vector and intack.

arch/x86/kvm/kvm_onhyperv.c

+3 −3
Original line number Diff line number Diff line
@@ -101,13 +101,13 @@ int hv_flush_remote_tlbs_range(struct kvm *kvm, gfn_t start_gfn, gfn_t nr_pages) 


	return __hv_flush_remote_tlbs_range(kvm, &range);

}

EXPORT_SYMBOL_GPL(hv_flush_remote_tlbs_range);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(hv_flush_remote_tlbs_range);



int hv_flush_remote_tlbs(struct kvm *kvm)

{

	return __hv_flush_remote_tlbs_range(kvm, NULL);

}

EXPORT_SYMBOL_GPL(hv_flush_remote_tlbs);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(hv_flush_remote_tlbs);



void hv_track_root_tdp(struct kvm_vcpu *vcpu, hpa_t root_tdp)

{
@@ -121,4 +121,4 @@ void hv_track_root_tdp(struct kvm_vcpu *vcpu, hpa_t root_tdp) 
		spin_unlock(&kvm_arch->hv_root_tdp_lock);

	}

}

EXPORT_SYMBOL_GPL(hv_track_root_tdp);
 
EXPORT_SYMBOL_FOR_KVM_INTERNAL(hv_track_root_tdp);

arch/x86/kvm/lapic.c

+20 −20
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector) 
}



__read_mostly DEFINE_STATIC_KEY_FALSE(kvm_has_noapic_vcpu);

EXPORT_SYMBOL_GPL(kvm_has_noapic_vcpu);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_has_noapic_vcpu);



__read_mostly DEFINE_STATIC_KEY_DEFERRED_FALSE(apic_hw_disabled, HZ);

__read_mostly DEFINE_STATIC_KEY_DEFERRED_FALSE(apic_sw_disabled, HZ);
@@ -646,7 +646,7 @@ bool __kvm_apic_update_irr(unsigned long *pir, void *regs, int *max_irr) 
	return ((max_updated_irr != -1) &&

		(max_updated_irr == *max_irr));

}

EXPORT_SYMBOL_GPL(__kvm_apic_update_irr);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(__kvm_apic_update_irr);



bool kvm_apic_update_irr(struct kvm_vcpu *vcpu, unsigned long *pir, int *max_irr)

{
@@ -657,7 +657,7 @@ bool kvm_apic_update_irr(struct kvm_vcpu *vcpu, unsigned long *pir, int *max_irr 
		apic->irr_pending = true;

	return irr_updated;

}

EXPORT_SYMBOL_GPL(kvm_apic_update_irr);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_update_irr);



static inline int apic_search_irr(struct kvm_lapic *apic)

{
@@ -697,7 +697,7 @@ void kvm_apic_clear_irr(struct kvm_vcpu *vcpu, int vec) 
{

	apic_clear_irr(vec, vcpu->arch.apic);

}

EXPORT_SYMBOL_GPL(kvm_apic_clear_irr);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_clear_irr);



static void *apic_vector_to_isr(int vec, struct kvm_lapic *apic)

{
@@ -779,7 +779,7 @@ void kvm_apic_update_hwapic_isr(struct kvm_vcpu *vcpu) 


	kvm_x86_call(hwapic_isr_update)(vcpu, apic_find_highest_isr(apic));

}

EXPORT_SYMBOL_GPL(kvm_apic_update_hwapic_isr);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_update_hwapic_isr);



int kvm_lapic_find_highest_irr(struct kvm_vcpu *vcpu)

{
@@ -790,7 +790,7 @@ int kvm_lapic_find_highest_irr(struct kvm_vcpu *vcpu) 
	 */

	return apic_find_highest_irr(vcpu->arch.apic);

}

EXPORT_SYMBOL_GPL(kvm_lapic_find_highest_irr);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_lapic_find_highest_irr);



static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,

			     int vector, int level, int trig_mode,
@@ -954,7 +954,7 @@ void kvm_apic_update_ppr(struct kvm_vcpu *vcpu) 
{

	apic_update_ppr(vcpu->arch.apic);

}

EXPORT_SYMBOL_GPL(kvm_apic_update_ppr);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_update_ppr);



static void apic_set_tpr(struct kvm_lapic *apic, u32 tpr)

{
@@ -1065,7 +1065,7 @@ bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source, 
		return false;

	}

}

EXPORT_SYMBOL_GPL(kvm_apic_match_dest);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_match_dest);



static int kvm_vector_to_index(u32 vector, u32 dest_vcpus,

			       const unsigned long *bitmap, u32 bitmap_size)
@@ -1292,7 +1292,7 @@ bool kvm_intr_is_single_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq, 


	return r == 1;

}

EXPORT_SYMBOL_GPL(kvm_intr_is_single_vcpu);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_intr_is_single_vcpu);



int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,

			     struct kvm_lapic_irq *irq, struct dest_map *dest_map)
@@ -1569,7 +1569,7 @@ void kvm_apic_set_eoi_accelerated(struct kvm_vcpu *vcpu, int vector) 
	kvm_ioapic_send_eoi(apic, vector);

	kvm_make_request(KVM_REQ_EVENT, apic->vcpu);

}

EXPORT_SYMBOL_GPL(kvm_apic_set_eoi_accelerated);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_set_eoi_accelerated);



static void kvm_icr_to_lapic_irq(struct kvm_lapic *apic, u32 icr_low,

				 u32 icr_high, struct kvm_lapic_irq *irq)
@@ -1600,7 +1600,7 @@ void kvm_apic_send_ipi(struct kvm_lapic *apic, u32 icr_low, u32 icr_high) 


	kvm_irq_delivery_to_apic(apic->vcpu->kvm, apic, &irq, NULL);

}

EXPORT_SYMBOL_GPL(kvm_apic_send_ipi);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_send_ipi);



static u32 apic_get_tmcct(struct kvm_lapic *apic)

{
@@ -1717,7 +1717,7 @@ u64 kvm_lapic_readable_reg_mask(struct kvm_lapic *apic) 


	return valid_reg_mask;

}

EXPORT_SYMBOL_GPL(kvm_lapic_readable_reg_mask);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_lapic_readable_reg_mask);



static int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len,

			      void *data)
@@ -1958,7 +1958,7 @@ void kvm_wait_lapic_expire(struct kvm_vcpu *vcpu) 
	    lapic_timer_int_injected(vcpu))

		__kvm_wait_lapic_expire(vcpu);

}

EXPORT_SYMBOL_GPL(kvm_wait_lapic_expire);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_wait_lapic_expire);



static void kvm_apic_inject_pending_timer_irqs(struct kvm_lapic *apic)

{
@@ -2272,7 +2272,7 @@ void kvm_lapic_expired_hv_timer(struct kvm_vcpu *vcpu) 
out:

	preempt_enable();

}

EXPORT_SYMBOL_GPL(kvm_lapic_expired_hv_timer);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_lapic_expired_hv_timer);



void kvm_lapic_switch_to_hv_timer(struct kvm_vcpu *vcpu)

{
@@ -2525,7 +2525,7 @@ void kvm_lapic_set_eoi(struct kvm_vcpu *vcpu) 
{

	kvm_lapic_reg_write(vcpu->arch.apic, APIC_EOI, 0);

}

EXPORT_SYMBOL_GPL(kvm_lapic_set_eoi);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_lapic_set_eoi);



#define X2APIC_ICR_RESERVED_BITS (GENMASK_ULL(31, 20) | GENMASK_ULL(17, 16) | BIT(13))
@@ -2608,7 +2608,7 @@ void kvm_apic_write_nodecode(struct kvm_vcpu *vcpu, u32 offset) 
	else

		kvm_lapic_reg_write(apic, offset, kvm_lapic_get_reg(apic, offset));

}

EXPORT_SYMBOL_GPL(kvm_apic_write_nodecode);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_write_nodecode);



void kvm_free_lapic(struct kvm_vcpu *vcpu)

{
@@ -2746,7 +2746,7 @@ int kvm_apic_set_base(struct kvm_vcpu *vcpu, u64 value, bool host_initiated) 
	kvm_recalculate_apic_map(vcpu->kvm);

	return 0;

}

EXPORT_SYMBOL_GPL(kvm_apic_set_base);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_set_base);



void kvm_apic_update_apicv(struct kvm_vcpu *vcpu)

{
@@ -2794,7 +2794,7 @@ int kvm_alloc_apic_access_page(struct kvm *kvm) 


	return 0;

}

EXPORT_SYMBOL_GPL(kvm_alloc_apic_access_page);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_alloc_apic_access_page);



void kvm_inhibit_apic_access_page(struct kvm_vcpu *vcpu)

{
@@ -3058,7 +3058,7 @@ int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu) 
	__apic_update_ppr(apic, &ppr);

	return apic_has_interrupt_for_ppr(apic, ppr);

}

EXPORT_SYMBOL_GPL(kvm_apic_has_interrupt);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_has_interrupt);



int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu)

{
@@ -3117,7 +3117,7 @@ void kvm_apic_ack_interrupt(struct kvm_vcpu *vcpu, int vector) 
	}



}

EXPORT_SYMBOL_GPL(kvm_apic_ack_interrupt);

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_ack_interrupt);



static int kvm_apic_state_fixup(struct kvm_vcpu *vcpu,

		struct kvm_lapic_state *s, bool set)