CoreSight

coresight@lists.linaro.org

7 participants
2442 discussions

[PATCH v2 0/7] pid: Introduce helper task_is_in_root_ns()

by Leo Yan

The kernel uses open code to check if a process is in root PID namespace or not in several places. Suggested by Suzuki, this patch set is to create a helper function task_is_in_init_pid_ns() to replace open code. This patch set has been applied on the mainline kernel and built for Arm64 kernel with enabling all relevant modules. Changes from v1: * Renamed helper function from task_is_in_root_ns() to task_is_in_init_pid_ns(). (Leon Romanovsky) * Improved patches' commit logs for more neat. Leo Yan (7): pid: Introduce helper task_is_in_init_pid_ns() coresight: etm3x: Use task_is_in_init_pid_ns() coresight: etm4x: Use task_is_in_init_pid_ns() connector/cn_proc: Use task_is_in_init_pid_ns() coda: Use task_is_in_init_pid_ns() audit: Use task_is_in_init_pid_ns() taskstats: Use task_is_in_init_pid_ns() drivers/connector/cn_proc.c | 2 +- drivers/hwtracing/coresight/coresight-etm3x-sysfs.c | 8 ++++---- drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 8 ++++---- fs/coda/inode.c | 2 +- fs/coda/psdev.c | 2 +- include/linux/pid_namespace.h | 5 +++++ kernel/audit.c | 2 +- kernel/taskstats.c | 2 +- 8 files changed, 18 insertions(+), 13 deletions(-) -- 2.25.1

3 years, 7 months

Re: [PATCH v2 2/9] Coresight: Add coresight TPDM source driver

by Mathieu Poirier

Hey Jinlong, On Fri, Jan 21, 2022 at 10:01:47PM +0800, Jinlong Mao wrote: > Hi Mathieu, > > Good Day. > > On 12/17/2021 3:02 AM, Mathieu Poirier wrote: > > [...] > > > > > > > > + > > > > > > +static void tpdm_init_default_data(struct tpdm_drvdata *drvdata) > > > > > > +{ > > > > > > + static int traceid = TPDM_TRACE_ID_START; > > > > > > + > > > > > > + drvdata->traceid = traceid++; > > > > > > +} > > > > > I have been specific on how to properly do this in the last revision. Given the > > > > > above about the MAINTAINERS file, I am not sure that I will continue reviewing this set. > > > > > > > > > > There is also no need to rush another revision as I won't have the bandwidth to > > > > > process it before the holidays. > > > > > > > > > > Thanks, > > > > > Mathieu > > > > Hi Mathieu, > > > > > > > > Sorry, not addressed your previous comments here. > > > > > > > > For the trace id, each coresight component has 7 bits to store the trace > > > > id. So the trace id should be from 1 to 127 as 0 is invalid. > > > IDs 0x70 - 0x7F (`112 - 127 ) are reserved - see the ARM Coresight > > > Architecture specification v3.0 > > > > > Correct > > > > > > Apart from TPDMs/STM/ETMs, we also have other coresight components in > > > > our internal device. About 80 ids are already used. > > > > > > > > Some components have fixed trace id in HW. If we use functions below to > > > > count the trace id, there will be conflict to other components. > > > > > > > > Can we use 1-15 for etm trace ids and 16 - 127 for other coresight > > > > components ? And handle trace ids in its' own driver ? > > > > > > > This will limit systems to 15 cores - some have more! > > > > > Correct > > > > > > static inline int coresight_get_system_trace_id(int id) > > > > { > > > > /* Start system IDs above the highest per CPU trace ID. */ > > > > return coresigth_get_trace_id(cpumask_last(cpu_possible_mask) + 1); > > > > } > > Looking at my own suggestion again this won't work since it returns the same traceID > > when called multiple times. > > > > For this patchset and _without_ taking into account internal devices that have > > their traceID set in HW: > > > > 1. Define a bitmask that is 7 bit wide. > Should it be a 128 bit wide bitmask (0--127)? Yes, you are correct. > > 2. By default, set bits under 0x10 and between 0x70 - 0x7F. > > 3. In coresight_get_system_trace_id(), drop the @id parameter and allocate the > > first available bit after cpumask_last(cpu_possible_mask) + 1. > > Should it allocate the first available bit after (cpumask_last(cpu_possible_mask) *2 ) + 0x10 ? > Return the first zero bit position as the trace id and set the bit. I need to clarify something with Mike on this - I will get back to you on Monday. > > > 4. Define a new function called coresight_put_system_trace_id(int id) that > > clears the bit in the mask corresponding to @id. > > > > For now that should work. > > > > > > static inline int coresight_get_trace_id(int cpu) > > > > { > > > > /* > > > > * A trace ID of value 0 is invalid, so let's start at some > > > > * random value that fits in 7 bits and go from there. Since > > > > * the common convention is to have data trace IDs be I(N) + 1, > > > > * set instruction trace IDs as a function of the CPU number. > > > > */ > > > > return (CORESIGHT_ETM_PMU_SEED + (cpu * 2)); > > > > } > > > > > > > This fixed relationship between cpu and trace ID is used in the perf > > > tooling to populate the elements in the perf.data file to correctly > > > allow association between CPU and trace data, and thus allow correct > > > trace decode. > > TraceIDs associated to CPUs are communicated to the perf tooling by way of the > > perf header - theoretically we should be able to change the allocation scheme > > without impacting the decoding process. > > > > > It should be possible to create another more dynamic mapping scheme - > > > but this must include a way to support the perf requirements too. > > > > > TraceIDs have been a lurking problem for as long as the subsystem has existed. > > For now what I have suggested above should be sufficient to provide an > > in-between solution that doesn't hold back this patchset. > > > > That being said, we need to start thinking about the best way to do this. I > > will put a patchset together in the new year that aims in that direction. > > > > > Regards > > > > > > Mike > > > > > > > Thanks > > > > > > > > Jinlong Mao > > > > > > > > > > + > > > > > > +static int tpdm_probe(struct amba_device *adev, const struct amba_id *id) > > > > > > +{ > > > > > > + struct device *dev = &adev->dev; > > > > > > + struct coresight_platform_data *pdata; > > > > > > + struct tpdm_drvdata *drvdata; > > > > > > + struct coresight_desc desc = { 0 }; > > > > > > + > > > > > > + desc.name = coresight_alloc_device_name(&tpdm_devs, dev); > > > > > > + if (!desc.name) > > > > > > + return -ENOMEM; > > > > > > + pdata = coresight_get_platform_data(dev); > > > > > > + if (IS_ERR(pdata)) > > > > > > + return PTR_ERR(pdata); > > > > > > + adev->dev.platform_data = pdata; > > > > > > + > > > > > > + drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); > > > > > > + if (!drvdata) > > > > > > + return -ENOMEM; > > > > > > + drvdata->dev = &adev->dev; > > > > > > + dev_set_drvdata(dev, drvdata); > > > > > > + > > > > > > + drvdata->base = devm_ioremap_resource(dev, &adev->res); > > > > > > + if (!drvdata->base) > > > > > > + return -ENOMEM; > > > > > > + > > > > > > + mutex_init(&drvdata->lock); > > > > > > + > > > > > > + desc.type = CORESIGHT_DEV_TYPE_SOURCE; > > > > > > + desc.subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_SYS; > > > > > > + desc.ops = &tpdm_cs_ops; > > > > > > + desc.pdata = adev->dev.platform_data; > > > > > > + desc.dev = &adev->dev; > > > > > > + drvdata->csdev = coresight_register(&desc); > > > > > > + if (IS_ERR(drvdata->csdev)) > > > > > > + return PTR_ERR(drvdata->csdev); > > > > > > + > > > > > > + tpdm_init_default_data(drvdata); > > > > > > + pm_runtime_put(&adev->dev); > > > > > > + > > > > > > + return 0; > > > > > > +} > > > > > > + > > > > > > +static void __exit tpdm_remove(struct amba_device *adev) > > > > > > +{ > > > > > > + struct tpdm_drvdata *drvdata = dev_get_drvdata(&adev->dev); > > > > > > + > > > > > > + coresight_unregister(drvdata->csdev); > > > > > > +} > > > > > > + > > > > > > +static struct amba_id tpdm_ids[] = { > > > > > > + { > > > > > > + .id = 0x000f0e00, > > > > > > + .mask = 0x000fff00, > > > > > > + }, > > > > > > + { 0, 0}, > > > > > > +}; > > > > > > + > > > > > > +static struct amba_driver tpdm_driver = { > > > > > > + .drv = { > > > > > > + .name = "coresight-tpdm", > > > > > > + .owner = THIS_MODULE, > > > > > > + .suppress_bind_attrs = true, > > > > > > + }, > > > > > > + .probe = tpdm_probe, > > > > > > + .id_table = tpdm_ids, > > > > > > +}; > > > > > > + > > > > > > +module_amba_driver(tpdm_driver); > > > > > > + > > > > > > +MODULE_LICENSE("GPL v2"); > > > > > > +MODULE_DESCRIPTION("Trace, Profiling & Diagnostic Monitor driver"); > > > > > > diff --git a/drivers/hwtracing/coresight/coresight-tpdm.h b/drivers/hwtracing/coresight/coresight-tpdm.h > > > > > > new file mode 100644 > > > > > > index 000000000000..980ae90ff1c8 > > > > > > --- /dev/null > > > > > > +++ b/drivers/hwtracing/coresight/coresight-tpdm.h > > > > > > @@ -0,0 +1,31 @@ > > > > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > > > > +/* > > > > > > + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. > > > > > > + */ > > > > > > + > > > > > > +#ifndef _CORESIGHT_CORESIGHT_TPDM_H > > > > > > +#define _CORESIGHT_CORESIGHT_TPDM_H > > > > > > + > > > > > > +/* Default value of the traceid */ > > > > > > +#define TPDM_TRACE_ID_START 128 > > > > > > + > > > > > > +/** > > > > > > + * struct tpdm_drvdata - specifics associated to an TPDM component > > > > > > + * @base: memory mapped base address for this component. > > > > > > + * @dev: The device entity associated to this component. > > > > > > + * @csdev: component vitals needed by the framework. > > > > > > + * @lock: lock for the enable value. > > > > > > + * @enable: enable status of the component. > > > > > > + * @traceid: value of the current ID for this component. > > > > > > + */ > > > > > > + > > > > > > +struct tpdm_drvdata { > > > > > > + void __iomem *base; > > > > > > + struct device *dev; > > > > > > + struct coresight_device *csdev; > > > > > > + struct mutex lock; > > > > > > + bool enable; > > > > > > + int traceid; > > > > > > +}; > > > > > > + > > > > > > +#endif /* _CORESIGHT_CORESIGHT_TPDM_H */ > > > > > > diff --git a/include/linux/coresight.h b/include/linux/coresight.h > > > > > > index 93a2922b7653..e48d463be63b 100644 > > > > > > --- a/include/linux/coresight.h > > > > > > +++ b/include/linux/coresight.h > > > > > > @@ -65,6 +65,7 @@ enum coresight_dev_subtype_source { > > > > > > CORESIGHT_DEV_SUBTYPE_SOURCE_PROC, > > > > > > CORESIGHT_DEV_SUBTYPE_SOURCE_BUS, > > > > > > CORESIGHT_DEV_SUBTYPE_SOURCE_SOFTWARE, > > > > > > + CORESIGHT_DEV_SUBTYPE_SOURCE_SYS, > > > > > > }; > > > > > > > > > > > > enum coresight_dev_subtype_helper { > > > > > > -- > > > > > > 2.17.1 > > > > > > > > > > > > > > > -- > > > Mike Leach > > > Principal Engineer, ARM Ltd. > > > Manchester Design Centre. UK

