Commit 51ba8811 authored by James Clark's avatar James Clark Committed by Arnaldo Carvalho de Melo
Browse files

perf cs-etm: Save TRCDEVARCH register 



When ETE is present save the TRCDEVARCH register and set a new magic
number. It will be used to configure the decoder in a later commit.

Old versions of perf will not be able to open files with this new magic
number, but old files will still work with newer versions of perf.

Reviewed-by: default avatarLeo Yan <leo.yan@linaro.org>
Signed-off-by: default avatarJames Clark <james.clark@arm.com>
Acked-by: default avatarSuzuki Poulouse <suzuki.poulose@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https //lore.kernel.org/r/20210806134109.1182235-5-james.clark@arm.com
[ Addressed some cosmetic suggestions by Suzuki Poulouse ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c9ccc96b

tools/perf/arch/arm/util/cs-etm.c

+44 −5
Original line number Diff line number Diff line
@@ -47,15 +47,17 @@ static const char *metadata_etmv3_ro[CS_ETM_PRIV_MAX] = { 
	[CS_ETM_ETMIDR]		= "mgmt/etmidr",

};



static const char *metadata_etmv4_ro[CS_ETMV4_PRIV_MAX] = {

static const char * const metadata_etmv4_ro[] = {

	[CS_ETMV4_TRCIDR0]		= "trcidr/trcidr0",

	[CS_ETMV4_TRCIDR1]		= "trcidr/trcidr1",

	[CS_ETMV4_TRCIDR2]		= "trcidr/trcidr2",

	[CS_ETMV4_TRCIDR8]		= "trcidr/trcidr8",

	[CS_ETMV4_TRCAUTHSTATUS]	= "mgmt/trcauthstatus",

	[CS_ETE_TRCDEVARCH]		= "mgmt/trcdevarch"

};



static bool cs_etm_is_etmv4(struct auxtrace_record *itr, int cpu);

static bool cs_etm_is_ete(struct auxtrace_record *itr, int cpu);



static int cs_etm_set_context_id(struct auxtrace_record *itr,

				 struct evsel *evsel, int cpu)
@@ -533,7 +535,7 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused, 
		      struct evlist *evlist __maybe_unused)

{

	int i;

	int etmv3 = 0, etmv4 = 0;

	int etmv3 = 0, etmv4 = 0, ete = 0;

	struct perf_cpu_map *event_cpus = evlist->core.cpus;

	struct perf_cpu_map *online_cpus = perf_cpu_map__new(NULL);
@@ -544,7 +546,9 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused, 
			    !cpu_map__has(online_cpus, i))

				continue;



			if (cs_etm_is_etmv4(itr, i))

			if (cs_etm_is_ete(itr, i))

				ete++;

			else if (cs_etm_is_etmv4(itr, i))

				etmv4++;

			else

				etmv3++;
@@ -555,7 +559,9 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused, 
			if (!cpu_map__has(online_cpus, i))

				continue;



			if (cs_etm_is_etmv4(itr, i))

			if (cs_etm_is_ete(itr, i))

				ete++;

			else if (cs_etm_is_etmv4(itr, i))

				etmv4++;

			else

				etmv3++;
@@ -565,6 +571,7 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused, 
	perf_cpu_map__put(online_cpus);



	return (CS_ETM_HEADER_SIZE +

	       (ete   * CS_ETE_PRIV_SIZE) +

	       (etmv4 * CS_ETMV4_PRIV_SIZE) +

	       (etmv3 * CS_ETMV3_PRIV_SIZE));

}
@@ -607,6 +614,27 @@ static int cs_etm_get_ro(struct perf_pmu *pmu, int cpu, const char *path) 
	return val;

}



#define TRCDEVARCH_ARCHPART_SHIFT 0

#define TRCDEVARCH_ARCHPART_MASK  GENMASK(11, 0)

#define TRCDEVARCH_ARCHPART(x)    (((x) & TRCDEVARCH_ARCHPART_MASK) >> TRCDEVARCH_ARCHPART_SHIFT)



#define TRCDEVARCH_ARCHVER_SHIFT 12

#define TRCDEVARCH_ARCHVER_MASK  GENMASK(15, 12)

#define TRCDEVARCH_ARCHVER(x)    (((x) & TRCDEVARCH_ARCHVER_MASK) >> TRCDEVARCH_ARCHVER_SHIFT)



static bool cs_etm_is_ete(struct auxtrace_record *itr, int cpu)

{

	struct cs_etm_recording *ptr = container_of(itr, struct cs_etm_recording, itr);

	struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;

	int trcdevarch = cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETE_TRCDEVARCH]);



	/*

	 * ETE if ARCHVER is 5 (ARCHVER is 4 for ETM) and ARCHPART is 0xA13.

	 * See ETM_DEVARCH_ETE_ARCH in coresight-etm4x.h

	 */

	return TRCDEVARCH_ARCHVER(trcdevarch) == 5 && TRCDEVARCH_ARCHPART(trcdevarch) == 0xA13;

}



