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

Commit 66b56562 authored by Christoffer Dall's avatar Christoffer Dall Committed by Paolo Bonzini
Browse files

KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_guest_debug 



Move vcpu_load() and vcpu_put() into the architecture specific
implementations of kvm_arch_vcpu_ioctl_set_guest_debug().

Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1da5b61d

arch/arm64/kvm/guest.c

+12 −3
Original line number Diff line number Diff line
@@ -361,10 +361,16 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,

					struct kvm_guest_debug *dbg)

{

	int ret = 0;



	vcpu_load(vcpu);



	trace_kvm_set_guest_debug(vcpu, dbg->control);



	if (dbg->control & ~KVM_GUESTDBG_VALID_MASK)

		return -EINVAL;

	if (dbg->control & ~KVM_GUESTDBG_VALID_MASK) {

		ret = -EINVAL;

		goto out;

	}



	if (dbg->control & KVM_GUESTDBG_ENABLE) {

		vcpu->guest_debug = dbg->control;
@@ -378,7 +384,10 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
		/* If not enabled clear all flags */

		vcpu->guest_debug = 0;

	}

	return 0;



out:

	vcpu_put(vcpu);

	return ret;

}



int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,

arch/powerpc/kvm/book3s.c

+2 −0
Original line number Diff line number Diff line
@@ -755,7 +755,9 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,

					struct kvm_guest_debug *dbg)

{

	vcpu_load(vcpu);

	vcpu->guest_debug = dbg->control;

	vcpu_put(vcpu);

	return 0;

}

arch/powerpc/kvm/booke.c

+13 −6
Original line number Diff line number Diff line
@@ -2016,12 +2016,15 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
{

	struct debug_reg *dbg_reg;

	int n, b = 0, w = 0;

	int ret = 0;



	vcpu_load(vcpu);



	if (!(dbg->control & KVM_GUESTDBG_ENABLE)) {

		vcpu->arch.dbg_reg.dbcr0 = 0;

		vcpu->guest_debug = 0;

		kvm_guest_protect_msr(vcpu, MSR_DE, false);

		return 0;

		goto out;

	}



	kvm_guest_protect_msr(vcpu, MSR_DE, true);
@@ -2053,8 +2056,9 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
#endif



	if (!(vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP))

		return 0;

		goto out;



	ret = -EINVAL;

	for (n = 0; n < (KVMPPC_BOOKE_IAC_NUM + KVMPPC_BOOKE_DAC_NUM); n++) {

		uint64_t addr = dbg->arch.bp[n].addr;

		uint32_t type = dbg->arch.bp[n].type;
@@ -2065,21 +2069,24 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
		if (type & ~(KVMPPC_DEBUG_WATCH_READ |

			     KVMPPC_DEBUG_WATCH_WRITE |

			     KVMPPC_DEBUG_BREAKPOINT))

			return -EINVAL;

			goto out;



		if (type & KVMPPC_DEBUG_BREAKPOINT) {

			/* Setting H/W breakpoint */

			if (kvmppc_booke_add_breakpoint(dbg_reg, addr, b++))

				return -EINVAL;

				goto out;

		} else {

			/* Setting H/W watchpoint */

			if (kvmppc_booke_add_watchpoint(dbg_reg, addr,

							type, w++))

				return -EINVAL;

				goto out;

		}

	}



	return 0;

	ret = 0;

out:

	vcpu_put(vcpu);

	return ret;

}



void kvmppc_booke_vcpu_load(struct kvm_vcpu *vcpu, int cpu)

arch/s390/kvm/kvm-s390.c

+12 −4
Original line number Diff line number Diff line
@@ -2801,13 +2801,19 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
{

	int rc = 0;



	vcpu_load(vcpu);



	vcpu->guest_debug = 0;

	kvm_s390_clear_bp_data(vcpu);



	if (dbg->control & ~VALID_GUESTDBG_FLAGS)

		return -EINVAL;

	if (!sclp.has_gpere)

		return -EINVAL;

	if (dbg->control & ~VALID_GUESTDBG_FLAGS) {

		rc = -EINVAL;

		goto out;

	}

	if (!sclp.has_gpere) {

		rc = -EINVAL;

		goto out;

	}



	if (dbg->control & KVM_GUESTDBG_ENABLE) {

		vcpu->guest_debug = dbg->control;
@@ -2827,6 +2833,8 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
		atomic_andnot(CPUSTAT_P, &vcpu->arch.sie_block->cpuflags);

	}



out:

	vcpu_put(vcpu);

	return rc;

}

arch/x86/kvm/x86.c

+3 −1
Original line number Diff line number Diff line
@@ -7625,6 +7625,8 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
	unsigned long rflags;

	int i, r;



	vcpu_load(vcpu);



	if (dbg->control & (KVM_GUESTDBG_INJECT_DB | KVM_GUESTDBG_INJECT_BP)) {

		r = -EBUSY;

		if (vcpu->arch.exception.pending)
@@ -7670,7 +7672,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
	r = 0;



out:



	vcpu_put(vcpu);

	return r;

}