| Message ID | 1569847479-13201-3-git-send-email-zhenzhong.duan@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add a unified parameter "nopvspin" | expand |
On Mon, Sep 30, 2019 at 08:44:37PM +0800, Zhenzhong Duan wrote: > pr_*() is preferred than printk(KERN_* ...), after change all the print > in arch/x86/kernel/kvm.c will have "KVM: xxx" style. > > No functional change. > > Suggested-by: Vitaly Kuznetsov <vkuznets@redhat.com> This wasn't really suggested by Vitaly, he just requested it be done in a separate patch. > Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Radim Krcmar <rkrcmar@redhat.com> > Cc: Sean Christopherson <sean.j.christopherson@intel.com> > Cc: Vitaly Kuznetsov <vkuznets@redhat.com> > Cc: Wanpeng Li <wanpengli@tencent.com> > Cc: Jim Mattson <jmattson@google.com> > Cc: Joerg Roedel <joro@8bytes.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: Borislav Petkov <bp@alien8.de> > Cc: "H. Peter Anvin" <hpa@zytor.com> > --- > arch/x86/kernel/kvm.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c > index a4f108d..ce4f578 100644 > --- a/arch/x86/kernel/kvm.c > +++ b/arch/x86/kernel/kvm.c > @@ -7,6 +7,8 @@ > * Authors: Anthony Liguori <aliguori@us.ibm.com> > */ > > +#define pr_fmt(fmt) "KVM: " fmt Not a fan of "KVM" as the prefix as it's easily confused with KVM the hypervisor. Maybe "kvm_guest"? > + > #include <linux/context_tracking.h> > #include <linux/init.h> > #include <linux/kernel.h> > @@ -286,8 +288,8 @@ static void kvm_register_steal_time(void) > return; > > wrmsrl(MSR_KVM_STEAL_TIME, (slow_virt_to_phys(st) | KVM_MSR_ENABLED)); > - pr_info("kvm-stealtime: cpu %d, msr %llx\n", > - cpu, (unsigned long long) slow_virt_to_phys(st)); > + pr_info("stealtime: cpu %d, msr %llx\n", cpu, > + (unsigned long long) slow_virt_to_phys(st)); > } > > static DEFINE_PER_CPU_DECRYPTED(unsigned long, kvm_apic_eoi) = KVM_PV_EOI_DISABLED; > @@ -321,8 +323,7 @@ static void kvm_guest_cpu_init(void) > > wrmsrl(MSR_KVM_ASYNC_PF_EN, pa); > __this_cpu_write(apf_reason.enabled, 1); > - printk(KERN_INFO"KVM setup async PF for cpu %d\n", > - smp_processor_id()); > + pr_info("setup async PF for cpu %d\n", smp_processor_id()); > } > > if (kvm_para_has_feature(KVM_FEATURE_PV_EOI)) { > @@ -347,8 +348,7 @@ static void kvm_pv_disable_apf(void) > wrmsrl(MSR_KVM_ASYNC_PF_EN, 0); > __this_cpu_write(apf_reason.enabled, 0); > > - printk(KERN_INFO"Unregister pv shared memory for cpu %d\n", > - smp_processor_id()); > + pr_info("Unregister pv shared memory for cpu %d\n", smp_processor_id()); > } > > static void kvm_pv_guest_cpu_reboot(void *unused) > @@ -509,7 +509,7 @@ static void kvm_setup_pv_ipi(void) > { > apic->send_IPI_mask = kvm_send_ipi_mask; > apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself; > - pr_info("KVM setup pv IPIs\n"); > + pr_info("setup pv IPIs\n"); > } > > static void kvm_smp_send_call_func_ipi(const struct cpumask *mask) > @@ -639,11 +639,11 @@ static void __init kvm_guest_init(void) > !kvm_para_has_hint(KVM_HINTS_REALTIME) && > kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) { > smp_ops.send_call_func_ipi = kvm_smp_send_call_func_ipi; > - pr_info("KVM setup pv sched yield\n"); > + pr_info("setup pv sched yield\n"); > } > if (cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/kvm:online", > kvm_cpu_online, kvm_cpu_down_prepare) < 0) > - pr_err("kvm_guest: Failed to install cpu hotplug callbacks\n"); > + pr_err("failed to install cpu hotplug callbacks\n"); > #else > sev_map_percpu_data(); > kvm_guest_cpu_init(); > @@ -746,7 +746,7 @@ static __init int kvm_setup_pv_tlb_flush(void) > zalloc_cpumask_var_node(per_cpu_ptr(&__pv_tlb_mask, cpu), > GFP_KERNEL, cpu_to_node(cpu)); > } > - pr_info("KVM setup pv remote TLB flush\n"); > + pr_info("setup pv remote TLB flush\n"); > } > > return 0; > @@ -879,8 +879,8 @@ static void kvm_enable_host_haltpoll(void *i) > void arch_haltpoll_enable(unsigned int cpu) > { > if (!kvm_para_has_feature(KVM_FEATURE_POLL_CONTROL)) { > - pr_err_once("kvm: host does not support poll control\n"); > - pr_err_once("kvm: host upgrade recommended\n"); > + pr_err_once("host does not support poll control\n"); > + pr_err_once("host upgrade recommended\n"); > return; > } > > -- > 1.8.3.1 >
On 2019/10/3 1:15, Sean Christopherson wrote: > On Mon, Sep 30, 2019 at 08:44:37PM +0800, Zhenzhong Duan wrote: >> pr_*() is preferred than printk(KERN_* ...), after change all the print >> in arch/x86/kernel/kvm.c will have "KVM: xxx" style. >> >> No functional change. >> >> Suggested-by: Vitaly Kuznetsov<vkuznets@redhat.com> > This wasn't really suggested by Vitaly, he just requested it be done in a > separate patch. Will fix. > >> Signed-off-by: Zhenzhong Duan<zhenzhong.duan@oracle.com> >> Cc: Paolo Bonzini<pbonzini@redhat.com> >> Cc: Radim Krcmar<rkrcmar@redhat.com> >> Cc: Sean Christopherson<sean.j.christopherson@intel.com> >> Cc: Vitaly Kuznetsov<vkuznets@redhat.com> >> Cc: Wanpeng Li<wanpengli@tencent.com> >> Cc: Jim Mattson<jmattson@google.com> >> Cc: Joerg Roedel<joro@8bytes.org> >> Cc: Thomas Gleixner<tglx@linutronix.de> >> Cc: Ingo Molnar<mingo@redhat.com> >> Cc: Borislav Petkov<bp@alien8.de> >> Cc: "H. Peter Anvin"<hpa@zytor.com> >> --- >> arch/x86/kernel/kvm.c | 24 ++++++++++++------------ >> 1 file changed, 12 insertions(+), 12 deletions(-) >> >> diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c >> index a4f108d..ce4f578 100644 >> --- a/arch/x86/kernel/kvm.c >> +++ b/arch/x86/kernel/kvm.c >> @@ -7,6 +7,8 @@ >> * Authors: Anthony Liguori<aliguori@us.ibm.com> >> */ >> >> +#define pr_fmt(fmt) "KVM: " fmt > Not a fan of "KVM" as the prefix as it's easily confused with KVM the > hypervisor. Maybe "kvm_guest"? Yeah, looks better, will change to"kvm_guest". Thanks Zhenzhong
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index a4f108d..ce4f578 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -7,6 +7,8 @@ * Authors: Anthony Liguori <aliguori@us.ibm.com> */ +#define pr_fmt(fmt) "KVM: " fmt + #include <linux/context_tracking.h> #include <linux/init.h> #include <linux/kernel.h> @@ -286,8 +288,8 @@ static void kvm_register_steal_time(void) return; wrmsrl(MSR_KVM_STEAL_TIME, (slow_virt_to_phys(st) | KVM_MSR_ENABLED)); - pr_info("kvm-stealtime: cpu %d, msr %llx\n", - cpu, (unsigned long long) slow_virt_to_phys(st)); + pr_info("stealtime: cpu %d, msr %llx\n", cpu, + (unsigned long long) slow_virt_to_phys(st)); } static DEFINE_PER_CPU_DECRYPTED(unsigned long, kvm_apic_eoi) = KVM_PV_EOI_DISABLED; @@ -321,8 +323,7 @@ static void kvm_guest_cpu_init(void) wrmsrl(MSR_KVM_ASYNC_PF_EN, pa); __this_cpu_write(apf_reason.enabled, 1); - printk(KERN_INFO"KVM setup async PF for cpu %d\n", - smp_processor_id()); + pr_info("setup async PF for cpu %d\n", smp_processor_id()); } if (kvm_para_has_feature(KVM_FEATURE_PV_EOI)) { @@ -347,8 +348,7 @@ static void kvm_pv_disable_apf(void) wrmsrl(MSR_KVM_ASYNC_PF_EN, 0); __this_cpu_write(apf_reason.enabled, 0); - printk(KERN_INFO"Unregister pv shared memory for cpu %d\n", - smp_processor_id()); + pr_info("Unregister pv shared memory for cpu %d\n", smp_processor_id()); } static void kvm_pv_guest_cpu_reboot(void *unused) @@ -509,7 +509,7 @@ static void kvm_setup_pv_ipi(void) { apic->send_IPI_mask = kvm_send_ipi_mask; apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself; - pr_info("KVM setup pv IPIs\n"); + pr_info("setup pv IPIs\n"); } static void kvm_smp_send_call_func_ipi(const struct cpumask *mask) @@ -639,11 +639,11 @@ static void __init kvm_guest_init(void) !kvm_para_has_hint(KVM_HINTS_REALTIME) && kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) { smp_ops.send_call_func_ipi = kvm_smp_send_call_func_ipi; - pr_info("KVM setup pv sched yield\n"); + pr_info("setup pv sched yield\n"); } if (cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/kvm:online", kvm_cpu_online, kvm_cpu_down_prepare) < 0) - pr_err("kvm_guest: Failed to install cpu hotplug callbacks\n"); + pr_err("failed to install cpu hotplug callbacks\n"); #else sev_map_percpu_data(); kvm_guest_cpu_init(); @@ -746,7 +746,7 @@ static __init int kvm_setup_pv_tlb_flush(void) zalloc_cpumask_var_node(per_cpu_ptr(&__pv_tlb_mask, cpu), GFP_KERNEL, cpu_to_node(cpu)); } - pr_info("KVM setup pv remote TLB flush\n"); + pr_info("setup pv remote TLB flush\n"); } return 0; @@ -879,8 +879,8 @@ static void kvm_enable_host_haltpoll(void *i) void arch_haltpoll_enable(unsigned int cpu) { if (!kvm_para_has_feature(KVM_FEATURE_POLL_CONTROL)) { - pr_err_once("kvm: host does not support poll control\n"); - pr_err_once("kvm: host upgrade recommended\n"); + pr_err_once("host does not support poll control\n"); + pr_err_once("host upgrade recommended\n"); return; }
pr_*() is preferred than printk(KERN_* ...), after change all the print in arch/x86/kernel/kvm.c will have "KVM: xxx" style. No functional change. Suggested-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim Krcmar <rkrcmar@redhat.com> Cc: Sean Christopherson <sean.j.christopherson@intel.com> Cc: Vitaly Kuznetsov <vkuznets@redhat.com> Cc: Wanpeng Li <wanpengli@tencent.com> Cc: Jim Mattson <jmattson@google.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: "H. Peter Anvin" <hpa@zytor.com> --- arch/x86/kernel/kvm.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)