diff for duplicates of <54653EBC.2020805@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index d77d65d..345ead0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -150,11 +150,11 @@ index 69d4085..5143d17 100644 vcpu->arch.ret = RESUME_GUEST; vcpu->arch.trap = 0; @@ -1825,6 +1840,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) - VCORE_EXIT_COUNT(vc) = 0) { + VCORE_EXIT_COUNT(vc) == 0) { kvmppc_create_dtl_entry(vcpu, vc); kvmppc_start_thread(vcpu); + trace_kvm_guest_enter(vcpu); - } else if (vc->vcore_state = VCORE_SLEEPING) { + } else if (vc->vcore_state == VCORE_SLEEPING) { wake_up(&vc->wq); } @@ -1889,6 +1905,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) @@ -167,13 +167,13 @@ index 69d4085..5143d17 100644 } @@ -1934,7 +1951,9 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu) - if (run->exit_reason = KVM_EXIT_PAPR_HCALL && + if (run->exit_reason == KVM_EXIT_PAPR_HCALL && !(vcpu->arch.shregs.msr & MSR_PR)) { + trace_kvm_hcall_enter(vcpu); r = kvmppc_pseries_do_hcall(vcpu); + trace_kvm_hcall_exit(vcpu, r); kvmppc_core_prepare_to_enter(vcpu); - } else if (r = RESUME_PAGE_FAULT) { + } else if (r == RESUME_PAGE_FAULT) { srcu_idx = srcu_read_lock(&vcpu->kvm->srcu); diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h new file mode 100644 @@ -606,7 +606,7 @@ index 0000000..2d2e55f + __entry->tgid = current->tgid; + ), + -+ TP_printk("%s runner_vcpu=%d runnable=%d tgid=%d", ++ TP_printk("%s runner_vcpu==%d runnable=%d tgid=%d", + __entry->where ? "Exit" : "Enter", + __entry->runner_vcpu, __entry->n_runnable, __entry->tgid) +); diff --git a/a/content_digest b/N1/content_digest index 7acd50c..c0f1731 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Suresh E. Warrier <warrier@linux.vnet.ibm.com>\0" "Subject\0[PATCH] KVM: PPC: Book3S HV: Tracepoints for KVM HV guest interactions\0" - "Date\0Thu, 13 Nov 2014 23:29:00 +0000\0" + "Date\0Thu, 13 Nov 2014 17:29:00 -0600\0" "To\0agraf@suse.de" kvm-ppc@vger.kernel.org " kvm@vger.kernel.org\0" @@ -159,11 +159,11 @@ " \tvcpu->arch.ret = RESUME_GUEST;\n" " \tvcpu->arch.trap = 0;\n" "@@ -1825,6 +1840,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)\n" - " \t\t VCORE_EXIT_COUNT(vc) = 0) {\n" + " \t\t VCORE_EXIT_COUNT(vc) == 0) {\n" " \t\t\tkvmppc_create_dtl_entry(vcpu, vc);\n" " \t\t\tkvmppc_start_thread(vcpu);\n" "+\t\t\ttrace_kvm_guest_enter(vcpu);\n" - " \t\t} else if (vc->vcore_state = VCORE_SLEEPING) {\n" + " \t\t} else if (vc->vcore_state == VCORE_SLEEPING) {\n" " \t\t\twake_up(&vc->wq);\n" " \t\t}\n" "@@ -1889,6 +1905,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)\n" @@ -176,13 +176,13 @@ " }\n" "@@ -1934,7 +1951,9 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu)\n" " \n" - " \t\tif (run->exit_reason = KVM_EXIT_PAPR_HCALL &&\n" + " \t\tif (run->exit_reason == KVM_EXIT_PAPR_HCALL &&\n" " \t\t !(vcpu->arch.shregs.msr & MSR_PR)) {\n" "+\t\t\ttrace_kvm_hcall_enter(vcpu);\n" " \t\t\tr = kvmppc_pseries_do_hcall(vcpu);\n" "+\t\t\ttrace_kvm_hcall_exit(vcpu, r);\n" " \t\t\tkvmppc_core_prepare_to_enter(vcpu);\n" - " \t\t} else if (r = RESUME_PAGE_FAULT) {\n" + " \t\t} else if (r == RESUME_PAGE_FAULT) {\n" " \t\t\tsrcu_idx = srcu_read_lock(&vcpu->kvm->srcu);\n" "diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h\n" "new file mode 100644\n" @@ -615,7 +615,7 @@ "+\t\t__entry->tgid\t\t= current->tgid;\n" "+\t),\n" "+\n" - "+\tTP_printk(\"%s runner_vcpu=%d runnable=%d tgid=%d\",\n" + "+\tTP_printk(\"%s runner_vcpu==%d runnable=%d tgid=%d\",\n" "+\t\t __entry->where ? \"Exit\" : \"Enter\",\n" "+\t\t __entry->runner_vcpu, __entry->n_runnable, __entry->tgid)\n" "+);\n" @@ -690,4 +690,4 @@ "-- \n" 1.8.3.4 -407652a666a91c207bc303ddbfa50c6b5786a3d252ec6de979e1c79415350631 +1874de7bc8f6f8c43e49425cadab8aeb2dad1e8eedd8aecc1e79b7be4008465f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.