From: David Woodhouse Date: Thu, 28 Jan 2021 20:50:29 +0000 (+0000) Subject: debug timing X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a3355d857dda7dfc2dd06f87397261ba116aadb1;p=users%2Fdwmw2%2Flinux.git debug timing Signed-off-by: David Woodhouse --- diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 5e78e01ca3b46..9eb0b9497855f 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -308,7 +308,7 @@ static void kvm_register_steal_time(void) return; wrmsrl(MSR_KVM_STEAL_TIME, (slow_virt_to_phys(st) | KVM_MSR_ENABLED)); - pr_info("stealtime: cpu %d, msr %llx\n", cpu, + if (0) pr_info("stealtime: cpu %d, msr %llx\n", cpu, (unsigned long long) slow_virt_to_phys(st)); } diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index aa593743acf67..79a5c26c376e3 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -108,7 +108,7 @@ static inline void kvm_sched_clock_init(bool stable) kvm_sched_clock_offset = kvm_clock_read(); pv_ops.time.sched_clock = kvm_sched_clock_read; - pr_info("kvm-clock: using sched offset of %llu cycles", + if (0) pr_info("kvm-clock: using sched offset of %llu cycles", kvm_sched_clock_offset); BUILD_BUG_ON(sizeof(kvm_sched_clock_offset) > @@ -184,7 +184,7 @@ static void kvm_register_clock(char *txt) pa = slow_virt_to_phys(&src->pvti) | 0x01ULL; wrmsrl(msr_kvm_system_time, pa); - pr_info("kvm-clock: cpu %d, msr %llx, %s", smp_processor_id(), pa, txt); + if (0) pr_info("kvm-clock: cpu %d, msr %llx, %s", smp_processor_id(), pa, txt); } static void kvm_save_sched_clock_state(void) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 6517ca40eb6fe..bd65ed446425f 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -373,7 +373,7 @@ int topology_update_die_map(unsigned int die, unsigned int cpu) goto found; new = logical_die++; - if (new != die) { + if (0 && new != die) { pr_info("CPU %u Converting physical %u to logical die %u\n", cpu, die, new); } diff --git a/kernel/cpu.c b/kernel/cpu.c index 11f9504b48456..dc2379326662c 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1336,6 +1336,7 @@ void bringup_nonboot_cpus(unsigned int setup_max_cpus) { unsigned int cpu; int n = setup_max_cpus - num_online_cpus(); + cycles_t t1, t2; /* ∀ parallel pre-bringup state, bring N CPUs to it */ if (n > 0) { @@ -1344,22 +1345,29 @@ void bringup_nonboot_cpus(unsigned int setup_max_cpus) while (st <= CPUHP_BP_PARALLEL_DYN_END && cpuhp_hp_states[st].name) { int i = n; - + t1 = get_cycles(); for_each_present_cpu(cpu) { cpu_up(cpu, st); if (!--i) break; } + t2 = get_cycles(); + + printk("Brought %d CPUs to %s in %lld cycles\n", n - i, + cpuhp_hp_states[st].name, t2 - t1); st++; } } + t1 = get_cycles(); for_each_present_cpu(cpu) { if (num_online_cpus() >= setup_max_cpus) break; if (!cpu_online(cpu)) cpu_up(cpu, CPUHP_ONLINE); } + t2 = get_cycles(); + printk("Brought CPUs online in %lld cycles\n", t2 - t1); } #ifdef CONFIG_PM_SLEEP_SMP