CoreSight October 2019

coresight@lists.linaro.org

14 participants
15 discussions

by Mike Leach

OpenCSD library version 0.12.1 is released. Changes:- 1) Snapshots can now have generic core type names that reflect architecture and profile. e,g, ARMv8-A. 2) Bugfix - certain classes of authenticated pointer instructions were not being recognised as P0 elements locations. 3) Bugfix - if a trace implementation represented the transition between A64 & A32 as an address packet followed by a separate context packet then decode could fail in some cases. Most implementations use a combined Address+Context packet. Mike -- Mike Leach Principal Engineer, ARM Ltd. Manchester Design Centre. UK

4 years, 11 months

Re: [PATCH 4/5] coresight: Expose device connections via sysfs

by Mathieu Poirier

On Thu, Oct 03, 2019 at 02:07:51PM -0600, Mathieu Poirier wrote: > From: Suzuki K Poulose <suzuki.poulose(a)arm.com> > > Coresight device connections are a bit complicated and is not > exposed currently to the user. One has to look at the platform > descriptions (DT bindings or ACPI bindings) to make an understanding. > Given the new naming scheme, it will be helpful to have this information > to choose the appropriate devices for tracing. This patch exposes > the device connections via links in the sysfs directories. > > e.g, for a connection devA[OutputPort_X] -> devB[InputPort_Y] > is represented as two symlinks: > > /sys/bus/coresight/.../devA/out:X -> /sys/bus/coresight/.../devB > /sys/bus/coresight/.../devB/in:Y -> /sys/bus/coresight/.../devA > > Provides default connections group if requested for any CoreSight device > using the coresight_connections structure. > > If a connections group is present on a device then links are collated > there. > > Co-developed-by: Mike Leach <mike.leach(a)linaro.org> > Signed-off-by: Mike Leach <mike.leach(a)linaro.org> > Cc: Mathieu Poirier <mathieu.poirier(a)linaro.org> > Signed-off-by: Suzuki K Poulose <suzuki.poulose(a)arm.com> > --- > drivers/hwtracing/coresight/coresight-priv.h | 7 + > drivers/hwtracing/coresight/coresight-sysfs.c | 150 ++++++++++++++++++ > drivers/hwtracing/coresight/coresight.c | 42 +++-- > include/linux/coresight.h | 7 + > 4 files changed, 195 insertions(+), 11 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h > index fa4b02ed3900..120928db426a 100644 > --- a/drivers/hwtracing/coresight/coresight-priv.h > +++ b/drivers/hwtracing/coresight/coresight-priv.h > @@ -155,6 +155,13 @@ struct list_head *coresight_build_path(struct coresight_device *csdev, > void coresight_release_path(struct list_head *path); > int coresight_add_sysfs_link(struct coresight_sysfs_link *info); > void coresight_remove_sysfs_link(struct coresight_sysfs_link *info); > +int coresight_make_links(struct coresight_device *orig, > + struct coresight_connection *conn, > + struct coresight_device *target); > +void coresight_remove_links(struct coresight_device *orig, > + struct coresight_connection *conn); > +int coresight_create_conns_sysfs_group(struct coresight_device *csdev); > +void coresight_remove_conns_sysfs_group(struct coresight_device *csdev); > > #ifdef CONFIG_CORESIGHT_SOURCE_ETM3X > extern int etm_readl_cp14(u32 off, unsigned int *val); > diff --git a/drivers/hwtracing/coresight/coresight-sysfs.c b/drivers/hwtracing/coresight/coresight-sysfs.c > index 058a092ba75f..f2ece44e2158 100644 > --- a/drivers/hwtracing/coresight/coresight-sysfs.c > +++ b/drivers/hwtracing/coresight/coresight-sysfs.c > @@ -80,3 +80,153 @@ void coresight_remove_sysfs_link(struct coresight_sysfs_link *info) > info->target_name, > info->target->sysfs_link_grp); > } > + > +/* > + * coresight_make_links: Make a link for a connection from a @orig > + * device to @target, represented by @conn. > + * > + * e.g, for devOrig[output_X] -> devTarget[input_Y] is represented > + * as two symbolic links : > + * > + * /sys/.../devOrig/out:X -> /sys/.../devTarget/ > + * /sys/.../devTarget/in:Y -> /sys/.../devOrig/ > + * > + * The link names are allocated for a device where it appears. i.e, the > + * "out" link on the master and "in" link on the slave device. > + * The link info is stored in the connection record for avoiding > + * the reconstruction of names for removal. > + */ > +int coresight_make_links(struct coresight_device *orig, > + struct coresight_connection *conn, > + struct coresight_device *target) > +{ > + int ret = -ENOMEM; > + char *outs = NULL, *ins = NULL; > + struct coresight_sysfs_link *link = NULL; > + > + do { > + outs = devm_kasprintf(&orig->dev, GFP_KERNEL, > + "out:%d", conn->outport); > + if (!outs) > + break; > + ins = devm_kasprintf(&target->dev, GFP_KERNEL, > + "in:%d", conn->child_port); > + if (!ins) > + break; > + link = devm_kzalloc(&orig->dev, > + sizeof(struct coresight_sysfs_link), > + GFP_KERNEL); > + if (!link) > + break; > + > + link->orig = orig; > + link->target = target; > + link->orig_name = outs; > + link->target_name = ins; > + > + ret = coresight_add_sysfs_link(link); > + if (ret) > + break; > + > + conn->link = link; > + > + /* > + * Install the device connection. This also indicates that > + * the links are operational on both ends. > + */ > + conn->child_dev = target; > + return 0; > + } while (0); > + > + if (outs) > + devm_kfree(&orig->dev, outs); > + if (ins) > + devm_kfree(&target->dev, ins); > + if (link) > + devm_kfree(&orig->dev, link); We should have to worry about freeing things if making a link fails. Device probing should fair and the memory released automatically since devm_kasprintf() was used. > + return ret; > +} > + > +/* > + * coresight_remove_links: Remove the sysfs links for a given connection @conn, > + * from @orig device to @target device. See coresight_make_links() for more > + * details. > + */ > +void coresight_remove_links(struct coresight_device *orig, > + struct coresight_connection *conn) > +{ > + if (!orig || !conn->link) > + return; > + > + coresight_remove_sysfs_link(conn->link); > + > + devm_kfree(&conn->child_dev->dev, conn->link->target_name); > + devm_kfree(&orig->dev, conn->link->orig_name); > + devm_kfree(&orig->dev, conn->link); > + conn->link = NULL; > + conn->child_dev = NULL; > +} > + > +static ssize_t nr_outports_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct coresight_device *csdev = to_coresight_device(dev); > + > + return scnprintf(buf, PAGE_SIZE, "%d\n", csdev->pdata->nr_outport); > +} > +static DEVICE_ATTR_RO(nr_outports); > + > +static ssize_t nr_inports_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct coresight_device *csdev = to_coresight_device(dev); > + > + return scnprintf(buf, PAGE_SIZE, "%d\n", csdev->pdata->nr_inport); > +} > +static DEVICE_ATTR_RO(nr_inports); > + > +static struct attribute *coresight_conns_attrs[] = { > + &dev_attr_nr_outports.attr, > + &dev_attr_nr_inports.attr, > + NULL, > +}; > + > +static struct attribute_group coresight_conns_group = { > + .attrs = coresight_conns_attrs, > + .name = "connections", > +}; Since those are present for all CS device, I would put this in the coresight_dev_type[] for all the CS devices, except etc. By proceeding this way we don't need coresight_create_conns_sysfs_group() and coresight_remove_conns_sysfs_group(). > + > +/* > + * Create connections group for CoreSight devices on the trace path > + * which use inports and outports to represent connections. > + * This group will then be used to collate the sysfs links between > + * devices. > + */ > +int coresight_create_conns_sysfs_group(struct coresight_device *csdev) > +{ > + int ret = 0; > + > + if (!csdev) > + return -EINVAL; > + > + ret = sysfs_create_group(&csdev->dev.kobj, &coresight_conns_group); > + if (ret) > + return ret; > + > + csdev->sysfs_link_grp = coresight_conns_group.name; > + csdev->default_conns_grp = true; > + return ret; > +} > + > +void coresight_remove_conns_sysfs_group(struct coresight_device *csdev) > +{ > + if (!csdev) > + return; > + > + if (csdev->sysfs_link_grp && csdev->default_conns_grp) { > + sysfs_remove_group(&csdev->dev.kobj, &coresight_conns_group); > + csdev->sysfs_link_grp = NULL; > + } > +} > diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c > index 1e75cc7203b5..e6e1850a6e96 100644 > --- a/drivers/hwtracing/coresight/coresight.c > +++ b/drivers/hwtracing/coresight/coresight.c > @@ -1034,7 +1034,7 @@ static void coresight_device_release(struct device *dev) > > static int coresight_orphan_match(struct device *dev, void *data) > { > - int i; > + int i, ret = 0; > bool still_orphan = false; > struct coresight_device *csdev, *i_csdev; > struct coresight_connection *conn; > @@ -1059,19 +1059,23 @@ static int coresight_orphan_match(struct device *dev, void *data) > /* We have found at least one orphan connection */ > if (conn->child_dev == NULL) { > /* Does it match this newly added device? */ > - if (conn->child_fwnode == csdev->dev.fwnode) > - conn->child_dev = csdev; > - else > + if (conn->child_fwnode == csdev->dev.fwnode) { > + ret = coresight_make_links(i_csdev, > + conn, csdev); > + if (ret) > + return ret; > + } else { > /* This component still has an orphan */ > still_orphan = true; > + } > } > } > > i_csdev->orphan = still_orphan; > > /* > - * Returning '0' ensures that all known component on the > - * bus will be checked. > + * Returning '0' in case we didn't encounter any error, > + * ensures that all known component on the bus will be checked. > */ > return 0; > } > @@ -1085,7 +1089,7 @@ static int coresight_fixup_orphan_conns(struct coresight_device *csdev) > > static int coresight_fixup_device_conns(struct coresight_device *csdev) > { > - int i; > + int i, ret = 0; > > for (i = 0; i < csdev->pdata->nr_outport; i++) { > struct coresight_connection *conn = &csdev->pdata->conns[i]; > @@ -1093,9 +1097,12 @@ static int coresight_fixup_device_conns(struct coresight_device *csdev) > > dev = bus_find_device_by_fwnode(&coresight_bustype, conn->child_fwnode); > if (dev) { > - conn->child_dev = to_coresight_device(dev); > + ret = coresight_make_links(csdev, conn, > + to_coresight_device(dev)); > /* and put reference from 'bus_find_device()' */ > put_device(dev); > + if (ret) > + break; > } else { > csdev->orphan = true; > conn->child_dev = NULL; > @@ -1130,7 +1137,7 @@ static int coresight_remove_match(struct device *dev, void *data) > > if (csdev->dev.fwnode == conn->child_fwnode) { > iterator->orphan = true; > - conn->child_dev = NULL; > + coresight_remove_links(iterator, conn); > /* > * Drop the reference to the handle for the remote > * device acquired in parsing the connections from > @@ -1224,13 +1231,23 @@ void coresight_release_platform_data(struct coresight_device *csdev, > struct coresight_platform_data *pdata) > { > int i; > + struct coresight_connection *conns = pdata->conns; > > for (i = 0; i < pdata->nr_outport; i++) { > - if (pdata->conns[i].child_fwnode) { > - fwnode_handle_put(pdata->conns[i].child_fwnode); > + /* If we have made the links, remove them now */ > + if (csdev && conns[i].child_dev) > + coresight_remove_links(csdev, &conns[i]); > + /* > + * Drop the refcount and clear the handle as this device > + * is going away > + */ > + if (conns[i].child_fwnode) { > + fwnode_handle_put(conns[i].child_fwnode); > pdata->conns[i].child_fwnode = NULL; > } > } > + if (csdev) > + coresight_remove_conns_sysfs_group(csdev); > } > > struct coresight_device *coresight_register(struct coresight_desc *desc) > @@ -1312,6 +1329,9 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) > > mutex_lock(&coresight_mutex); > > + if (desc->add_conns_group) > + ret = coresight_create_conns_sysfs_group(csdev); > + > ret = coresight_fixup_device_conns(csdev); > if (!ret) > ret = coresight_fixup_orphan_conns(csdev); > diff --git a/include/linux/coresight.h b/include/linux/coresight.h > index cd0d92611be6..95634d4ce7ff 100644 > --- a/include/linux/coresight.h > +++ b/include/linux/coresight.h > @@ -122,6 +122,8 @@ struct coresight_platform_data { > * @groups: operations specific to this component. These will end up > * in the component's sysfs sub-directory. > * @name: name for the coresight device, also shown under sysfs. > + * @add_conns_group: Dynamically add default connections group to the supplied > + * groups. > */ > struct coresight_desc { > enum coresight_dev_type type; > @@ -131,6 +133,7 @@ struct coresight_desc { > struct device *dev; > const struct attribute_group **groups; > const char *name; > + bool add_conns_group; I don't think we need this since displaying connection information should be mandatory. > }; > > /** > @@ -140,12 +143,14 @@ struct coresight_desc { > * @chid_fwnode: remote component's fwnode handle. > * @child_dev: a @coresight_device representation of the component > connected to @outport. > + * @link: Representation of the connection as a sysfs link. > */ > struct coresight_connection { > int outport; > int child_port; > struct fwnode_handle *child_fwnode; > struct coresight_device *child_dev; > + struct coresight_sysfs_link *link; > }; > > /** > @@ -182,6 +187,7 @@ struct coresight_sysfs_link { > * @sysfs_link_grp: Optional name for a group created to add sysfs links into > * on this device. Group must have been created on device > * registration. > + * @default_conns_grp: Added a default connections group. > */ > struct coresight_device { > struct coresight_platform_data *pdata; > @@ -198,6 +204,7 @@ struct coresight_device { > /* cross trigger handling */ > struct coresight_device *ect_dev; > const char *sysfs_link_grp; > + bool default_conns_grp; Same here. > }; > > /* > -- > 2.17.1 >

4 years, 11 months

Re: [PATCH 5/5] coresight: add default connections group in sysfs to components.

by Mathieu Poirier

On Thu, Oct 03, 2019 at 02:07:52PM -0600, Mathieu Poirier wrote: > From: Mike Leach <mike.leach(a)linaro.org> > > Add the default connections group in sysfs to etm4x, etm3x, stm, tmc, > funnel and replicator components. > > This group will be used to collate the sysfs links representing the trace > data path to and from the devices. When booting this set on my Juno R0, probing each CTI result in a bracktrace like the following: [ 5.708275] sysfs: cannot create duplicate filename '/devices/platform/22020000.cti/cti_cpu1/connections' [ 5.717760] CPU: 2 PID: 42 Comm: kworker/2:1 Not tainted 5.3.0-04961-gb632d2fadfdd #279 [ 5.725679] Hardware name: ARM Juno development board (r0) (DT) [ 5.731543] Workqueue: events amba_deferred_retry_func [ 5.736625] Call trace: [ 5.739044] dump_backtrace+0x0/0x150 [ 5.742664] show_stack+0x14/0x20 [ 5.745942] dump_stack+0xb0/0xf4 [ 5.749218] sysfs_warn_dup+0x5c/0x78 [ 5.752839] internal_create_group+0x394/0x3d8 [ 5.757232] sysfs_create_group+0x14/0x20 [ 5.761199] coresight_create_conns_sysfs_group+0x24/0x50 [ 5.766538] coresight_register+0x2d4/0x378 [ 5.770674] cti_probe+0x158/0x380 [ 5.774035] amba_probe+0xb0/0x158 [ 5.777399] really_probe+0xdc/0x358 [ 5.780933] driver_probe_device+0x58/0x100 [ 5.785069] __device_attach_driver+0x90/0xb0 [ 5.789377] bus_for_each_drv+0x64/0xc8 [ 5.793169] __device_attach+0xd8/0x138 [ 5.796960] device_initial_probe+0x10/0x18 [ 5.801096] bus_probe_device+0x90/0x98 [ 5.804887] device_add+0x3c4/0x620 [ 5.808335] amba_device_try_add+0x1c0/0x378 [ 5.812556] amba_deferred_retry_func+0x48/0xd0 [ 5.817036] process_one_work+0x1e0/0x350 [ 5.820999] worker_thread+0x40/0x480 [ 5.824619] kthread+0x124/0x128 [ 5.827809] ret_from_fork+0x10/0x18 I am done reviewing both your sets. Thanks and best, Mathieu > > Signed-off-by: Mike Leach <mike.leach(a)linaro.org> > --- > drivers/hwtracing/coresight/coresight-etm3x.c | 1 + > drivers/hwtracing/coresight/coresight-etm4x.c | 1 + > drivers/hwtracing/coresight/coresight-funnel.c | 1 + > drivers/hwtracing/coresight/coresight-replicator.c | 1 + > drivers/hwtracing/coresight/coresight-stm.c | 1 + > drivers/hwtracing/coresight/coresight-tmc.c | 1 + > 6 files changed, 6 insertions(+) > > diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c > index e2cb6873c3f2..aa017ed1e2fe 100644 > --- a/drivers/hwtracing/coresight/coresight-etm3x.c > +++ b/drivers/hwtracing/coresight/coresight-etm3x.c > @@ -864,6 +864,7 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) > desc.pdata = pdata; > desc.dev = dev; > desc.groups = coresight_etm_groups; > + desc.add_conns_group = true; > drvdata->csdev = coresight_register(&desc); > if (IS_ERR(drvdata->csdev)) { > ret = PTR_ERR(drvdata->csdev); > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c > index a128b5063f46..7d94096191c3 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x.c > @@ -1160,6 +1160,7 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > desc.pdata = pdata; > desc.dev = dev; > desc.groups = coresight_etmv4_groups; > + desc.add_conns_group = true; > drvdata->csdev = coresight_register(&desc); > if (IS_ERR(drvdata->csdev)) { > ret = PTR_ERR(drvdata->csdev); > diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c > index 05f7896c3a01..9cdbfb75a246 100644 > --- a/drivers/hwtracing/coresight/coresight-funnel.c > +++ b/drivers/hwtracing/coresight/coresight-funnel.c > @@ -238,6 +238,7 @@ static int funnel_probe(struct device *dev, struct resource *res) > desc.ops = &funnel_cs_ops; > desc.pdata = pdata; > desc.dev = dev; > + desc.add_conns_group = true; > drvdata->csdev = coresight_register(&desc); > if (IS_ERR(drvdata->csdev)) { > ret = PTR_ERR(drvdata->csdev); > diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c > index b29ba640eb25..eac2690c0fda 100644 > --- a/drivers/hwtracing/coresight/coresight-replicator.c > +++ b/drivers/hwtracing/coresight/coresight-replicator.c > @@ -230,6 +230,7 @@ static int replicator_probe(struct device *dev, struct resource *res) > desc.ops = &replicator_cs_ops; > desc.pdata = dev->platform_data; > desc.dev = dev; > + desc.add_conns_group = true; > > drvdata->csdev = coresight_register(&desc); > if (IS_ERR(drvdata->csdev)) { > diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c > index b908ca104645..5a7c7b43d48c 100644 > --- a/drivers/hwtracing/coresight/coresight-stm.c > +++ b/drivers/hwtracing/coresight/coresight-stm.c > @@ -933,6 +933,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) > desc.pdata = pdata; > desc.dev = dev; > desc.groups = coresight_stm_groups; > + desc.add_conns_group = true; > drvdata->csdev = coresight_register(&desc); > if (IS_ERR(drvdata->csdev)) { > ret = PTR_ERR(drvdata->csdev); > diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c > index 1cf82fa58289..b656c1b58735 100644 > --- a/drivers/hwtracing/coresight/coresight-tmc.c > +++ b/drivers/hwtracing/coresight/coresight-tmc.c > @@ -519,6 +519,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) > } > adev->dev.platform_data = pdata; > desc.pdata = pdata; > + desc.add_conns_group = true; > > drvdata->csdev = coresight_register(&desc); > if (IS_ERR(drvdata->csdev)) { > -- > 2.17.1 >

4 years, 11 months

[RFC PATCH v4 00/15] CoreSight CTI driver

by Mike Leach

CTIs are defined in the device tree and associated with other CoreSight devices. The core CoreSight code has been modified to enable the registration of the CTI devices on the same bus as the other CoreSight components, but as these are not actually trace generation / capture devices, they are not part of the Coresight path when generating trace. However, the definition of the standard CoreSight device has been extended to include a reference to an associated CTI device, and the enable / disable trace path operations will auto enable/disable any associated CTI devices at the same time. Programming is at present via sysfs - a full API is provided to utilise the hardware capabilities. As CTI devices are unprogrammed by default, the auto enable describe above will have no effect until explicit programming takes place. A set of device tree bindings specific to the CTI topology has been defined. The driver accesses these in a platform agnostic manner, so ACPI bindings can be added later, once they have been agreed and defined for the CTI device. Documentation has been updated to describe both the CTI hardware, its use and programming in sysfs, and the new dts bindings required. Tested on DB410 board, applies on coresight/next tree - 5.3-rc1 based. Changes since v3: * After discussion on CS mailing list, each CTI connection has a triggers<N> sysfs directory with name and trigger signals listed for the connection. * Initial code for creating sysfs links between CoreSight components is introduced and implementation for CTI provided. This allows exploration of the CoreSight topology within the sysfs infrastructure. Patches for links between other CoreSight components to follow. * Power management - CPU hotplug and idle omitted from this set as ongoing developments may define required direction. Additional patch set to follow. * Multiple fixes applied as requested by reviewers esp. Matthieu, Suzuki and Leo. Changes since v2: Updates to allow for new features on coresight/next and feedback from Mathieu and Leo. 1) Rebase and restructuring to apply on top of ACPI support patch set, currently on coresight/next. of_coresight_cti has been renamed to coresight-cti-platform and device tree bindings added to this but accessed in a platform agnostic manner using fwnode for later ACPI support to be added. 2) Split the sysfs patch info a series of functional patches. 3) Revised the refcount and enabling support. 4) Adopted the generic naming protocol - CTIs are either cti_cpuN or cti_sysM 5) Various minor presentation /checkpatch issues highlighted in feedback. 6) revised CPU hotplug to cover missing cases needed by ETM. Changes since v1: 1) Significant restructuring of the source code. Adds cti-sysfs file and cti device tree file. Patches add per feature rather than per source file. 2) CPU type power event handling for hotplug moved to CoreSight core, with generic registration interface provided for all CPU bound CS devices to use. 3) CTI signal interconnection details in sysfs now generated dynamically from connection lists in driver. This to fix issue with multi-line sysfs output in previous version. 4) Full device tree bindings for DB410 and Juno provided (to the extent that CTI information is available). 5) AMBA driver update for UCI IDs are now upstream so no longer included in this set. Mike Leach (15): coresight: cti: Initial CoreSight CTI Driver coresight: cti: Add sysfs coresight mgmt reg access. coresight: cti: Add sysfs access to program function regs coresight: cti: Add sysfs trigger / channel programming API dt-bindings: arm: Adds CoreSight CTI hardware definitions. coresight: cti: Add device tree support for v8 arch CTI coresight: cti: Add device tree support for custom CTI. coresight: cti: Enable CTI associated with devices. coresight: cti: Add connection information to sysfs coresight: Add generic sysfs link creation functions. coresight: cti: Add in sysfs links to other coresight devices. dt-bindings: qcom: Add CTI options for qcom msm8916 dt-bindings: arm: Juno platform - add CTI entries to device tree. docs: coresight: Update documentation for CoreSight to cover CTI. docs: sysfs: coresight: Add sysfs documentation for CTI .../testing/sysfs-bus-coresight-devices-cti | 231 ++++ .../bindings/arm/coresight-ect-cti.txt | 396 ++++++ .../devicetree/bindings/arm/coresight.txt | 7 + Documentation/trace/coresight-ect.txt | 164 +++ Documentation/trace/coresight.txt | 7 + MAINTAINERS | 3 + arch/arm64/boot/dts/arm/juno-base.dtsi | 149 +- arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 31 +- arch/arm64/boot/dts/arm/juno-r1.dts | 25 + arch/arm64/boot/dts/arm/juno-r2.dts | 25 + arch/arm64/boot/dts/arm/juno.dts | 25 + arch/arm64/boot/dts/qcom/msm8916.dtsi | 85 +- drivers/hwtracing/coresight/Kconfig | 12 + drivers/hwtracing/coresight/Makefile | 4 + .../coresight/coresight-cti-platform.c | 431 ++++++ .../hwtracing/coresight/coresight-cti-sysfs.c | 1199 +++++++++++++++++ drivers/hwtracing/coresight/coresight-cti.c | 763 +++++++++++ drivers/hwtracing/coresight/coresight-cti.h | 238 ++++ .../hwtracing/coresight/coresight-platform.c | 23 + drivers/hwtracing/coresight/coresight-priv.h | 10 + drivers/hwtracing/coresight/coresight.c | 133 +- include/dt-bindings/arm/coresight-cti-dt.h | 36 + include/linux/coresight.h | 46 + 23 files changed, 4029 insertions(+), 14 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-cti create mode 100644 Documentation/devicetree/bindings/arm/coresight-ect-cti.txt create mode 100644 Documentation/trace/coresight-ect.txt create mode 100644 drivers/hwtracing/coresight/coresight-cti-platform.c create mode 100644 drivers/hwtracing/coresight/coresight-cti-sysfs.c create mode 100644 drivers/hwtracing/coresight/coresight-cti.c create mode 100644 drivers/hwtracing/coresight/coresight-cti.h create mode 100644 include/dt-bindings/arm/coresight-cti-dt.h -- 2.17.1

