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

Commit c3950b66 authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

KVM: s390: no special machine check delivery 



The load PSW handler does not have to inject pending machine checks.
This can wait until the CPU runs the generic interrupt injection code.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent fbfa3049

arch/s390/kvm/interrupt.c

+0 −56
Original line number Original line Diff line number Diff line
@@ -721,62 +721,6 @@ void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu) 
	}

	}

}

}





void kvm_s390_deliver_pending_machine_checks(struct kvm_vcpu *vcpu)

{

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

	struct kvm_s390_float_interrupt *fi = vcpu->arch.local_int.float_int;

	struct kvm_s390_interrupt_info  *n, *inti = NULL;

	int deliver;



	__reset_intercept_indicators(vcpu);

	if (atomic_read(&li->active)) {

		do {

			deliver = 0;

			spin_lock(&li->lock);

			list_for_each_entry_safe(inti, n, &li->list, list) {

				if ((inti->type == KVM_S390_MCHK) &&

				    __interrupt_is_deliverable(vcpu, inti)) {

					list_del(&inti->list);

					deliver = 1;

					break;

				}

				__set_intercept_indicator(vcpu, inti);

			}

			if (list_empty(&li->list))

				atomic_set(&li->active, 0);

			spin_unlock(&li->lock);

			if (deliver) {

				__do_deliver_interrupt(vcpu, inti);

				kfree(inti);

			}

		} while (deliver);

	}



	if (atomic_read(&fi->active)) {

		do {

			deliver = 0;

			spin_lock(&fi->lock);

			list_for_each_entry_safe(inti, n, &fi->list, list) {

				if ((inti->type == KVM_S390_MCHK) &&

				    __interrupt_is_deliverable(vcpu, inti)) {

					list_del(&inti->list);

					fi->irq_count--;

					deliver = 1;

					break;

				}

				__set_intercept_indicator(vcpu, inti);

			}

			if (list_empty(&fi->list))

				atomic_set(&fi->active, 0);

			spin_unlock(&fi->lock);

			if (deliver) {

				__do_deliver_interrupt(vcpu, inti);

				kfree(inti);

			}

		} while (deliver);

	}

}



int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code)

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_local_interrupt *li = &vcpu->arch.local_int;

arch/s390/kvm/kvm-s390.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -139,7 +139,6 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu); 
void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu);

void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu);

enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer);

enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer);

void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu);

void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu);

void kvm_s390_deliver_pending_machine_checks(struct kvm_vcpu *vcpu);

void kvm_s390_clear_local_irqs(struct kvm_vcpu *vcpu);

void kvm_s390_clear_local_irqs(struct kvm_vcpu *vcpu);

void kvm_s390_clear_float_irqs(struct kvm *kvm);

void kvm_s390_clear_float_irqs(struct kvm *kvm);

int __must_check kvm_s390_inject_vm(struct kvm *kvm,

int __must_check kvm_s390_inject_vm(struct kvm *kvm,

arch/s390/kvm/priv.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -352,13 +352,6 @@ static int handle_stfl(struct kvm_vcpu *vcpu) 
	return 0;

	return 0;

}

}





static void handle_new_psw(struct kvm_vcpu *vcpu)

{

	/* Check whether the new psw is enabled for machine checks. */

	if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_MCHECK)

		kvm_s390_deliver_pending_machine_checks(vcpu);

}



#define PSW_MASK_ADDR_MODE (PSW_MASK_EA | PSW_MASK_BA)

#define PSW_MASK_ADDR_MODE (PSW_MASK_EA | PSW_MASK_BA)

#define PSW_MASK_UNASSIGNED 0xb80800fe7fffffffUL

#define PSW_MASK_UNASSIGNED 0xb80800fe7fffffffUL

#define PSW_ADDR_24 0x0000000000ffffffUL

#define PSW_ADDR_24 0x0000000000ffffffUL
@@ -405,7 +398,6 @@ int kvm_s390_handle_lpsw(struct kvm_vcpu *vcpu) 
	gpsw->addr = new_psw.addr & ~PSW32_ADDR_AMODE;

	gpsw->addr = new_psw.addr & ~PSW32_ADDR_AMODE;

	if (!is_valid_psw(gpsw))

	if (!is_valid_psw(gpsw))

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

	handle_new_psw(vcpu);

	return 0;

	return 0;

}

}
@@ -427,7 +419,6 @@ static int handle_lpswe(struct kvm_vcpu *vcpu) 
	vcpu->arch.sie_block->gpsw = new_psw;

	vcpu->arch.sie_block->gpsw = new_psw;

	if (!is_valid_psw(&vcpu->arch.sie_block->gpsw))

	if (!is_valid_psw(&vcpu->arch.sie_block->gpsw))

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

	handle_new_psw(vcpu);

	return 0;

	return 0;

}

}