3 years, 7 months

[PATCH 0/1] coresight: Fix TRCCONFIGR.QE sysfs interface

by James Clark

I was working on refactoring some of the magic numbers for the register accesses and I saw this issue with programming one of the values. I don't have any evidence that someone encountered it not working, probably there is no hardware where QSUPP==0b10, or it just didn't get used yet. But the issue is that this silently writes a reserved value even if the user provided one was correct so it might ruin someones day if it ever comes up. It's a small change so I didn't see the harm in fixing it. Applies to coresight/next f9809d565135 James Clark (1): coresight: Fix TRCCONFIGR.QE sysfs interface drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1

3 years, 7 months

Re: [PATCH] coresight: syscfg: Fix memleak on registration failure in cscfg_create_device

by Mathieu Poirier

Good morning, On Mon, Jan 10, 2022 at 07:31:00AM +0000, Miaoqian Lin wrote: > device_register() calls device_initialize(), > according to doc of device_initialize: > > Use put_device() to give up your reference instead of freeing > * @dev directly once you have called this function. That is _if_ device_initialize() is called manually. In this instance @dev is registered with device_register() and unregistered with device_unregister(). The latter conforms to the comment you pointed out and calls put_device() as expected. Thanks, Mathieu > > To prevent potential memleak, use put_device() instead call kfree > directly. > > Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> > --- > drivers/hwtracing/coresight/coresight-syscfg.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/hwtracing/coresight/coresight-syscfg.c b/drivers/hwtracing/coresight/coresight-syscfg.c > index 43054568430f..007fa1c761a7 100644 > --- a/drivers/hwtracing/coresight/coresight-syscfg.c > +++ b/drivers/hwtracing/coresight/coresight-syscfg.c > @@ -764,7 +764,7 @@ struct device *cscfg_device(void) > /* Must have a release function or the kernel will complain on module unload */ > static void cscfg_dev_release(struct device *dev) > { > - kfree(cscfg_mgr); > + put_device(dev); > cscfg_mgr = NULL; > } > > -- > 2.17.1 >

3 years, 7 months

Re: [RESEND PATCH v2] coresight: change tmc from misc device to cdev device

by Mathieu Poirier

