CoreSight

coresight@lists.linaro.org

6 participants
2824 discussions

Re: [PATCH v8 2/8] coresight: core: add a new API to retrieve the helper device

by Suzuki K Poulose

On 11/12/2025 06:10, Jie Gan wrote: > Retrieving the helper device of the specific coresight device based on > its helper_subtype because a single coresight device may has multiple types > of the helper devices. > > Reviewed-by: Mike Leach <mike.leach(a)linaro.org> > Signed-off-by: Jie Gan <jie.gan(a)oss.qualcomm.com> > --- > drivers/hwtracing/coresight/coresight-core.c | 35 ++++++++++++++++++++++++++++ > drivers/hwtracing/coresight/coresight-priv.h | 2 ++ > 2 files changed, 37 insertions(+) > > diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c > index 0e8448784c62..667883ccb4b7 100644 > --- a/drivers/hwtracing/coresight/coresight-core.c > +++ b/drivers/hwtracing/coresight/coresight-core.c > @@ -585,6 +585,41 @@ struct coresight_device *coresight_get_sink(struct coresight_path *path) > } > EXPORT_SYMBOL_GPL(coresight_get_sink); > > +/** > + * coresight_get_helper: find the helper device of the assigned csdev. > + * > + * @csdev: The csdev the helper device is conntected to. > + * @type: helper_subtype of the expected helper device. > + * > + * Retrieve the helper device for the specific csdev based on its > + * helper_subtype. > + * > + * Return: the helper's csdev upon success or NULL for fail. > + */ > +struct coresight_device *coresight_get_helper(struct coresight_device *csdev, > + enum coresight_dev_subtype_helper subtype) We have almost a similar function in coresight-core.c : coresight_find_output_type(pdata, type, subtype). Please could we reuse that, instead of adding similar funcitons ? Please be careful about the mutex. Suzuki > +{ > + int i; > + struct coresight_device *helper; > + > + /* protect the connections */ > + mutex_lock(&coresight_mutex); > + for (i = 0; i < csdev->pdata->nr_outconns; ++i) { > + helper = csdev->pdata->out_conns[i]->dest_dev; > + if (!helper || !coresight_is_helper(helper)) > + continue; > + > + if (helper->subtype.helper_subtype == subtype) { > + mutex_unlock(&coresight_mutex); > + return helper; > + } > + } > + mutex_unlock(&coresight_mutex); > + > + return NULL; > +} > +EXPORT_SYMBOL_GPL(coresight_get_helper); > + > /** > * coresight_get_in_port: Find the input port number at @csdev where a @remote > * device is connected to. > diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h > index cbf80b83e5ce..8e39a4dc7256 100644 > --- a/drivers/hwtracing/coresight/coresight-priv.h > +++ b/drivers/hwtracing/coresight/coresight-priv.h > @@ -157,6 +157,8 @@ void coresight_path_assign_trace_id(struct coresight_path *path, > enum cs_mode mode); > int coresight_get_in_port(struct coresight_device *csdev, > struct coresight_device *remote); > +struct coresight_device *coresight_get_helper(struct coresight_device *csdev, > + enum coresight_dev_subtype_helper subtype); > > #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM3X) > int etm_readl_cp14(u32 off, unsigned int *val); >

8 months

Re: [PATCH v4 1/3] coresight: tpda: add sysfs nodes for tpda cross-trigger configuration

by Suzuki K Poulose

On 28/10/2025 02:02, Jie Gan wrote: > From: Tao Zhang <tao.zhang(a)oss.qualcomm.com> > > Introduce sysfs nodes to configure cross-trigger parameters for TPDA. > These registers define the characteristics of cross-trigger packets, > including generation frequency and flag values. > > Signed-off-by: Tao Zhang <tao.zhang(a)oss.qualcomm.com> > Reviewed-by: James Clark <james.clark(a)linaro.org> > Co-developed-by: Jie Gan <jie.gan(a)oss.qualcomm.com> > Signed-off-by: Jie Gan <jie.gan(a)oss.qualcomm.com> > --- > .../ABI/testing/sysfs-bus-coresight-devices-tpda | 43 ++++ > drivers/hwtracing/coresight/coresight-tpda.c | 230 +++++++++++++++++++++ > drivers/hwtracing/coresight/coresight-tpda.h | 27 ++- > 3 files changed, 299 insertions(+), 1 deletion(-) > > diff --git a/Documentation/ABI/testing/sysfs-bus-coresight-devices-tpda b/Documentation/ABI/testing/sysfs-bus-coresight-devices-tpda > new file mode 100644 > index 000000000000..80e4b05a1ab4 > --- /dev/null > +++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-tpda > @@ -0,0 +1,43 @@ > +What: /sys/bus/coresight/devices/<tpda-name>/trig_async_enable > +Date: October 2025 > +KernelVersion: 6.19 > +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> > +Description: > + (RW) Enable/disable cross trigger synchronization sequence interface. > + > +What: /sys/bus/coresight/devices/<tpda-name>/trig_flag_ts_enable > +Date: October 2025 > +KernelVersion: 6.19 > +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> > +Description: > + (RW) Enable/disable cross trigger FLAG packet request interface. > + > +What: /sys/bus/coresight/devices/<tpda-name>/trig_freq_enable > +Date: October 2025 > +KernelVersion: 6.19 > +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> > +Description: > + (RW) Enable/disable cross trigger FREQ packet request interface. > + > +What: /sys/bus/coresight/devices/<tpda-name>/freq_ts_enable > +Date: October 2025 > +KernelVersion: 6.19 > +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> > +Description: > + (RW) Enable/disable the timestamp for all FREQ packets. > + > +What: /sys/bus/coresight/devices/<tpda-name>/global_flush_req > +Date: October 2025 > +KernelVersion: 6.19 > +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> > +Description: > + (RW) Set global (all ports) flush request bit. The bit remains set until a > + global flush request sequence completes. > + > +What: /sys/bus/coresight/devices/<tpda-name>/cmbchan_mode > +Date: October 2025 > +KernelVersion: 6.19 > +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> > +Description: > + (RW) Configure the CMB/MCMB channel mode for all enabled ports. > + Value 0 means raw channel mapping mode. Value 1 means channel pair marking mode. > diff --git a/drivers/hwtracing/coresight/coresight-tpda.c b/drivers/hwtracing/coresight/coresight-tpda.c > index 333b3cb23685..a9a27bcc65a1 100644 > --- a/drivers/hwtracing/coresight/coresight-tpda.c > +++ b/drivers/hwtracing/coresight/coresight-tpda.c > @@ -147,9 +147,37 @@ static void tpda_enable_pre_port(struct tpda_drvdata *drvdata) > u32 val; > > val = readl_relaxed(drvdata->base + TPDA_CR); > + val &= ~TPDA_CR_MID; > val &= ~TPDA_CR_ATID; See, below. > val |= FIELD_PREP(TPDA_CR_ATID, drvdata->atid); > + if (drvdata->trig_async) > + val |= TPDA_CR_SRIE; > + else > + val &= ~TPDA_CR_SRIE; > + if (drvdata->trig_flag_ts) > + val |= TPDA_CR_FLRIE; > + else > + val &= ~TPDA_CR_FLRIE; > + if (drvdata->trig_freq) > + val |= TPDA_CR_FRIE; > + else > + val &= ~TPDA_CR_FRIE; > + if (drvdata->freq_ts) > + val |= TPDA_CR_FREQTS; > + else > + val &= ~TPDA_CR_FREQTS; > + if (drvdata->cmbchan_mode) > + val |= TPDA_CR_CMBCHANMODE; > + else > + val &= ~TPDA_CR_CMBCHANMODE; Could we clear all of the bits that are configurable in one go in the beginning and set the appropriate ones based on the setting ? i.e.: Do we really need to retain any values ? And if not, why not start with a fresh set of values and avoid the read ? > writel_relaxed(val, drvdata->base + TPDA_CR); > + > + /* > + * If FLRIE bit is set, set the master and channel > + * id as zero > + */ > + if (drvdata->trig_flag_ts) > + writel_relaxed(0x0, drvdata->base + TPDA_FPID_CR); > } > > static int tpda_enable_port(struct tpda_drvdata *drvdata, int port) > @@ -265,6 +293,206 @@ static const struct coresight_ops tpda_cs_ops = { > .link_ops = &tpda_link_ops, > }; > > +static ssize_t trig_async_enable_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); > + > + return sysfs_emit(buf, "%u\n", (unsigned int)drvdata->trig_async); > +} > + > +static ssize_t trig_async_enable_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, > + size_t size) > +{ > + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); > + unsigned long val; > + > + if (kstrtoul(buf, 0, &val)) > + return -EINVAL; > + > + guard(spinlock)(&drvdata->spinlock); > + drvdata->trig_async = !!val; > + > + return size; > +} > +static DEVICE_ATTR_RW(trig_async_enable); ... > +static DEVICE_ATTR_RW(trig_flag_ts_enable); ... > +static DEVICE_ATTR_RW(trig_freq_enable); ... > +static DEVICE_ATTR_RW(freq_ts_enable); These attribute are boolean and looks like we could save some space on code by using dev_ext_attribute. see tpdm_simple_dataset_rw()/tpdm_simple_dataset_ro() . You could #define TPDA_TRIG_ASYNC 0 #define TPDA_TRIG_FLAG_TS 1 #define TPDA_TRIG_FREQ 2 tpda_trig_sysfs_show/store() bool *ptr; switch (eattr->var) { case TPDA_TRIG_ASYNC: ptr = &drvdata->trig_async; break; case TPDA_TRIG_FLAG_TS: ptr = &drvdata->trig_flag_ts; break; ... } > + > +static ssize_t global_flush_req_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); > + unsigned long val; > + > + if (!drvdata->csdev->refcnt) > + return -EINVAL; > + > + guard(spinlock)(&drvdata->spinlock); > + CS_UNLOCK(drvdata->base); > + val = readl_relaxed(drvdata->base + TPDA_CR); > + CS_LOCK(drvdata->base); > + /* Only read value for bit 0 */ > + val &= BIT(0); > + > + return sysfs_emit(buf, "%lu\n", val); > +} > + > +static ssize_t global_flush_req_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, > + size_t size) > +{ > + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); > + unsigned long val; > + > + if (kstrtoul(buf, 0, &val)) > + return -EINVAL; > + > + if (!drvdata->csdev->refcnt || !val) > + return -EINVAL; > + > + guard(spinlock)(&drvdata->spinlock); > + CS_UNLOCK(drvdata->base); > + val = readl_relaxed(drvdata->base + TPDA_CR); > + /* Only set bit 0 */ > + val |= BIT(0); What is BIT 0 ? Please document it > + writel_relaxed(val, drvdata->base + TPDA_CR); > + CS_LOCK(drvdata->base); > + > + return size; > +} > +static DEVICE_ATTR_RW(global_flush_req); > + > +static ssize_t cmbchan_mode_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); > + > + return sysfs_emit(buf, "%u\n", (unsigned int)drvdata->cmbchan_mode); > +} > + > +static ssize_t cmbchan_mode_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, > + size_t size) > +{ > + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); > + unsigned long val; > + > + if (kstrtoul(buf, 0, &val)) > + return -EINVAL; > + > + guard(spinlock)(&drvdata->spinlock); > + drvdata->cmbchan_mode = !!val; > + > + return size; > +} > +static DEVICE_ATTR_RW(cmbchan_mode); Even this could go to the dev_ext_attribute magic and reuse a single show/store. > + > +static struct attribute *tpda_attrs[] = { > + &dev_attr_trig_async_enable.attr, > + &dev_attr_trig_flag_ts_enable.attr, > + &dev_attr_trig_freq_enable.attr, > + &dev_attr_freq_ts_enable.attr, > + &dev_attr_global_flush_req.attr, > + &dev_attr_cmbchan_mode.attr, > + NULL, > +}; > diff --git a/drivers/hwtracing/coresight/coresight-tpda.h b/drivers/hwtracing/coresight/coresight-tpda.h > index c6af3d2da3ef..0be625fb52fd 100644 > --- a/drivers/hwtracing/coresight/coresight-tpda.h > +++ b/drivers/hwtracing/coresight/coresight-tpda.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* > - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. > + * Copyright (c) 2023,2025 Qualcomm Innovation Center, Inc. All rights reserved. > */ > > #ifndef _CORESIGHT_CORESIGHT_TPDA_H > @@ -8,6 +8,19 @@ > > #define TPDA_CR (0x000) > #define TPDA_Pn_CR(n) (0x004 + (n * 4)) > +#define TPDA_FPID_CR (0x084) > + > +/* Cross trigger FREQ packets timestamp bit */ > +#define TPDA_CR_FREQTS BIT(2) > +/* Cross trigger FREQ packet request bit */ > +#define TPDA_CR_FRIE BIT(3) > +/* Cross trigger FLAG packet request interface bit */ > +#define TPDA_CR_FLRIE BIT(4) > +/* Cross trigger synchronization bit */ > +#define TPDA_CR_SRIE BIT(5) > +/* Packetize CMB/MCMB traffic bit */ > +#define TPDA_CR_CMBCHANMODE BIT(20) > + Why are these not clubbed with the other TPDA_CR_ defintions ? > /* Aggregator port enable bit */ > #define TPDA_Pn_CR_ENA BIT(0) > /* Aggregator port CMB data set element size bit */ > @@ -19,6 +32,8 @@ > > /* Bits 6 ~ 12 is for atid value */ > #define TPDA_CR_ATID GENMASK(12, 6) > +/* Bits 13 ~ 19 is for mid value */ > +#define TPDA_CR_MID GENMASK(19, 13) > > /** > * struct tpda_drvdata - specifics associated to an TPDA component > @@ -29,6 +44,11 @@ > * @enable: enable status of the component. > * @dsb_esize Record the DSB element size. > * @cmb_esize Record the CMB element size. > + * @trig_async: Enable/disable cross trigger synchronization sequence interface. > + * @trig_flag_ts: Enable/disable cross trigger FLAG packet request interface. > + * @trig_freq: Enable/disable cross trigger FREQ packet request interface. > + * @freq_ts: Enable/disable the timestamp for all FREQ packets. > + * @cmbchan_mode: Configure the CMB/MCMB channel mode. > */ > struct tpda_drvdata { > void __iomem *base; > @@ -38,6 +58,11 @@ struct tpda_drvdata { > u8 atid; > u32 dsb_esize; > u32 cmb_esize; > + bool trig_async; > + bool trig_flag_ts; > + bool trig_freq; > + bool freq_ts; > + bool cmbchan_mode; > }; > > #endif /* _CORESIGHT_CORESIGHT_TPDA_H */ Suzuki

