CoreSight

coresight@lists.linaro.org

5 participants
2501 discussions

by Jinlong Mao

Hi Suzuki & Mike & James, We have new CTI HW component called Qcom Extended CTI. The main difference of extended CTI to the normal CTI is that the address mapping is changed and it supports a max of 128 trigger signals. For the changes to CTI driver, I want to define the address mapping like below. Could you please help to provide your comments how can we make the changes to the different address mappings of Qcom extended CTI ? /* CTI programming registers */ +#define CTIINTACK(drvdata, n) ((drvdata->is_extended ? 0x020 : 0x010) + (4 * n)) +#define CTIAPPSET(drvdata) (drvdata->is_extended ? 0x004 : 0x014) +#define CTIAPPCLEAR(drvdata) (drvdata->is_extended ? 0x008 : 0x018) +#define CTIAPPPULSE(drvdata) (drvdata->is_extended ? 0x00C : 0x01C) +#define CTIINEN(drvdata, n) ((drvdata->is_extended ? 0x400 : 0x020) + (4 * n)) +#define CTIOUTEN(drvdata, n) ((drvdata->is_extended ? 0x800 : 0x0A0) + (4 * n)) +#define CTITRIGINSTATUS(drvdata, n) ((drvdata->is_extended ? 0x040 : 0x130) + (4 * n)) +#define CTITRIGOUTSTATUS(drvdata, n) ((drvdata->is_extended ? 0x060 : 0x134) + (4 * n)) +#define CTICHINSTATUS(drvdata) (drvdata->is_extended ? 0x080 : 0x138) +#define CTICHOUTSTATUS(drvdata) (drvdata->is_extended ? 0x084 : 0x13C) +#define CTIGATE(drvdata) (drvdata->is_extended ? 0x088 : 0x140) +#define ASICCTL(drvdata) (drvdata->is_extended ? 0x08C : 0x144) /* Integration test registers */ +#define ITCHINACK(drvdata) (drvdata->is_extended ? 0xE70 : 0xEDC) /* WO CTI CSSoc 400 only*/ +#define ITTRIGINACK(drvdata, n) ((drvdata->is_extended ? 0xE80 : 0xEE0) + (4 * n)) /* WO CTI CSSoc 400 only*/ +#define ITCHOUT(drvdata) (drvdata->is_extended ? 0xE74 : 0xEE4) /* WO RW-600 */ +#define ITTRIGOUT(drvdata, n) ((drvdata->is_extended ? 0xEA : 0xEE8) + (4 * n)) /* WO RW-600 */ +#define ITCHOUTACK(drvdata) (drvdata->is_extended ? 0xE78 : 0xEEC) /* RO CTI CSSoc 400 only*/ +#define ITTRIGOUTACK(drvdata, n) ((drvdata->is_extended ? 0xEC0 : 0xEF0) + (4 * n))/* RO CTI CSSoc 400 only*/ +#define ITCHIN(drvdata) (drvdata->is_extended ? 0xE7C : 0xEF4) /* RO */ +#define ITTRIGIN(drvdata, n) ((drvdata->is_extended ? 0xEE0 : 0xEF8) + (4 * n))/* RO */ Thanks Jinlong Mao

1 year, 1 month

Re: [PATCH V5 0/4] arm-cs-trace-disasm.py/perf must accommodate non-zero DSO text offset

by Steve Clevenger