4 years, 11 months

[PATCH] perf cs-etm: Fix definition of macro TO_CS_QUEUE_NR

by Leo Yan

Macro TO_CS_QUEUE_NR definition has a typo, which uses 'trace_id_chan' as its parameter, this doesn't match with its definition body which uses 'trace_chan_id'. So renames the parameter to 'trace_chan_id'. It's luck to have a local variable 'trace_chan_id' in the function cs_etm__setup_queue(), even we wrongly define the macro TO_CS_QUEUE_NR, the local variable 'trace_chan_id' is used rather than the macro's parameter 'trace_id_chan'; so the compiler doesn't complain for this before. After renaming the parameter, it leads to a compiling error due cs_etm__setup_queue() has no variable 'trace_id_chan'. This patch uses the variable 'trace_chan_id' for the macro so that fixes the compiling error. Signed-off-by: Leo Yan <leo.yan(a)linaro.org> --- tools/perf/util/cs-etm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 4ba0f871f086..f5f855fff412 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -110,7 +110,7 @@ static int cs_etm__decode_data_block(struct cs_etm_queue *etmq); * encode the etm queue number as the upper 16 bit and the channel as * the lower 16 bit. */ -#define TO_CS_QUEUE_NR(queue_nr, trace_id_chan) \ +#define TO_CS_QUEUE_NR(queue_nr, trace_chan_id) \ (queue_nr << 16 | trace_chan_id) #define TO_QUEUE_NR(cs_queue_nr) (cs_queue_nr >> 16) #define TO_TRACE_CHAN_ID(cs_queue_nr) (cs_queue_nr & 0x0000ffff) @@ -819,7 +819,7 @@ static int cs_etm__setup_queue(struct cs_etm_auxtrace *etm, * Note that packets decoded above are still in the traceID's packet * queue and will be processed in cs_etm__process_queues(). */ - cs_queue_nr = TO_CS_QUEUE_NR(queue_nr, trace_id_chan); + cs_queue_nr = TO_CS_QUEUE_NR(queue_nr, trace_chan_id); ret = auxtrace_heap__add(&etm->heap, cs_queue_nr, timestamp); out: return ret; -- 2.17.1