8 months

Re: [PATCH v1] dt-binding: Update oss email address for Coresight documents

by Suzuki K Poulose

On Tue, 02 Sep 2025 12:21:43 +0800, Jie Gan wrote: > Update the OSS email addresses across all Coresight documents, as the > previous addresses have been deprecated. > > Applied, thanks! [1/1] dt-binding: Update oss email address for Coresight documents https://git.kernel.org/coresight/c/7009646d937f Best regards, -- Suzuki K Poulose <suzuki.poulose(a)arm.com>

8 months

Re: [PATCH v4 1/3] coresight: tpda: add sysfs nodes for tpda cross-trigger configuration

by Suzuki K Poulose

On 18/12/2025 06:22, Jie Gan wrote: > > > On 10/28/2025 10:02 AM, Jie Gan wrote: >> From: Tao Zhang <tao.zhang(a)oss.qualcomm.com> >> >> Introduce sysfs nodes to configure cross-trigger parameters for TPDA. >> These registers define the characteristics of cross-trigger packets, >> including generation frequency and flag values. >> >> Signed-off-by: Tao Zhang <tao.zhang(a)oss.qualcomm.com> >> Reviewed-by: James Clark <james.clark(a)linaro.org> >> Co-developed-by: Jie Gan <jie.gan(a)oss.qualcomm.com> >> Signed-off-by: Jie Gan <jie.gan(a)oss.qualcomm.com> >> --- >> .../ABI/testing/sysfs-bus-coresight-devices-tpda | 43 ++++ >> drivers/hwtracing/coresight/coresight-tpda.c | 230 +++++++++++ >> ++++++++++ >> drivers/hwtracing/coresight/coresight-tpda.h | 27 ++- >> 3 files changed, 299 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/ABI/testing/sysfs-bus-coresight-devices- >> tpda b/Documentation/ABI/testing/sysfs-bus-coresight-devices-tpda >> new file mode 100644 >> index 000000000000..80e4b05a1ab4 >> --- /dev/null >> +++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-tpda > > Gentle reminder. > > Do I need update the date and the kernelVersion of the sysfs node? > (target 7.0?) Leave it with me, I can fix it up. Apologies for missing this out. Suzuki > > Thanks, > Jie > > >> @@ -0,0 +1,43 @@ >> +What: /sys/bus/coresight/devices/<tpda-name>/trig_async_enable >> +Date: October 2025 >> +KernelVersion: 6.19 >> +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang >> <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> >> +Description: >> + (RW) Enable/disable cross trigger synchronization sequence >> interface. >> + >> +What: /sys/bus/coresight/devices/<tpda-name>/trig_flag_ts_enable >> +Date: October 2025 >> +KernelVersion: 6.19 >> +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang >> <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> >> +Description: >> + (RW) Enable/disable cross trigger FLAG packet request interface. >> + >> +What: /sys/bus/coresight/devices/<tpda-name>/trig_freq_enable >> +Date: October 2025 >> +KernelVersion: 6.19 >> +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang >> <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> >> +Description: >> + (RW) Enable/disable cross trigger FREQ packet request interface. >> + >> +What: /sys/bus/coresight/devices/<tpda-name>/freq_ts_enable >> +Date: October 2025 >> +KernelVersion: 6.19 >> +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang >> <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> >> +Description: >> + (RW) Enable/disable the timestamp for all FREQ packets. >> + >> +What: /sys/bus/coresight/devices/<tpda-name>/global_flush_req >> +Date: October 2025 >> +KernelVersion: 6.19 >> +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang >> <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> >> +Description: >> + (RW) Set global (all ports) flush request bit. The bit >> remains set until a >> + global flush request sequence completes. >> + >> +What: /sys/bus/coresight/devices/<tpda-name>/cmbchan_mode >> +Date: October 2025 >> +KernelVersion: 6.19 >> +Contact: Jinlong Mao <jinlong.mao(a)oss.qualcomm.com>, Tao Zhang >> <tao.zhang(a)oss.qualcomm.com>, Jie Gan <jie.gan(a)oss.qualcomm.com> >> +Description: >> + (RW) Configure the CMB/MCMB channel mode for all enabled ports. >> + Value 0 means raw channel mapping mode. Value 1 means channel >> pair marking mode. >> diff --git a/drivers/hwtracing/coresight/coresight-tpda.c b/drivers/ >> hwtracing/coresight/coresight-tpda.c >> index 333b3cb23685..a9a27bcc65a1 100644 >> --- a/drivers/hwtracing/coresight/coresight-tpda.c >> +++ b/drivers/hwtracing/coresight/coresight-tpda.c >> @@ -147,9 +147,37 @@ static void tpda_enable_pre_port(struct >> tpda_drvdata *drvdata) >> u32 val; >> val = readl_relaxed(drvdata->base + TPDA_CR); >> + val &= ~TPDA_CR_MID; >> val &= ~TPDA_CR_ATID; >> val |= FIELD_PREP(TPDA_CR_ATID, drvdata->atid); >> + if (drvdata->trig_async) >> + val |= TPDA_CR_SRIE; >> + else >> + val &= ~TPDA_CR_SRIE; >> + if (drvdata->trig_flag_ts) >> + val |= TPDA_CR_FLRIE; >> + else >> + val &= ~TPDA_CR_FLRIE; >> + if (drvdata->trig_freq) >> + val |= TPDA_CR_FRIE; >> + else >> + val &= ~TPDA_CR_FRIE; >> + if (drvdata->freq_ts) >> + val |= TPDA_CR_FREQTS; >> + else >> + val &= ~TPDA_CR_FREQTS; >> + if (drvdata->cmbchan_mode) >> + val |= TPDA_CR_CMBCHANMODE; >> + else >> + val &= ~TPDA_CR_CMBCHANMODE; >> writel_relaxed(val, drvdata->base + TPDA_CR); >> + >> + /* >> + * If FLRIE bit is set, set the master and channel >> + * id as zero >> + */ >> + if (drvdata->trig_flag_ts) >> + writel_relaxed(0x0, drvdata->base + TPDA_FPID_CR); >> } >> static int tpda_enable_port(struct tpda_drvdata *drvdata, int port) >> @@ -265,6 +293,206 @@ static const struct coresight_ops tpda_cs_ops = { >> .link_ops = &tpda_link_ops, >> }; >> +static ssize_t trig_async_enable_show(struct device *dev, >> + struct device_attribute *attr, >> + char *buf) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + >> + return sysfs_emit(buf, "%u\n", (unsigned int)drvdata->trig_async); >> +} >> + >> +static ssize_t trig_async_enable_store(struct device *dev, >> + struct device_attribute *attr, >> + const char *buf, >> + size_t size) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + unsigned long val; >> + >> + if (kstrtoul(buf, 0, &val)) >> + return -EINVAL; >> + >> + guard(spinlock)(&drvdata->spinlock); >> + drvdata->trig_async = !!val; >> + >> + return size; >> +} >> +static DEVICE_ATTR_RW(trig_async_enable); >> + >> +static ssize_t trig_flag_ts_enable_show(struct device *dev, >> + struct device_attribute *attr, >> + char *buf) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + >> + return sysfs_emit(buf, "%u\n", (unsigned int)drvdata->trig_flag_ts); >> +} >> + >> +static ssize_t trig_flag_ts_enable_store(struct device *dev, >> + struct device_attribute *attr, >> + const char *buf, >> + size_t size) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + unsigned long val; >> + >> + if (kstrtoul(buf, 0, &val)) >> + return -EINVAL; >> + >> + guard(spinlock)(&drvdata->spinlock); >> + drvdata->trig_flag_ts = !!val; >> + >> + return size; >> +} >> +static DEVICE_ATTR_RW(trig_flag_ts_enable); >> + >> +static ssize_t trig_freq_enable_show(struct device *dev, >> + struct device_attribute *attr, >> + char *buf) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + >> + return sysfs_emit(buf, "%u\n", (unsigned int)drvdata->trig_freq); >> +} >> + >> +static ssize_t trig_freq_enable_store(struct device *dev, >> + struct device_attribute *attr, >> + const char *buf, >> + size_t size) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + unsigned long val; >> + >> + if (kstrtoul(buf, 0, &val)) >> + return -EINVAL; >> + >> + guard(spinlock)(&drvdata->spinlock); >> + drvdata->trig_freq = !!val; >> + >> + return size; >> +} >> +static DEVICE_ATTR_RW(trig_freq_enable); >> + >> +static ssize_t freq_ts_enable_show(struct device *dev, >> + struct device_attribute *attr, >> + char *buf) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + >> + return sysfs_emit(buf, "%u\n", (unsigned int)drvdata->freq_ts); >> +} >> + >> +static ssize_t freq_ts_enable_store(struct device *dev, >> + struct device_attribute *attr, >> + const char *buf, >> + size_t size) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + unsigned long val; >> + >> + if (kstrtoul(buf, 0, &val)) >> + return -EINVAL; >> + >> + guard(spinlock)(&drvdata->spinlock); >> + drvdata->freq_ts = !!val; >> + >> + return size; >> +} >> +static DEVICE_ATTR_RW(freq_ts_enable); >> + >> +static ssize_t global_flush_req_show(struct device *dev, >> + struct device_attribute *attr, >> + char *buf) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + unsigned long val; >> + >> + if (!drvdata->csdev->refcnt) >> + return -EINVAL; >> + >> + guard(spinlock)(&drvdata->spinlock); >> + CS_UNLOCK(drvdata->base); >> + val = readl_relaxed(drvdata->base + TPDA_CR); >> + CS_LOCK(drvdata->base); >> + /* Only read value for bit 0 */ >> + val &= BIT(0); >> + >> + return sysfs_emit(buf, "%lu\n", val); >> +} >> + >> +static ssize_t global_flush_req_store(struct device *dev, >> + struct device_attribute *attr, >> + const char *buf, >> + size_t size) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + unsigned long val; >> + >> + if (kstrtoul(buf, 0, &val)) >> + return -EINVAL; >> + >> + if (!drvdata->csdev->refcnt || !val) >> + return -EINVAL; >> + >> + guard(spinlock)(&drvdata->spinlock); >> + CS_UNLOCK(drvdata->base); >> + val = readl_relaxed(drvdata->base + TPDA_CR); >> + /* Only set bit 0 */ >> + val |= BIT(0); >> + writel_relaxed(val, drvdata->base + TPDA_CR); >> + CS_LOCK(drvdata->base); >> + >> + return size; >> +} >> +static DEVICE_ATTR_RW(global_flush_req); >> + >> +static ssize_t cmbchan_mode_show(struct device *dev, >> + struct device_attribute *attr, >> + char *buf) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + >> + return sysfs_emit(buf, "%u\n", (unsigned int)drvdata->cmbchan_mode); >> +} >> + >> +static ssize_t cmbchan_mode_store(struct device *dev, >> + struct device_attribute *attr, >> + const char *buf, >> + size_t size) >> +{ >> + struct tpda_drvdata *drvdata = dev_get_drvdata(dev->parent); >> + unsigned long val; >> + >> + if (kstrtoul(buf, 0, &val)) >> + return -EINVAL; >> + >> + guard(spinlock)(&drvdata->spinlock); >> + drvdata->cmbchan_mode = !!val; >> + >> + return size; >> +} >> +static DEVICE_ATTR_RW(cmbchan_mode); >> + >> +static struct attribute *tpda_attrs[] = { >> + &dev_attr_trig_async_enable.attr, >> + &dev_attr_trig_flag_ts_enable.attr, >> + &dev_attr_trig_freq_enable.attr, >> + &dev_attr_freq_ts_enable.attr, >> + &dev_attr_global_flush_req.attr, >> + &dev_attr_cmbchan_mode.attr, >> + NULL, >> +}; >> + >> +static struct attribute_group tpda_attr_grp = { >> + .attrs = tpda_attrs, >> +}; >> + >> +static const struct attribute_group *tpda_attr_grps[] = { >> + &tpda_attr_grp, >> + NULL, >> +}; >> + >> static int tpda_init_default_data(struct tpda_drvdata *drvdata) >> { >> int atid; >> @@ -280,6 +508,7 @@ static int tpda_init_default_data(struct >> tpda_drvdata *drvdata) >> return atid; >> drvdata->atid = atid; >> + drvdata->freq_ts = true; >> return 0; >> } >> @@ -323,6 +552,7 @@ static int tpda_probe(struct amba_device *adev, >> const struct amba_id *id) >> desc.ops = &tpda_cs_ops; >> desc.pdata = adev->dev.platform_data; >> desc.dev = &adev->dev; >> + desc.groups = tpda_attr_grps; >> desc.access = CSDEV_ACCESS_IOMEM(base); >> drvdata->csdev = coresight_register(&desc); >> if (IS_ERR(drvdata->csdev)) >> diff --git a/drivers/hwtracing/coresight/coresight-tpda.h b/drivers/ >> hwtracing/coresight/coresight-tpda.h >> index c6af3d2da3ef..0be625fb52fd 100644 >> --- a/drivers/hwtracing/coresight/coresight-tpda.h >> +++ b/drivers/hwtracing/coresight/coresight-tpda.h >> @@ -1,6 +1,6 @@ >> /* SPDX-License-Identifier: GPL-2.0 */ >> /* >> - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights >> reserved. >> + * Copyright (c) 2023,2025 Qualcomm Innovation Center, Inc. All >> rights reserved. >> */ >> #ifndef _CORESIGHT_CORESIGHT_TPDA_H >> @@ -8,6 +8,19 @@ >> #define TPDA_CR (0x000) >> #define TPDA_Pn_CR(n) (0x004 + (n * 4)) >> +#define TPDA_FPID_CR (0x084) >> + >> +/* Cross trigger FREQ packets timestamp bit */ >> +#define TPDA_CR_FREQTS BIT(2) >> +/* Cross trigger FREQ packet request bit */ >> +#define TPDA_CR_FRIE BIT(3) >> +/* Cross trigger FLAG packet request interface bit */ >> +#define TPDA_CR_FLRIE BIT(4) >> +/* Cross trigger synchronization bit */ >> +#define TPDA_CR_SRIE BIT(5) >> +/* Packetize CMB/MCMB traffic bit */ >> +#define TPDA_CR_CMBCHANMODE BIT(20) >> + >> /* Aggregator port enable bit */ >> #define TPDA_Pn_CR_ENA BIT(0) >> /* Aggregator port CMB data set element size bit */ >> @@ -19,6 +32,8 @@ >> /* Bits 6 ~ 12 is for atid value */ >> #define TPDA_CR_ATID GENMASK(12, 6) >> +/* Bits 13 ~ 19 is for mid value */ >> +#define TPDA_CR_MID GENMASK(19, 13) >> /** >> * struct tpda_drvdata - specifics associated to an TPDA component >> @@ -29,6 +44,11 @@ >> * @enable: enable status of the component. >> * @dsb_esize Record the DSB element size. >> * @cmb_esize Record the CMB element size. >> + * @trig_async: Enable/disable cross trigger synchronization >> sequence interface. >> + * @trig_flag_ts: Enable/disable cross trigger FLAG packet request >> interface. >> + * @trig_freq: Enable/disable cross trigger FREQ packet request >> interface. >> + * @freq_ts: Enable/disable the timestamp for all FREQ packets. >> + * @cmbchan_mode: Configure the CMB/MCMB channel mode. >> */ >> struct tpda_drvdata { >> void __iomem *base; >> @@ -38,6 +58,11 @@ struct tpda_drvdata { >> u8 atid; >> u32 dsb_esize; >> u32 cmb_esize; >> + bool trig_async; >> + bool trig_flag_ts; >> + bool trig_freq; >> + bool freq_ts; >> + bool cmbchan_mode; >> }; >> #endif /* _CORESIGHT_CORESIGHT_TPDA_H */ >> >

