Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd39e117 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: VMX: extract __pi_post_block 



Simple code movement patch, preparing for the next one.

Cc: Huangweidong <weidong.huang@huawei.com>
Cc: Gonglei <arei.gonglei@huawei.com>
Cc: wangxin <wangxinxin.wang@huawei.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Tested-by: default avatarLongpeng (Mike) <longpeng2@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e001fa78

arch/x86/kvm/vmx.c

+38 −33
Original line number Diff line number Diff line
@@ -11705,6 +11705,43 @@ static void vmx_enable_log_dirty_pt_masked(struct kvm *kvm, 
	kvm_mmu_clear_dirty_pt_masked(kvm, memslot, offset, mask);

}



static void __pi_post_block(struct kvm_vcpu *vcpu)

{

	struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);

	struct pi_desc old, new;

	unsigned int dest;

	unsigned long flags;



	do {

		old.control = new.control = pi_desc->control;



		dest = cpu_physical_id(vcpu->cpu);



		if (x2apic_enabled())

			new.ndst = dest;

		else

			new.ndst = (dest << 8) & 0xFF00;



		/* Allow posting non-urgent interrupts */

		new.sn = 0;



		/* set 'NV' to 'notification vector' */

		new.nv = POSTED_INTR_VECTOR;

	} while (cmpxchg(&pi_desc->control, old.control,

			new.control) != old.control);



	if(vcpu->pre_pcpu != -1) {

		spin_lock_irqsave(

			&per_cpu(blocked_vcpu_on_cpu_lock,

			vcpu->pre_pcpu), flags);

		list_del(&vcpu->blocked_vcpu_list);

		spin_unlock_irqrestore(

			&per_cpu(blocked_vcpu_on_cpu_lock,

			vcpu->pre_pcpu), flags);

		vcpu->pre_pcpu = -1;

	}

}



/*

 * This routine does the following things for vCPU which is going

 * to be blocked if VT-d PI is enabled.
@@ -11798,44 +11835,12 @@ static int vmx_pre_block(struct kvm_vcpu *vcpu) 


static void pi_post_block(struct kvm_vcpu *vcpu)

{

	struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);

	struct pi_desc old, new;

	unsigned int dest;

	unsigned long flags;



	if (!kvm_arch_has_assigned_device(vcpu->kvm) ||

		!irq_remapping_cap(IRQ_POSTING_CAP)  ||

		!kvm_vcpu_apicv_active(vcpu))

		return;



	do {

		old.control = new.control = pi_desc->control;



		dest = cpu_physical_id(vcpu->cpu);



		if (x2apic_enabled())

			new.ndst = dest;

		else

			new.ndst = (dest << 8) & 0xFF00;



		/* Allow posting non-urgent interrupts */

		new.sn = 0;



		/* set 'NV' to 'notification vector' */

		new.nv = POSTED_INTR_VECTOR;

	} while (cmpxchg(&pi_desc->control, old.control,

			new.control) != old.control);



	if(vcpu->pre_pcpu != -1) {

		spin_lock_irqsave(

			&per_cpu(blocked_vcpu_on_cpu_lock,

			vcpu->pre_pcpu), flags);

		list_del(&vcpu->blocked_vcpu_list);

		spin_unlock_irqrestore(

			&per_cpu(blocked_vcpu_on_cpu_lock,

			vcpu->pre_pcpu), flags);

		vcpu->pre_pcpu = -1;

	}

	__pi_post_block(vcpu);

}



static void vmx_post_block(struct kvm_vcpu *vcpu)