4 years, 11 months

Re: Coresight: ocsdError error

by Mike Leach

Hi, >From the little information in this mail, this looks like an issue with how the version of perf you have is interacting with the OpenCSD library. An ocsdError will usually be generated if the library detects input errors in configuration or data being passed to it. ocsdErrors in general should provide a code + string - though output could be being suppressed by perf. I would follow Leo's suggestion to see if you can spot the library call from the backtrace that causes the issue. Regards Mike On Mon, 21 Oct 2019 at 06:39, Leo Yan <leo.yan(a)linaro.org> wrote: > > Hi Bharat, > > [ + Mike ] > > On Mon, Oct 21, 2019 at 05:28:54AM +0000, Bharat Bhushan wrote: > > Hi Leo, Mathieu, > > > > I found your email-id from linux git-log, Please ignore if you are not right person. > > > > I am using perf for hwtracing (coresight). > > > > > > $perf record -C 0 -e cs_etm/@tmc_etr0/u ./test > > Couldn't synthesize bpf events. > > [ perf record: Woken up 1 times to write data ] > > [ perf record: Captured and wrote 0.124 MB perf.data ] > > > > $ perf report > > terminate called after throwing an instance of 'ocsdError' > > terminate called recursively > > Aborted (core dumped) > > > > > > $ perf report -v > > build id event received for [kernel.kallsyms]: 473d5d96eceb209a58f19ec8f3e4f74891d49c9f > > build id event received for /usr/lib/systemd/systemd: 16460ffcbc368221e1e71c587c059a44497eb3de > > build id event received for /usr/lib/aarch64-linux-gnu/libudev.so.1.6.12: bf0152a1c65039afe462800eb834190830a5c8d2 > > . > > <snip> > > . > > build id event received for /usr/lib/aarch64-linux-gnu/libdw-0.176.so: ad9dc3a40b2f39629fcc70ad2bb931d75f89b748 > > build id event received for /usr/lib/aarch64-linux-gnu/libelf-0.176.so: 0b36ddcd158758dcb8356713eff8fe12c1326d21 > > build id event received for /usr/lib/libopencsd_c_api.so.0.12.0: 84a1cf9a8b6efb9670b902d87118f05c81856b53 > > Aborted (core dumped) > > terminate called after throwing an instance of 'ocsdError' > > terminate called recursively > > root@ubuntu:~# > > > > > > Also I added prints in "perf" source code before calling and opencsd library function (please find attached file) and no prints observed. > > I am not sure why we are getting "ocsdError". > > > > Can you please point what's wrong I am doing. > > I think the error is reported internally in OpenCSD rather than the > failure in perf tool. > > And you could see there have core dump file, suggest you could to > use the core dump file with gdb to dump the backtrace. Then this can > help us to find the flow for the failure. > > I loop Mike since this issue is more likely related with decoder. > > Thanks, > Leo Yan -- Mike Leach Principal Engineer, ARM Ltd. Manchester Design Centre. UK