8 months

Re: [PATCH v3 05/12] perf evsel: Add a helper to get the value of a config field

by James Clark

On 16/12/2025 22:44, Ian Rogers wrote: > On Fri, Dec 12, 2025 at 7:32 AM James Clark <james.clark(a)linaro.org> wrote: >> >> This will be used by aux PMUs to read an already written value for >> configuring their events and for also testing. >> >> Its helper pmu_format_unpack() does the opposite of the existing >> pmu_format_value() so rename that one to pmu_format_pack() so it's clear >> how they are related. >> >> Signed-off-by: James Clark <james.clark(a)linaro.org> >> --- >> tools/perf/util/evsel.h | 2 ++ >> tools/perf/util/pmu.c | 77 ++++++++++++++++++++++++++++++++++++++++++------- >> 2 files changed, 68 insertions(+), 11 deletions(-) >> >> diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h >> index a08130ff2e47a887b19f6c47bfa9f51e0c40d226..092904a61ec7afdc59253f9b78a9fe8b7cb5bfa7 100644 >> --- a/tools/perf/util/evsel.h >> +++ b/tools/perf/util/evsel.h >> @@ -575,6 +575,8 @@ void evsel__uniquify_counter(struct evsel *counter); >> ((((src) >> (pos)) & ((1ull << (size)) - 1)) << (63 - ((pos) + (size) - 1))) >> >> u64 evsel__bitfield_swap_branch_flags(u64 value); >> +int evsel__get_config_val(struct perf_pmu *pmu, struct evsel *evsel, >> + const char *config_name, u64 *val); >> void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel, >> const char *config_name, u64 val); >> >> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c >> index 514cba91f5d99b399d2d6a1e350971660c54a9fc..ef7358ad1fb955f29f2e68b3d0ce711754e4d67c 100644 >> --- a/tools/perf/util/pmu.c >> +++ b/tools/perf/util/pmu.c >> @@ -144,8 +144,8 @@ struct perf_pmu_format { >> }; >> >> static int pmu_aliases_parse(struct perf_pmu *pmu); >> -static void pmu_format_value(unsigned long *format, __u64 value, __u64 *v, >> - bool zero); >> +static void pmu_format_pack(unsigned long *format, __u64 value, __u64 *v, >> + bool zero); >> static struct perf_pmu_format *pmu_find_format(const struct list_head *formats, >> const char *name); >> >> @@ -1377,6 +1377,61 @@ bool evsel__is_aux_event(const struct evsel *evsel) >> return pmu && pmu->auxtrace; >> } >> >> +/* >> + * Unpacks a raw config[n] value using the sparse bitfield that defines a >> + * format attr. For example "config1:1,6-7,44" defines a 4 bit value across non >> + * contiguous bits and this function returns those 4 bits as a value. >> + */ >> +static u64 pmu_format_unpack(u64 format, u64 config_val) >> +{ >> + int val_bit = 0; >> + u64 res = 0; >> + int fmt_bit; >> + >> + for_each_set_bit(fmt_bit, &format, PERF_PMU_FORMAT_BITS) { >> + if (test_bit(fmt_bit, &config_val)) >> + res |= BIT_ULL(val_bit); >> + >> + val_bit++; >> + } >> + return res; >> +} >> + >> +int evsel__get_config_val(struct perf_pmu *pmu, struct evsel *evsel, >> + const char *config_name, u64 *val) > > nits: > This is an evsel__ function but the evsel is the 2nd argument not the first. > Why pass the PMU and not just read evsel->pmu (or better evsel__find_pmu) ? That makes sense, I can do that. > Why not place this in evsel.c to match the header file declaration? This was for consistency with evsel__set_config_if_unset() that Arnaldo moved to pmu.c because of an issue with the Python bindings [1]. That doesn't seem to be an issue any more so I could move both to evsel.c. That would require making the following things public: struct perf_pmu_format pmu_format_pack() pmu_format_unpack() pmu_find_format() Probably not the end of the world though? [1]: https://lore.kernel.org/all/ZEbAS2yx2fguW60w@kernel.org/ > The evsel could be likely be const. > Will do > Thanks, > Ian > >> +{ >> + struct perf_pmu_format *format = pmu_find_format(&pmu->format, config_name); >> + u64 bits = perf_pmu__format_bits(pmu, config_name); >> + >> + if (!format || !bits) { >> + pr_err("Unknown/empty format name: %s\n", config_name); >> + *val = 0; >> + return -EINVAL; >> + } >> + >> + switch (format->value) { >> + case PERF_PMU_FORMAT_VALUE_CONFIG: >> + *val = pmu_format_unpack(bits, evsel->core.attr.config); >> + return 0; >> + case PERF_PMU_FORMAT_VALUE_CONFIG1: >> + *val = pmu_format_unpack(bits, evsel->core.attr.config1); >> + return 0; >> + case PERF_PMU_FORMAT_VALUE_CONFIG2: >> + *val = pmu_format_unpack(bits, evsel->core.attr.config2); >> + return 0; >> + case PERF_PMU_FORMAT_VALUE_CONFIG3: >> + *val = pmu_format_unpack(bits, evsel->core.attr.config3); >> + return 0; >> + case PERF_PMU_FORMAT_VALUE_CONFIG4: >> + *val = pmu_format_unpack(bits, evsel->core.attr.config4); >> + return 0; >> + default: >> + pr_err("Unknown format value: %d\n", format->value); >> + *val = 0; >> + return -EINVAL; >> + } >> +} >> + >> /* >> * Set @config_name to @val as long as the user hasn't already set or cleared it >> * by passing a config term on the command line. >> @@ -1432,7 +1487,7 @@ void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel, >> return; >> >> /* Otherwise replace it */ >> - pmu_format_value(&bits, val, vp, /*zero=*/true); >> + pmu_format_pack(&bits, val, vp, /*zero=*/true); >> } >> >> static struct perf_pmu_format * >> @@ -1477,8 +1532,8 @@ int perf_pmu__format_type(struct perf_pmu *pmu, const char *name) >> * Sets value based on the format definition (format parameter) >> * and unformatted value (value parameter). >> */ >> -static void pmu_format_value(unsigned long *format, __u64 value, __u64 *v, >> - bool zero) >> +static void pmu_format_pack(unsigned long *format, __u64 value, __u64 *v, >> + bool zero) >> { >> unsigned long fbit, vbit; >> >> @@ -1595,23 +1650,23 @@ static int pmu_config_term(const struct perf_pmu *pmu, >> switch (term->type_term) { >> case PARSE_EVENTS__TERM_TYPE_CONFIG: >> assert(term->type_val == PARSE_EVENTS__TERM_TYPE_NUM); >> - pmu_format_value(bits, term->val.num, &attr->config, zero); >> + pmu_format_pack(bits, term->val.num, &attr->config, zero); >> break; >> case PARSE_EVENTS__TERM_TYPE_CONFIG1: >> assert(term->type_val == PARSE_EVENTS__TERM_TYPE_NUM); >> - pmu_format_value(bits, term->val.num, &attr->config1, zero); >> + pmu_format_pack(bits, term->val.num, &attr->config1, zero); >> break; >> case PARSE_EVENTS__TERM_TYPE_CONFIG2: >> assert(term->type_val == PARSE_EVENTS__TERM_TYPE_NUM); >> - pmu_format_value(bits, term->val.num, &attr->config2, zero); >> + pmu_format_pack(bits, term->val.num, &attr->config2, zero); >> break; >> case PARSE_EVENTS__TERM_TYPE_CONFIG3: >> assert(term->type_val == PARSE_EVENTS__TERM_TYPE_NUM); >> - pmu_format_value(bits, term->val.num, &attr->config3, zero); >> + pmu_format_pack(bits, term->val.num, &attr->config3, zero); >> break; >> case PARSE_EVENTS__TERM_TYPE_CONFIG4: >> assert(term->type_val == PARSE_EVENTS__TERM_TYPE_NUM); >> - pmu_format_value(bits, term->val.num, &attr->config4, zero); >> + pmu_format_pack(bits, term->val.num, &attr->config4, zero); >> break; >> case PARSE_EVENTS__TERM_TYPE_LEGACY_HARDWARE_CONFIG: >> assert(term->type_val == PARSE_EVENTS__TERM_TYPE_NUM); >> @@ -1749,7 +1804,7 @@ static int pmu_config_term(const struct perf_pmu *pmu, >> */ >> } >> >> - pmu_format_value(format->bits, val, vp, zero); >> + pmu_format_pack(format->bits, val, vp, zero); >> return 0; >> } >> >> >> -- >> 2.34.1 >>

