Commit 66933b78 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: simplify in-kernel program irq injection 



The main reason to keep program injection in kernel separated until now
was that we were able to do some checking, if really only the owning
thread injects program interrupts (via waitqueue_active(li->wq)).

This BUG_ON was never triggered and the chances of really hitting it, if
another thread injected a program irq to another vcpu, were very small.

Let's drop this check and turn kvm_s390_inject_program_int() and
kvm_s390_inject_prog_irq() into simple inline functions that makes use of
kvm_s390_inject_vcpu().

__must_check can be dropped as they are implicitely given by
kvm_s390_inject_vcpu(), to avoid ugly long function prototypes.

Reviewed-by: default avatarJens Freimann <jfrei@linux.vnet.ibm.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 4d32ad6b

arch/s390/kvm/interrupt.c

+0 −28
Original line number Diff line number Diff line
@@ -977,34 +977,6 @@ static int __inject_prog(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq) 
	return 0;

}



int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code)

{

	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;

	struct kvm_s390_irq irq;



	spin_lock(&li->lock);

	irq.u.pgm.code = code;

	__inject_prog(vcpu, &irq);

	BUG_ON(waitqueue_active(li->wq));

	spin_unlock(&li->lock);

	return 0;

}



int kvm_s390_inject_prog_irq(struct kvm_vcpu *vcpu,

			     struct kvm_s390_pgm_info *pgm_info)

{

	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;

	struct kvm_s390_irq irq;

	int rc;



	spin_lock(&li->lock);

	irq.u.pgm = *pgm_info;

	rc = __inject_prog(vcpu, &irq);

	BUG_ON(waitqueue_active(li->wq));

	spin_unlock(&li->lock);

	return rc;

}



static int __inject_pfault_init(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq)

{

	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;

arch/s390/kvm/kvm-s390.h

+20 −4
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ static inline int kvm_s390_user_cpu_state_ctrl(struct kvm *kvm) 
	return kvm->arch.user_cpu_state_ctrl != 0;

}



/* implemented in interrupt.c */

int kvm_s390_handle_wait(struct kvm_vcpu *vcpu);

void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu);

enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer);
@@ -185,7 +186,25 @@ int __must_check kvm_s390_inject_vm(struct kvm *kvm, 
				    struct kvm_s390_interrupt *s390int);

int __must_check kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,

				      struct kvm_s390_irq *irq);

int __must_check kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code);

static inline int kvm_s390_inject_prog_irq(struct kvm_vcpu *vcpu,

					   struct kvm_s390_pgm_info *pgm_info)

{

	struct kvm_s390_irq irq = {

		.type = KVM_S390_PROGRAM_INT,

		.u.pgm = *pgm_info,

	};



	return kvm_s390_inject_vcpu(vcpu, &irq);

}

static inline int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code)

{

	struct kvm_s390_irq irq = {

		.type = KVM_S390_PROGRAM_INT,

		.u.pgm.code = code,

	};



	return kvm_s390_inject_vcpu(vcpu, &irq);

}

struct kvm_s390_interrupt_info *kvm_s390_get_io_int(struct kvm *kvm,

						    u64 isc_mask, u32 schid);

int kvm_s390_reinject_io_int(struct kvm *kvm,
@@ -231,9 +250,6 @@ extern unsigned long kvm_s390_fac_list_mask[]; 


/* implemented in diag.c */

int kvm_s390_handle_diag(struct kvm_vcpu *vcpu);

/* implemented in interrupt.c */

int kvm_s390_inject_prog_irq(struct kvm_vcpu *vcpu,

			     struct kvm_s390_pgm_info *pgm_info);



static inline void kvm_s390_vcpu_block_all(struct kvm *kvm)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE