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

Commit 8a22f234 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: move kvm_set_irq_inatomic to legacy device assignment 



The function is not used outside device assignment, and
kvm_arch_set_irq_inatomic has a different prototype.  Move it here and
make it static to avoid confusion.

Reviewed-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 76954056

arch/x86/kvm/assigned-dev.c

+37 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/fs.h>

#include "irq.h"

#include "assigned-dev.h"

#include "trace/events/kvm.h"



struct kvm_assigned_dev_kernel {

	struct kvm_irq_ack_notifier ack_notifier;
@@ -131,6 +132,42 @@ static irqreturn_t kvm_assigned_dev_thread_intx(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



/*

 * Deliver an IRQ in an atomic context if we can, or return a failure,

 * user can retry in a process context.

 * Return value:

 *  -EWOULDBLOCK - Can't deliver in atomic context: retry in a process context.

 *  Other values - No need to retry.

 */

static int kvm_set_irq_inatomic(struct kvm *kvm, int irq_source_id, u32 irq,

				int level)

{

	struct kvm_kernel_irq_routing_entry entries[KVM_NR_IRQCHIPS];

	struct kvm_kernel_irq_routing_entry *e;

	int ret = -EINVAL;

	int idx;



	trace_kvm_set_irq(irq, level, irq_source_id);



	/*

	 * Injection into either PIC or IOAPIC might need to scan all CPUs,

	 * which would need to be retried from thread context;  when same GSI

	 * is connected to both PIC and IOAPIC, we'd have to report a

	 * partial failure here.

	 * Since there's no easy way to do this, we only support injecting MSI

	 * which is limited to 1:1 GSI mapping.

	 */

	idx = srcu_read_lock(&kvm->irq_srcu);

	if (kvm_irq_map_gsi(kvm, entries, irq) > 0) {

		e = &entries[0];

		ret = kvm_arch_set_irq_inatomic(e, kvm, irq_source_id,

						irq, level);

	}

	srcu_read_unlock(&kvm->irq_srcu, idx);

	return ret;

}





static irqreturn_t kvm_assigned_dev_msi(int irq, void *dev_id)

{

	struct kvm_assigned_dev_kernel *assigned_dev = dev_id;

arch/x86/kvm/irq_comm.c

+0 −34
Original line number Diff line number Diff line
@@ -142,40 +142,6 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, 
		return -EWOULDBLOCK;

}



/*

 * Deliver an IRQ in an atomic context if we can, or return a failure,

 * user can retry in a process context.

 * Return value:

 *  -EWOULDBLOCK - Can't deliver in atomic context: retry in a process context.

 *  Other values - No need to retry.

 */

int kvm_set_irq_inatomic(struct kvm *kvm, int irq_source_id, u32 irq, int level)

{

	struct kvm_kernel_irq_routing_entry entries[KVM_NR_IRQCHIPS];

	struct kvm_kernel_irq_routing_entry *e;

	int ret = -EINVAL;

	int idx;



	trace_kvm_set_irq(irq, level, irq_source_id);



	/*

	 * Injection into either PIC or IOAPIC might need to scan all CPUs,

	 * which would need to be retried from thread context;  when same GSI

	 * is connected to both PIC and IOAPIC, we'd have to report a

	 * partial failure here.

	 * Since there's no easy way to do this, we only support injecting MSI

	 * which is limited to 1:1 GSI mapping.

	 */

	idx = srcu_read_lock(&kvm->irq_srcu);

	if (kvm_irq_map_gsi(kvm, entries, irq) > 0) {

		e = &entries[0];

		ret = kvm_arch_set_irq_inatomic(e, kvm, irq_source_id,

						irq, level);

	}

	srcu_read_unlock(&kvm->irq_srcu, idx);

	return ret;

}



int kvm_request_irq_source_id(struct kvm *kvm)

{

	unsigned long *bitmap = &kvm->arch.irq_sources_bitmap;

include/linux/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -827,7 +827,6 @@ int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned irqchip, unsigned pin); 


int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level,

		bool line_status);

int kvm_set_irq_inatomic(struct kvm *kvm, int irq_source_id, u32 irq, int level);

int kvm_set_msi(struct kvm_kernel_irq_routing_entry *irq_entry, struct kvm *kvm,

		int irq_source_id, int level, bool line_status);

int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,