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

Commit 383d0b05 authored by Jens Freimann's avatar Jens Freimann Committed by Christian Borntraeger
Browse files

KVM: s390: handle pending local interrupts via bitmap 



This patch adapts handling of local interrupts to be more compliant with
the z/Architecture Principles of Operation and introduces a data
structure
which allows more efficient handling of interrupts.

* get rid of li->active flag, use bitmap instead
* Keep interrupts in a bitmap instead of a list
* Deliver interrupts in the order of their priority as defined in the
  PoP
* Use a second bitmap for sigp emergency requests, as a CPU can have
  one request pending from every other CPU in the system.

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

arch/s390/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -398,8 +398,6 @@ struct kvm_s390_irq_payload { 


struct kvm_s390_local_interrupt {

	spinlock_t lock;

	struct list_head list;

	atomic_t active;

	struct kvm_s390_float_interrupt *float_int;

	wait_queue_head_t *wq;

	atomic_t *cpuflags;

arch/s390/kvm/intercept.c

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int handle_instruction_and_prog(struct kvm_vcpu *vcpu) 
static int handle_external_interrupt(struct kvm_vcpu *vcpu)

{

	u16 eic = vcpu->arch.sie_block->eic;

	struct kvm_s390_interrupt irq;

	struct kvm_s390_irq irq;

	psw_t newpsw;

	int rc;
@@ -282,7 +282,7 @@ static int handle_external_interrupt(struct kvm_vcpu *vcpu) 
		if (kvm_s390_si_ext_call_pending(vcpu))

			return 0;

		irq.type = KVM_S390_INT_EXTERNAL_CALL;

		irq.parm = vcpu->arch.sie_block->extcpuaddr;

		irq.u.extcall.code = vcpu->arch.sie_block->extcpuaddr;

		break;

	default:

		return -EOPNOTSUPP;

arch/s390/kvm/interrupt.c

+356 −245

File changed.

Preview size limit exceeded, changes collapsed.

arch/s390/kvm/kvm-s390.c

+9 −5
Original line number Diff line number Diff line
@@ -719,7 +719,6 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, 
	}



	spin_lock_init(&vcpu->arch.local_int.lock);

	INIT_LIST_HEAD(&vcpu->arch.local_int.list);

	vcpu->arch.local_int.float_int = &kvm->arch.float_int;

	vcpu->arch.local_int.wq = &vcpu->wq;

	vcpu->arch.local_int.cpuflags = &vcpu->arch.sie_block->cpuflags;
@@ -1122,13 +1121,15 @@ static void __kvm_inject_pfault_token(struct kvm_vcpu *vcpu, bool start_token, 
				      unsigned long token)

{

	struct kvm_s390_interrupt inti;

	inti.parm64 = token;

	struct kvm_s390_irq irq;



	if (start_token) {

		inti.type = KVM_S390_INT_PFAULT_INIT;

		WARN_ON_ONCE(kvm_s390_inject_vcpu(vcpu, &inti));

		irq.u.ext.ext_params2 = token;

		irq.type = KVM_S390_INT_PFAULT_INIT;

		WARN_ON_ONCE(kvm_s390_inject_vcpu(vcpu, &irq));

	} else {

		inti.type = KVM_S390_INT_PFAULT_DONE;

		inti.parm64 = token;

		WARN_ON_ONCE(kvm_s390_inject_vm(vcpu->kvm, &inti));

	}

}
@@ -1622,11 +1623,14 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
	switch (ioctl) {

	case KVM_S390_INTERRUPT: {

		struct kvm_s390_interrupt s390int;

		struct kvm_s390_irq s390irq;



		r = -EFAULT;

		if (copy_from_user(&s390int, argp, sizeof(s390int)))

			break;

		r = kvm_s390_inject_vcpu(vcpu, &s390int);

		if (s390int_to_s390irq(&s390int, &s390irq))

			return -EINVAL;

		r = kvm_s390_inject_vcpu(vcpu, &s390irq);

		break;

	}

	case KVM_S390_STORE_STATUS:

arch/s390/kvm/kvm-s390.h

+4 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ void kvm_s390_clear_float_irqs(struct kvm *kvm); 
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_interrupt *s390int);

				      struct kvm_s390_irq *irq);

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

struct kvm_s390_interrupt_info *kvm_s390_get_io_int(struct kvm *kvm,

						    u64 cr6, u64 schid);
@@ -224,6 +224,9 @@ static inline int kvm_s390_inject_prog_cond(struct kvm_vcpu *vcpu, int rc) 
	return kvm_s390_inject_prog_irq(vcpu, &vcpu->arch.pgm);

}



int s390int_to_s390irq(struct kvm_s390_interrupt *s390int,

			struct kvm_s390_irq *s390irq);



/* implemented in interrupt.c */

int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu);

int psw_extint_disabled(struct kvm_vcpu *vcpu);