4 years, 11 months

[PATCH v1 0/4] perf cs-etm: Fix synthesizing instruction samples

by Leo Yan

This patch series is to address the issue for synthesizing instruction samples, especially when the instruction sample period is small enough, the current logic cannot synthesize multiple instruction samples within one instruction range packet. To fix this issue, patch 0001 avoids to reset the last branches for every instruction sample; if reset the last branches when every time generate instruction sample, then the later samples in the same range packet cannot use the last branches anymore. Patch 0002 is the main patch to fix the logic for synthesizing instruction samples; it allows to handle different instruction periods. Patch 0003 is an optimization for copying last branches; it only copies last branches once if the instruction samples share the same last branches. Patch 0004 is a minor fix for unsigned variable comparison to zero. To verify my changing for synthesizing instruction samples, I added some logs in the code, and reviewed the output log manually for instuctions samples. The below commands are tested on DB410c board: # perf script --itrace=i2 # perf script --itrace=i2li16 # perf inject --itrace=i2il16 -i perf.data -o perf.data.new # perf inject --itrace=i100il16 -i perf.data -o perf.data.new Leo Yan (4): perf cs-etm: Continuously record last branches perf cs-etm: Correct synthesizing instruction samples perf cs-etm: Optimize copying last branches perf cs-etm: Fix unsigned variable comparison to zero tools/perf/util/cs-etm.c | 137 ++++++++++++++++++++++++++++++++------- 1 file changed, 115 insertions(+), 22 deletions(-) -- 2.17.1