On 8/30/2024 12:20 AM, Leo Yan wrote: > On 8/29/24 18:39, Steve Clevenger wrote:> >> On 8/29/2024 12:55 AM, Leo Yan wrote: >>> On 8/29/2024 12:17 AM, Steve Clevenger wrote: >>>> >>>> Changes in V5: >>>> - In symbol-elf.c, branch to exit_close label if open file. >>>> - In trace_event_python.c, correct indentation. set_sym_in_dict >>>> call parameter "map_pgoff" renamed as "addr_map_pgoff" to >>>> match local naming. >>> >>> For the series: >>> >>> Reviewed-by: Leo Yan <leo.yan(a)arm.com> >>> >>> Hi Steve, >>> >>> Later when you respin a new version patches, it is better to amend >>> the review >>> and ACK tags you have received. (Just remind, b4 is your friend for >>> helping do >>> these things). >>> >>> Thanks, >>> Leo >> >> Got it. Thanks, Leo. By the way, I noticed when I rebased to >> perf-tools-next the kernel version was 6.11-rc3. Is there any chance >> this patch gets into 6.11? > > Linus' master branch now is 6.11-rc5, it is not far away from the 6.11. > > I think we still have much chance to get it done before it. Added > maintainers > in case any missing. > > Thanks, > Leo Hi Leo, That's great. Unfortuantely, I need to submit a V6 for patch 4/4, which is the arm-cs-trace-disasm.py script. Kernel instruction trace requires zeroing map_pgoff. perf makes most offset decisions, but this one is in the script. It's a one liner. I know you're a b4 fan, but I've never used it. If I'm able to make progress with it I'll use it to resubmit. Otherwise more of the same. Steve Steve

1 year, 1 month

Re: [PATCH] perf scripts python arm-cs-trace-disasm.py: Skip disasm if address continuity is broken

by James Clark

