From: Ian Rogers <irogers@google.com>
To: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Andi Kleen <ak@linux.intel.com>,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Subject: Re: [PATCH 32/35] perf intel-pt: Determine guest thread from guest sideband
Date: Tue, 19 Jul 2022 18:15:52 -0700 [thread overview]
Message-ID: <CAP-5=fWRH0wUfsUA+=s8BFJLycth+xopfM-miyk0EPe+rUwoJw@mail.gmail.com> (raw)
In-Reply-To: <20220711093218.10967-33-adrian.hunter@intel.com>
On Mon, Jul 11, 2022 at 2:34 AM Adrian Hunter <adrian.hunter@intel.com> wrote:
>
> Prior to decoding, determine what guest thread, if any, is running.
>
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Ian Rogers <irogers@google.com>
Thanks,
Ian
> ---
> tools/perf/util/intel-pt.c | 69 ++++++++++++++++++++++++++++++++++++--
> 1 file changed, 67 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
> index dc2af64f9e31..a08c2f059d5a 100644
> --- a/tools/perf/util/intel-pt.c
> +++ b/tools/perf/util/intel-pt.c
> @@ -196,6 +196,10 @@ struct intel_pt_queue {
> struct machine *guest_machine;
> struct thread *guest_thread;
> struct thread *unknown_guest_thread;
> + pid_t guest_machine_pid;
> + pid_t guest_pid;
> + pid_t guest_tid;
> + int vcpu;
> bool exclude_kernel;
> bool have_sample;
> u64 time;
> @@ -759,8 +763,13 @@ static int intel_pt_walk_next_insn(struct intel_pt_insn *intel_pt_insn,
> cpumode = intel_pt_nr_cpumode(ptq, *ip, nr);
>
> if (nr) {
> - if ((!symbol_conf.guest_code && cpumode != PERF_RECORD_MISC_GUEST_KERNEL) ||
> - intel_pt_get_guest(ptq)) {
> + if (ptq->pt->have_guest_sideband) {
> + if (!ptq->guest_machine || ptq->guest_machine_pid != ptq->pid) {
> + intel_pt_log("ERROR: guest sideband but no guest machine\n");
> + return -EINVAL;
> + }
> + } else if ((!symbol_conf.guest_code && cpumode != PERF_RECORD_MISC_GUEST_KERNEL) ||
> + intel_pt_get_guest(ptq)) {
> intel_pt_log("ERROR: no guest machine\n");
> return -EINVAL;
> }
> @@ -1385,6 +1394,55 @@ static void intel_pt_first_timestamp(struct intel_pt *pt, u64 timestamp)
> }
> }
>
> +static int intel_pt_get_guest_from_sideband(struct intel_pt_queue *ptq)
> +{
> + struct machines *machines = &ptq->pt->session->machines;
> + struct machine *machine;
> + pid_t machine_pid = ptq->pid;
> + pid_t tid;
> + int vcpu;
> +
> + if (machine_pid <= 0)
> + return 0; /* Not a guest machine */
> +
> + machine = machines__find(machines, machine_pid);
> + if (!machine)
> + return 0; /* Not a guest machine */
> +
> + if (ptq->guest_machine != machine) {
> + ptq->guest_machine = NULL;
> + thread__zput(ptq->guest_thread);
> + thread__zput(ptq->unknown_guest_thread);
> +
> + ptq->unknown_guest_thread = machine__find_thread(machine, 0, 0);
> + if (!ptq->unknown_guest_thread)
> + return -1;
> + ptq->guest_machine = machine;
> + }
> +
> + vcpu = ptq->thread ? ptq->thread->guest_cpu : -1;
> + if (vcpu < 0)
> + return -1;
> +
> + tid = machine__get_current_tid(machine, vcpu);
> +
> + if (ptq->guest_thread && ptq->guest_thread->tid != tid)
> + thread__zput(ptq->guest_thread);
> +
> + if (!ptq->guest_thread) {
> + ptq->guest_thread = machine__find_thread(machine, -1, tid);
> + if (!ptq->guest_thread)
> + return -1;
> + }
> +
> + ptq->guest_machine_pid = machine_pid;
> + ptq->guest_pid = ptq->guest_thread->pid_;
> + ptq->guest_tid = tid;
> + ptq->vcpu = vcpu;
> +
> + return 0;
> +}
> +
> static void intel_pt_set_pid_tid_cpu(struct intel_pt *pt,
> struct auxtrace_queue *queue)
> {
> @@ -1405,6 +1463,13 @@ static void intel_pt_set_pid_tid_cpu(struct intel_pt *pt,
> if (queue->cpu == -1)
> ptq->cpu = ptq->thread->cpu;
> }
> +
> + if (pt->have_guest_sideband && intel_pt_get_guest_from_sideband(ptq)) {
> + ptq->guest_machine_pid = 0;
> + ptq->guest_pid = -1;
> + ptq->guest_tid = -1;
> + ptq->vcpu = -1;
> + }
> }
>
> static void intel_pt_sample_flags(struct intel_pt_queue *ptq)
> --
> 2.25.1
>
next prev parent reply other threads:[~2022-07-20 1:21 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-11 9:31 [PATCH 00/35] perf intel-pt: Add support for tracing virtual machine user space on the host Adrian Hunter
2022-07-11 9:31 ` [PATCH 01/35] perf tools: Fix dso_id inode generation comparison Adrian Hunter
2022-07-18 14:57 ` Arnaldo Carvalho de Melo
2022-07-19 10:18 ` Adrian Hunter
2022-07-19 15:13 ` Ian Rogers
2022-07-19 19:16 ` Arnaldo Carvalho de Melo
2022-07-11 9:31 ` [PATCH 02/35] perf tools: Export dsos__for_each_with_build_id() Adrian Hunter
2022-07-19 16:55 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 03/35] perf ordered_events: Add ordered_events__last_flush_time() Adrian Hunter
2022-07-19 16:56 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 04/35] perf tools: Export perf_event__process_finished_round() Adrian Hunter
2022-07-19 17:04 ` Ian Rogers
2022-08-09 11:37 ` Adrian Hunter
2022-07-11 9:31 ` [PATCH 05/35] perf tools: Factor out evsel__id_hdr_size() Adrian Hunter
2022-07-19 17:09 ` Ian Rogers
2022-08-09 11:49 ` Adrian Hunter
2022-08-09 17:07 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 06/35] perf tools: Add perf_event__synthesize_id_sample() Adrian Hunter
2022-07-19 17:10 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 07/35] perf script: Add --dump-unsorted-raw-trace option Adrian Hunter
2022-07-19 17:11 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 08/35] perf buildid-cache: Add guestmount'd files to the build ID cache Adrian Hunter
2022-07-19 17:41 ` Ian Rogers
2022-08-09 12:21 ` Adrian Hunter
2022-07-11 9:31 ` [PATCH 09/35] perf buildid-cache: Do not require purge files to also be in the file system Adrian Hunter
2022-07-19 17:44 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 10/35] perf tools: Add machine_pid and vcpu to id_index Adrian Hunter
2022-07-19 17:48 ` Ian Rogers
2022-08-09 12:19 ` Adrian Hunter
2022-07-11 9:31 ` [PATCH 11/35] perf session: Create guest machines from id_index Adrian Hunter
2022-07-19 17:51 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 12/35] perf tools: Add guest_cpu to hypervisor threads Adrian Hunter
2022-07-20 0:23 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 13/35] perf tools: Add machine_pid and vcpu to perf_sample Adrian Hunter
2022-07-20 0:36 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 14/35] perf tools: Use sample->machine_pid to find guest machine Adrian Hunter
2022-07-20 0:37 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 15/35] perf script: Add machine_pid and vcpu Adrian Hunter
2022-07-20 0:39 ` Ian Rogers
2022-07-11 9:31 ` [PATCH 16/35] perf dlfilter: " Adrian Hunter
2022-07-20 0:42 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 17/35] perf auxtrace: Add machine_pid and vcpu to auxtrace_error Adrian Hunter
2022-07-20 0:43 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 18/35] perf script python: Add machine_pid and vcpu Adrian Hunter
2022-07-20 0:43 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 19/35] perf script python: intel-pt-events: " Adrian Hunter
2022-07-20 0:44 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 20/35] perf tools: Remove also guest kcore_dir with host kcore_dir Adrian Hunter
2022-07-20 0:45 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 21/35] perf tools: Make has_kcore_dir() work also for guest kcore_dir Adrian Hunter
2022-07-20 0:49 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 22/35] perf tools: Automatically use guest kcore_dir if present Adrian Hunter
2022-07-20 0:51 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 23/35] perf tools: Add reallocarray_as_needed() Adrian Hunter
2022-07-20 0:55 ` Ian Rogers
2022-08-09 16:48 ` Adrian Hunter
2022-07-11 9:32 ` [PATCH 24/35] perf inject: Add support for injecting guest sideband events Adrian Hunter
2022-07-20 1:06 ` Ian Rogers
2022-08-11 17:19 ` Adrian Hunter
2022-07-11 9:32 ` [PATCH 25/35] perf machine: Use realloc_array_as_needed() in machine__set_current_tid() Adrian Hunter
2022-07-11 9:32 ` [PATCH 26/35] perf tools: Handle injected guest kernel mmap event Adrian Hunter
2022-07-20 1:09 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 27/35] perf tools: Add perf_event__is_guest() Adrian Hunter
2022-07-20 1:11 ` Ian Rogers
2022-07-20 14:06 ` Arnaldo Carvalho de Melo
2022-07-20 14:56 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 28/35] perf intel-pt: Remove guest_machine_pid Adrian Hunter
2022-07-20 1:12 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 29/35] perf intel-pt: Add some more logging to intel_pt_walk_next_insn() Adrian Hunter
2022-07-20 1:13 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 30/35] perf intel-pt: Track guest context switches Adrian Hunter
2022-07-20 1:13 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 31/35] perf intel-pt: Disable sync switch with guest sideband Adrian Hunter
2022-07-20 1:14 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 32/35] perf intel-pt: Determine guest thread from " Adrian Hunter
2022-07-20 1:15 ` Ian Rogers [this message]
2022-07-11 9:32 ` [PATCH 33/35] perf intel-pt: Add machine_pid and vcpu to auxtrace_error Adrian Hunter
2022-07-20 5:27 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 34/35] perf intel-pt: Use guest pid/tid etc in guest samples Adrian Hunter
2022-07-20 5:28 ` Ian Rogers
2022-07-11 9:32 ` [PATCH 35/35] perf intel-pt: Add documentation for tracing guest machine user space Adrian Hunter
2022-07-20 5:29 ` Ian Rogers
2022-07-18 15:28 ` [PATCH 00/35] perf intel-pt: Add support for tracing virtual machine user space on the host Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAP-5=fWRH0wUfsUA+=s8BFJLycth+xopfM-miyk0EPe+rUwoJw@mail.gmail.com' \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).