8 months

[PATCH 00/19] coresight: trbe: Support trigger and circle buffer modes

by Leo Yan

The current TRBE driver operates only in fill mode, where tracing stops at the top of buffer and a maintenance interrupt is raised. Due to interrupt latency, tracing is halted while the program continues to run, resulting in trace data lose. This series enhances the driver for the trigger mode to mitigate trace discontinuity. The circle buffer mode is introduced to avoid any maintenance interrupts during the snapshot session. It can be divided into three parts for easier review: Patches 01~05: Minor refactoring for disabling operations and clearing status. Patches 06~12: Refactor fault action and trace size calculation. Patches 13~19: Support trigger and circle modes. To better utilize the new buffer modes, perf sets the watermark to one-quarter of the buffer size. This series is applied on coresight-next branch and has been validated on Orion O6 board: 1) The trigger count and wrap mode are verified using Ftrace logs. 2) A new kunit test module verifies limit and count calculations. 3) Basic perf record / script commands and module load/unload have been tested successfully. Signed-off-by: Leo Yan <leo.yan(a)arm.com> --- Leo Yan (19): coresight: trbe: Use helpers for checking errata coresight: trbe: Remove redundant disable operation coresight: trbe: Remove buffer disabling in trbe_handle_overflow() coresight: trbe: Remove set_trbe_disabled() from the enable flow coresight: trbe: Refactor status clearing coresight: trbe: Refactor syndrome decoding coresight: trbe: Refactor AUX flag setting coresight: trbe: Use PERF_AUX_FLAG_PARTIAL instead of PERF_AUX_FLAG_COLLISION coresight: trbe: Add fault action argument to trbe_handle_overflow() coresight: trbe: Always check fault action when updating buffer coresight: trbe: Apply overwrite erratum for only wrap event coresight: trbe: Calculate size for buffer wrapping coresight: trbe: Remove misleading comment coresight: trbe: Refactor compute_trbe_buffer_limit() coresight: trbe: Add static key for bypassing trigger mode coresight: trbe: Support trigger mode coresight: trbe: Enable circle mode for snapshot coresight: trbe: Add kunit tests perf: cs-etm: Set watermark for AUX trace drivers/hwtracing/coresight/Kconfig | 9 + drivers/hwtracing/coresight/Makefile | 1 + .../coresight/coresight-trbe-kunit-tests.c | 536 +++++++++++++++++++++ drivers/hwtracing/coresight/coresight-trbe.c | 440 +++++++++-------- drivers/hwtracing/coresight/coresight-trbe.h | 111 ++++- tools/perf/arch/arm/util/cs-etm.c | 7 + 6 files changed, 896 insertions(+), 208 deletions(-) --- base-commit: 9e9182cab5ebc3ee7544e60ef08ba19fdf216920 change-id: 20251120-trbe_buffer_refactor_v1-1-8f8023105469 Best regards, -- Leo Yan <leo.yan(a)arm.com>