On 23/08/2024 10:57 am, Ganapatrao Kulkarni wrote: > > Hi James/Mike, > > On 23-08-2024 02:33 pm, James Clark wrote: >> >> >> On 19/08/2024 11:59 am, Mike Leach wrote: >>> Hi, >>> >>> A new branch of OpenCSD is available - ocsd-consistency-checks-1.5.4-rc1 >>> >>> Testing I managed to do confirms the N atom on unconditional branches >>> appear to work. I do not have a test case for the range >>> discontinuities. >>> >>> The checks are enabled using operation flags on decoder creation. See >>> the docs for details. >>> >>> Mike >>> >> >> Hi Mike, >> >> I tested the new OpenCSD and I don't see the error anymore in the >> disassembly script. I'm not sure if we need to go any further and add >> the backwards check, it looks like just a later symptom and the checks >> that you've added already prevent it. >> >> If you release a new version I can send the perf patch. I was going to >> use these flags if that looks right to you? As far as I know that's the >> set that can be always on and won't fail on bad hardware? >> >> I also assumed that ETM4_OPFLG_PKTDEC_AA64_OPCODE_CHK can be given even >> for etmv3 and it's just a nop? >> >> diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c >> b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c >> index e917985bbbe6..90967fd807e6 100644 >> --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c >> +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c >> @@ -685,9 +685,14 @@ cs_etm_decoder__create_etm_decoder(struct >> cs_etm_decoder_params *d_params, >> return 0; >> >> if (d_params->operation == CS_ETM_OPERATION_DECODE) { >> + int decode_flags = OCSD_CREATE_FLG_FULL_DECODER; >> +#ifdef OCSD_OPFLG_N_UNCOND_DIR_BR_CHK >> + decode_flags |= OCSD_OPFLG_N_UNCOND_DIR_BR_CHK | >> OCSD_OPFLG_CHK_RANGE_CONTINUE | >> + ETM4_OPFLG_PKTDEC_AA64_OPCODE_CHK; >> +#endif >> if (ocsd_dt_create_decoder(decoder->dcd_tree, >> decoder->decoder_name, >> - OCSD_CREATE_FLG_FULL_DECODER, >> + decode_flags, >> trace_config, &csid)) >> return -1; >> > > I tried Mike's branch with above James's patch and still the segfault is > happening to us. > Looks like the Perf bug is only on the timestamped decode path, you can force timeless as a workaround. Timestamps aren't used by the disassembly script anyway: --itrace=Zb Full command: perf script -i ./kcore -s python:tools/perf/scripts/python/arm-cs-\ trace-disasm.py --itrace=Zb -- -k ./kcore/kcore_dir/kcore You can also disable timestamps when recording then you don't need the itrace option. This will save you a lot of data anyway. But I'm still working on the proper fix.

1 year, 1 month

Re: [PATCH V5 0/4] arm-cs-trace-disasm.py/perf must accommodate non-zero DSO text offset

by Steve Clevenger

On 8/29/2024 12:55 AM, Leo Yan wrote: > On 8/29/2024 12:17 AM, Steve Clevenger wrote: >> >> Changes in V5: >> - In symbol-elf.c, branch to exit_close label if open file. >> - In trace_event_python.c, correct indentation. set_sym_in_dict >> call parameter "map_pgoff" renamed as "addr_map_pgoff" to >> match local naming. > > For the series: > > Reviewed-by: Leo Yan <leo.yan(a)arm.com> > > Hi Steve, > > Later when you respin a new version patches, it is better to amend the review > and ACK tags you have received. (Just remind, b4 is your friend for helping do > these things). > > Thanks, > Leo Got it. Thanks, Leo. By the way, I noticed when I rebased to perf-tools-next the kernel version was 6.11-rc3. Is there any chance this patch gets into 6.11? Steve

1 year, 1 month

New version of OpenCSD released

by Mike Leach

OpenCSD version 1.5.4 is now released. This update contains a number of optional consistency checks that the client can enable in the library to detect incorrect memory images or corrupt trace being supplied to the decoder by the client. Mike -- Mike Leach Principal Engineer, ARM Ltd. Manchester Design Centre. UK

1 year, 1 month

Re: [PATCH] perf scripts python arm-cs-trace-disasm.py: Skip disasm if address continuity is broken

by James Clark

On 07/08/2024 5:48 pm, Leo Yan wrote: > Hi all, > > On 8/7/2024 3:53 PM, James Clark wrote: > > A minor suggestion: if the discussion is too long, please delete the > irrelevant message ;) > > [...] > >>> --- a/tools/perf/scripts/python/arm-cs-trace-disasm.py >>> +++ b/tools/perf/scripts/python/arm-cs-trace-disasm.py >>> @@ -257,6 +257,11 @@ def process_event(param_dict): >>> print("Stop address 0x%x is out of range [ 0x%x .. 0x%x >>> ] for dso %s" % (stop_addr, int(dso_start), int(dso_end), dso)) >>> return >>> >>> + if (stop_addr < start_addr): >>> + if (options.verbose == True): >>> + print("Packet Dropped, Discontinuity detected >>> [stop_add:0x%x start_addr:0x%x ] for dso %s" % (stop_addr, start_addr, >>> dso)) >>> + return >>> + >> >> I suppose my only concern with this is that it hides real errors and >> Perf shouldn't be outputting samples that go backwards. Considering that >> fixing this in OpenCSD and Perf has a much wider benefit I think that >> should be the ultimate goal. I'm putting this on my todo list for now >> (including Steve's merging idea). > > In the perf's util/cs-etm.c file, it handles DISCONTINUITY with: > > case CS_ETM_DISCONTINUITY: > /* > * The trace is discontinuous, if the previous packet is > * instruction packet, set flag PERF_IP_FLAG_TRACE_END > * for previous packet. > */ > if (prev_packet->sample_type == CS_ETM_RANGE) > prev_packet->flags |= PERF_IP_FLAG_BRANCH | > PERF_IP_FLAG_TRACE_END; > > I am wandering if OpenCSD has passed the correct info so Perf decoder can > detect the discontinuity. If yes, then the flag 'PERF_IP_FLAG_TRACE_END' will > be set (it is a general flag in branch sample), then we can consider use it in > the python script to handle discontinuous data. No OpenCSD isn't passing the correct info here. Higher up in the thread I suggested an OpenCSD patch that makes it detect the error earlier and fixes the issue. It also needs to output a discontinuity when the address goes backwards. So two fixes and then the script works without modifications. > >> >> But in the mean time what about having a force option? >> >>> + if (stop_addr < start_addr): >>> + if (options.verbose == True or not options.force): >>> + print("Packet Dropped, Discontinuity detected >>> [stop_add:0x%x start_addr:0x%x ] for dso %s" % (stop_addr, start_addr, >>> dso)) >>> + if (not options.force): >>> + return > > If the stop address is less than the start address, it must be something > wrong. In this case, we can report a warning for discontinuity and directly > return (also need to save the `addr` into global variable for next parsing). > > I prefer to not add force option for this case - eventually, this will consume > much time for reporting this kind of failure and need to root causing it. A > better way is we just print out the reasoning in the log and continue to dump. But in this case we've identified all the known issues that would cause the script to fail and we can fix them in Perf and OpenCSD. There may not even be any more issues that will cause the script to fail in the future so there's no point in softening the error IMO. That will only hide future issues (of which there may be none) and make root causing harder when it hits some other tool.

1 year, 1 month

[PATCH V5 0/4] arm-cs-trace-disasm.py/perf must accommodate non-zero DSO text offset

by Steve Clevenger

Changes in V5: - In symbol-elf.c, branch to exit_close label if open file. - In trace_event_python.c, correct indentation. set_sym_in_dict call parameter "map_pgoff" renamed as "addr_map_pgoff" to match local naming. Changes in V4: - In trace-event-python.c, fixed perf-tools-next merge problem. Changes in V3: - Rebased to linux-perf-tools branch. - Squash symbol-elf.c and symbol.h into same commit. - In map.c, merge dso__is_pie() call into existing if statement. - In arm-cs-trace-disasm.py, remove debug artifacts. Changes in V2: - In dso__is_pie() (symbol-elf.c), Decrease indentation, add null pointer checks per Leo Yan review. - Updated mailing list distribution Steve Clevenger (4): Add dso__is_pie call to identify ELF PIE Force MAPPING_TYPE__IDENTIY for PIE Add map pgoff to python dictionary based on MAPPING_TYPE Adjust objdump start/end range per map pgoff parameter .../scripts/python/arm-cs-trace-disasm.py | 9 ++- tools/perf/util/map.c | 4 +- .../scripting-engines/trace-event-python.c | 13 +++- tools/perf/util/symbol-elf.c | 61 +++++++++++++++++++ tools/perf/util/symbol.h | 1 + 5 files changed, 80 insertions(+), 8 deletions(-) -- 2.25.1

1 year, 1 month

Re: [PATCH V4 3/4] Add map pgoff to python dictionary based on MAPPING_TYPE

by Steve Clevenger

On 8/28/2024 1:44 AM, Leo Yan wrote: > On 8/28/2024 6:09 AM, Steve Clevenger wrote: >> >> Add map_pgoff parameter to python dictionary so it can be seen by the >> python script, arm-cs-trace-disasm.py. map_pgoff is forced to zero in >> the dictionary if file type is MAPPING_TYPE__IDENTITY. Otherwise, the >> map_pgoff value is directly added to the dictionary. >> >> Signed-off-by: Steve Clevenger <scclevenger(a)os.amperecomputing.com> >> --- >> .../util/scripting-engines/trace-event-python.c | 13 ++++++++++--- >> 1 file changed, 10 insertions(+), 3 deletions(-) >> >> diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c >> index 6971dd6c231f..b8da0ea5e55c 100644 >> --- a/tools/perf/util/scripting-engines/trace-event-python.c >> +++ b/tools/perf/util/scripting-engines/trace-event-python.c >> @@ -798,7 +798,8 @@ static int set_regs_in_dict(PyObject *dict, >> static void set_sym_in_dict(PyObject *dict, struct addr_location *al, >> const char *dso_field, const char *dso_bid_field, >> const char *dso_map_start, const char *dso_map_end, >> - const char *sym_field, const char *symoff_field) >> + const char *sym_field, const char *symoff_field, >> + const char *map_pgoff) >> { >> char sbuild_id[SBUILD_ID_SIZE]; >> >> @@ -814,6 +815,12 @@ static void set_sym_in_dict(PyObject *dict, struct addr_location *al, >> PyLong_FromUnsignedLong(map__start(al->map))); >> pydict_set_item_string_decref(dict, dso_map_end, >> PyLong_FromUnsignedLong(map__end(al->map))); >> + if (al->map->mapping_type == MAPPING_TYPE__DSO) >> + pydict_set_item_string_decref(dict, map_pgoff, >> + PyLong_FromUnsignedLongLong(al->map->pgoff)); >> + else >> + pydict_set_item_string_decref(dict, map_pgoff, >> + PyLong_FromUnsignedLongLong(0)); > > Indention is inconsistent. Please keep the same format. Corrected. > >> } >> if (al->sym) { >> pydict_set_item_string_decref(dict, sym_field, >> @@ -900,7 +907,7 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample, >> pydict_set_item_string_decref(dict, "comm", >> _PyUnicode_FromString(thread__comm_str(al->thread))); >> set_sym_in_dict(dict, al, "dso", "dso_bid", "dso_map_start", "dso_map_end", >> - "symbol", "symoff"); >> + "symbol", "symoff", "map_pgoff"); >> >> pydict_set_item_string_decref(dict, "callchain", callchain); >> >> @@ -925,7 +932,7 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample, >> PyBool_FromLong(1)); >> set_sym_in_dict(dict_sample, addr_al, "addr_dso", "addr_dso_bid", >> "addr_dso_map_start", "addr_dso_map_end", >> - "addr_symbol", "addr_symoff"); >> + "addr_symbol", "addr_symoff", "map_pgoff"); > > This dict variable is for data address parsing. For alignment the naming, here > can change it as "addr_map_pgoff"? > > Please note, from my understanding, this renaming will not impact the > sequential change as the python script should only use the dso dict. Please > confirm at your side. Renamed as "addr_map_pgoff" to match local call convention. The dso dictionary is not affected. See V5 patch series. > > With above changes: > > Reviewed-by: Leo Yan <leo.yan(a)arm.com> > >> } >> >> if (sample->flags) >> -- >> 2.25.1 >>

