KVM: s390: Removing untriggerable BUG_ONs (fed495d2) · Commits · 戴 / test

The BUG_ON in kvm-s390.c is unreachable, as we get the vcpu per common code, which itself does this from the private_data field of the file descriptor, and there is no KVM_UNCREATE_VCPU. The __{set,unset}_cpu_idle BUG_ONs are not triggerable because the vcpu creation code already checks against KVM_MAX_VCPUS. Signed-off-by:

Dominik Dingel <dingel@linux.vnet.ibm.com> Acked-by:

Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by:

Christian Borntraeger <borntraeger@de.ibm.com>

arch/s390/kvm/interrupt.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -114,14 +114,12 @@ static int __interrupt_is_deliverable(struct kvm_vcpu *vcpu,

		static void __set_cpu_idle(struct kvm_vcpu *vcpu)
		{
		BUG_ON(vcpu->vcpu_id > KVM_MAX_VCPUS - 1);
		atomic_set_mask(CPUSTAT_WAIT, &vcpu->arch.sie_block->cpuflags);
		set_bit(vcpu->vcpu_id, vcpu->arch.local_int.float_int->idle_mask);
		}

		static void __unset_cpu_idle(struct kvm_vcpu *vcpu)
		{
		BUG_ON(vcpu->vcpu_id > KVM_MAX_VCPUS - 1);
		atomic_clear_mask(CPUSTAT_WAIT, &vcpu->arch.sie_block->cpuflags);
		clear_bit(vcpu->vcpu_id, vcpu->arch.local_int.float_int->idle_mask);
		}

arch/s390/kvm/kvm-s390.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -949,8 +949,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu vcpu, struct kvm_run kvm_run)

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

		BUG_ON(kvm_get_vcpu(vcpu->kvm, vcpu->vcpu_id) == NULL);

		switch (kvm_run->exit_reason) {
		case KVM_EXIT_S390_SIEIC:
		case KVM_EXIT_UNKNOWN:

Admin message