4 years, 12 months

[PATCH v2 00/11] coresight: etm4x: Fixes and updates for sysfs API

by Mike Leach

Review of ETMV4 sysfs code resulted in a number of minor issues being discovered. Patch set fixes these issues:- 1) Update for ETM v4.4 archtecture. 2) Add missing single shot comparator API. 3) Misc fixes and improvements to sysfs API 4) Updated programmers documentation and reference. Changes since v1 (from reviews by Mathieu and Leo):- Usability patch split into 2 separate functional patches. Docs patch split into 3 patches. Misc style and comment typo fixes. Mike Leach (11): coresight: etm4x: Fixes for ETM v4.4 architecture updates. coresight: etm4x: Fix input validation for sysfs. coresight: etm4x: Add missing API to set EL match on address filters coresight: etm4x: Fix issues with start-stop logic. coresight: etm4x: Improve usability of sysfs - include/exclude addr. coresight: etm4x: Improve usability of sysfs - CID and VMID masks. coresight: etm4x: Add view comparator settings API to sysfs. coresight: etm4x: Add missing single-shot control API to sysfs coresight: etm4x: docs: Update ABI doc for sysfs features added. coresight: docs: Create common sub-directory for coresight trace. coresight: etm4x: docs: Adds detailed document for programming etm4x. .../testing/sysfs-bus-coresight-devices-etm4x | 183 ++++--- .../{ => coresight}/coresight-cpu-debug.txt | 0 .../coresight/coresight-etm4x-reference.txt | 458 ++++++++++++++++++ .../trace/{ => coresight}/coresight.txt | 0 MAINTAINERS | 3 +- .../coresight/coresight-etm4x-sysfs.c | 312 +++++++++++- drivers/hwtracing/coresight/coresight-etm4x.c | 32 +- drivers/hwtracing/coresight/coresight-etm4x.h | 18 +- 8 files changed, 905 insertions(+), 101 deletions(-) rename Documentation/trace/{ => coresight}/coresight-cpu-debug.txt (100%) create mode 100644 Documentation/trace/coresight/coresight-etm4x-reference.txt rename Documentation/trace/{ => coresight}/coresight.txt (100%) -- 2.17.1