8 months

Re: [PATCH v2 RESEND] coresight: etm-perf: Fix reference count leak in etm_setup_aux

by James Clark

On 15/12/2025 04:27, Ma Ke wrote: > In etm_setup_aux(), when a user sink is obtained via > coresight_get_sink_by_id(), it increments the reference count of the > sink device. However, if the sink is used in path building, the path > holds a reference, but the initial reference from > coresight_get_sink_by_id() is not released, causing a reference count > leak. We should release the initial reference after the path is built. > > Found by code review. > > Cc: stable(a)vger.kernel.org > Fixes: 0e6c20517596 ("coresight: etm-perf: Allow an event to use different sinks") > Signed-off-by: Ma Ke <make24(a)iscas.ac.cn> > --- > Changes in v2: > - modified the patch as suggestions. I think Leo's comment on the previous v2 is still unaddressed. But releasing it in coresight_get_sink_by_id() would make it consistent with coresight_find_csdev_by_fwnode() and prevent further mistakes. It also leads me to see that users of coresight_find_device_by_fwnode() should also release it, but only one out of two appears to. James > --- > drivers/hwtracing/coresight/coresight-etm-perf.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c > index 17afa0f4cdee..56d012ab6d3a 100644 > --- a/drivers/hwtracing/coresight/coresight-etm-perf.c > +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c > @@ -454,6 +454,11 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, > goto err; > > out: > + if (user_sink) { > + put_device(&user_sink->dev); > + user_sink = NULL; > + } > + > return event_data; > > err:

