diff for duplicates of <547FAF4A.1080100@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 4ae86dc..92b9ada 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -156,11 +156,11 @@ index c2d2535..40615ab 100644 vcpu->arch.ret = RESUME_GUEST; vcpu->arch.trap = 0; @@ -1887,6 +1902,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); } @@ -1951,6 +1967,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) @@ -173,13 +173,13 @@ index c2d2535..40615ab 100644 } @@ -1996,7 +2013,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_book3s.h b/arch/powerpc/kvm/trace_book3s.h new file mode 100644 @@ -630,7 +630,7 @@ index 0000000..33d9daf + __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 8250c11..fa456d2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\054653EBC.2020805@linux.vnet.ibm.com\0" "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, 04 Dec 2014 00:48:10 +0000\0" + "Date\0Wed, 03 Dec 2014 18:48:10 -0600\0" "To\0Alexander Graf <agraf@suse.de>" kvm-ppc@vger.kernel.org <kvm-ppc@vger.kernel.org> kvm@vger.kernel.org <kvm@vger.kernel.org> @@ -166,11 +165,11 @@ " \tvcpu->arch.ret = RESUME_GUEST;\n" " \tvcpu->arch.trap = 0;\n" "@@ -1887,6 +1902,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" "@@ -1951,6 +1967,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)\n" @@ -183,13 +182,13 @@ " }\n" "@@ -1996,7 +2013,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_book3s.h b/arch/powerpc/kvm/trace_book3s.h\n" "new file mode 100644\n" @@ -640,7 +639,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" @@ -757,4 +756,4 @@ "-- \n" 1.8.3.4 -ab8e9592e2636bd72f14856cfd69b73fe3dcd81dede310f40b4f22e2f74fa517 +9779eadfda5e86fe16c28c475810fdbabe2f643536d46e7d7daebec7075be809
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.