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

Commit 2ed10cc1 authored by Jens Freimann's avatar Jens Freimann Committed by Christian Borntraeger
Browse files

KVM: s390: clear local interrupts at cpu initial reset 



Empty list of local interrupts when vcpu goes through initial reset
to provide a clean state

Signed-off-by: default avatarJens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 91880d07

arch/s390/kvm/interrupt.c

+14 −0
Original line number Diff line number Diff line
@@ -509,6 +509,20 @@ enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer) 
	return HRTIMER_NORESTART;

}



void kvm_s390_clear_local_irqs(struct kvm_vcpu *vcpu)

{

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

	struct kvm_s390_interrupt_info  *n, *inti = NULL;



	spin_lock_bh(&li->lock);

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

		list_del(&inti->list);

		kfree(inti);

	}

	atomic_set(&li->active, 0);

	spin_unlock_bh(&li->lock);

}



void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu)

{

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

arch/s390/kvm/kvm-s390.c

+1 −0
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu) 
	vcpu->arch.pfault_token = KVM_S390_PFAULT_TOKEN_INVALID;

	kvm_clear_async_pf_completion_queue(vcpu);

	atomic_set_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);

	kvm_s390_clear_local_irqs(vcpu);

}



int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

arch/s390/kvm/kvm-s390.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer); 
void kvm_s390_tasklet(unsigned long parm);

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);

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,