[v2,11/17] perf tools: Move thread to traceid_queue

Message ID	20190524173508.29044-12-mathieu.poirier@linaro.org
State	Accepted
Commit	3c21d7d813c55fa1688c2223fe15a1c5cb14a559
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Mathieu Poirier <mathieu.poirier@linaro.org> To: acme@kernel.org Cc: peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, jolsa@redhat.com, namhyung@kernel.org, suzuki.poulose@arm.com, leo.yan@linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Subject: [PATCH v2 11/17] perf tools: Move thread to traceid_queue Date: Fri, 24 May 2019 11:35:02 -0600 Message-Id: <20190524173508.29044-12-mathieu.poirier@linaro.org> In-Reply-To: <20190524173508.29044-1-mathieu.poirier@linaro.org> References: <20190524173508.29044-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	perf tools: Coresight: Add CPU-wide trace support \| expand [v2,00/17] perf tools: Coresight: Add CPU-wide trace support [v2,01/17] perf tools: Configure contextID tracing in CPU-wide mode [v2,02/17] perf tools: Configure timestsamp generation in CPU-wide mode [v2,03/17] perf tools: Configure SWITCH_EVENTS in CPU-wide mode [v2,04/17] perf tools: Add handling of itrace start events [v2,05/17] perf tools: Add handling of switch-CPU-wide events [v2,06/17] perf tools: Refactor error path in cs_etm_decoder__new() [v2,07/17] perf tools: Move packet queue out of decoder structure [v2,08/17] perf tools: Fix indentation in function cs_etm__process_decoder_queue() [v2,09/17] perf tools: Introduce the concept of trace ID queues [v2,10/17] perf tools: Get rid of unused cpu in struct cs_etm_queue [v2,11/17] perf tools: Move thread to traceid_queue [v2,12/17] perf tools: Move tid/pid to traceid_queue [v2,13/17] perf tools: Use traceID aware memory callback API [v2,14/17] perf tools: Add support for multiple traceID queues [v2,15/17] perf tools: Linking PE contextID with perf thread mechanic [v2,16/17] perf tools: Add notion of time to decoding code [v2,17/17] perf tools: Add support for CPU-wide trace scenarios

Message ID

20190524173508.29044-12-mathieu.poirier@linaro.org

State

Accepted

Commit

3c21d7d813c55fa1688c2223fe15a1c5cb14a559

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: acme@kernel.org
Cc: peterz@infradead.org, mingo@redhat.com,
	alexander.shishkin@linux.intel.com, jolsa@redhat.com,
	namhyung@kernel.org, suzuki.poulose@arm.com, leo.yan@linaro.org,
	linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	coresight@lists.linaro.org
Subject: [PATCH v2 11/17] perf tools: Move thread to traceid_queue
Date: Fri, 24 May 2019 11:35:02 -0600
Message-Id: <20190524173508.29044-12-mathieu.poirier@linaro.org>
In-Reply-To: <20190524173508.29044-1-mathieu.poirier@linaro.org>
References: <20190524173508.29044-1-mathieu.poirier@linaro.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

perf tools: Coresight: Add CPU-wide trace support | expand

Commit Message

Mathieu Poirier May 24, 2019, 5:35 p.m. UTC

The thread field of structure cs_etm_queue is CPU dependent and as
such need to be part of the cs_etm_traceid_queue in order to support
CPU-wide trace scenarios.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

---
 tools/perf/util/cs-etm.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

-- 
2.17.1

diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 531bbb355ba4..0d51d6d9a594 100644
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -65,6 +65,7 @@  struct cs_etm_traceid_queue {
 	u64 period_instructions;
 	size_t last_branch_pos;
 	union perf_event *event_buf;
+	struct thread *thread;
 	struct branch_stack *last_branch;
 	struct branch_stack *last_branch_rb;
 	struct cs_etm_packet *prev_packet;
@@ -74,7 +75,6 @@  struct cs_etm_traceid_queue {
 
 struct cs_etm_queue {
 	struct cs_etm_auxtrace *etm;
-	struct thread *thread;
 	struct cs_etm_decoder *decoder;
 	struct auxtrace_buffer *buffer;
 	unsigned int queue_nr;
@@ -415,7 +415,7 @@  static void cs_etm__free_queue(void *priv)
 	if (!etmq)
 		return;
 
-	thread__zput(etmq->thread);
+	thread__zput(etmq->traceid_queues->thread);
 	cs_etm_decoder__free(etmq->decoder);
 	zfree(&etmq->traceid_queues->event_buf);
 	zfree(&etmq->traceid_queues->last_branch);
@@ -503,7 +503,7 @@  static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u64 address,
 	machine = etmq->etm->machine;
 	cpumode = cs_etm__cpu_mode(etmq, address);
 
-	thread = etmq->thread;
+	thread = etmq->traceid_queues->thread;
 	if (!thread) {
 		if (cpumode != PERF_RECORD_MISC_KERNEL)
 			return 0;
@@ -819,18 +819,21 @@  cs_etm__get_trace(struct cs_etm_queue *etmq)
 static void cs_etm__set_pid_tid_cpu(struct cs_etm_auxtrace *etm,
 				    struct auxtrace_queue *queue)
 {
+	struct cs_etm_traceid_queue *tidq;
 	struct cs_etm_queue *etmq = queue->priv;
 
+	tidq = cs_etm__etmq_get_traceid_queue(etmq, CS_ETM_PER_THREAD_TRACEID);
+
 	/* CPU-wide tracing isn't supported yet */
 	if (queue->tid == -1)
 		return;
 
-	if ((!etmq->thread) && (etmq->tid != -1))
-		etmq->thread = machine__find_thread(etm->machine, -1,
+	if ((!tidq->thread) && (etmq->tid != -1))
+		tidq->thread = machine__find_thread(etm->machine, -1,
 						    etmq->tid);
 
-	if (etmq->thread)
-		etmq->pid = etmq->thread->pid_;
+	if (tidq->thread)
+		etmq->pid = tidq->thread->pid_;
 }
 
 static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq,

[v2,11/17] perf tools: Move thread to traceid_queue

Commit Message

Patch