On Fri, 7 Feb 2020 06:39:54 -0500 Christian Borntraeger <borntraeger@xxxxxxxxxx> wrote: > From: Janosch Frank <frankja@xxxxxxxxxxxxx> > > Let's have some debug traces which stay around for longer than the > guest. > > Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx> > [borntraeger@xxxxxxxxxx: patch merging, splitting, fixing] > Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> > --- > arch/s390/kvm/kvm-s390.c | 9 ++++++++- > arch/s390/kvm/kvm-s390.h | 9 +++++++++ > arch/s390/kvm/pv.c | 20 +++++++++++++++++++- > 3 files changed, 36 insertions(+), 2 deletions(-) (...) > diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c > index a58f5106ba5f..da281d8dcc92 100644 > --- a/arch/s390/kvm/pv.c > +++ b/arch/s390/kvm/pv.c > @@ -74,6 +74,8 @@ int kvm_s390_pv_destroy_vm(struct kvm *kvm) > atomic_set(&kvm->mm->context.is_protected, 0); > VM_EVENT(kvm, 3, "PROTVIRT DESTROY VM: rc %x rrc %x", > ret >> 16, ret & 0x0000ffff); > + KVM_UV_EVENT(kvm, 3, "PROTVIRT DESTROY VM: rc %x rrc %x", > + ret >> 16, ret & 0x0000ffff); > return rc; > } > > @@ -89,6 +91,8 @@ int kvm_s390_pv_destroy_cpu(struct kvm_vcpu *vcpu) > > VCPU_EVENT(vcpu, 3, "PROTVIRT DESTROY VCPU: cpu %d rc %x rrc %x", > vcpu->vcpu_id, ret >> 16, ret & 0x0000ffff); I think these should drop the vcpu_id, as VCPU_EVENT already includes it (in the patch introducing them). > + KVM_UV_EVENT(vcpu->kvm, 3, "PROTVIRT DESTROY VCPU: cpu %d rc %x rrc %x", > + vcpu->vcpu_id, ret >> 16, ret & 0x0000ffff); > } > > free_pages(vcpu->arch.pv.stor_base, Otherwise, looks good. Reviewed-by: Cornelia Huck <cohuck@xxxxxxxxxx>