| Message ID | 20171204203538.8370-12-cdall@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 4 Dec 2017 21:35:33 +0100 Christoffer Dall <cdall@kernel.org> wrote: > From: Christoffer Dall <christoffer.dall@linaro.org> > > Move vcpu_load() and vcpu_put() into the architecture specific > implementations of kvm_arch_vcpu_ioctl_set_guest_debug(). > > Reviewed-by: David Hildenbrand <david@redhat.com> > Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> > --- > arch/arm64/kvm/guest.c | 15 ++++++++++++--- > arch/powerpc/kvm/book3s.c | 2 ++ > arch/powerpc/kvm/booke.c | 19 +++++++++++++------ > arch/s390/kvm/kvm-s390.c | 16 ++++++++++++---- > arch/x86/kvm/x86.c | 4 +++- > virt/kvm/kvm_main.c | 2 -- > 6 files changed, 42 insertions(+), 16 deletions(-) > > diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c > index 1b491b89cd43..7cb0e2677e60 100644 > --- a/arch/powerpc/kvm/booke.c > +++ b/arch/powerpc/kvm/booke.c > @@ -2018,12 +2018,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); > @@ -2055,8 +2058,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; > @@ -2067,21 +2071,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; I would probably set the -EINVAL in the individual branches (so it is clear that something is wrong, and it is not just a benign exit as in the cases above), but your code is correct as well. Let the powerpc folks decide. > +out: > + vcpu_put(vcpu); > + return ret; > } > > void kvmppc_booke_vcpu_load(struct kvm_vcpu *vcpu, int cpu) In any case, Reviewed-by: Cornelia Huck <cohuck@redhat.com>
On Mon, Dec 11, 2017 at 01:39:43PM +0100, Cornelia Huck wrote: > On Mon, 4 Dec 2017 21:35:33 +0100 > Christoffer Dall <cdall@kernel.org> wrote: > > > From: Christoffer Dall <christoffer.dall@linaro.org> > > > > Move vcpu_load() and vcpu_put() into the architecture specific > > implementations of kvm_arch_vcpu_ioctl_set_guest_debug(). > > > > Reviewed-by: David Hildenbrand <david@redhat.com> > > Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> > > --- > > arch/arm64/kvm/guest.c | 15 ++++++++++++--- > > arch/powerpc/kvm/book3s.c | 2 ++ > > arch/powerpc/kvm/booke.c | 19 +++++++++++++------ > > arch/s390/kvm/kvm-s390.c | 16 ++++++++++++---- > > arch/x86/kvm/x86.c | 4 +++- > > virt/kvm/kvm_main.c | 2 -- > > 6 files changed, 42 insertions(+), 16 deletions(-) > > > > > diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c > > index 1b491b89cd43..7cb0e2677e60 100644 > > --- a/arch/powerpc/kvm/booke.c > > +++ b/arch/powerpc/kvm/booke.c > > @@ -2018,12 +2018,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); > > @@ -2055,8 +2058,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; > > @@ -2067,21 +2071,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; > > I would probably set the -EINVAL in the individual branches (so it is > clear that something is wrong, and it is not just a benign exit as in > the cases above), but your code is correct as well. I think that's better as well actually. I got probably got a little used to that pattern after looking the main dispatcher function for a while. I'm happy to change it. > > +out: > > + vcpu_put(vcpu); > > + return ret; > > } > > > > void kvmppc_booke_vcpu_load(struct kvm_vcpu *vcpu, int cpu) > > In any case, > > Reviewed-by: Cornelia Huck <cohuck@redhat.com> Thanks! -Christoffer
On 11/12/2017 13:39, Cornelia Huck wrote: >> + 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; >> @@ -2067,21 +2071,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; > > I would probably set the -EINVAL in the individual branches (so it is > clear that something is wrong, and it is not just a benign exit as in > the cases above), but your code is correct as well. Let the powerpc > folks decide. The idiom that Christoffer used is found elsewhere in KVM, so I'm accepting his version. Thanks for the review! Paolo
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index 5c7f657dd207..d7e3299a7734 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -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, diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index 047651622cb8..234531d1bee1 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -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; } diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 1b491b89cd43..7cb0e2677e60 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -2018,12 +2018,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); @@ -2055,8 +2058,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; @@ -2067,21 +2071,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) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 8fade858c790..4bf80b57b5c1 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -2804,13 +2804,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; @@ -2830,6 +2836,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; } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index c30ba99e7aa3..5d19caee6d51 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7601,6 +7601,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) @@ -7646,7 +7648,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, r = 0; out: - + vcpu_put(vcpu); return r; } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 0a8a49073a23..c688eb777bec 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2642,9 +2642,7 @@ static long kvm_vcpu_ioctl(struct file *filp, r = -EFAULT; if (copy_from_user(&dbg, argp, sizeof(dbg))) goto out; - vcpu_load(vcpu); r = kvm_arch_vcpu_ioctl_set_guest_debug(vcpu, &dbg); - vcpu_put(vcpu); break; } case KVM_SET_SIGNAL_MASK: {