static void cs_etm_save_etmv4_header(__u64 data[], struct auxtrace_record *itr, int cpu)

{

	struct cs_etm_recording *ptr = container_of(itr, struct cs_etm_recording, itr);
@@ -640,7 +668,18 @@ static void cs_etm_get_metadata(int cpu, u32 *offset, 
	struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;



	/* first see what kind of tracer this cpu is affined to */

	if (cs_etm_is_etmv4(itr, cpu)) {

	if (cs_etm_is_ete(itr, cpu)) {

		magic = __perf_cs_ete_magic;

		/* ETE uses the same registers as ETMv4 plus TRCDEVARCH */

		cs_etm_save_etmv4_header(&info->priv[*offset], itr, cpu);

		info->priv[*offset + CS_ETE_TRCDEVARCH] =

			cs_etm_get_ro(cs_etm_pmu, cpu,

				      metadata_etmv4_ro[CS_ETE_TRCDEVARCH]);



		/* How much space was used */

		increment = CS_ETE_PRIV_MAX;

		nr_trc_params = CS_ETE_PRIV_MAX - CS_ETM_COMMON_BLK_MAX_V1;

	} else if (cs_etm_is_etmv4(itr, cpu)) {

		magic = __perf_cs_etmv4_magic;

		cs_etm_save_etmv4_header(&info->priv[*offset], itr, cpu);

tools/perf/util/cs-etm.c

+13 −2
Original line number Diff line number Diff line
@@ -2521,6 +2521,7 @@ static const char * const cs_etmv4_priv_fmts[] = { 
	[CS_ETMV4_TRCIDR2]	= "	TRCIDR2			       %llx\n",

	[CS_ETMV4_TRCIDR8]	= "	TRCIDR8			       %llx\n",

	[CS_ETMV4_TRCAUTHSTATUS] = "	TRCAUTHSTATUS		       %llx\n",

	[CS_ETE_TRCDEVARCH]	= "	TRCDEVARCH                     %llx\n"

};



static const char * const param_unk_fmt =
@@ -2580,10 +2581,15 @@ static int cs_etm__print_cpu_metadata_v1(__u64 *val, int *offset) 
			else

				fprintf(stdout, cs_etm_priv_fmts[j], val[i]);

		}

	} else if (magic == __perf_cs_etmv4_magic) {

	} else if (magic == __perf_cs_etmv4_magic || magic == __perf_cs_ete_magic) {

		/*

		 * ETE and ETMv4 can be printed in the same block because the number of parameters

		 * is saved and they share the list of parameter names. ETE is also only supported

		 * in V1 files.

		 */

		for (j = 0; j < total_params; j++, i++) {

			/* if newer record - could be excess params */

			if (j >= CS_ETMV4_PRIV_MAX)

			if (j >= CS_ETE_PRIV_MAX)

				fprintf(stdout, param_unk_fmt, j, val[i]);

			else

				fprintf(stdout, cs_etmv4_priv_fmts[j], val[i]);
@@ -2952,6 +2958,11 @@ int cs_etm__process_auxtrace_info(union perf_event *event, 


			/* The traceID is our handle */

			trcidr_idx = CS_ETMV4_TRCTRACEIDR;

		} else if (ptr[i] == __perf_cs_ete_magic) {

			metadata[j] = cs_etm__create_meta_blk(ptr, &i, CS_ETE_PRIV_MAX, -1);



			/* ETE shares first part of metadata with ETMv4 */

			trcidr_idx = CS_ETMV4_TRCTRACEIDR;

		}



		if (!metadata[j]) {

tools/perf/util/cs-etm.h

+11 −0
Original line number Diff line number Diff line
@@ -76,6 +76,15 @@ enum { 
/* define fixed version 0 length - allow new format reader to read old files. */

#define CS_ETMV4_NR_TRC_PARAMS_V0 (CS_ETMV4_TRCAUTHSTATUS - CS_ETMV4_TRCCONFIGR + 1)



/*

 * ETE metadata is ETMv4 plus TRCDEVARCH register and doesn't support header V0 since it was

 * added in header V1

 */

enum {

	CS_ETE_TRCDEVARCH = CS_ETMV4_PRIV_MAX,

	CS_ETE_PRIV_MAX

};



/*

 * ETMv3 exception encoding number:

 * See Embedded Trace Macrocell specification (ARM IHI 0014Q)
@@ -187,8 +196,10 @@ struct cs_etm_packet_queue { 


#define __perf_cs_etmv3_magic 0x3030303030303030ULL

#define __perf_cs_etmv4_magic 0x4040404040404040ULL

#define __perf_cs_ete_magic   0x5050505050505050ULL

#define CS_ETMV3_PRIV_SIZE (CS_ETM_PRIV_MAX * sizeof(u64))

#define CS_ETMV4_PRIV_SIZE (CS_ETMV4_PRIV_MAX * sizeof(u64))

#define CS_ETE_PRIV_SIZE (CS_ETE_PRIV_MAX * sizeof(u64))



#ifdef HAVE_CSTRACE_SUPPORT

int cs_etm__process_auxtrace_info(union perf_event *event,