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

Commit 246b7218 authored by Michael Mueller's avatar Michael Mueller Committed by Christian Borntraeger
Browse files

KVM: s390: move bitmap idle_mask into arch struct top level 



The vcpu idle_mask state is used by but not specific
to the emulated floating interruptions. The state is
relevant to gisa related interruptions as well.

Signed-off-by: default avatarMichael Mueller <mimu@linux.ibm.com>
Reviewed-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Acked-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Message-Id: <20190131085247.13826-4-mimu@linux.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 689bdf9e

arch/s390/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,6 @@ struct kvm_s390_float_interrupt { 
	struct kvm_s390_mchk_info mchk;

	struct kvm_s390_ext_info srv_signal;

	int next_rr_cpu;

	DECLARE_BITMAP(idle_mask, KVM_MAX_VCPUS);

	struct mutex ais_lock;

	u8 simm;

	u8 nimm;
@@ -838,6 +837,7 @@ struct kvm_arch{ 
	/* subset of available cpu features enabled by user space */

	DECLARE_BITMAP(cpu_feat, KVM_S390_VM_CPU_FEAT_NR_BITS);

	struct kvm_s390_gisa *gisa;

	DECLARE_BITMAP(idle_mask, KVM_MAX_VCPUS);

};



#define KVM_HVA_ERR_BAD		(-1UL)

arch/s390/kvm/interrupt.c

+5 −6
Original line number Diff line number Diff line
@@ -318,13 +318,13 @@ static unsigned long deliverable_irqs(struct kvm_vcpu *vcpu) 
static void __set_cpu_idle(struct kvm_vcpu *vcpu)

{

	kvm_s390_set_cpuflags(vcpu, CPUSTAT_WAIT);

	set_bit(vcpu->vcpu_id, vcpu->kvm->arch.float_int.idle_mask);

	set_bit(vcpu->vcpu_id, vcpu->kvm->arch.idle_mask);

}



static void __unset_cpu_idle(struct kvm_vcpu *vcpu)

{

	kvm_s390_clear_cpuflags(vcpu, CPUSTAT_WAIT);

	clear_bit(vcpu->vcpu_id, vcpu->kvm->arch.float_int.idle_mask);

	clear_bit(vcpu->vcpu_id, vcpu->kvm->arch.idle_mask);

}



static void __reset_intercept_indicators(struct kvm_vcpu *vcpu)
@@ -1726,7 +1726,6 @@ static int __inject_io(struct kvm *kvm, struct kvm_s390_interrupt_info *inti) 
 */

static void __floating_irq_kick(struct kvm *kvm, u64 type)

{

	struct kvm_s390_float_interrupt *fi = &kvm->arch.float_int;

	struct kvm_vcpu *dst_vcpu;

	int sigcpu, online_vcpus, nr_tries = 0;
@@ -1735,11 +1734,11 @@ static void __floating_irq_kick(struct kvm *kvm, u64 type) 
		return;



	/* find idle VCPUs first, then round robin */

	sigcpu = find_first_bit(fi->idle_mask, online_vcpus);

	sigcpu = find_first_bit(kvm->arch.idle_mask, online_vcpus);

	if (sigcpu == online_vcpus) {

		do {

			sigcpu = fi->next_rr_cpu;

			fi->next_rr_cpu = (fi->next_rr_cpu + 1) % online_vcpus;

			sigcpu = kvm->arch.float_int.next_rr_cpu++;

			kvm->arch.float_int.next_rr_cpu %= online_vcpus;

			/* avoid endless loops if all vcpus are stopped */

			if (nr_tries++ >= online_vcpus)

				return;

arch/s390/kvm/kvm-s390.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static inline int is_vcpu_stopped(struct kvm_vcpu *vcpu) 


static inline int is_vcpu_idle(struct kvm_vcpu *vcpu)

{

	return test_bit(vcpu->vcpu_id, vcpu->kvm->arch.float_int.idle_mask);

	return test_bit(vcpu->vcpu_id, vcpu->kvm->arch.idle_mask);

}



static inline int kvm_is_ucontrol(struct kvm *kvm)