| Message ID | 20220704081149.16797-9-mike.leach@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | coresight: Add new API to allocate trace source ID values | expand |
On 04/07/2022 09:11, Mike Leach wrote: > The information to associate Trace ID and CPU will be changing. > Drivers will start outputting this as a hardware ID packet in the data > file and setting the value in AUXINFO to an unused value. > > To prepare for this, we only map Trace ID and CPU data from AUXINFO if the > header version and values are valid, and move the mapping into a > helper function. > > Signed-off-by: Mike Leach <mike.leach@linaro.org> > --- > tools/perf/util/cs-etm.c | 53 +++++++++++++++++++++++++++------------- > tools/perf/util/cs-etm.h | 14 +++++++++-- > 2 files changed, 48 insertions(+), 19 deletions(-) > > diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c > index 8b95fb3c4d7b..df9d67901f8d 100644 > --- a/tools/perf/util/cs-etm.c > +++ b/tools/perf/util/cs-etm.c > @@ -193,6 +193,30 @@ int cs_etm__get_pid_fmt(u8 trace_chan_id, u64 *pid_fmt) > return 0; > } > > +static int cs_etm__map_trace_id(u8 trace_chan_id, u64 *cpu_metadata) > +{ > + struct int_node *inode; > + > + /* Get an RB node for this CPU */ > + inode = intlist__findnew(traceid_list, trace_chan_id); > + > + /* Something went wrong, no need to continue */ > + if (!inode) > + return -ENOMEM; > + > + /* > + * The node for that CPU should not be taken. > + * Back out if that's the case. > + */ > + if (inode->priv) > + return -EINVAL; > + > + /* All good, associate the traceID with the metadata pointer */ > + inode->priv = cpu_metadata; > + > + return 0; > +} > + > void cs_etm__etmq_set_traceid_queue_timestamp(struct cs_etm_queue *etmq, > u8 trace_chan_id) > { > @@ -2886,7 +2910,6 @@ int cs_etm__process_auxtrace_info(union perf_event *event, > { > struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info; > struct cs_etm_auxtrace *etm = NULL; > - struct int_node *inode; > unsigned int pmu_type; > int event_header_size = sizeof(struct perf_event_header); > int info_header_size; > @@ -2898,6 +2921,7 @@ int cs_etm__process_auxtrace_info(union perf_event *event, > u64 *ptr, *hdr = NULL; > u64 **metadata = NULL; > u64 hdr_version; > + u8 trace_chan_id; > > /* > * sizeof(auxtrace_info_event::type) + > @@ -2991,25 +3015,20 @@ int cs_etm__process_auxtrace_info(union perf_event *event, > goto err_free_metadata; > } > > - /* Get an RB node for this CPU */ > - inode = intlist__findnew(traceid_list, metadata[j][trcidr_idx]); > - > - /* Something went wrong, no need to continue */ > - if (!inode) { > - err = -ENOMEM; > - goto err_free_metadata; > - } > - > /* > - * The node for that CPU should not be taken. > - * Back out if that's the case. > + * Associate a trace ID with metadata. > + * Later versions of the drivers will make this association using a > + * hardware ID packet in the data file, setting the value in AUXINFO to an > + * invalid trace ID value. Only map here if the value is valid. > */ > - if (inode->priv) { > - err = -EINVAL; > - goto err_free_metadata; > + if (hdr_version < CS_AUX_HW_ID_VERSION_MIN) { > + trace_chan_id = metadata[j][trcidr_idx]; > + if (CS_IS_VALID_TRACE_ID(trace_chan_id)) { > + err = cs_etm__map_trace_id(trace_chan_id, metadata[j]); > + if (err) > + goto err_free_metadata; > + } > } > - /* All good, associate the traceID with the metadata pointer */ > - inode->priv = metadata[j]; > } > > /* > diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h > index 90c83f932d9a..712a6f855f0e 100644 > --- a/tools/perf/util/cs-etm.h > +++ b/tools/perf/util/cs-etm.h > @@ -28,13 +28,17 @@ enum { > /* > * Update the version for new format. > * > - * New version 1 format adds a param count to the per cpu metadata. > + * Version 1: format adds a param count to the per cpu metadata. > * This allows easy adding of new metadata parameters. > * Requires that new params always added after current ones. > * Also allows client reader to handle file versions that are different by > * checking the number of params in the file vs the number expected. > + * > + * Version 2: Drivers will use PERF_RECORD_AUX_OUTPUT_HW_ID to output > + * CoreSight Trace ID. ...TRACEIDR metadata will be set to unused ID. > */ > -#define CS_HEADER_CURRENT_VERSION 1 > +#define CS_HEADER_CURRENT_VERSION 2 > +#define CS_AUX_HW_ID_VERSION_MIN 2 Hi Mike, I'm starting to look at this set now. Am I right in thinking that this hard coded value means that new versions of Perf won't work with older drivers? Does this need to be highlighted somewhere in a warning that it's not the Perf version that's the issue but both the Perf and driver version together? I thought the idea was to search through the file to look for PERF_RECORD_AUX_OUTPUT_HW_ID records (or lack of) and then choose the appropriate decode method. But maybe that's too complicated and there is no requirement for backwards compatibility? From experience it can be inconvenient when you can't just throw any build of Perf on a system and it supports everything that it knows about. Now we will have Perf builds that know about Coresight but don't work with older drivers. But then as you say the ID allocation is already broken for some people. It's hard to decide. James > > /* Beginning of header common to both ETMv3 and V4 */ > enum { > @@ -85,6 +89,12 @@ enum { > CS_ETE_PRIV_MAX > }; > > +/* > + * Check for valid CoreSight trace ID. If an invalid value is present in the metadata, > + * then IDs are present in the hardware ID packet in the data file. > + */ > +#define CS_IS_VALID_TRACE_ID(id) ((id > 0) && (id < 0x70)) > + > /* > * ETMv3 exception encoding number: > * See Embedded Trace Macrocell specification (ARM IHI 0014Q)
Hi James On Tue, 19 Jul 2022 at 15:54, James Clark <james.clark@arm.com> wrote: > > > > On 04/07/2022 09:11, Mike Leach wrote: > > The information to associate Trace ID and CPU will be changing. > > Drivers will start outputting this as a hardware ID packet in the data > > file and setting the value in AUXINFO to an unused value. > > > > To prepare for this, we only map Trace ID and CPU data from AUXINFO if the > > header version and values are valid, and move the mapping into a > > helper function. > > > > Signed-off-by: Mike Leach <mike.leach@linaro.org> > > --- > > tools/perf/util/cs-etm.c | 53 +++++++++++++++++++++++++++------------- > > tools/perf/util/cs-etm.h | 14 +++++++++-- > > 2 files changed, 48 insertions(+), 19 deletions(-) > > > > diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c > > index 8b95fb3c4d7b..df9d67901f8d 100644 > > --- a/tools/perf/util/cs-etm.c > > +++ b/tools/perf/util/cs-etm.c > > @@ -193,6 +193,30 @@ int cs_etm__get_pid_fmt(u8 trace_chan_id, u64 *pid_fmt) > > return 0; > > } > > > > +static int cs_etm__map_trace_id(u8 trace_chan_id, u64 *cpu_metadata) > > +{ > > + struct int_node *inode; > > + > > + /* Get an RB node for this CPU */ > > + inode = intlist__findnew(traceid_list, trace_chan_id); > > + > > + /* Something went wrong, no need to continue */ > > + if (!inode) > > + return -ENOMEM; > > + > > + /* > > + * The node for that CPU should not be taken. > > + * Back out if that's the case. > > + */ > > + if (inode->priv) > > + return -EINVAL; > > + > > + /* All good, associate the traceID with the metadata pointer */ > > + inode->priv = cpu_metadata; > > + > > + return 0; > > +} > > + > > void cs_etm__etmq_set_traceid_queue_timestamp(struct cs_etm_queue *etmq, > > u8 trace_chan_id) > > { > > @@ -2886,7 +2910,6 @@ int cs_etm__process_auxtrace_info(union perf_event *event, > > { > > struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info; > > struct cs_etm_auxtrace *etm = NULL; > > - struct int_node *inode; > > unsigned int pmu_type; > > int event_header_size = sizeof(struct perf_event_header); > > int info_header_size; > > @@ -2898,6 +2921,7 @@ int cs_etm__process_auxtrace_info(union perf_event *event, > > u64 *ptr, *hdr = NULL; > > u64 **metadata = NULL; > > u64 hdr_version; > > + u8 trace_chan_id; > > > > /* > > * sizeof(auxtrace_info_event::type) + > > @@ -2991,25 +3015,20 @@ int cs_etm__process_auxtrace_info(union perf_event *event, > > goto err_free_metadata; > > } > > > > - /* Get an RB node for this CPU */ > > - inode = intlist__findnew(traceid_list, metadata[j][trcidr_idx]); > > - > > - /* Something went wrong, no need to continue */ > > - if (!inode) { > > - err = -ENOMEM; > > - goto err_free_metadata; > > - } > > - > > /* > > - * The node for that CPU should not be taken. > > - * Back out if that's the case. > > + * Associate a trace ID with metadata. > > + * Later versions of the drivers will make this association using a > > + * hardware ID packet in the data file, setting the value in AUXINFO to an > > + * invalid trace ID value. Only map here if the value is valid. > > */ > > - if (inode->priv) { > > - err = -EINVAL; > > - goto err_free_metadata; > > + if (hdr_version < CS_AUX_HW_ID_VERSION_MIN) { > > + trace_chan_id = metadata[j][trcidr_idx]; > > + if (CS_IS_VALID_TRACE_ID(trace_chan_id)) { > > + err = cs_etm__map_trace_id(trace_chan_id, metadata[j]); > > + if (err) > > + goto err_free_metadata; > > + } > > } > > - /* All good, associate the traceID with the metadata pointer */ > > - inode->priv = metadata[j]; > > } > > > > /* > > diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h > > index 90c83f932d9a..712a6f855f0e 100644 > > --- a/tools/perf/util/cs-etm.h > > +++ b/tools/perf/util/cs-etm.h > > @@ -28,13 +28,17 @@ enum { > > /* > > * Update the version for new format. > > * > > - * New version 1 format adds a param count to the per cpu metadata. > > + * Version 1: format adds a param count to the per cpu metadata. > > * This allows easy adding of new metadata parameters. > > * Requires that new params always added after current ones. > > * Also allows client reader to handle file versions that are different by > > * checking the number of params in the file vs the number expected. > > + * > > + * Version 2: Drivers will use PERF_RECORD_AUX_OUTPUT_HW_ID to output > > + * CoreSight Trace ID. ...TRACEIDR metadata will be set to unused ID. > > */ > > -#define CS_HEADER_CURRENT_VERSION 1 > > +#define CS_HEADER_CURRENT_VERSION 2 > > +#define CS_AUX_HW_ID_VERSION_MIN 2 > > Hi Mike, > > I'm starting to look at this set now. > > Am I right in thinking that this hard coded value means that new versions > of Perf won't work with older drivers? Does this need to be highlighted > somewhere in a warning that it's not the Perf version that's the issue but > both the Perf and driver version together? > Need to differentiate here between perf record, and perf report. My understanding is that perf record must always match the version of your kernel. If you use an old version of perf record on a newer kernel then you are asking for trouble. Indeed, if I run perf on my x86 dev machine at the moment it whinges: WARNING: perf not found for kernel 5.4.0-122 because the last version of perf I have is for 5.4.0-120. The new perf report will differentiate between the new and old versions of the perf.data file and act accordingly. For version 1 it will take the IDs from the metadata, for version 2 it will search for the IDs in the packet data. An older perf report will not be able to decode the newer files - though that has always been the case. Were we to permit and old version of perf report to be used to generate a file using the new drivers, and then attempt to process that file with and older perf report, it would fail miserably. Regards Mike > I thought the idea was to search through the file to look for > PERF_RECORD_AUX_OUTPUT_HW_ID records (or lack of) and then choose the appropriate > decode method. But maybe that's too complicated and there is no requirement > for backwards compatibility? > > From experience it can be inconvenient when you can't just throw > any build of Perf on a system and it supports everything that it knows > about. Now we will have Perf builds that know about Coresight but don't > work with older drivers. > > But then as you say the ID allocation is already broken for some people. > It's hard to decide. > > James > > > > > /* Beginning of header common to both ETMv3 and V4 */ > > enum { > > @@ -85,6 +89,12 @@ enum { > > CS_ETE_PRIV_MAX > > }; > > > > +/* > > + * Check for valid CoreSight trace ID. If an invalid value is present in the metadata, > > + * then IDs are present in the hardware ID packet in the data file. > > + */ > > +#define CS_IS_VALID_TRACE_ID(id) ((id > 0) && (id < 0x70)) > > + > > /* > > * ETMv3 exception encoding number: > > * See Embedded Trace Macrocell specification (ARM IHI 0014Q)
On 20/07/2022 11:22, Mike Leach wrote: > Hi James > > On Tue, 19 Jul 2022 at 15:54, James Clark <james.clark@arm.com> wrote: >> >> >> >> On 04/07/2022 09:11, Mike Leach wrote: >>> The information to associate Trace ID and CPU will be changing. >>> Drivers will start outputting this as a hardware ID packet in the data >>> file and setting the value in AUXINFO to an unused value. >>> >>> To prepare for this, we only map Trace ID and CPU data from AUXINFO if the >>> header version and values are valid, and move the mapping into a >>> helper function. >>> >>> Signed-off-by: Mike Leach <mike.leach@linaro.org> >>> --- >>> tools/perf/util/cs-etm.c | 53 +++++++++++++++++++++++++++------------- >>> tools/perf/util/cs-etm.h | 14 +++++++++-- >>> 2 files changed, 48 insertions(+), 19 deletions(-) >>> >>> diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c >>> index 8b95fb3c4d7b..df9d67901f8d 100644 >>> --- a/tools/perf/util/cs-etm.c >>> +++ b/tools/perf/util/cs-etm.c >>> @@ -193,6 +193,30 @@ int cs_etm__get_pid_fmt(u8 trace_chan_id, u64 *pid_fmt) >>> return 0; >>> } >>> >>> +static int cs_etm__map_trace_id(u8 trace_chan_id, u64 *cpu_metadata) >>> +{ >>> + struct int_node *inode; >>> + >>> + /* Get an RB node for this CPU */ >>> + inode = intlist__findnew(traceid_list, trace_chan_id); >>> + >>> + /* Something went wrong, no need to continue */ >>> + if (!inode) >>> + return -ENOMEM; >>> + >>> + /* >>> + * The node for that CPU should not be taken. >>> + * Back out if that's the case. >>> + */ >>> + if (inode->priv) >>> + return -EINVAL; >>> + >>> + /* All good, associate the traceID with the metadata pointer */ >>> + inode->priv = cpu_metadata; >>> + >>> + return 0; >>> +} >>> + >>> void cs_etm__etmq_set_traceid_queue_timestamp(struct cs_etm_queue *etmq, >>> u8 trace_chan_id) >>> { >>> @@ -2886,7 +2910,6 @@ int cs_etm__process_auxtrace_info(union perf_event *event, >>> { >>> struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info; >>> struct cs_etm_auxtrace *etm = NULL; >>> - struct int_node *inode; >>> unsigned int pmu_type; >>> int event_header_size = sizeof(struct perf_event_header); >>> int info_header_size; >>> @@ -2898,6 +2921,7 @@ int cs_etm__process_auxtrace_info(union perf_event *event, >>> u64 *ptr, *hdr = NULL; >>> u64 **metadata = NULL; >>> u64 hdr_version; >>> + u8 trace_chan_id; >>> >>> /* >>> * sizeof(auxtrace_info_event::type) + >>> @@ -2991,25 +3015,20 @@ int cs_etm__process_auxtrace_info(union perf_event *event, >>> goto err_free_metadata; >>> } >>> >>> - /* Get an RB node for this CPU */ >>> - inode = intlist__findnew(traceid_list, metadata[j][trcidr_idx]); >>> - >>> - /* Something went wrong, no need to continue */ >>> - if (!inode) { >>> - err = -ENOMEM; >>> - goto err_free_metadata; >>> - } >>> - >>> /* >>> - * The node for that CPU should not be taken. >>> - * Back out if that's the case. >>> + * Associate a trace ID with metadata. >>> + * Later versions of the drivers will make this association using a >>> + * hardware ID packet in the data file, setting the value in AUXINFO to an >>> + * invalid trace ID value. Only map here if the value is valid. >>> */ >>> - if (inode->priv) { >>> - err = -EINVAL; >>> - goto err_free_metadata; >>> + if (hdr_version < CS_AUX_HW_ID_VERSION_MIN) { >>> + trace_chan_id = metadata[j][trcidr_idx]; >>> + if (CS_IS_VALID_TRACE_ID(trace_chan_id)) { >>> + err = cs_etm__map_trace_id(trace_chan_id, metadata[j]); >>> + if (err) >>> + goto err_free_metadata; >>> + } >>> } >>> - /* All good, associate the traceID with the metadata pointer */ >>> - inode->priv = metadata[j]; >>> } >>> >>> /* >>> diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h >>> index 90c83f932d9a..712a6f855f0e 100644 >>> --- a/tools/perf/util/cs-etm.h >>> +++ b/tools/perf/util/cs-etm.h >>> @@ -28,13 +28,17 @@ enum { >>> /* >>> * Update the version for new format. >>> * >>> - * New version 1 format adds a param count to the per cpu metadata. >>> + * Version 1: format adds a param count to the per cpu metadata. >>> * This allows easy adding of new metadata parameters. >>> * Requires that new params always added after current ones. >>> * Also allows client reader to handle file versions that are different by >>> * checking the number of params in the file vs the number expected. >>> + * >>> + * Version 2: Drivers will use PERF_RECORD_AUX_OUTPUT_HW_ID to output >>> + * CoreSight Trace ID. ...TRACEIDR metadata will be set to unused ID. >>> */ >>> -#define CS_HEADER_CURRENT_VERSION 1 >>> +#define CS_HEADER_CURRENT_VERSION 2 >>> +#define CS_AUX_HW_ID_VERSION_MIN 2 >> >> Hi Mike, >> >> I'm starting to look at this set now. >> >> Am I right in thinking that this hard coded value means that new versions >> of Perf won't work with older drivers? Does this need to be highlighted >> somewhere in a warning that it's not the Perf version that's the issue but >> both the Perf and driver version together? >> > > Need to differentiate here between perf record, and perf report. > > My understanding is that perf record must always match the version of > your kernel. If you use an old version of perf record on a newer > kernel then you are asking for trouble. In that case it's probably ok then. Although there are some users using a mainline version of Perf for all the decode fixes, but running on a platform with an older production kernel. I suppose they'd have to backport the new Coresight driver. In this case having Perf support both older and new drivers would simplify this workflow. But if it's not supported then it's not supported. > Indeed, if I run perf on my x86 dev machine at the moment it whinges: > WARNING: perf not found for kernel 5.4.0-122 > because the last version of perf I have is for 5.4.0-120. > These are printed for the package manager installed version, but not for dev builds. If we know there is some incompatibility I wonder if adding a warning would be easy. Otherwise you'd get the obscure "This file has no samples!" message. Or just leave it to the wrapper script to warn only non-devbuild users? > The new perf report will differentiate between the new and old > versions of the perf.data file and act accordingly. For version 1 it > will take the IDs from the metadata, for version 2 it will search for > the IDs in the packet data. > An older perf report will not be able to decode the newer files - > though that has always been the case. > > Were we to permit and old version of perf report to be used to > generate a file using the new drivers, and then attempt to process > that file with and older perf report, it would fail miserably. > > Regards > > Mike > > >> I thought the idea was to search through the file to look for >> PERF_RECORD_AUX_OUTPUT_HW_ID records (or lack of) and then choose the appropriate >> decode method. But maybe that's too complicated and there is no requirement >> for backwards compatibility? >> >> From experience it can be inconvenient when you can't just throw >> any build of Perf on a system and it supports everything that it knows >> about. Now we will have Perf builds that know about Coresight but don't >> work with older drivers. >> >> But then as you say the ID allocation is already broken for some people. >> It's hard to decide. >> >> James >> >>> >>> /* Beginning of header common to both ETMv3 and V4 */ >>> enum { >>> @@ -85,6 +89,12 @@ enum { >>> CS_ETE_PRIV_MAX >>> }; >>> >>> +/* >>> + * Check for valid CoreSight trace ID. If an invalid value is present in the metadata, >>> + * then IDs are present in the hardware ID packet in the data file. >>> + */ >>> +#define CS_IS_VALID_TRACE_ID(id) ((id > 0) && (id < 0x70)) >>> + >>> /* >>> * ETMv3 exception encoding number: >>> * See Embedded Trace Macrocell specification (ARM IHI 0014Q) > > >
Em Wed, Jul 20, 2022 at 11:22:37AM +0100, Mike Leach escreveu: > On Tue, 19 Jul 2022 at 15:54, James Clark <james.clark@arm.com> wrote: > > I'm starting to look at this set now. > > Am I right in thinking that this hard coded value means that new versions > > of Perf won't work with older drivers? Does this need to be highlighted > > somewhere in a warning that it's not the Perf version that's the issue but > > both the Perf and driver version together? > Need to differentiate here between perf record, and perf report. > My understanding is that perf record must always match the version of > your kernel. If you use an old version of perf record on a newer No, that is not what is intended, one should be able to use whatever perf (record or otherwise) with whatever kernel version. perf tries to cope with, and if it is not possible to record the way the user asks to then it should emit a helpful error message stating why it is not possible, see: evsel__disable_missing_features() evsel__detect_missing_features() Used during a evsel__open() - Arnaldo > kernel then you are asking for trouble. > Indeed, if I run perf on my x86 dev machine at the moment it whinges: > WARNING: perf not found for kernel 5.4.0-122 > because the last version of perf I have is for 5.4.0-120. > > The new perf report will differentiate between the new and old > versions of the perf.data file and act accordingly. For version 1 it > will take the IDs from the metadata, for version 2 it will search for > the IDs in the packet data. > An older perf report will not be able to decode the newer files - > though that has always been the case. > > Were we to permit and old version of perf report to be used to > generate a file using the new drivers, and then attempt to process > that file with and older perf report, it would fail miserably. > > Regards > > Mike > > > > I thought the idea was to search through the file to look for > > PERF_RECORD_AUX_OUTPUT_HW_ID records (or lack of) and then choose the appropriate > > decode method. But maybe that's too complicated and there is no requirement > > for backwards compatibility? > > > > From experience it can be inconvenient when you can't just throw > > any build of Perf on a system and it supports everything that it knows > > about. Now we will have Perf builds that know about Coresight but don't > > work with older drivers. > > > > But then as you say the ID allocation is already broken for some people. > > It's hard to decide. > > > > James > > > > > > > > /* Beginning of header common to both ETMv3 and V4 */ > > > enum { > > > @@ -85,6 +89,12 @@ enum { > > > CS_ETE_PRIV_MAX > > > }; > > > > > > +/* > > > + * Check for valid CoreSight trace ID. If an invalid value is present in the metadata, > > > + * then IDs are present in the hardware ID packet in the data file. > > > + */ > > > +#define CS_IS_VALID_TRACE_ID(id) ((id > 0) && (id < 0x70)) > > > + > > > /* > > > * ETMv3 exception encoding number: > > > * See Embedded Trace Macrocell specification (ARM IHI 0014Q) > > > > -- > Mike Leach > Principal Engineer, ARM Ltd. > Manchester Design Centre. UK
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 8b95fb3c4d7b..df9d67901f8d 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -193,6 +193,30 @@ int cs_etm__get_pid_fmt(u8 trace_chan_id, u64 *pid_fmt) return 0; } +static int cs_etm__map_trace_id(u8 trace_chan_id, u64 *cpu_metadata) +{ + struct int_node *inode; + + /* Get an RB node for this CPU */ + inode = intlist__findnew(traceid_list, trace_chan_id); + + /* Something went wrong, no need to continue */ + if (!inode) + return -ENOMEM; + + /* + * The node for that CPU should not be taken. + * Back out if that's the case. + */ + if (inode->priv) + return -EINVAL; + + /* All good, associate the traceID with the metadata pointer */ + inode->priv = cpu_metadata; + + return 0; +} + void cs_etm__etmq_set_traceid_queue_timestamp(struct cs_etm_queue *etmq, u8 trace_chan_id) { @@ -2886,7 +2910,6 @@ int cs_etm__process_auxtrace_info(union perf_event *event, { struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info; struct cs_etm_auxtrace *etm = NULL; - struct int_node *inode; unsigned int pmu_type; int event_header_size = sizeof(struct perf_event_header); int info_header_size; @@ -2898,6 +2921,7 @@ int cs_etm__process_auxtrace_info(union perf_event *event, u64 *ptr, *hdr = NULL; u64 **metadata = NULL; u64 hdr_version; + u8 trace_chan_id; /* * sizeof(auxtrace_info_event::type) + @@ -2991,25 +3015,20 @@ int cs_etm__process_auxtrace_info(union perf_event *event, goto err_free_metadata; } - /* Get an RB node for this CPU */ - inode = intlist__findnew(traceid_list, metadata[j][trcidr_idx]); - - /* Something went wrong, no need to continue */ - if (!inode) { - err = -ENOMEM; - goto err_free_metadata; - } - /* - * The node for that CPU should not be taken. - * Back out if that's the case. + * Associate a trace ID with metadata. + * Later versions of the drivers will make this association using a + * hardware ID packet in the data file, setting the value in AUXINFO to an + * invalid trace ID value. Only map here if the value is valid. */ - if (inode->priv) { - err = -EINVAL; - goto err_free_metadata; + if (hdr_version < CS_AUX_HW_ID_VERSION_MIN) { + trace_chan_id = metadata[j][trcidr_idx]; + if (CS_IS_VALID_TRACE_ID(trace_chan_id)) { + err = cs_etm__map_trace_id(trace_chan_id, metadata[j]); + if (err) + goto err_free_metadata; + } } - /* All good, associate the traceID with the metadata pointer */ - inode->priv = metadata[j]; } /* diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h index 90c83f932d9a..712a6f855f0e 100644 --- a/tools/perf/util/cs-etm.h +++ b/tools/perf/util/cs-etm.h @@ -28,13 +28,17 @@ enum { /* * Update the version for new format. * - * New version 1 format adds a param count to the per cpu metadata. + * Version 1: format adds a param count to the per cpu metadata. * This allows easy adding of new metadata parameters. * Requires that new params always added after current ones. * Also allows client reader to handle file versions that are different by * checking the number of params in the file vs the number expected. + * + * Version 2: Drivers will use PERF_RECORD_AUX_OUTPUT_HW_ID to output + * CoreSight Trace ID. ...TRACEIDR metadata will be set to unused ID. */ -#define CS_HEADER_CURRENT_VERSION 1 +#define CS_HEADER_CURRENT_VERSION 2 +#define CS_AUX_HW_ID_VERSION_MIN 2 /* Beginning of header common to both ETMv3 and V4 */ enum { @@ -85,6 +89,12 @@ enum { CS_ETE_PRIV_MAX }; +/* + * Check for valid CoreSight trace ID. If an invalid value is present in the metadata, + * then IDs are present in the hardware ID packet in the data file. + */ +#define CS_IS_VALID_TRACE_ID(id) ((id > 0) && (id < 0x70)) + /* * ETMv3 exception encoding number: * See Embedded Trace Macrocell specification (ARM IHI 0014Q)
The information to associate Trace ID and CPU will be changing. Drivers will start outputting this as a hardware ID packet in the data file and setting the value in AUXINFO to an unused value. To prepare for this, we only map Trace ID and CPU data from AUXINFO if the header version and values are valid, and move the mapping into a helper function. Signed-off-by: Mike Leach <mike.leach@linaro.org> --- tools/perf/util/cs-etm.c | 53 +++++++++++++++++++++++++++------------- tools/perf/util/cs-etm.h | 14 +++++++++-- 2 files changed, 48 insertions(+), 19 deletions(-)