diff for duplicates of <546D119B.1000809@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 6ca23be..7fd069d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -158,11 +158,11 @@ On 11/14/2014 04:56 AM, Alexander Graf wrote: >> 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) @@ -175,13 +175,13 @@ On 11/14/2014 04:56 AM, Alexander Graf wrote: >> } >> @@ -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 @@ -645,7 +645,7 @@ Thanks for your suggestions! >> + __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 0ceb55a..d0b7bfb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0376A90D5-6462-41D2-8469-5EB2440F14CD@suse.de\0" "From\0Suresh E. Warrier <warrier@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH] KVM: PPC: Book3S HV: Tracepoints for KVM HV guest interactions\0" - "Date\0Wed, 19 Nov 2014 21:54:35 +0000\0" + "Date\0Wed, 19 Nov 2014 15:54:35 -0600\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0kvm-ppc@vger.kernel.org <kvm-ppc@vger.kernel.org>" kvm@vger.kernel.org <kvm@vger.kernel.org> @@ -169,11 +169,11 @@ ">> vcpu->arch.ret = RESUME_GUEST;\n" ">> vcpu->arch.trap = 0;\n" ">> @@ -1825,6 +1840,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)\n" - ">> VCORE_EXIT_COUNT(vc) = 0) {\n" + ">> VCORE_EXIT_COUNT(vc) == 0) {\n" ">> kvmppc_create_dtl_entry(vcpu, vc);\n" ">> kvmppc_start_thread(vcpu);\n" ">> + trace_kvm_guest_enter(vcpu);\n" - ">> } else if (vc->vcore_state = VCORE_SLEEPING) {\n" + ">> } else if (vc->vcore_state == VCORE_SLEEPING) {\n" ">> wake_up(&vc->wq);\n" ">> }\n" ">> @@ -1889,6 +1905,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)\n" @@ -186,13 +186,13 @@ ">> }\n" ">> @@ -1934,7 +1951,9 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu)\n" ">>\n" - ">> if (run->exit_reason = KVM_EXIT_PAPR_HCALL &&\n" + ">> if (run->exit_reason == KVM_EXIT_PAPR_HCALL &&\n" ">> !(vcpu->arch.shregs.msr & MSR_PR)) {\n" ">> + trace_kvm_hcall_enter(vcpu);\n" ">> r = kvmppc_pseries_do_hcall(vcpu);\n" ">> + trace_kvm_hcall_exit(vcpu, r);\n" ">> kvmppc_core_prepare_to_enter(vcpu);\n" - ">> } else if (r = RESUME_PAGE_FAULT) {\n" + ">> } else if (r == RESUME_PAGE_FAULT) {\n" ">> srcu_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" @@ -656,7 +656,7 @@ ">> + __entry->tgid = current->tgid;\n" ">> + ),\n" ">> +\n" - ">> + TP_printk(\"%s runner_vcpu=%d runnable=%d tgid=%d\",\n" + ">> + TP_printk(\"%s runner_vcpu==%d runnable=%d tgid=%d\",\n" ">> + __entry->where ? \"Exit\" : \"Enter\",\n" ">> + __entry->runner_vcpu, __entry->n_runnable, __entry->tgid)\n" ">> +);\n" @@ -737,4 +737,4 @@ ">> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -9a587e4727712d7ad7784f88495740217a8b4d203eb1b0879b80dd91f95b4f9e +b05338c186684123f07264d957b88d73db4269a29a81bf146eb7cec539201535
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.