8 months, 1 week

[PATCH v3 00/12] perf cs-etm/arm-spe: Remove hard coded config fields

by James Clark

The specific config field that an event format attribute is in is consistently hard coded, even though the API is supposed to be that the driver publishes the config field name. To stop this pattern from being copy pasted and causing problems in the future, replace them all with calls to a new helper that returns the value that a user set. This reveals some issues in evsel__set_config_if_unset(). It doesn't work with sparse bitfields, which are an unused but documented feature. And it also only writes to the attr.config field. To fix it we need to start tracking user changes for all config fields and then use existing helper functions that support sparse bitfields. Some other refactoring was also required and a test was added. Signed-off-by: James Clark <james.clark(a)linaro.org> --- Changes in v3: - Fix uninitialized variable warning on GCC - Fix leak of evlist in test - Confirm no type punning issues with ubsan (Ian) - Link to v2: https://lore.kernel.org/r/20251208-james-perf-config-bits-v2-0-4ac0281993b0… Changes in v2: - Remove macros in get_config_chgs() and some other refactoring. - Support sparse bitfields in evsel__set_config_if_unset(). - Always track user changes instead of only when 'pmu->perf_event_attr_init_default' is set. - Add a test. - Don't bail out in cs-etm.c if any format fields are missing (Leo). - Rename 'guess' to 'synth' (Mike). - Link to v1: https://lore.kernel.org/r/20251201-james-perf-config-bits-v1-0-22ecbbf8007c… --- James Clark (12): perf parse-events: Refactor get_config_terms() to remove macros perf evsel: Support sparse fields in evsel__set_config_if_unset() perf parse-events: Track all user changed config bits perf evsel: apply evsel__set_config_if_unset() to all config fields perf evsel: Add a helper to get the value of a config field perf parse-events: Always track user config changes perf tests: Test evsel__set_config_if_unset() and config change tracking perf cs-etm: Make a helper to find the Coresight evsel perf cs-etm: Don't use hard coded config bits when setting up ETMCR perf cs-etm: Don't use hard coded config bits when setting up TRCCONFIGR perf cs-etm: Don't hard code config attribute when configuring the event perf arm-spe: Don't hard code config attribute tools/perf/arch/arm/util/cs-etm.c | 193 +++++++++++++++------------ tools/perf/arch/arm64/util/arm-spe.c | 15 ++- tools/perf/tests/pmu.c | 91 +++++++++++++ tools/perf/util/evsel.c | 6 +- tools/perf/util/evsel.h | 2 + tools/perf/util/evsel_config.h | 7 +- tools/perf/util/parse-events.c | 248 ++++++++++++++++++++--------------- tools/perf/util/pmu.c | 112 ++++++++++++++-- 8 files changed, 460 insertions(+), 214 deletions(-) --- base-commit: 2eeb09fe1c5173b659929f92fee4461796ca8c14 change-id: 20251112-james-perf-config-bits-bee7106f0f00 Best regards, -- James Clark <james.clark(a)linaro.org>

8 months, 1 week

Re: [PATCH v2 01/12] perf parse-events: Refactor get_config_terms() to remove macros

by James Clark