On Thu, 13 Jan 2022 at 20:16, Jiankang Chen <jkchen(a)linux.alibaba.com> wrote: > > Hi Mathieu > > 在 2022/1/14 00:56, Mathieu Poirier 写道: > > On Wed, 12 Jan 2022 at 23:12, Jay Chen <jkchen(a)linux.alibaba.com> wrote: > >> Currently, there are 130 etr and etf on our machine, > >> but the current coresight tmc driver uses misc_register > >> to register the device, which leads to the error that > >> the device number is not enough. > >> > >> coresight-tmc: probe of xxxxx failed with error -16 > >> > >> This patch changes the device registration method > >> to cdev's dynamic registration method to solve the > >> problem of insufficient device numbers. > > On December 21st you posted this patch with a "RFC V3 PATCH" tag. On > > January 5th you posted a new version with a simple "PATCH" tag which, > > minutes later, was superseded by another patch labelled "RESEND > > PATCH". Today you're sending yet another revision labelled "RESEND > > PATCH V2"... > > > > Is it a "V2" of the "RESEND PATCH" that was a new revision of the "RFC > > V3 PATCH"? Are you confused? I certainly am... > > > this patch v2 is a new version，and it fix some bugs; > How can it be a V2 when a V3 has already been published? I will not review this patch, and even less apply it, until it is properly labelled. > sorry > > jay > > >> Signed-off-by: Jay Chen <jkchen(a)linux.alibaba.com> > >> --- > >> .../hwtracing/coresight/coresight-tmc-core.c | 103 ++++++++++++++---- > >> drivers/hwtracing/coresight/coresight-tmc.h | 11 +- > >> 2 files changed, 91 insertions(+), 23 deletions(-) > >> > >> diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwtracing/coresight/coresight-tmc-core.c > >> index d0276af82494..0977f1ce6338 100644 > >> --- a/drivers/hwtracing/coresight/coresight-tmc-core.c > >> +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c > >> @@ -12,7 +12,6 @@ > >> #include <linux/io.h> > >> #include <linux/err.h> > >> #include <linux/fs.h> > >> -#include <linux/miscdevice.h> > >> #include <linux/mutex.h> > >> #include <linux/property.h> > >> #include <linux/uaccess.h> > >> @@ -31,6 +30,12 @@ DEFINE_CORESIGHT_DEVLIST(etb_devs, "tmc_etb"); > >> DEFINE_CORESIGHT_DEVLIST(etf_devs, "tmc_etf"); > >> DEFINE_CORESIGHT_DEVLIST(etr_devs, "tmc_etr"); > >> > >> +static DEFINE_IDA(tmc_ida); > >> +static dev_t tmc_major; > >> +static struct class *tmc_class; > >> + > >> +#define TMC_DEV_MAX (MINORMASK + 1) > >> + > >> void tmc_wait_for_tmcready(struct tmc_drvdata *drvdata) > >> { > >> struct coresight_device *csdev = drvdata->csdev; > >> @@ -146,8 +151,10 @@ static int tmc_read_unprepare(struct tmc_drvdata *drvdata) > >> static int tmc_open(struct inode *inode, struct file *file) > >> { > >> int ret; > >> - struct tmc_drvdata *drvdata = container_of(file->private_data, > >> - struct tmc_drvdata, miscdev); > >> + struct tmc_cdev *cdev = container_of(inode->i_cdev, > >> + struct tmc_cdev, cdev); > >> + struct tmc_drvdata *drvdata = container_of(cdev, > >> + struct tmc_drvdata, cdev); > >> > >> ret = tmc_read_prepare(drvdata); > >> if (ret) > >> @@ -178,8 +185,10 @@ static ssize_t tmc_read(struct file *file, char __user *data, size_t len, > >> { > >> char *bufp; > >> ssize_t actual; > >> - struct tmc_drvdata *drvdata = container_of(file->private_data, > >> - struct tmc_drvdata, miscdev); > >> + struct tmc_cdev *cdev = container_of(file->f_inode->i_cdev, > >> + struct tmc_cdev, cdev); > >> + struct tmc_drvdata *drvdata = container_of(cdev, > >> + struct tmc_drvdata, cdev); > >> actual = tmc_get_sysfs_trace(drvdata, *ppos, len, &bufp); > >> if (actual <= 0) > >> return 0; > >> @@ -199,8 +208,10 @@ static ssize_t tmc_read(struct file *file, char __user *data, size_t len, > >> static int tmc_release(struct inode *inode, struct file *file) > >> { > >> int ret; > >> - struct tmc_drvdata *drvdata = container_of(file->private_data, > >> - struct tmc_drvdata, miscdev); > >> + struct tmc_cdev *cdev = container_of(inode->i_cdev, > >> + struct tmc_cdev, cdev); > >> + struct tmc_drvdata *drvdata = container_of(cdev, > >> + struct tmc_drvdata, cdev); > >> > >> ret = tmc_read_unprepare(drvdata); > >> if (ret) > >> @@ -451,6 +462,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) > >> { > >> int ret = 0; > >> u32 devid; > >> + dev_t devt; > >> void __iomem *base; > >> struct device *dev = &adev->dev; > >> struct coresight_platform_data *pdata = NULL; > >> @@ -546,14 +558,32 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) > >> goto out; > >> } > >> > >> - drvdata->miscdev.name = desc.name; > >> - drvdata->miscdev.minor = MISC_DYNAMIC_MINOR; > >> - drvdata->miscdev.fops = &tmc_fops; > >> - ret = misc_register(&drvdata->miscdev); > >> + ret = ida_simple_get(&tmc_ida, 0, TMC_DEV_MAX, GFP_KERNEL); > >> + if (ret < 0) > >> + goto err_coresight_unregister; > >> + > >> + cdev_init(&drvdata->cdev.cdev, &tmc_fops); > >> + drvdata->cdev.cdev.owner = THIS_MODULE; > >> + devt = MKDEV(MAJOR(tmc_major), ret); > >> + ret = cdev_add(&drvdata->cdev.cdev, devt, 1); > >> if (ret) > >> - coresight_unregister(drvdata->csdev); > >> - else > >> + goto err_free_tmc_ida; > >> + > >> + drvdata->cdev.dev = device_create(tmc_class, NULL, devt, &drvdata->cdev, desc.name); > >> + if (IS_ERR(drvdata->cdev.dev)) { > >> + ret = PTR_ERR(drvdata->cdev.dev); > >> + goto err_delete_cdev; > >> + } else > >> pm_runtime_put(&adev->dev); > >> + > >> + return 0; > >> + > >> +err_delete_cdev: > >> + cdev_del(&drvdata->cdev.cdev); > >> +err_free_tmc_ida: > >> + ida_simple_remove(&tmc_ida, MINOR(devt)); > >> +err_coresight_unregister: > >> + coresight_unregister(drvdata->csdev); > >> out: > >> return ret; > >> } > >> @@ -583,13 +613,11 @@ static void tmc_shutdown(struct amba_device *adev) > >> static void tmc_remove(struct amba_device *adev) > >> { > >> struct tmc_drvdata *drvdata = dev_get_drvdata(&adev->dev); > >> + struct device *dev = drvdata->cdev.dev; > >> > >> - /* > >> - * Since misc_open() holds a refcount on the f_ops, which is > >> - * etb fops in this case, device is there until last file > >> - * handler to this device is closed. > >> - */ > >> - misc_deregister(&drvdata->miscdev); > >> + ida_simple_remove(&tmc_ida, MINOR(dev->devt)); > >> + device_destroy(tmc_class, dev->devt); > >> + cdev_del(&drvdata->cdev.cdev); > >> coresight_unregister(drvdata->csdev); > >> } > >> > >> @@ -618,7 +646,42 @@ static struct amba_driver tmc_driver = { > >> .id_table = tmc_ids, > >> }; > >> > >> -module_amba_driver(tmc_driver); > >> +static int __init tmc_init(void) > >> +{ > >> + int ret; > >> + > >> + ret = alloc_chrdev_region(&tmc_major, 0, TMC_DEV_MAX, "tmc"); > >> + if (ret < 0) { > >> + pr_err("tmc: failed to allocate char dev region\n"); > >> + return ret; > >> + } > >> + > >> + tmc_class = class_create(THIS_MODULE, "tmc"); > >> + if (IS_ERR(tmc_class)) { > >> + pr_err("tmc: failed to create class\n"); > >> + unregister_chrdev_region(tmc_major, TMC_DEV_MAX); > >> + return PTR_ERR(tmc_class); > >> + } > >> + > >> + ret = amba_driver_register(&tmc_driver); > >> + if (ret) { > >> + pr_err("tmc: error registering amba driver\n"); > >> + class_destroy(tmc_class); > >> + unregister_chrdev_region(tmc_major, TMC_DEV_MAX); > >> + } > >> + > >> + return ret; > >> +} > >> + > >> +static void __exit tmc_exit(void) > >> +{ > >> + amba_driver_unregister(&tmc_driver); > >> + class_destroy(tmc_class); > >> + unregister_chrdev_region(tmc_major, TMC_DEV_MAX); > >> +} > >> + > >> +module_init(tmc_init); > >> +module_exit(tmc_exit); > >> > >> MODULE_AUTHOR("Pratik Patel <pratikp(a)codeaurora.org>"); > >> MODULE_DESCRIPTION("Arm CoreSight Trace Memory Controller driver"); > >> diff --git a/drivers/hwtracing/coresight/coresight-tmc.h b/drivers/hwtracing/coresight/coresight-tmc.h > >> index 6bec20a392b3..11441c6b9c26 100644 > >> --- a/drivers/hwtracing/coresight/coresight-tmc.h > >> +++ b/drivers/hwtracing/coresight/coresight-tmc.h > >> @@ -7,9 +7,9 @@ > >> #ifndef _CORESIGHT_TMC_H > >> #define _CORESIGHT_TMC_H > >> > >> +#include <linux/cdev.h> > >> #include <linux/dma-mapping.h> > >> #include <linux/idr.h> > >> -#include <linux/miscdevice.h> > >> #include <linux/mutex.h> > >> #include <linux/refcount.h> > >> > >> @@ -163,11 +163,16 @@ struct etr_buf { > >> void *private; > >> }; > >> > >> +struct tmc_cdev { > >> + struct cdev cdev; > >> + struct device *dev; > >> +}; > >> + > >> /** > >> * struct tmc_drvdata - specifics associated to an TMC component > >> * @base: memory mapped base address for this component. > >> * @csdev: component vitals needed by the framework. > >> - * @miscdev: specifics to handle "/dev/xyz.tmc" entry. > >> + * @tmc_cdev: specifics to handle "/dev/xyz.tmc" entry. > >> * @spinlock: only one at a time pls. > >> * @pid: Process ID of the process being monitored by the session > >> * that is using this component. > >> @@ -191,7 +196,7 @@ struct etr_buf { > >> struct tmc_drvdata { > >> void __iomem *base; > >> struct coresight_device *csdev; > >> - struct miscdevice miscdev; > >> + struct tmc_cdev cdev; > >> spinlock_t spinlock; > >> pid_t pid; > >> bool reading; > >> -- > >> 2.27.0 > >>