4 years, 12 months

[PATCH v3 0/6] perf cs-etm: Support thread stack and callchain

by Leo Yan

This patch series adds support for thread stack and callchain. Patch 01 is to fix the unsigned variable comparison to zero; patch 02 is to refactor the instruction size calculation; these two patches are preparation for patch 03. Patch 03 is to add thread stack support, after applying this patch the option '-F,+callindent' can be used by perf script tool; patch 04 is to add branch filter thus the Perf tool can display branch samples only for function calls and returns after enable the call indentation or call chain related options. Patch 05 is to synthesize call chain for the instruction samples. Patch 06 allows the instruction sample can be handled synchronously with the thread stack, thus it fixes an error for the callchain generation. This patch set has been tested on 96boards Hikey620 after applied on perf/core branch with latest commit f7bf75a78095 ("perf annotate: Don't return -1 for error when doing BPF disassembly"). Test for option '-F,+callindent': Before: # perf script -F,+callindent main 2808 1 branches: coresight_test1 ffff8634f5c8 coresight_test1+0x3c (/root/coresight_test/libcstest.so) main 2808 1 branches: printf@plt aaaaba8d37ec main+0x28 (/root/coresight_test/main) main 2808 1 branches: printf@plt aaaaba8d36bc printf@plt+0xc (/root/coresight_test/main) main 2808 1 branches: _init aaaaba8d3650 _init+0x30 (/root/coresight_test/main) main 2808 1 branches: _dl_fixup ffff86373b4c _dl_runtime_resolve+0x40 (/lib/aarch64-linux-gnu/ld-2.28.so) main 2808 1 branches: _dl_lookup_symbol_x ffff8636e078 _dl_fixup+0xb8 (/lib/aarch64-linux-gnu/ld-2.28.so) [...] After: # perf script -F,+callindent main 2808 1 branches: coresight_test1@plt aaaaba8d37d8 main+0x14 (/root/coresight_test/main) main 2808 1 branches: _dl_fixup ffff86373b4c _dl_runtime_resolve+0x40 (/lib/aarch64-linux-gnu/ld-2.28.s main 2808 1 branches: _dl_lookup_symbol_x ffff8636e078 _dl_fixup+0xb8 (/lib/aarch64-linux-gnu/ld-2.28.so) main 2808 1 branches: do_lookup_x ffff8636a49c _dl_lookup_symbol_x+0x104 (/lib/aarch64-linux-gnu/ld-2.28. main 2808 1 branches: check_match ffff86369bf0 do_lookup_x+0x238 (/lib/aarch64-linux-gnu/ld-2.28.so) main 2808 1 branches: strcmp ffff86369888 check_match+0x70 (/lib/aarch64-linux-gnu/ld-2.28.so) main 2808 1 branches: printf@plt aaaaba8d37ec main+0x28 (/root/coresight_test/main) main 2808 1 branches: _dl_fixup ffff86373b4c _dl_runtime_resolve+0x40 (/lib/aarch64-linux-gnu/ld-2.28.s main 2808 1 branches: _dl_lookup_symbol_x ffff8636e078 _dl_fixup+0xb8 (/lib/aarch64-linux-gnu/ld-2.28.so) main 2808 1 branches: do_lookup_x ffff8636a49c _dl_lookup_symbol_x+0x104 (/lib/aarch64-linux-gnu/ld-2.28. main 2808 1 branches: _dl_name_match_p ffff86369af0 do_lookup_x+0x138 (/lib/aarch64-linux-gnu/ld-2.28.so) main 2808 1 branches: strcmp ffff8636f7f0 _dl_name_match_p+0x18 (/lib/aarch64-linux-gnu/ld-2.28.so) [...] Test for option '--itrace=g': Before: # perf script --itrace=g16l64i100 main 1579 100 instructions: ffff0000102137f0 group_sched_in+0xb0 ([kernel.kallsyms]) main 1579 100 instructions: ffff000010213b78 flexible_sched_in+0xf0 ([kernel.kallsyms]) main 1579 100 instructions: ffff0000102135ac event_sched_in.isra.57+0x74 ([kernel.kallsyms]) main 1579 100 instructions: ffff000010219344 perf_swevent_add+0x6c ([kernel.kallsyms]) main 1579 100 instructions: ffff000010214854 perf_event_update_userpage+0x4c ([kernel.kallsyms]) [...] After: # perf script --itrace=g16l64i100 main 1579 100 instructions: ffff000010213b78 flexible_sched_in+0xf0 ([kernel.kallsyms]) ffff00001020c0b4 visit_groups_merge+0x12c ([kernel.kallsyms]) main 1579 100 instructions: ffff0000102135ac event_sched_in.isra.57+0x74 ([kernel.kallsyms]) ffff0000102137a0 group_sched_in+0x60 ([kernel.kallsyms]) ffff000010213b84 flexible_sched_in+0xfc ([kernel.kallsyms]) ffff00001020c0b4 visit_groups_merge+0x12c ([kernel.kallsyms]) main 1579 100 instructions: ffff000010219344 perf_swevent_add+0x6c ([kernel.kallsyms]) ffff0000102135f4 event_sched_in.isra.57+0xbc ([kernel.kallsyms]) ffff0000102137a0 group_sched_in+0x60 ([kernel.kallsyms]) ffff000010213b84 flexible_sched_in+0xfc ([kernel.kallsyms]) ffff00001020c0b4 visit_groups_merge+0x12c ([kernel.kallsyms]) [...] Changes from v2: * Added patch 01 to fix the unsigned variable comparison to zero (Suzuki). * Refined commit logs. Changes from v1: * Added comments for task thread handling (Mathieu). * Split patch 02 into two patches, one is for support thread stack and another is for callchain support (Mathieu). * Added a new patch to support branch filter. Leo Yan (6): perf cs-etm: Fix unsigned variable comparison to zero perf cs-etm: Refactor instruction size handling perf cs-etm: Support thread stack perf cs-etm: Support branch filter perf cs-etm: Support callchain for instruction sample perf cs-etm: Synchronize instruction sample with the thread stack tools/perf/util/cs-etm.c | 145 ++++++++++++++++++++++++++++++++------- 1 file changed, 120 insertions(+), 25 deletions(-) -- 2.17.1

