Commit 8d20bd63 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Unify pr_fmt to use module name for all KVM modules 



Define pr_fmt using KBUILD_MODNAME for all KVM x86 code so that printks
use consistent formatting across common x86, Intel, and AMD code.  In
addition to providing consistent print formatting, using KBUILD_MODNAME,
e.g. kvm_amd and kvm_intel, allows referencing SVM and VMX (and SEV and
SGX and ...) as technologies without generating weird messages, and
without causing naming conflicts with other kernel code, e.g. "SEV: ",
"tdx: ", "sgx: " etc.. are all used by the kernel for non-KVM subsystems.

Opportunistically move away from printk() for prints that need to be
modified anyways, e.g. to drop a manual "kvm: " prefix.

Opportunistically convert a few SGX WARNs that are similarly modified to
WARN_ONCE; in the very unlikely event that the WARNs fire, odds are good
that they would fire repeatedly and spam the kernel log without providing
unique information in each print.

Note, defining pr_fmt yields undesirable results for code that uses KVM's
printk wrappers, e.g. vcpu_unimpl().  But, that's a pre-existing problem
as SVM/kvm_amd already defines a pr_fmt, and thankfully use of KVM's
wrappers is relatively limited in KVM x86 code.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarPaul Durrant <paul@xen.org>
Message-Id: <20221130230934.1014142-35-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 08a9d59c

arch/arm64/include/asm/kvm_host.h

+7 −7
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ enum kvm_mode kvm_get_mode(void); 


DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use);



extern unsigned int kvm_sve_max_vl;

int kvm_arm_init_sve(void);

extern unsigned int __ro_after_init kvm_sve_max_vl;

int __init kvm_arm_init_sve(void);



u32 __attribute_const__ kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
@@ -877,7 +877,7 @@ int kvm_handle_cp10_id(struct kvm_vcpu *vcpu); 


void kvm_reset_sys_regs(struct kvm_vcpu *vcpu);



int kvm_sys_reg_table_init(void);

int __init kvm_sys_reg_table_init(void);



/* MMIO helpers */

void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);
@@ -908,9 +908,9 @@ int kvm_arm_pvtime_get_attr(struct kvm_vcpu *vcpu, 
int kvm_arm_pvtime_has_attr(struct kvm_vcpu *vcpu,

			    struct kvm_device_attr *attr);



extern unsigned int kvm_arm_vmid_bits;

int kvm_arm_vmid_alloc_init(void);

void kvm_arm_vmid_alloc_free(void);

extern unsigned int __ro_after_init kvm_arm_vmid_bits;

int __init kvm_arm_vmid_alloc_init(void);

void __init kvm_arm_vmid_alloc_free(void);

void kvm_arm_vmid_update(struct kvm_vmid *kvm_vmid);

void kvm_arm_vmid_clear_active(void);
@@ -993,7 +993,7 @@ static inline void kvm_clr_pmu_events(u32 clr) {} 
void kvm_vcpu_load_sysregs_vhe(struct kvm_vcpu *vcpu);

void kvm_vcpu_put_sysregs_vhe(struct kvm_vcpu *vcpu);



int kvm_set_ipa_limit(void);

int __init kvm_set_ipa_limit(void);



#define __KVM_HAVE_ARCH_VM_ALLOC

struct kvm *kvm_arch_alloc_vm(void);

arch/arm64/include/asm/kvm_mmu.h

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ int create_hyp_io_mappings(phys_addr_t phys_addr, size_t size, 
			   void __iomem **haddr);

int create_hyp_exec_mappings(phys_addr_t phys_addr, size_t size,

			     void **haddr);

void free_hyp_pgds(void);

void __init free_hyp_pgds(void);



void stage2_unmap_vm(struct kvm *kvm);

int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu, unsigned long type);
@@ -175,7 +175,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu); 


phys_addr_t kvm_mmu_get_httbr(void);

phys_addr_t kvm_get_idmap_vector(void);

int kvm_mmu_init(u32 *hyp_va_bits);

int __init kvm_mmu_init(u32 *hyp_va_bits);



static inline void *__kvm_vector_slot2addr(void *base,

					   enum arm64_hyp_spectre_vector slot)

arch/arm64/kvm/arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,7 @@ static int kvm_irq_init(struct arch_timer_kvm_info *info) 
	return 0;

}



int kvm_timer_hyp_init(bool has_gic)

int __init kvm_timer_hyp_init(bool has_gic)

{

	struct arch_timer_kvm_info *info;

	int err;

arch/arm64/kvm/mmu.c

+6 −6
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 
static struct kvm_pgtable *hyp_pgtable;

static DEFINE_MUTEX(kvm_hyp_pgd_mutex);



static unsigned long hyp_idmap_start;

static unsigned long hyp_idmap_end;

static phys_addr_t hyp_idmap_vector;

static unsigned long __ro_after_init hyp_idmap_start;

static unsigned long __ro_after_init hyp_idmap_end;

static phys_addr_t __ro_after_init hyp_idmap_vector;



static unsigned long io_map_base;

static unsigned long __ro_after_init io_map_base;



static phys_addr_t stage2_range_addr_end(phys_addr_t addr, phys_addr_t end)

{
@@ -280,7 +280,7 @@ static void stage2_flush_vm(struct kvm *kvm) 
/**

 * free_hyp_pgds - free Hyp-mode page tables

 */

void free_hyp_pgds(void)

void __init free_hyp_pgds(void)

{

	mutex_lock(&kvm_hyp_pgd_mutex);

	if (hyp_pgtable) {
@@ -1665,7 +1665,7 @@ static struct kvm_pgtable_mm_ops kvm_hyp_mm_ops = { 
	.virt_to_phys		= kvm_host_pa,

};



int kvm_mmu_init(u32 *hyp_va_bits)

int __init kvm_mmu_init(u32 *hyp_va_bits)

{

	int err;

	u32 idmap_bits;

arch/arm64/kvm/reset.c

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <asm/virt.h>



/* Maximum phys_shift supported for any VM on this host */

static u32 kvm_ipa_limit;

static u32 __ro_after_init kvm_ipa_limit;



/*

 * ARMv8 Reset Values
@@ -41,9 +41,9 @@ static u32 kvm_ipa_limit; 
#define VCPU_RESET_PSTATE_SVC	(PSR_AA32_MODE_SVC | PSR_AA32_A_BIT | \

				 PSR_AA32_I_BIT | PSR_AA32_F_BIT)



unsigned int kvm_sve_max_vl;

unsigned int __ro_after_init kvm_sve_max_vl;



int kvm_arm_init_sve(void)

int __init kvm_arm_init_sve(void)

{

	if (system_supports_sve()) {

		kvm_sve_max_vl = sve_max_virtualisable_vl();
@@ -352,7 +352,7 @@ u32 get_kvm_ipa_limit(void) 
	return kvm_ipa_limit;

}



int kvm_set_ipa_limit(void)

int __init kvm_set_ipa_limit(void)

{

	unsigned int parange;

	u64 mmfr0;