3 years, 7 months

Re: [RESEND PATCH v2] coresight: change tmc from misc device to cdev device

by Mathieu Poirier

On Wed, 12 Jan 2022 at 23:12, Jay Chen <jkchen(a)linux.alibaba.com> wrote: > > Currently, there are 130 etr and etf on our machine, > but the current coresight tmc driver uses misc_register > to register the device, which leads to the error that > the device number is not enough. > > coresight-tmc: probe of xxxxx failed with error -16 > > This patch changes the device registration method > to cdev's dynamic registration method to solve the > problem of insufficient device numbers. On December 21st you posted this patch with a "RFC V3 PATCH" tag. On January 5th you posted a new version with a simple "PATCH" tag which, minutes later, was superseded by another patch labelled "RESEND PATCH". Today you're sending yet another revision labelled "RESEND PATCH V2"... Is it a "V2" of the "RESEND PATCH" that was a new revision of the "RFC V3 PATCH"? Are you confused? I certainly am... > > Signed-off-by: Jay Chen <jkchen(a)linux.alibaba.com> > --- > .../hwtracing/coresight/coresight-tmc-core.c | 103 ++++++++++++++---- > drivers/hwtracing/coresight/coresight-tmc.h | 11 +- > 2 files changed, 91 insertions(+), 23 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwtracing/coresight/coresight-tmc-core.c > index d0276af82494..0977f1ce6338 100644 > --- a/drivers/hwtracing/coresight/coresight-tmc-core.c > +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c > @@ -12,7 +12,6 @@ > #include <linux/io.h> > #include <linux/err.h> > #include <linux/fs.h> > -#include <linux/miscdevice.h> > #include <linux/mutex.h> > #include <linux/property.h> > #include <linux/uaccess.h> > @@ -31,6 +30,12 @@ DEFINE_CORESIGHT_DEVLIST(etb_devs, "tmc_etb"); > DEFINE_CORESIGHT_DEVLIST(etf_devs, "tmc_etf"); > DEFINE_CORESIGHT_DEVLIST(etr_devs, "tmc_etr"); > > +static DEFINE_IDA(tmc_ida); > +static dev_t tmc_major; > +static struct class *tmc_class; > + > +#define TMC_DEV_MAX (MINORMASK + 1) > + > void tmc_wait_for_tmcready(struct tmc_drvdata *drvdata) > { > struct coresight_device *csdev = drvdata->csdev; > @@ -146,8 +151,10 @@ static int tmc_read_unprepare(struct tmc_drvdata *drvdata) > static int tmc_open(struct inode *inode, struct file *file) > { > int ret; > - struct tmc_drvdata *drvdata = container_of(file->private_data, > - struct tmc_drvdata, miscdev); > + struct tmc_cdev *cdev = container_of(inode->i_cdev, > + struct tmc_cdev, cdev); > + struct tmc_drvdata *drvdata = container_of(cdev, > + struct tmc_drvdata, cdev); > > ret = tmc_read_prepare(drvdata); > if (ret) > @@ -178,8 +185,10 @@ static ssize_t tmc_read(struct file *file, char __user *data, size_t len, > { > char *bufp; > ssize_t actual; > - struct tmc_drvdata *drvdata = container_of(file->private_data, > - struct tmc_drvdata, miscdev); > + struct tmc_cdev *cdev = container_of(file->f_inode->i_cdev, > + struct tmc_cdev, cdev); > + struct tmc_drvdata *drvdata = container_of(cdev, > + struct tmc_drvdata, cdev); > actual = tmc_get_sysfs_trace(drvdata, *ppos, len, &bufp); > if (actual <= 0) > return 0; > @@ -199,8 +208,10 @@ static ssize_t tmc_read(struct file *file, char __user *data, size_t len, > static int tmc_release(struct inode *inode, struct file *file) > { > int ret; > - struct tmc_drvdata *drvdata = container_of(file->private_data, > - struct tmc_drvdata, miscdev); > + struct tmc_cdev *cdev = container_of(inode->i_cdev, > + struct tmc_cdev, cdev); > + struct tmc_drvdata *drvdata = container_of(cdev, > + struct tmc_drvdata, cdev); > > ret = tmc_read_unprepare(drvdata); > if (ret) > @@ -451,6 +462,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) > { > int ret = 0; > u32 devid; > + dev_t devt; > void __iomem *base; > struct device *dev = &adev->dev; > struct coresight_platform_data *pdata = NULL; > @@ -546,14 +558,32 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) > goto out; > } > > - drvdata->miscdev.name = desc.name; > - drvdata->miscdev.minor = MISC_DYNAMIC_MINOR; > - drvdata->miscdev.fops = &tmc_fops; > - ret = misc_register(&drvdata->miscdev); > + ret = ida_simple_get(&tmc_ida, 0, TMC_DEV_MAX, GFP_KERNEL); > + if (ret < 0) > + goto err_coresight_unregister; > + > + cdev_init(&drvdata->cdev.cdev, &tmc_fops); > + drvdata->cdev.cdev.owner = THIS_MODULE; > + devt = MKDEV(MAJOR(tmc_major), ret); > + ret = cdev_add(&drvdata->cdev.cdev, devt, 1); > if (ret) > - coresight_unregister(drvdata->csdev); > - else > + goto err_free_tmc_ida; > + > + drvdata->cdev.dev = device_create(tmc_class, NULL, devt, &drvdata->cdev, desc.name); > + if (IS_ERR(drvdata->cdev.dev)) { > + ret = PTR_ERR(drvdata->cdev.dev); > + goto err_delete_cdev; > + } else > pm_runtime_put(&adev->dev); > + > + return 0; > + > +err_delete_cdev: > + cdev_del(&drvdata->cdev.cdev); > +err_free_tmc_ida: > + ida_simple_remove(&tmc_ida, MINOR(devt)); > +err_coresight_unregister: > + coresight_unregister(drvdata->csdev); > out: > return ret; > } > @@ -583,13 +613,11 @@ static void tmc_shutdown(struct amba_device *adev) > static void tmc_remove(struct amba_device *adev) > { > struct tmc_drvdata *drvdata = dev_get_drvdata(&adev->dev); > + struct device *dev = drvdata->cdev.dev; > > - /* > - * Since misc_open() holds a refcount on the f_ops, which is > - * etb fops in this case, device is there until last file > - * handler to this device is closed. > - */ > - misc_deregister(&drvdata->miscdev); > + ida_simple_remove(&tmc_ida, MINOR(dev->devt)); > + device_destroy(tmc_class, dev->devt); > + cdev_del(&drvdata->cdev.cdev); > coresight_unregister(drvdata->csdev); > } > > @@ -618,7 +646,42 @@ static struct amba_driver tmc_driver = { > .id_table = tmc_ids, > }; > > -module_amba_driver(tmc_driver); > +static int __init tmc_init(void) > +{ > + int ret; > + > + ret = alloc_chrdev_region(&tmc_major, 0, TMC_DEV_MAX, "tmc"); > + if (ret < 0) { > + pr_err("tmc: failed to allocate char dev region\n"); > + return ret; > + } > + > + tmc_class = class_create(THIS_MODULE, "tmc"); > + if (IS_ERR(tmc_class)) { > + pr_err("tmc: failed to create class\n"); > + unregister_chrdev_region(tmc_major, TMC_DEV_MAX); > + return PTR_ERR(tmc_class); > + } > + > + ret = amba_driver_register(&tmc_driver); > + if (ret) { > + pr_err("tmc: error registering amba driver\n"); > + class_destroy(tmc_class); > + unregister_chrdev_region(tmc_major, TMC_DEV_MAX); > + } > + > + return ret; > +} > + > +static void __exit tmc_exit(void) > +{ > + amba_driver_unregister(&tmc_driver); > + class_destroy(tmc_class); > + unregister_chrdev_region(tmc_major, TMC_DEV_MAX); > +} > + > +module_init(tmc_init); > +module_exit(tmc_exit); > > MODULE_AUTHOR("Pratik Patel <pratikp(a)codeaurora.org>"); > MODULE_DESCRIPTION("Arm CoreSight Trace Memory Controller driver"); > diff --git a/drivers/hwtracing/coresight/coresight-tmc.h b/drivers/hwtracing/coresight/coresight-tmc.h > index 6bec20a392b3..11441c6b9c26 100644 > --- a/drivers/hwtracing/coresight/coresight-tmc.h > +++ b/drivers/hwtracing/coresight/coresight-tmc.h > @@ -7,9 +7,9 @@ > #ifndef _CORESIGHT_TMC_H > #define _CORESIGHT_TMC_H > > +#include <linux/cdev.h> > #include <linux/dma-mapping.h> > #include <linux/idr.h> > -#include <linux/miscdevice.h> > #include <linux/mutex.h> > #include <linux/refcount.h> > > @@ -163,11 +163,16 @@ struct etr_buf { > void *private; > }; > > +struct tmc_cdev { > + struct cdev cdev; > + struct device *dev; > +}; > + > /** > * struct tmc_drvdata - specifics associated to an TMC component > * @base: memory mapped base address for this component. > * @csdev: component vitals needed by the framework. > - * @miscdev: specifics to handle "/dev/xyz.tmc" entry. > + * @tmc_cdev: specifics to handle "/dev/xyz.tmc" entry. > * @spinlock: only one at a time pls. > * @pid: Process ID of the process being monitored by the session > * that is using this component. > @@ -191,7 +196,7 @@ struct etr_buf { > struct tmc_drvdata { > void __iomem *base; > struct coresight_device *csdev; > - struct miscdevice miscdev; > + struct tmc_cdev cdev; > spinlock_t spinlock; > pid_t pid; > bool reading; > -- > 2.27.0 >

