Use the newfangled EXPORT_SYMBOL_GPL_FOR_MODULES() along with some macro shenanigans to export KVM-internal symbols if and only if KVM has one or more sub-modules, and only for those sub-modules, e.g. x86's kvm-amd.ko and/or kvm-intel.ko.
Patch 5 gives KVM x86 the full treatment. If anyone wants to tackle PPC, it should be doable to restrict KVM PPC's exports as well. Patch 6 is essentially an RFC; it compiles and is tested, but it probably should be chunked into multiple patches. The main reason I included it here is to get feedback on using kvm_types.h to define the "for KVM" macros. For KVM itself, kvm_types.h is a solid choice, but it feels a bit awkward for non-KVM usage, and including linux/kvm_types.h in non-KVM generic code, e.g. in kernel/, isn't viable at the moment because asm/kvm_types.h is only provided by architectures that actually support KVM. Based on kvm/queue. Sean Christopherson (6): KVM: s390/vfio-ap: Use kvm_is_gpa_in_memslot() instead of open coded equivalent KVM: Export KVM-internal symbols for sub-modules only KVM: x86: Move kvm_intr_is_single_vcpu() to lapic.c KVM: x86: Drop pointless exports of kvm_arch_xxx() hooks KVM: x86: Export KVM-internal symbols for sub-modules only x86: Restrict KVM-induced symbol exports to KVM modules where obvious/possible arch/powerpc/include/asm/kvm_types.h | 15 ++ arch/s390/include/asm/kvm_host.h | 2 + arch/s390/kvm/priv.c | 8 + arch/x86/entry/entry.S | 7 +- arch/x86/entry/entry_64_fred.S | 3 +- arch/x86/events/amd/core.c | 5 +- arch/x86/events/core.c | 7 +- arch/x86/events/intel/lbr.c | 3 +- arch/x86/events/intel/pt.c | 7 +- arch/x86/include/asm/kvm_host.h | 3 - arch/x86/include/asm/kvm_types.h | 15 ++ arch/x86/kernel/apic/apic.c | 3 +- arch/x86/kernel/apic/apic_common.c | 3 +- arch/x86/kernel/cpu/amd.c | 4 +- arch/x86/kernel/cpu/bugs.c | 17 +-- arch/x86/kernel/cpu/bus_lock.c | 3 +- arch/x86/kernel/cpu/common.c | 7 +- arch/x86/kernel/cpu/sgx/main.c | 3 +- arch/x86/kernel/cpu/sgx/virt.c | 5 +- arch/x86/kernel/e820.c | 3 +- arch/x86/kernel/fpu/core.c | 21 +-- arch/x86/kernel/fpu/xstate.c | 7 +- arch/x86/kernel/hw_breakpoint.c | 3 +- arch/x86/kernel/irq.c | 3 +- arch/x86/kernel/kvm.c | 5 +- arch/x86/kernel/nmi.c | 5 +- arch/x86/kernel/process_64.c | 5 +- arch/x86/kernel/reboot.c | 5 +- arch/x86/kernel/tsc.c | 1 + arch/x86/kvm/cpuid.c | 10 +- arch/x86/kvm/hyperv.c | 4 +- arch/x86/kvm/irq.c | 34 +---- arch/x86/kvm/kvm_onhyperv.c | 6 +- arch/x86/kvm/lapic.c | 70 ++++++--- arch/x86/kvm/lapic.h | 4 +- arch/x86/kvm/mmu/mmu.c | 36 ++--- arch/x86/kvm/mmu/spte.c | 10 +- arch/x86/kvm/mmu/tdp_mmu.c | 2 +- arch/x86/kvm/pmu.c | 8 +- arch/x86/kvm/smm.c | 2 +- arch/x86/kvm/x86.c | 211 +++++++++++++-------------- arch/x86/lib/cache-smp.c | 9 +- arch/x86/lib/msr.c | 5 +- arch/x86/mm/pat/memtype.c | 3 +- arch/x86/mm/tlb.c | 5 +- arch/x86/virt/vmx/tdx/tdx.c | 65 +++++---- drivers/s390/crypto/vfio_ap_ops.c | 2 +- include/linux/kvm_types.h | 39 ++++- virt/kvm/eventfd.c | 2 +- virt/kvm/guest_memfd.c | 4 +- virt/kvm/kvm_main.c | 126 ++++++++-------- 51 files changed, 457 insertions(+), 378 deletions(-) create mode 100644 arch/powerpc/include/asm/kvm_types.h base-commit: beafd7ecf2255e8b62a42dc04f54843033db3d24 -- 2.50.1.552.g942d659e1b-goog