4 years, 12 months

[PATCH v4 0/4] coresight: etm4x: docs: sysfs API doc updates

by Mike Leach

Review of ETMV4 sysfs code resulted in a number of minor issues being discovered. Patchset fixed these and updated docs. Applies to coresight/next Changes since v3 First 8 patches of v3 have been accepted onto coresight/next. The patch series is now documents only Docs .txt files changed to .rst by unrelated patch. This set reflects this change and updates the added docs to match. Indexing changed for new coresight docs directory. Changes since v2 (reviews from Mathieu and Leo):- Patch 0002 now adds stable tag. Tested on 4.9, 4.14, 4.19 Applies to coresight/next (5.4-rc1) Documentation changed to .rst format to match recent updates that converted other CoreSight .txt files. Misc typo / comment changes. Changes since v1 (from reviews by Mathieu and Leo):- Usability patch split into 2 separate functional patches. Docs patch split into 3 patches. Misc style and comment typo fixes. Mike Leach (4): coresight: etm4x: docs: Update ABI doc for new sysfs name scheme. coresight: etm4x: docs: Update ABI doc for new sysfs etm4 attributes coresight: docs: Create common sub-directory for coresight trace. coresight: etm4x: docs: Adds detailed document for programming etm4x. .../testing/sysfs-bus-coresight-devices-etm4x | 183 ++-- .../{ => coresight}/coresight-cpu-debug.rst | 0 .../coresight/coresight-etm4x-reference.rst | 798 ++++++++++++++++++ .../trace/{ => coresight}/coresight.rst | 2 +- Documentation/trace/coresight/index.rst | 9 + Documentation/trace/index.rst | 3 +- MAINTAINERS | 3 +- 7 files changed, 925 insertions(+), 73 deletions(-) rename Documentation/trace/{ => coresight}/coresight-cpu-debug.rst (100%) create mode 100644 Documentation/trace/coresight/coresight-etm4x-reference.rst rename Documentation/trace/{ => coresight}/coresight.rst (99%) create mode 100644 Documentation/trace/coresight/index.rst -- 2.17.1

4 years, 12 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

CoreSight October 2019