3 years, 7 months

[PATCH 1/3] coresight: Add config flag to enable branch broadcast

by James Clark

When enabled, all taken branch addresses are output, even if the branch was because of a direct branch instruction. This enables reconstruction of the program flow without having access to the memory image of the code being executed. Use bit 8 for the config option which would be the correct bit for programming ETMv3. Although branch broadcast can't be enabled on ETMv3 because it's not in the define ETM3X_SUPPORTED_OPTIONS, using the correct bit might help prevent future collisions or allow it to be enabled if needed. Signed-off-by: James Clark <james.clark(a)arm.com> --- drivers/hwtracing/coresight/coresight-etm-perf.c | 2 ++ drivers/hwtracing/coresight/coresight-etm4x-core.c | 9 +++++++++ include/linux/coresight-pmu.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index c039b6ae206f..43bbd5dc3d3b 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -52,6 +52,7 @@ static DEFINE_PER_CPU(struct coresight_device *, csdev_src); * The PMU formats were orignally for ETMv3.5/PTM's ETMCR 'config'; * now take them as general formats and apply on all ETMs. */ +PMU_FORMAT_ATTR(branch_broadcast, "config:"__stringify(ETM_OPT_BRANCH_BROADCAST)); PMU_FORMAT_ATTR(cycacc, "config:" __stringify(ETM_OPT_CYCACC)); /* contextid1 enables tracing CONTEXTIDR_EL1 for ETMv4 */ PMU_FORMAT_ATTR(contextid1, "config:" __stringify(ETM_OPT_CTXTID)); @@ -97,6 +98,7 @@ static struct attribute *etm_config_formats_attr[] = { &format_attr_sinkid.attr, &format_attr_preset.attr, &format_attr_configid.attr, + &format_attr_branch_broadcast.attr, NULL, }; diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index bf18128cf5de..d2bafb50c66a 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -692,6 +692,15 @@ static int etm4_parse_event_config(struct coresight_device *csdev, ret = cscfg_csdev_enable_active_config(csdev, cfg_hash, preset); } + /* branch broadcast - enable if selected and supported */ + if (attr->config & BIT(ETM_OPT_BRANCH_BROADCAST)) { + if (!drvdata->trcbb) { + ret = -EINVAL; + goto out; + } else + config->cfg |= BIT(ETM4_CFG_BIT_BB); + } + out: return ret; } diff --git a/include/linux/coresight-pmu.h b/include/linux/coresight-pmu.h index 4ac5c081af93..6c2fd6cc5a98 100644 --- a/include/linux/coresight-pmu.h +++ b/include/linux/coresight-pmu.h @@ -18,6 +18,7 @@ * ETMv3.5/PTM doesn't define ETMCR config bits with prefix "ETM3_" and * directly use below macros as config bits. */ +#define ETM_OPT_BRANCH_BROADCAST 8 #define ETM_OPT_CYCACC 12 #define ETM_OPT_CTXTID 14 #define ETM_OPT_CTXTID2 15 @@ -25,6 +26,7 @@ #define ETM_OPT_RETSTK 29 /* ETMv4 CONFIGR programming bits for the ETM OPTs */ +#define ETM4_CFG_BIT_BB 3 #define ETM4_CFG_BIT_CYCACC 4 #define ETM4_CFG_BIT_CTXTID 6 #define ETM4_CFG_BIT_VMID 7 -- 2.28.0

