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

Commit 67335e63 authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

KVM: s390: Drop pending interrupts on guest exit 



On hard exits (abort, sigkill) we have have some kvm_s390_interrupt_info
structures hanging around. Delete those on exit to avoid memory leaks.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
CC: stable@vger.kernel.org
Reviewed-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
parent f71d0dc5

arch/s390/kvm/interrupt.c

+2 −2
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu, 
	return 0;

}



static void clear_floating_interrupts(struct kvm *kvm)

void kvm_s390_clear_float_irqs(struct kvm *kvm)

{

	struct kvm_s390_float_interrupt *fi;

	struct kvm_s390_interrupt_info	*n, *inti = NULL;
@@ -1391,7 +1391,7 @@ static int flic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr) 
		break;

	case KVM_DEV_FLIC_CLEAR_IRQS:

		r = 0;

		clear_floating_interrupts(dev->kvm);

		kvm_s390_clear_float_irqs(dev->kvm);

		break;

	case KVM_DEV_FLIC_APF_ENABLE:

		dev->kvm->arch.gmap->pfault_enabled = 1;

arch/s390/kvm/kvm-s390.c

+2 −0
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 
{

	VCPU_EVENT(vcpu, 3, "%s", "free cpu");

	trace_kvm_s390_destroy_vcpu(vcpu->vcpu_id);

	kvm_s390_clear_local_irqs(vcpu);

	kvm_clear_async_pf_completion_queue(vcpu);

	if (!kvm_is_ucontrol(vcpu->kvm)) {

		clear_bit(63 - vcpu->vcpu_id,
@@ -520,6 +521,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
	if (!kvm_is_ucontrol(kvm))

		gmap_free(kvm->arch.gmap);

	kvm_s390_destroy_adapters(kvm);

	kvm_s390_clear_float_irqs(kvm);

}



/* Section: vcpu related */

arch/s390/kvm/kvm-s390.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ 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);

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,