KVM: x86: Fix pv tlb flush dependencies (17a1079d) · Commits · 戴 / test

PV TLB FLUSH can only be turned on when steal time is enabled. The condition got reversed during conflict resolution. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim Krčmář <rkrcmar@redhat.com> Signed-off-by:

Wanpeng Li <wanpengli@tencent.com> Fixes: ("KVM: X86: Avoid traversing all the cpus for pv tlb flush when steal time is disabled") [Rebased on top of kvm/master and reworded the commit message. - Radim] Signed-off-by:

Radim Krčmář <rkrcmar@redhat.com>

arch/x86/kernel/kvm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -546,7 +546,7 @@ static void __init kvm_guest_init(void)
		}

		if (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&
		!kvm_para_has_feature(KVM_FEATURE_STEAL_TIME))
		kvm_para_has_feature(KVM_FEATURE_STEAL_TIME))
		pv_mmu_ops.flush_tlb_others = kvm_flush_tlb_others;

		if (kvm_para_has_feature(KVM_FEATURE_PV_EOI))
		@@ -635,7 +635,7 @@ static __init int kvm_setup_pv_tlb_flush(void)
		int cpu;

		if (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&
		!kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {
		kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {
		for_each_possible_cpu(cpu) {
		zalloc_cpumask_var_node(per_cpu_ptr(&__pv_tlb_mask, cpu),
		GFP_KERNEL, cpu_to_node(cpu));

Admin message