3 years, 7 months

Re: [PATCH v4 48/48] perf cpumap: Give CPUs their own type.

by Arnaldo Carvalho de Melo

Em Tue, Jan 11, 2022 at 11:16:16AM -0800, Ian Rogers escreveu: > On Mon, Jan 10, 2022 at 11:50 AM Arnaldo Carvalho de Melo > <acme(a)kernel.org> wrote: > > > > Em Tue, Jan 04, 2022 at 10:13:51PM -0800, Ian Rogers escreveu: > > > A common problem is confusing CPU map indices with the CPU, by wrapping > > > the CPU with a struct then this is avoided. This approach is similar to > > > atomic_t. > > > > This one needed this to build with BUILD_BPF_SKEL=1, please check, I'll > > soon push this to tmp.perf/perf_cpu so that you can take a look and test > > it. > > > Thanks Arnaldo, I did eye-ball one issue where cpu_map__default_new's > behavior would be impacted (nr would be 1 rather than nr_cpus). The > fix is: > > --- a/tools/lib/perf/cpumap.c > +++ b/tools/lib/perf/cpumap.c > @@ -18,7 +18,7 @@ static struct perf_cpu_map *perf_cpu_map__alloc(int nr_cpus) > if (!cpus) > return NULL; > > - cpus->nr = 1; > + cpus->nr = nr_cpus; > refcount_set(&cpus->refcnt, 1); > return cpus; > } > Could you add that into this patch as well? Sure. I´m now running perf-test after each of those csets, so far so good. > Thanks, > Ian > > > > - Arnaldo > > > > diff --git a/tools/perf/util/bpf_counter.c b/tools/perf/util/bpf_counter.c > > index 80d1a3a31052fe55..328479df5e16a638 100644 > > --- a/tools/perf/util/bpf_counter.c > > +++ b/tools/perf/util/bpf_counter.c > > @@ -540,7 +540,7 @@ static int bperf__load(struct evsel *evsel, struct target *target) > > filter_type == BPERF_FILTER_TGID) > > key = evsel->core.threads->map[i].pid; > > else if (filter_type == BPERF_FILTER_CPU) > > - key = evsel->core.cpus->map[i]; > > + key = evsel->core.cpus->map[i].cpu; > > else > > break; > > > > @@ -584,7 +584,7 @@ static int bperf_sync_counters(struct evsel *evsel) > > > > num_cpu = all_cpu_map->nr; > > for (i = 0; i < num_cpu; i++) { > > - cpu = all_cpu_map->map[i]; > > + cpu = all_cpu_map->map[i].cpu; > > bperf_trigger_reading(evsel->bperf_leader_prog_fd, cpu); > > } > > return 0; > > @@ -605,7 +605,7 @@ static int bperf__disable(struct evsel *evsel) > > static int bperf__read(struct evsel *evsel) > > { > > struct bperf_follower_bpf *skel = evsel->follower_skel; > > - __u32 num_cpu_bpf = cpu__max_cpu(); > > + __u32 num_cpu_bpf = cpu__max_cpu().cpu; > > struct bpf_perf_event_value values[num_cpu_bpf]; > > int reading_map_fd, err = 0; > > __u32 i; > > @@ -615,6 +615,7 @@ static int bperf__read(struct evsel *evsel) > > reading_map_fd = bpf_map__fd(skel->maps.accum_readings); > > > > for (i = 0; i < bpf_map__max_entries(skel->maps.accum_readings); i++) { > > + struct perf_cpu entry; > > __u32 cpu; > > > > err = bpf_map_lookup_elem(reading_map_fd, &i, values); > > @@ -624,14 +625,15 @@ static int bperf__read(struct evsel *evsel) > > case BPERF_FILTER_GLOBAL: > > assert(i == 0); > > > > - perf_cpu_map__for_each_cpu(cpu, j, all_cpu_map) { > > + perf_cpu_map__for_each_cpu(entry, j, all_cpu_map) { > > + cpu = entry.cpu; > > perf_counts(evsel->counts, cpu, 0)->val = values[cpu].counter; > > perf_counts(evsel->counts, cpu, 0)->ena = values[cpu].enabled; > > perf_counts(evsel->counts, cpu, 0)->run = values[cpu].running; > > } > > break; > > case BPERF_FILTER_CPU: > > - cpu = evsel->core.cpus->map[i]; > > + cpu = evsel->core.cpus->map[i].cpu; > > perf_counts(evsel->counts, i, 0)->val = values[cpu].counter; > > perf_counts(evsel->counts, i, 0)->ena = values[cpu].enabled; > > perf_counts(evsel->counts, i, 0)->run = values[cpu].running; > > diff --git a/tools/perf/util/bpf_counter_cgroup.c b/tools/perf/util/bpf_counter_cgroup.c > > index cbc6c2bca488f6bf..631e34a0b66ff084 100644 > > --- a/tools/perf/util/bpf_counter_cgroup.c > > +++ b/tools/perf/util/bpf_counter_cgroup.c > > @@ -48,7 +48,7 @@ static int bperf_load_program(struct evlist *evlist) > > struct cgroup *cgrp, *leader_cgrp; > > __u32 i, cpu; > > __u32 nr_cpus = evlist->core.all_cpus->nr; > > - int total_cpus = cpu__max_cpu(); > > + int total_cpus = cpu__max_cpu().cpu; > > int map_size, map_fd; > > int prog_fd, err; > > > > @@ -125,7 +125,7 @@ static int bperf_load_program(struct evlist *evlist) > > for (cpu = 0; cpu < nr_cpus; cpu++) { > > int fd = FD(evsel, cpu); > > __u32 idx = evsel->core.idx * total_cpus + > > - evlist->core.all_cpus->map[cpu]; > > + evlist->core.all_cpus->map[cpu].cpu; > > > > err = bpf_map_update_elem(map_fd, &idx, &fd, > > BPF_ANY); > > @@ -212,7 +212,7 @@ static int bperf_cgrp__sync_counters(struct evlist *evlist) > > int prog_fd = bpf_program__fd(skel->progs.trigger_read); > > > > for (i = 0; i < nr_cpus; i++) { > > - cpu = evlist->core.all_cpus->map[i]; > > + cpu = evlist->core.all_cpus->map[i].cpu; > > bperf_trigger_reading(prog_fd, cpu); > > } > > > > @@ -245,7 +245,7 @@ static int bperf_cgrp__read(struct evsel *evsel) > > { > > struct evlist *evlist = evsel->evlist; > > int i, cpu, nr_cpus = evlist->core.all_cpus->nr; > > - int total_cpus = cpu__max_cpu(); > > + int total_cpus = cpu__max_cpu().cpu; > > struct perf_counts_values *counts; > > struct bpf_perf_event_value *values; > > int reading_map_fd, err = 0; > > @@ -272,7 +272,7 @@ static int bperf_cgrp__read(struct evsel *evsel) > > } > > > > for (i = 0; i < nr_cpus; i++) { > > - cpu = evlist->core.all_cpus->map[i]; > > + cpu = evlist->core.all_cpus->map[i].cpu; > > > > counts = perf_counts(evsel->counts, i, 0); > > counts->val = values[cpu].counter; > > diff --git a/tools/perf/util/bpf_ftrace.c b/tools/perf/util/bpf_ftrace.c > > index 28dc4c60c7884818..d756cc66eef32ae8 100644 > > --- a/tools/perf/util/bpf_ftrace.c > > +++ b/tools/perf/util/bpf_ftrace.c > > @@ -63,7 +63,7 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *ftrace) > > fd = bpf_map__fd(skel->maps.cpu_filter); > > > > for (i = 0; i < ncpus; i++) { > > - cpu = perf_cpu_map__cpu(ftrace->evlist->core.cpus, i); > > + cpu = perf_cpu_map__cpu(ftrace->evlist->core.cpus, i).cpu; > > bpf_map_update_elem(fd, &cpu, &val, BPF_ANY); > > } > > } > > @@ -122,7 +122,7 @@ int perf_ftrace__latency_read_bpf(struct perf_ftrace *ftrace __maybe_unused, > > int i, fd, err; > > u32 idx; > > u64 *hist; > > - int ncpus = cpu__max_cpu(); > > + int ncpus = cpu__max_cpu().cpu; > > > > fd = bpf_map__fd(skel->maps.latency); > > -- - Arnaldo

3 years, 7 months

Re: [PATCH v4 02/48] perf stat: Add aggr creators that are passed a cpu.

by Arnaldo Carvalho de Melo

Em Tue, Jan 11, 2022 at 11:36:02AM -0800, Ian Rogers escreveu: > On Tue, Jan 11, 2022 at 11:33 AM Arnaldo Carvalho de Melo > <acme(a)kernel.org> wrote: > > > > Em Tue, Jan 04, 2022 at 10:13:05PM -0800, Ian Rogers escreveu: > > > The cpu_map and index can get confused. Add variants of the cpu_map__get > > > routines that are passed a cpu. Make the existing cpu_map__get routines > > > use the new functions with a view to remove them when no longer used. > > > > > > Reviewed-by: James Clark <james.clark(a)arm.com> > > > Signed-off-by: Ian Rogers <irogers(a)google.com> > > > --- > > > tools/perf/util/cpumap.c | 79 +++++++++++++++++++++++----------------- > > > tools/perf/util/cpumap.h | 6 ++- > > > 2 files changed, 51 insertions(+), 34 deletions(-) > > > > > > diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c > > > index 87d3eca9b872..49fba2c53822 100644 > > > --- a/tools/perf/util/cpumap.c > > > +++ b/tools/perf/util/cpumap.c > > > @@ -128,21 +128,23 @@ int cpu_map__get_socket_id(int cpu) > > > return ret ?: value; > > > } > > > > > > -struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, > > > - void *data __maybe_unused) > > > +struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data __maybe_unused) > > > { > > > - int cpu; > > > struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > > > > > > - if (idx > map->nr) > > > - return id; > > > - > > > - cpu = map->map[idx]; > > > - > > > id.socket = cpu_map__get_socket_id(cpu); > > > return id; > > > } > > > > > > +struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, > > > + void *data) > > > +{ > > > + if (idx < 0 || idx > map->nr) > > > + return cpu_map__empty_aggr_cpu_id(); > > > + > > > + return cpu_map__get_socket_aggr_by_cpu(map->map[idx], data); > > > +} > > > + > > > > > > This 'idx < 0' wasn't in the original code nor is described in the > > comment log message, please avoid doing this, this may be harmless or > > even a good hardening, but either way would be interesting to have it in > > a separate patch. This eases review as in the end this code is just a > > refactoring, moving things around but in the end should be equivalent code. > > > > There are a few more, please consider this and if you agree, to speed > > things up I can make the changes here, if I think this won't fallout in > > changes to subsequent patches touching this area. > > > > - Arnaldo > > Fwiw, there's the same issue in cpu_map__get_die that's also in > cpu_map__get_core, but weirdly not copied into cpu_map__get_node. As > these functions are removed later I think doing nothing is best here. Sure. > Thanks, > Ian > > > > static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) > > > { > > > struct aggr_cpu_id *a = (struct aggr_cpu_id *)a_pointer; > > > @@ -200,15 +202,10 @@ int cpu_map__get_die_id(int cpu) > > > return ret ?: value; > > > } > > > > > > -struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data) > > > +struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data) > > > { > > > - int cpu, die; > > > - struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > > > - > > > - if (idx > map->nr) > > > - return id; > > > - > > > - cpu = map->map[idx]; > > > + struct aggr_cpu_id id; > > > + int die; > > > > > > die = cpu_map__get_die_id(cpu); > > > /* There is no die_id on legacy system. */ > > > @@ -220,7 +217,7 @@ struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *dat > > > * with the socket ID and then add die to > > > * make a unique ID. > > > */ > > > - id = cpu_map__get_socket(map, idx, data); > > > + id = cpu_map__get_socket_aggr_by_cpu(cpu, data); > > > if (cpu_map__aggr_cpu_id_is_empty(id)) > > > return id; > > > > > > @@ -228,6 +225,15 @@ struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *dat > > > return id; > > > } > > > > > > +struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, > > > + void *data) > > > +{ > > > + if (idx < 0 || idx > map->nr) > > > + return cpu_map__empty_aggr_cpu_id(); > > > > Ditto > > > > > + > > > + return cpu_map__get_die_aggr_by_cpu(map->map[idx], data); > > > +} > > > + > > > int cpu_map__get_core_id(int cpu) > > > { > > > int value, ret = cpu__get_topology_int(cpu, "core_id", &value); > > > @@ -239,20 +245,13 @@ int cpu_map__get_node_id(int cpu) > > > return cpu__get_node(cpu); > > > } > > > > > > -struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data) > > > +struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data) > > > { > > > - int cpu; > > > - struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > > > - > > > - if (idx > map->nr) > > > - return id; > > > - > > > - cpu = map->map[idx]; > > > - > > > - cpu = cpu_map__get_core_id(cpu); > > > + struct aggr_cpu_id id; > > > + int core = cpu_map__get_core_id(cpu); > > > > > > /* cpu_map__get_die returns a struct with socket and die set*/ > > > - id = cpu_map__get_die(map, idx, data); > > > + id = cpu_map__get_die_aggr_by_cpu(cpu, data); > > > if (cpu_map__aggr_cpu_id_is_empty(id)) > > > return id; > > > > > > @@ -260,19 +259,33 @@ struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *da > > > * core_id is relative to socket and die, we need a global id. > > > * So we combine the result from cpu_map__get_die with the core id > > > */ > > > - id.core = cpu; > > > + id.core = core; > > > return id; > > > + > > > } > > > > > > -struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data __maybe_unused) > > > +struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data) > > > +{ > > > + if (idx < 0 || idx > map->nr) > > > + return cpu_map__empty_aggr_cpu_id(); > > > > Ditto > > > > > + > > > + return cpu_map__get_core_aggr_by_cpu(map->map[idx], data); > > > +} > > > + > > > +struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data __maybe_unused) > > > { > > > struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > > > > > > + id.node = cpu_map__get_node_id(cpu); > > > + return id; > > > +} > > > + > > > +struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data) > > > +{ > > > if (idx < 0 || idx >= map->nr) > > > - return id; > > > + return cpu_map__empty_aggr_cpu_id(); > > > > > > - id.node = cpu_map__get_node_id(map->map[idx]); > > > - return id; > > > + return cpu_map__get_node_aggr_by_cpu(map->map[idx], data); > > > } > > > > > > int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp) > > > diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h > > > index a27eeaf086e8..c62d67704425 100644 > > > --- a/tools/perf/util/cpumap.h > > > +++ b/tools/perf/util/cpumap.h > > > @@ -31,13 +31,17 @@ size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size); > > > size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size); > > > size_t cpu_map__fprintf(struct perf_cpu_map *map, FILE *fp); > > > int cpu_map__get_socket_id(int cpu); > > > +struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data); > > > struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, void *data); > > > int cpu_map__get_die_id(int cpu); > > > +struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data); > > > struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data); > > > int cpu_map__get_core_id(int cpu); > > > +struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data); > > > struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data); > > > int cpu_map__get_node_id(int cpu); > > > -struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data); > > > +struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data); > > > +struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data); > > > int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp); > > > int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep); > > > int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep); > > > -- > > > 2.34.1.448.ga2b2bfdf31-goog > > > > -- > > > > - Arnaldo -- - Arnaldo

