History

KVM: Introduce pv check helpers

Introduce some pv check helpers for consistency.

Wanpeng Li committed 6 years ago

Commit a262bca1 parent fcd07f91 file · +24 −10Browse files

Unified · Split

arch/x86/kernel/kvm.c+24−10
@@ -425,7 +425,27 @@ static void __init sev_map_percpu_data(void) · 424 unmodified lines
425 }425 }
426}426}
427 427
428static bool pv_tlb_flush_supported(void)
429{
430 return (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&
431 !kvm_para_has_hint(KVM_HINTS_REALTIME) &&
432 kvm_para_has_feature(KVM_FEATURE_STEAL_TIME));
433}
434
428#ifdef CONFIG_SMP435#ifdef CONFIG_SMP
436
437static bool pv_ipi_supported(void)
438{
439 return kvm_para_has_feature(KVM_FEATURE_PV_SEND_IPI);
440}
441
442static bool pv_sched_yield_supported(void)
443{
444 return (kvm_para_has_feature(KVM_FEATURE_PV_SCHED_YIELD) &&
445 !kvm_para_has_hint(KVM_HINTS_REALTIME) &&
446 kvm_para_has_feature(KVM_FEATURE_STEAL_TIME));
447}
448
429#define KVM_IPI_CLUSTER_SIZE (2 * BITS_PER_LONG)449#define KVM_IPI_CLUSTER_SIZE (2 * BITS_PER_LONG)
430 450
431static void __send_ipi_mask(const struct cpumask *mask, int vector)451static void __send_ipi_mask(const struct cpumask *mask, int vector)
@@ -619,9 +639,7 @@ static void __init kvm_guest_init(void) · 187 unmodified lines
619 pv_ops.time.steal_clock = kvm_steal_clock;639 pv_ops.time.steal_clock = kvm_steal_clock;
620 }640 }
621 641
622 if (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&642 if (pv_tlb_flush_supported()) {
623 !kvm_para_has_hint(KVM_HINTS_REALTIME) &&
624 kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {
625 pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;643 pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;
626 pv_ops.mmu.tlb_remove_table = tlb_remove_table;644 pv_ops.mmu.tlb_remove_table = tlb_remove_table;
627 }645 }
@@ -632,9 +650,7 @@ static void __init kvm_guest_init(void) · 4 unmodified lines
632#ifdef CONFIG_SMP650#ifdef CONFIG_SMP
633 smp_ops.smp_prepare_cpus = kvm_smp_prepare_cpus;651 smp_ops.smp_prepare_cpus = kvm_smp_prepare_cpus;
634 smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu;652 smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu;
635 if (kvm_para_has_feature(KVM_FEATURE_PV_SCHED_YIELD) &&653 if (pv_sched_yield_supported()) {
636 !kvm_para_has_hint(KVM_HINTS_REALTIME) &&
637 kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {
638 smp_ops.send_call_func_ipi = kvm_smp_send_call_func_ipi;654 smp_ops.send_call_func_ipi = kvm_smp_send_call_func_ipi;
639 pr_info("KVM setup pv sched yield\n");655 pr_info("KVM setup pv sched yield\n");
640 }656 }
@@ -700,7 +716,7 @@ static uint32_t __init kvm_detect(void) · 59 unmodified lines
700static void __init kvm_apic_init(void)716static void __init kvm_apic_init(void)
701{717{
702#if defined(CONFIG_SMP)718#if defined(CONFIG_SMP)
703 if (kvm_para_has_feature(KVM_FEATURE_PV_SEND_IPI))719 if (pv_ipi_supported())
704 kvm_setup_pv_ipi();720 kvm_setup_pv_ipi();
705#endif721#endif
706}722}
@@ -739,9 +755,7 @@ static __init int kvm_setup_pv_tlb_flush(void) · 32 unmodified lines
739 if (!kvm_para_available() || nopv)755 if (!kvm_para_available() || nopv)
740 return 0;756 return 0;
741 757
742 if (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&758 if (pv_tlb_flush_supported()) {
743 !kvm_para_has_hint(KVM_HINTS_REALTIME) &&
744 kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {
745 for_each_possible_cpu(cpu) {759 for_each_possible_cpu(cpu) {
746 zalloc_cpumask_var_node(per_cpu_ptr(&__pv_tlb_mask, cpu),760 zalloc_cpumask_var_node(per_cpu_ptr(&__pv_tlb_mask, cpu),
747 GFP_KERNEL, cpu_to_node(cpu));761 GFP_KERNEL, cpu_to_node(cpu));