1 year, 1 month

Re: [PATCH v1 2/9] perf auxtrace: Remove unused 'pmu' pointer from struct auxtrace_record

by Arnaldo Carvalho de Melo

On Fri, Aug 09, 2024 at 11:02:16AM +0300, Adrian Hunter wrote: > On 6/08/24 23:41, Leo Yan wrote: > > The 'pmu' pointer in the auxtrace_record structure is not used after > > support multiple AUX events, remove it. > > > > Signed-off-by: Leo Yan <leo.yan(a)arm.com> > > Reviewed-by: Adrian Hunter <adrian.hunter(a)intel.com> Applied the first reviewed two patches. - Arnaldo > > --- > > tools/perf/arch/arm/util/cs-etm.c | 1 - > > tools/perf/arch/arm64/util/arm-spe.c | 1 - > > tools/perf/arch/arm64/util/hisi-ptt.c | 1 - > > tools/perf/arch/x86/util/intel-bts.c | 1 - > > tools/perf/arch/x86/util/intel-pt.c | 1 - > > tools/perf/util/auxtrace.h | 1 - > > 6 files changed, 6 deletions(-) > > > > diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c > > index da6231367993..96aeb7cdbee1 100644 > > --- a/tools/perf/arch/arm/util/cs-etm.c > > +++ b/tools/perf/arch/arm/util/cs-etm.c > > @@ -888,7 +888,6 @@ struct auxtrace_record *cs_etm_record_init(int *err) > > } > > > > ptr->cs_etm_pmu = cs_etm_pmu; > > - ptr->itr.pmu = cs_etm_pmu; > > ptr->itr.parse_snapshot_options = cs_etm_parse_snapshot_options; > > ptr->itr.recording_options = cs_etm_recording_options; > > ptr->itr.info_priv_size = cs_etm_info_priv_size; > > diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c > > index d59f6ca499f2..2be99fdf997d 100644 > > --- a/tools/perf/arch/arm64/util/arm-spe.c > > +++ b/tools/perf/arch/arm64/util/arm-spe.c > > @@ -514,7 +514,6 @@ struct auxtrace_record *arm_spe_recording_init(int *err, > > } > > > > sper->arm_spe_pmu = arm_spe_pmu; > > - sper->itr.pmu = arm_spe_pmu; > > sper->itr.snapshot_start = arm_spe_snapshot_start; > > sper->itr.snapshot_finish = arm_spe_snapshot_finish; > > sper->itr.find_snapshot = arm_spe_find_snapshot; > > diff --git a/tools/perf/arch/arm64/util/hisi-ptt.c b/tools/perf/arch/arm64/util/hisi-ptt.c > > index ba97c8a562a0..eac9739c87e6 100644 > > --- a/tools/perf/arch/arm64/util/hisi-ptt.c > > +++ b/tools/perf/arch/arm64/util/hisi-ptt.c > > @@ -174,7 +174,6 @@ struct auxtrace_record *hisi_ptt_recording_init(int *err, > > } > > > > pttr->hisi_ptt_pmu = hisi_ptt_pmu; > > - pttr->itr.pmu = hisi_ptt_pmu; > > pttr->itr.recording_options = hisi_ptt_recording_options; > > pttr->itr.info_priv_size = hisi_ptt_info_priv_size; > > pttr->itr.info_fill = hisi_ptt_info_fill; > > diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c > > index 34696f3d3d5d..85c8186300c8 100644 > > --- a/tools/perf/arch/x86/util/intel-bts.c > > +++ b/tools/perf/arch/x86/util/intel-bts.c > > @@ -434,7 +434,6 @@ struct auxtrace_record *intel_bts_recording_init(int *err) > > } > > > > btsr->intel_bts_pmu = intel_bts_pmu; > > - btsr->itr.pmu = intel_bts_pmu; > > btsr->itr.recording_options = intel_bts_recording_options; > > btsr->itr.info_priv_size = intel_bts_info_priv_size; > > btsr->itr.info_fill = intel_bts_info_fill; > > diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c > > index 4b710e875953..ea510a7486b1 100644 > > --- a/tools/perf/arch/x86/util/intel-pt.c > > +++ b/tools/perf/arch/x86/util/intel-pt.c > > @@ -1197,7 +1197,6 @@ struct auxtrace_record *intel_pt_recording_init(int *err) > > } > > > > ptr->intel_pt_pmu = intel_pt_pmu; > > - ptr->itr.pmu = intel_pt_pmu; > > ptr->itr.recording_options = intel_pt_recording_options; > > ptr->itr.info_priv_size = intel_pt_info_priv_size; > > ptr->itr.info_fill = intel_pt_info_fill; > > diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h > > index 8a6ec9565835..95304368103b 100644 > > --- a/tools/perf/util/auxtrace.h > > +++ b/tools/perf/util/auxtrace.h > > @@ -411,7 +411,6 @@ struct auxtrace_record { > > int (*read_finish)(struct auxtrace_record *itr, int idx); > > unsigned int alignment; > > unsigned int default_aux_sample_size; > > - struct perf_pmu *pmu; > > struct evlist *evlist; > > }; > >

