Commit 4b2caef0 authored Oct 25, 2021 by Paolo Bonzini

Merge tag 'kvm-s390-master-5.15-2' of...

Merge tag 'kvm-s390-master-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: Fixes for interrupt delivery

Two bugs that might result in CPUs not woken up when interrupts are
pending.

parents 8228c77d 0e9ff65f

arch/s390/kvm/interrupt.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3053,13 +3053,14 @@ static void __airqs_kick_single_vcpu(struct kvm *kvm, u8 deliverable_mask)
	int vcpu_idx, online_vcpus = atomic_read(&kvm->online_vcpus);		int vcpu_idx, online_vcpus = atomic_read(&kvm->online_vcpus);
	struct kvm_s390_gisa_interrupt *gi = &kvm->arch.gisa_int;		struct kvm_s390_gisa_interrupt *gi = &kvm->arch.gisa_int;
	struct kvm_vcpu *vcpu;		struct kvm_vcpu *vcpu;
			u8 vcpu_isc_mask;

	for_each_set_bit(vcpu_idx, kvm->arch.idle_mask, online_vcpus) {		for_each_set_bit(vcpu_idx, kvm->arch.idle_mask, online_vcpus) {
	vcpu = kvm_get_vcpu(kvm, vcpu_idx);		vcpu = kvm_get_vcpu(kvm, vcpu_idx);
	if (psw_ioint_disabled(vcpu))		if (psw_ioint_disabled(vcpu))
	continue;		continue;
	deliverable_mask &= (u8)(vcpu->arch.sie_block->gcr[6] >> 24);		vcpu_isc_mask = (u8)(vcpu->arch.sie_block->gcr[6] >> 24);
	if (deliverable_mask) {		if (deliverable_mask & vcpu_isc_mask) {
	/* lately kicked but not yet running */		/* lately kicked but not yet running */
	if (test_and_set_bit(vcpu_idx, gi->kicked_mask))		if (test_and_set_bit(vcpu_idx, gi->kicked_mask))
	return;		return;

arch/s390/kvm/kvm-s390.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3363,6 +3363,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)

	int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)		int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
	{		{
			clear_bit(vcpu->vcpu_idx, vcpu->kvm->arch.gisa_int.kicked_mask);
	return kvm_s390_vcpu_has_irq(vcpu, 0);		return kvm_s390_vcpu_has_irq(vcpu, 0);
	}		}