3 years, 7 months

Re: [PATCH v4 02/48] perf stat: Add aggr creators that are passed a cpu.

by Arnaldo Carvalho de Melo

Em Tue, Jan 04, 2022 at 10:13:05PM -0800, Ian Rogers escreveu: > The cpu_map and index can get confused. Add variants of the cpu_map__get > routines that are passed a cpu. Make the existing cpu_map__get routines > use the new functions with a view to remove them when no longer used. > > Reviewed-by: James Clark <james.clark(a)arm.com> > Signed-off-by: Ian Rogers <irogers(a)google.com> > --- > tools/perf/util/cpumap.c | 79 +++++++++++++++++++++++----------------- > tools/perf/util/cpumap.h | 6 ++- > 2 files changed, 51 insertions(+), 34 deletions(-) > > diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c > index 87d3eca9b872..49fba2c53822 100644 > --- a/tools/perf/util/cpumap.c > +++ b/tools/perf/util/cpumap.c > @@ -128,21 +128,23 @@ int cpu_map__get_socket_id(int cpu) > return ret ?: value; > } > > -struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, > - void *data __maybe_unused) > +struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data __maybe_unused) > { > - int cpu; > struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > > - if (idx > map->nr) > - return id; > - > - cpu = map->map[idx]; > - > id.socket = cpu_map__get_socket_id(cpu); > return id; > } > > +struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, > + void *data) > +{ > + if (idx < 0 || idx > map->nr) > + return cpu_map__empty_aggr_cpu_id(); > + > + return cpu_map__get_socket_aggr_by_cpu(map->map[idx], data); > +} > + This 'idx < 0' wasn't in the original code nor is described in the comment log message, please avoid doing this, this may be harmless or even a good hardening, but either way would be interesting to have it in a separate patch. This eases review as in the end this code is just a refactoring, moving things around but in the end should be equivalent code. There are a few more, please consider this and if you agree, to speed things up I can make the changes here, if I think this won't fallout in changes to subsequent patches touching this area. - Arnaldo > static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) > { > struct aggr_cpu_id *a = (struct aggr_cpu_id *)a_pointer; > @@ -200,15 +202,10 @@ int cpu_map__get_die_id(int cpu) > return ret ?: value; > } > > -struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data) > +struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data) > { > - int cpu, die; > - struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > - > - if (idx > map->nr) > - return id; > - > - cpu = map->map[idx]; > + struct aggr_cpu_id id; > + int die; > > die = cpu_map__get_die_id(cpu); > /* There is no die_id on legacy system. */ > @@ -220,7 +217,7 @@ struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *dat > * with the socket ID and then add die to > * make a unique ID. > */ > - id = cpu_map__get_socket(map, idx, data); > + id = cpu_map__get_socket_aggr_by_cpu(cpu, data); > if (cpu_map__aggr_cpu_id_is_empty(id)) > return id; > > @@ -228,6 +225,15 @@ struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *dat > return id; > } > > +struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, > + void *data) > +{ > + if (idx < 0 || idx > map->nr) > + return cpu_map__empty_aggr_cpu_id(); Ditto > + > + return cpu_map__get_die_aggr_by_cpu(map->map[idx], data); > +} > + > int cpu_map__get_core_id(int cpu) > { > int value, ret = cpu__get_topology_int(cpu, "core_id", &value); > @@ -239,20 +245,13 @@ int cpu_map__get_node_id(int cpu) > return cpu__get_node(cpu); > } > > -struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data) > +struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data) > { > - int cpu; > - struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > - > - if (idx > map->nr) > - return id; > - > - cpu = map->map[idx]; > - > - cpu = cpu_map__get_core_id(cpu); > + struct aggr_cpu_id id; > + int core = cpu_map__get_core_id(cpu); > > /* cpu_map__get_die returns a struct with socket and die set*/ > - id = cpu_map__get_die(map, idx, data); > + id = cpu_map__get_die_aggr_by_cpu(cpu, data); > if (cpu_map__aggr_cpu_id_is_empty(id)) > return id; > > @@ -260,19 +259,33 @@ struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *da > * core_id is relative to socket and die, we need a global id. > * So we combine the result from cpu_map__get_die with the core id > */ > - id.core = cpu; > + id.core = core; > return id; > + > } > > -struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data __maybe_unused) > +struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data) > +{ > + if (idx < 0 || idx > map->nr) > + return cpu_map__empty_aggr_cpu_id(); Ditto > + > + return cpu_map__get_core_aggr_by_cpu(map->map[idx], data); > +} > + > +struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data __maybe_unused) > { > struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > > + id.node = cpu_map__get_node_id(cpu); > + return id; > +} > + > +struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data) > +{ > if (idx < 0 || idx >= map->nr) > - return id; > + return cpu_map__empty_aggr_cpu_id(); > > - id.node = cpu_map__get_node_id(map->map[idx]); > - return id; > + return cpu_map__get_node_aggr_by_cpu(map->map[idx], data); > } > > int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp) > diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h > index a27eeaf086e8..c62d67704425 100644 > --- a/tools/perf/util/cpumap.h > +++ b/tools/perf/util/cpumap.h > @@ -31,13 +31,17 @@ size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size); > size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size); > size_t cpu_map__fprintf(struct perf_cpu_map *map, FILE *fp); > int cpu_map__get_socket_id(int cpu); > +struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data); > struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, void *data); > int cpu_map__get_die_id(int cpu); > +struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data); > struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data); > int cpu_map__get_core_id(int cpu); > +struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data); > struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data); > int cpu_map__get_node_id(int cpu); > -struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data); > +struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data); > +struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data); > int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp); > int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep); > int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep); > -- > 2.34.1.448.ga2b2bfdf31-goog -- - Arnaldo

3 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

CoreSight