1 year, 1 month

Re: [PATCH v1 9/9] perf arm-spe: Dump metadata with version 2

by James Clark

On 27/08/2024 5:44 pm, Leo Yan wrote: > This commit dumps metadata with version 2. It uses two string arrays > metadata_hdr_fmts and metadata_per_cpu_fmts as string formats for the > header and per CPU data respectively, and the arm_spe_print_info() > function is enhanced to support dumping metadata with the version 2 > format. > > After: > > 0 0 0x4a8 [0x170]: PERF_RECORD_AUXTRACE_INFO type: 4 > PMU Type :13 > Version :2 > Num of CPUs :8 > CPU # :0 > MIDR :0x410fd801 > Bound PMU Type :-1 > Min Interval :0 > Load Data Source :0 > CPU # :1 > MIDR :0x410fd801 > Bound PMU Type :-1 > Min Interval :0 > Load Data Source :0 > CPU # :2 > MIDR :0x410fd870 > Bound PMU Type :13 > Min Interval :1024 > Load Data Source :1 > CPU # :3 > MIDR :0x410fd870 > Bound PMU Type :13 > Min Interval :1024 > Load Data Source :1 > CPU # :4 > MIDR :0x410fd870 > Bound PMU Type :13 > Min Interval :1024 > Load Data Source :1 > CPU # :5 > MIDR :0x410fd870 > Bound PMU Type :13 > Min Interval :1024 > Load Data Source :1 > CPU # :6 > MIDR :0x410fd850 > Bound PMU Type :14 > Min Interval :1024 > Load Data Source :1 > CPU # :7 > MIDR :0x410fd850 > Bound PMU Type :14 > Min Interval :1024 > Load Data Source :1 > > Signed-off-by: Leo Yan <leo.yan(a)arm.com> > --- > tools/perf/util/arm-spe.c | 43 ++++++++++++++++++++++++++++++++++----- > 1 file changed, 38 insertions(+), 5 deletions(-) > > diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c > index 87cf06db765b..be34d4c4306a 100644 > --- a/tools/perf/util/arm-spe.c > +++ b/tools/perf/util/arm-spe.c > @@ -1067,16 +1067,49 @@ static bool arm_spe_evsel_is_auxtrace(struct perf_session *session __maybe_unuse > return strstarts(evsel->name, ARM_SPE_PMU_NAME); > } > > -static const char * const arm_spe_info_fmts[] = { > - [ARM_SPE_PMU_TYPE] = " PMU Type %"PRId64"\n", > +static const char * const metadata_hdr_fmts[] = { > + [ARM_SPE_PMU_TYPE] = " PMU Type :%"PRId64"\n", > + [ARM_SPE_HEADER_VERSION] = " Version :%"PRId64"\n", > + [ARM_SPE_CPU_NUM] = " Num of CPUs :%"PRId64"\n", > }; > > -static void arm_spe_print_info(__u64 *arr) > +static const char * const metadata_per_cpu_fmts[] = { > + [ARM_SPE_CPU] = " CPU # :%"PRId64"\n", > + [ARM_SPE_CPU_MIDR] = " MIDR :0x%"PRIx64"\n", > + [ARM_SPE_CPU_PMU_TYPE] = " Bound PMU Type :%"PRId64"\n", > + [ARM_SPE_CAP_MIN_IVAL] = " Min Interval :%"PRId64"\n", > + [ARM_SPE_CAP_LDS] = " Load Data Source :%"PRId64"\n", > +}; > + > +static void arm_spe_print_info(struct arm_spe *spe, __u64 *arr) > { > + unsigned int i, cpu, header_size, cpu_num, per_cpu_size; > + > if (!dump_trace) > return; > > - fprintf(stdout, arm_spe_info_fmts[ARM_SPE_PMU_TYPE], arr[ARM_SPE_PMU_TYPE]); > + if (spe->metadata_ver == 1) { > + cpu_num = 0; > + header_size = ARM_SPE_AUXTRACE_V1_PRIV_MAX; > + per_cpu_size = 0; > + } else if (spe->metadata_ver == 2) { Assuming future version updates are backwards compatible and only add new info this should be spe->metadata_ver >= 2, otherwise version bumps end up causing errors when files get passed around. I know there are arguments about what should and shouldn't be supported when opening new files on old perfs, but in this case it's easy to only add new info to the aux header and leave the old stuff intact. > + cpu_num = arr[ARM_SPE_CPU_NUM]; > + header_size = ARM_SPE_AUXTRACE_V2_PRIV_MAX; > + per_cpu_size = ARM_SPE_AUXTRACE_V2_PRIV_PER_CPU_MAX; I think for coresight we also save the size of each per-cpu block rather than use a constant, that way new items can be appended without breaking readers. That kind of leads to another point that this mechanism is mostly duplicated from coresight. It saves a main header version, then per-cpu groups of variable size with named elements. I'm not saying we should definitely try to share the code, but it's worth keeping in mind. > + } else { > + pr_err("Cannot support metadata ver: %ld\n", spe->metadata_ver); > + return; > + } > + > + for (i = 0; i < header_size; i++) > + fprintf(stdout, metadata_hdr_fmts[i], arr[i]); > + > + arr += header_size; > + for (cpu = 0; cpu < cpu_num; cpu++) { > + for (i = 0; i < per_cpu_size; i++) > + fprintf(stdout, metadata_per_cpu_fmts[i], arr[i]); > + arr += per_cpu_size; > + } > } > > static void arm_spe_set_event_name(struct evlist *evlist, u64 id, > @@ -1383,7 +1416,7 @@ int arm_spe_process_auxtrace_info(union perf_event *event, > spe->auxtrace.evsel_is_auxtrace = arm_spe_evsel_is_auxtrace; > session->auxtrace = &spe->auxtrace; > > - arm_spe_print_info(&auxtrace_info->priv[0]); > + arm_spe_print_info(spe, &auxtrace_info->priv[0]); > > if (dump_trace) > return 0;

1 year, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

CoreSight