On 09/12/2025 20:09, Ian Rogers wrote: > On Tue, Dec 9, 2025 at 9:55 AM James Clark <james.clark(a)linaro.org> wrote: >> >> On 09/12/2025 15:58, Ian Rogers wrote: >>> On Tue, Dec 9, 2025 at 4:48 AM James Clark <james.clark(a)linaro.org> wrote: >>>> >>>> On 08/12/2025 2:22 pm, James Clark wrote: >>>>> The ADD_CONFIG_TERM() macros build the __type argument out of a partial >>>>> EVSEL__CONFIG_TERM_x enum name. This means that they can't be called >>>>> from a function where __type is a variable and it's also impossible to >>>>> grep the codebase to find usages of these enums as they're never typed >>>>> in full. >>>>> >>>>> Fix this by removing the macros and replacing them with an >>>>> add_config_term() function. It seems the main reason these existed in >>>>> the first place was to avoid type punning and to write to a specific >>>>> field in the union, but the same thing can be achieved with a single >>>>> write to a u64 'val' field. >>>>> >>>>> Signed-off-by: James Clark <james.clark(a)linaro.org> >>>>> --- >>>>> tools/perf/util/evsel_config.h | 1 + >>>>> tools/perf/util/parse-events.c | 146 ++++++++++++++++++++++++----------------- >>>>> 2 files changed, 86 insertions(+), 61 deletions(-) >>>>> >>>>> diff --git a/tools/perf/util/evsel_config.h b/tools/perf/util/evsel_config.h >>>>> index bcd3a978f0c4..685fd8d5c4a8 100644 >>>>> --- a/tools/perf/util/evsel_config.h >>>>> +++ b/tools/perf/util/evsel_config.h >>>>> @@ -50,6 +50,7 @@ struct evsel_config_term { >>>>> u64 cfg_chg; >>>>> char *str; >>>>> int cpu; >>>>> + u64 val; >>>>> } val; >>>>> bool weak; >>>>> }; >>>>> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c >>>>> index 17c1c36a7bf9..d5b009b4ebab 100644 >>>>> --- a/tools/perf/util/parse-events.c >>>>> +++ b/tools/perf/util/parse-events.c >>>>> @@ -1116,105 +1116,107 @@ static int config_attr(struct perf_event_attr *attr, >>>>> return 0; >>>>> } >>>>> >>>>> -static int get_config_terms(const struct parse_events_terms *head_config, >>>>> - struct list_head *head_terms) >>>>> +static struct evsel_config_term *add_config_term(enum evsel_term_type type, >>>>> + struct list_head *head_terms, >>>>> + bool weak) >>>>> { >>>>> -#define ADD_CONFIG_TERM(__type, __weak) \ >>>>> - struct evsel_config_term *__t; \ >>>>> - \ >>>>> - __t = zalloc(sizeof(*__t)); \ >>>>> - if (!__t) \ >>>>> - return -ENOMEM; \ >>>>> - \ >>>>> - INIT_LIST_HEAD(&__t->list); \ >>>>> - __t->type = EVSEL__CONFIG_TERM_ ## __type; \ >>>>> - __t->weak = __weak; \ >>>>> - list_add_tail(&__t->list, head_terms) >>>>> - >>>>> -#define ADD_CONFIG_TERM_VAL(__type, __name, __val, __weak) \ >>>>> -do { \ >>>>> - ADD_CONFIG_TERM(__type, __weak); \ >>>>> - __t->val.__name = __val; \ >>>>> -} while (0) >>>>> + struct evsel_config_term *t; >>>>> >>>>> -#define ADD_CONFIG_TERM_STR(__type, __val, __weak) \ >>>>> -do { \ >>>>> - ADD_CONFIG_TERM(__type, __weak); \ >>>>> - __t->val.str = strdup(__val); \ >>>>> - if (!__t->val.str) { \ >>>>> - zfree(&__t); \ >>>>> - return -ENOMEM; \ >>>>> - } \ >>>>> - __t->free_str = true; \ >>>>> -} while (0) >>>>> + t = zalloc(sizeof(*t)); >>>>> + if (!t) >>>>> + return NULL; >>>>> + >>>>> + INIT_LIST_HEAD(&t->list); >>>>> + t->type = type; >>>>> + t->weak = weak; >>>>> + list_add_tail(&t->list, head_terms); >>>>> >>>>> + return t; >>>>> +} >>>>> + >>>>> +static int get_config_terms(const struct parse_events_terms *head_config, >>>>> + struct list_head *head_terms) >>>>> +{ >>>>> struct parse_events_term *term; >>>>> >>>>> list_for_each_entry(term, &head_config->terms, list) { >>>>> + struct evsel_config_term *new_term; >>>>> + enum evsel_term_type new_type; >>>>> + char *str = NULL; >>>>> + u64 val; >>>>> + >>>>> switch (term->type_term) { >>>>> case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD: >>>>> - ADD_CONFIG_TERM_VAL(PERIOD, period, term->val.num, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_PERIOD; >>>>> + val = term->val.num; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ: >>>>> - ADD_CONFIG_TERM_VAL(FREQ, freq, term->val.num, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_FREQ; >>>>> + val = term->val.num; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_TIME: >>>>> - ADD_CONFIG_TERM_VAL(TIME, time, term->val.num, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_TIME; >>>>> + val = term->val.num; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_CALLGRAPH: >>>>> - ADD_CONFIG_TERM_STR(CALLGRAPH, term->val.str, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_CALLGRAPH; >>>>> + str = term->val.str; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE: >>>>> - ADD_CONFIG_TERM_STR(BRANCH, term->val.str, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_BRANCH; >>>>> + str = term->val.str; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_STACKSIZE: >>>>> - ADD_CONFIG_TERM_VAL(STACK_USER, stack_user, >>>>> - term->val.num, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_STACK_USER; >>>>> + val = term->val.num; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_INHERIT: >>>>> - ADD_CONFIG_TERM_VAL(INHERIT, inherit, >>>>> - term->val.num ? 1 : 0, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_INHERIT; >>>>> + val = term->val.num ? 1 : 0; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_NOINHERIT: >>>>> - ADD_CONFIG_TERM_VAL(INHERIT, inherit, >>>>> - term->val.num ? 0 : 1, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_INHERIT; >>>>> + val = term->val.num ? 0 : 1; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_MAX_STACK: >>>>> - ADD_CONFIG_TERM_VAL(MAX_STACK, max_stack, >>>>> - term->val.num, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_MAX_STACK; >>>>> + val = term->val.num; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_MAX_EVENTS: >>>>> - ADD_CONFIG_TERM_VAL(MAX_EVENTS, max_events, >>>>> - term->val.num, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_MAX_EVENTS; >>>>> + val = term->val.num; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_OVERWRITE: >>>>> - ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite, >>>>> - term->val.num ? 1 : 0, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_OVERWRITE; >>>>> + val = term->val.num ? 1 : 0; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_NOOVERWRITE: >>>>> - ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite, >>>>> - term->val.num ? 0 : 1, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_OVERWRITE; >>>>> + val = term->val.num ? 0 : 1; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_DRV_CFG: >>>>> - ADD_CONFIG_TERM_STR(DRV_CFG, term->val.str, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_DRV_CFG; >>>>> + str = term->val.str; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_PERCORE: >>>>> - ADD_CONFIG_TERM_VAL(PERCORE, percore, >>>>> - term->val.num ? true : false, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_PERCORE; >>>>> + val = term->val.num ? true : false; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT: >>>>> - ADD_CONFIG_TERM_VAL(AUX_OUTPUT, aux_output, >>>>> - term->val.num ? 1 : 0, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_AUX_OUTPUT; >>>>> + val = term->val.num ? 1 : 0; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_AUX_ACTION: >>>>> - ADD_CONFIG_TERM_STR(AUX_ACTION, term->val.str, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_AUX_ACTION; >>>>> + str = term->val.str; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE: >>>>> - ADD_CONFIG_TERM_VAL(AUX_SAMPLE_SIZE, aux_sample_size, >>>>> - term->val.num, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_AUX_SAMPLE_SIZE; >>>>> + val = term->val.num; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_RATIO_TO_PREV: >>>>> - ADD_CONFIG_TERM_STR(RATIO_TO_PREV, term->val.str, term->weak); >>>>> + new_type = EVSEL__CONFIG_TERM_RATIO_TO_PREV; >>>>> + str = term->val.str; >>>>> break; >>>>> case PARSE_EVENTS__TERM_TYPE_USER: >>>>> case PARSE_EVENTS__TERM_TYPE_CONFIG: >>>>> @@ -1229,7 +1231,23 @@ do { \ >>>>> case PARSE_EVENTS__TERM_TYPE_RAW: >>>>> case PARSE_EVENTS__TERM_TYPE_CPU: >>>>> default: >>>>> - break; >>>>> + /* Don't add a new term for these ones */ >>>>> + continue; >>>>> + } >>>>> + >>>>> + new_term = add_config_term(new_type, head_terms, term->weak); >>>>> + if (!new_term) >>>>> + return -ENOMEM; >>>>> + >>>>> + if (str) { >>>>> + new_term->val.str = strdup(str); >>>>> + if (!new_term->val.str) { >>>>> + zfree(&new_term); >>>>> + return -ENOMEM; >>>>> + } >>>>> + new_term->free_str = true; >>>>> + } else { >>>> >>>> This will incorrectly hit the else if term->val.str is NULL. Not sure if >>>> that can happen but will fix anyway. >>>> >>>>> + new_term->val.val = val; >>>> >>>> There's an uninitialized variable warning for val here on release >>>> builds. Will fix too >>> >>> I'm not sure how I feel about the change, but did you check that it is >>> ubsan clean? I worry it is introducing writes to "val" and then reads >>> from say "period" in the evsel_config_term val union. I believe ubsan >>> will flag this as: >>> https://en.cppreference.com/w/cpp/language/union.html >>> "It is undefined behavior to read from the member of the union that >>> wasn't most recently written." >>> >>> Thanks, >>> Ian >>> >> >> Maybe for C++, but not for C [1]: >> >> Accessing my_union.i after most recently writing to the other member, >> my_union.d, is an allowed form of type-punning in C, provided that the >> member read is not larger than the one whose value was set >> >> Type punning with unions is widely used in the kernel and there are a >> couple of instances in Perf. There are tons of discussions about it on >> the mailing lists too. I can check it with ubsan though. > > Thanks. I'm mostly worried about ubsan being clean. One of those > mailing list discussions, or sadly outside the usual trolls lack of > discussion, is my trying to remove a prevalent source of type punning: > https://lore.kernel.org/lkml/20251016205126.2882625-1-irogers@google.com/ > > Ian > No ubsan issues on any Perf tests from this, but I did forget a free in the new test that I saw with asan so I'll send a new version. >> [1]: https://en.wikipedia.org/wiki/Type_punning#C_and_C++ >> >>>>> } >>>>> } >>>>> return 0; >>>>> @@ -1290,10 +1308,16 @@ static int get_config_chgs(struct perf_pmu *pmu, struct parse_events_terms *head >>>>> } >>>>> } >>>>> >>>>> - if (bits) >>>>> - ADD_CONFIG_TERM_VAL(CFG_CHG, cfg_chg, bits, false); >>>>> + if (bits) { >>>>> + struct evsel_config_term *new_term; >>>>> + >>>>> + new_term = add_config_term(EVSEL__CONFIG_TERM_CFG_CHG, >>>>> + head_terms, false); >>>>> + if (!new_term) >>>>> + return -ENOMEM; >>>>> + new_term->val.cfg_chg = bits; >>>>> + } >>>>> >>>>> -#undef ADD_CONFIG_TERM >>>>> return 0; >>>>> } >>>>> >>>>> >>>> >>

8 months, 1 week

Re: [PATCH v2 01/12] perf parse-events: Refactor get_config_terms() to remove macros

by James Clark

On 09/12/2025 15:58, Ian Rogers wrote: > On Tue, Dec 9, 2025 at 4:48 AM James Clark <james.clark(a)linaro.org> wrote: >> >> On 08/12/2025 2:22 pm, James Clark wrote: >>> The ADD_CONFIG_TERM() macros build the __type argument out of a partial >>> EVSEL__CONFIG_TERM_x enum name. This means that they can't be called >>> from a function where __type is a variable and it's also impossible to >>> grep the codebase to find usages of these enums as they're never typed >>> in full. >>> >>> Fix this by removing the macros and replacing them with an >>> add_config_term() function. It seems the main reason these existed in >>> the first place was to avoid type punning and to write to a specific >>> field in the union, but the same thing can be achieved with a single >>> write to a u64 'val' field. >>> >>> Signed-off-by: James Clark <james.clark(a)linaro.org> >>> --- >>> tools/perf/util/evsel_config.h | 1 + >>> tools/perf/util/parse-events.c | 146 ++++++++++++++++++++++++----------------- >>> 2 files changed, 86 insertions(+), 61 deletions(-) >>> >>> diff --git a/tools/perf/util/evsel_config.h b/tools/perf/util/evsel_config.h >>> index bcd3a978f0c4..685fd8d5c4a8 100644 >>> --- a/tools/perf/util/evsel_config.h >>> +++ b/tools/perf/util/evsel_config.h >>> @@ -50,6 +50,7 @@ struct evsel_config_term { >>> u64 cfg_chg; >>> char *str; >>> int cpu; >>> + u64 val; >>> } val; >>> bool weak; >>> }; >>> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c >>> index 17c1c36a7bf9..d5b009b4ebab 100644 >>> --- a/tools/perf/util/parse-events.c >>> +++ b/tools/perf/util/parse-events.c >>> @@ -1116,105 +1116,107 @@ static int config_attr(struct perf_event_attr *attr, >>> return 0; >>> } >>> >>> -static int get_config_terms(const struct parse_events_terms *head_config, >>> - struct list_head *head_terms) >>> +static struct evsel_config_term *add_config_term(enum evsel_term_type type, >>> + struct list_head *head_terms, >>> + bool weak) >>> { >>> -#define ADD_CONFIG_TERM(__type, __weak) \ >>> - struct evsel_config_term *__t; \ >>> - \ >>> - __t = zalloc(sizeof(*__t)); \ >>> - if (!__t) \ >>> - return -ENOMEM; \ >>> - \ >>> - INIT_LIST_HEAD(&__t->list); \ >>> - __t->type = EVSEL__CONFIG_TERM_ ## __type; \ >>> - __t->weak = __weak; \ >>> - list_add_tail(&__t->list, head_terms) >>> - >>> -#define ADD_CONFIG_TERM_VAL(__type, __name, __val, __weak) \ >>> -do { \ >>> - ADD_CONFIG_TERM(__type, __weak); \ >>> - __t->val.__name = __val; \ >>> -} while (0) >>> + struct evsel_config_term *t; >>> >>> -#define ADD_CONFIG_TERM_STR(__type, __val, __weak) \ >>> -do { \ >>> - ADD_CONFIG_TERM(__type, __weak); \ >>> - __t->val.str = strdup(__val); \ >>> - if (!__t->val.str) { \ >>> - zfree(&__t); \ >>> - return -ENOMEM; \ >>> - } \ >>> - __t->free_str = true; \ >>> -} while (0) >>> + t = zalloc(sizeof(*t)); >>> + if (!t) >>> + return NULL; >>> + >>> + INIT_LIST_HEAD(&t->list); >>> + t->type = type; >>> + t->weak = weak; >>> + list_add_tail(&t->list, head_terms); >>> >>> + return t; >>> +} >>> + >>> +static int get_config_terms(const struct parse_events_terms *head_config, >>> + struct list_head *head_terms) >>> +{ >>> struct parse_events_term *term; >>> >>> list_for_each_entry(term, &head_config->terms, list) { >>> + struct evsel_config_term *new_term; >>> + enum evsel_term_type new_type; >>> + char *str = NULL; >>> + u64 val; >>> + >>> switch (term->type_term) { >>> case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD: >>> - ADD_CONFIG_TERM_VAL(PERIOD, period, term->val.num, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_PERIOD; >>> + val = term->val.num; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ: >>> - ADD_CONFIG_TERM_VAL(FREQ, freq, term->val.num, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_FREQ; >>> + val = term->val.num; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_TIME: >>> - ADD_CONFIG_TERM_VAL(TIME, time, term->val.num, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_TIME; >>> + val = term->val.num; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_CALLGRAPH: >>> - ADD_CONFIG_TERM_STR(CALLGRAPH, term->val.str, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_CALLGRAPH; >>> + str = term->val.str; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE: >>> - ADD_CONFIG_TERM_STR(BRANCH, term->val.str, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_BRANCH; >>> + str = term->val.str; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_STACKSIZE: >>> - ADD_CONFIG_TERM_VAL(STACK_USER, stack_user, >>> - term->val.num, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_STACK_USER; >>> + val = term->val.num; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_INHERIT: >>> - ADD_CONFIG_TERM_VAL(INHERIT, inherit, >>> - term->val.num ? 1 : 0, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_INHERIT; >>> + val = term->val.num ? 1 : 0; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_NOINHERIT: >>> - ADD_CONFIG_TERM_VAL(INHERIT, inherit, >>> - term->val.num ? 0 : 1, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_INHERIT; >>> + val = term->val.num ? 0 : 1; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_MAX_STACK: >>> - ADD_CONFIG_TERM_VAL(MAX_STACK, max_stack, >>> - term->val.num, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_MAX_STACK; >>> + val = term->val.num; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_MAX_EVENTS: >>> - ADD_CONFIG_TERM_VAL(MAX_EVENTS, max_events, >>> - term->val.num, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_MAX_EVENTS; >>> + val = term->val.num; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_OVERWRITE: >>> - ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite, >>> - term->val.num ? 1 : 0, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_OVERWRITE; >>> + val = term->val.num ? 1 : 0; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_NOOVERWRITE: >>> - ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite, >>> - term->val.num ? 0 : 1, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_OVERWRITE; >>> + val = term->val.num ? 0 : 1; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_DRV_CFG: >>> - ADD_CONFIG_TERM_STR(DRV_CFG, term->val.str, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_DRV_CFG; >>> + str = term->val.str; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_PERCORE: >>> - ADD_CONFIG_TERM_VAL(PERCORE, percore, >>> - term->val.num ? true : false, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_PERCORE; >>> + val = term->val.num ? true : false; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT: >>> - ADD_CONFIG_TERM_VAL(AUX_OUTPUT, aux_output, >>> - term->val.num ? 1 : 0, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_AUX_OUTPUT; >>> + val = term->val.num ? 1 : 0; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_AUX_ACTION: >>> - ADD_CONFIG_TERM_STR(AUX_ACTION, term->val.str, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_AUX_ACTION; >>> + str = term->val.str; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE: >>> - ADD_CONFIG_TERM_VAL(AUX_SAMPLE_SIZE, aux_sample_size, >>> - term->val.num, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_AUX_SAMPLE_SIZE; >>> + val = term->val.num; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_RATIO_TO_PREV: >>> - ADD_CONFIG_TERM_STR(RATIO_TO_PREV, term->val.str, term->weak); >>> + new_type = EVSEL__CONFIG_TERM_RATIO_TO_PREV; >>> + str = term->val.str; >>> break; >>> case PARSE_EVENTS__TERM_TYPE_USER: >>> case PARSE_EVENTS__TERM_TYPE_CONFIG: >>> @@ -1229,7 +1231,23 @@ do { \ >>> case PARSE_EVENTS__TERM_TYPE_RAW: >>> case PARSE_EVENTS__TERM_TYPE_CPU: >>> default: >>> - break; >>> + /* Don't add a new term for these ones */ >>> + continue; >>> + } >>> + >>> + new_term = add_config_term(new_type, head_terms, term->weak); >>> + if (!new_term) >>> + return -ENOMEM; >>> + >>> + if (str) { >>> + new_term->val.str = strdup(str); >>> + if (!new_term->val.str) { >>> + zfree(&new_term); >>> + return -ENOMEM; >>> + } >>> + new_term->free_str = true; >>> + } else { >> >> This will incorrectly hit the else if term->val.str is NULL. Not sure if >> that can happen but will fix anyway. >> >>> + new_term->val.val = val; >> >> There's an uninitialized variable warning for val here on release >> builds. Will fix too > > I'm not sure how I feel about the change, but did you check that it is > ubsan clean? I worry it is introducing writes to "val" and then reads > from say "period" in the evsel_config_term val union. I believe ubsan > will flag this as: > https://en.cppreference.com/w/cpp/language/union.html > "It is undefined behavior to read from the member of the union that > wasn't most recently written." > > Thanks, > Ian > Maybe for C++, but not for C [1]: Accessing my_union.i after most recently writing to the other member, my_union.d, is an allowed form of type-punning in C, provided that the member read is not larger than the one whose value was set Type punning with unions is widely used in the kernel and there are a couple of instances in Perf. There are tons of discussions about it on the mailing lists too. I can check it with ubsan though. [1]: https://en.wikipedia.org/wiki/Type_punning#C_and_C++ >>> } >>> } >>> return 0; >>> @@ -1290,10 +1308,16 @@ static int get_config_chgs(struct perf_pmu *pmu, struct parse_events_terms *head >>> } >>> } >>> >>> - if (bits) >>> - ADD_CONFIG_TERM_VAL(CFG_CHG, cfg_chg, bits, false); >>> + if (bits) { >>> + struct evsel_config_term *new_term; >>> + >>> + new_term = add_config_term(EVSEL__CONFIG_TERM_CFG_CHG, >>> + head_terms, false); >>> + if (!new_term) >>> + return -ENOMEM; >>> + new_term->val.cfg_chg = bits; >>> + } >>> >>> -#undef ADD_CONFIG_TERM >>> return 0; >>> } >>> >>> >>

8 months, 1 week

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

CoreSight