Add parents to struct pmu -> dev
Subsystems (25)
v2 cover Add parents to struct pmu -> dev
Robin posted a patch for the cmn and that reminded me that I never sent a v2.
v2: Drop first patch that added a parent to struct pmu as that has been
upstream for a year.
Drop the arm-cmn change as Robin has dealt with that one. Gathered tags.
Updated cover letter:
These are the low hanging fruit following GregKH's feedback that all the devices registered via perf_pmu_register() should have parents.
Note that this causes potential ABI breakage.
It may fall in the category of it isn't breakage if no one notices but I can't be certain of that. Whilst it is arguable that no one should be been accessing PMUs except via the event_source bus, there was documentation suggesting /sys/devices/ for particular PMUs (because it was a shorter path?)
Addressing all the other instances of struct pmu not covered by this series is likely to be a more complex discussion but unlikely to have an affect on what is proposed here.
Documentation updates deliberately 'fixed' in separate patches before changing the path to highlight that using /sys/bus/event_source/devices path is unchanged by this series and that is presumed to be the most common way these files are accessed.
Jonathan Cameron (30):
perf/hisi-pcie: Assign parent for event_source device
Documentation: hisi-pmu: Drop reference to /sys/devices path perf/hisi-uncore: Assign parents for event_source devices
Documentation: hns-pmu: Use /sys/bus/event_source/devices paths perf/hisi-hns3: Assign parents for event_source device perf/amlogic: Assign parents for event_source devices perf/arm_cspmu: Assign parents for event_source devices
Documentation: xgene-pmu: Use /sys/bus/event_source/devices paths perf/xgene: Assign parents for event_source devices
Documentation: thunderx2-pmu: Use /sys/bus/event_source/devices paths perf/thunderx2: Assign parents for event_source devices perf/riscv: Assign parents for event_source devices
Documentation: qcom-pmu: Use /sys/bus/event_source/devices paths perf/qcom: Assign parents for event_source devices perf/imx_ddr: Assign parents for event_source devices perf/arm_pmu: Assign parents for event_source devices perf/alibaba_uncore: Assign parents for event_source device perf/arm-cci: Assign parents for event_source device perf/arm-ccn: Assign parents for event_source device perf/arm-dmc620: Assign parents for event_source device perf/arm-dsu: Assign parents for event_source device perf/arm-smmuv3: Assign parents for event_source device perf/arm-spe: Assign parents for event_source device
arc: Assign parents for event_source devices
ARM: imx: Assign parents for mmdc event_source devices
dmaengine: idxd: Assign parent for event_source device
fpga: dfl: Assign parent for event_source device drivers/nvdimm: Assign parent for event_source device
Documentation: ABI + trace: hisi_ptt: update paths to bus/event_source
hwtracing: hisi_ptt: Assign parent for event_source device
...i_ptt => sysfs-bus-event_source-devices-hisi_ptt} | 12 ++++++------
Documentation/admin-guide/perf/hisi-pmu.rst | 1 -
Documentation/admin-guide/perf/hns3-pmu.rst | 8 ++++----
Documentation/admin-guide/perf/qcom_l2_pmu.rst | 2 +-
Documentation/admin-guide/perf/qcom_l3_pmu.rst | 2 +-
Documentation/admin-guide/perf/thunderx2-pmu.rst | 2 +-
Documentation/admin-guide/perf/xgene-pmu.rst | 2 +-
Documentation/trace/hisi-ptt.rst | 4 ++--
MAINTAINERS | 2 +-
arch/arc/kernel/perf_event.c | 1 +
arch/arm/mach-imx/mmdc.c | 1 +
drivers/dma/idxd/perfmon.c | 1 +
drivers/fpga/dfl-fme-perf.c | 1 +
drivers/hwtracing/ptt/hisi_ptt.c | 1 +
drivers/nvdimm/nd_perf.c | 1 +
drivers/perf/alibaba_uncore_drw_pmu.c | 1 +
drivers/perf/amlogic/meson_ddr_pmu_core.c | 1 +
drivers/perf/arm-cci.c | 1 +
drivers/perf/arm-ccn.c | 1 +
drivers/perf/arm_cspmu/arm_cspmu.c | 1 +
drivers/perf/arm_dmc620_pmu.c | 1 +
drivers/perf/arm_dsu_pmu.c | 1 +
drivers/perf/arm_pmu_platform.c | 1 +
drivers/perf/arm_smmuv3_pmu.c | 1 +
drivers/perf/arm_spe_pmu.c | 1 +
drivers/perf/fsl_imx8_ddr_perf.c | 1 +
drivers/perf/hisilicon/hisi_pcie_pmu.c | 1 +
drivers/perf/hisilicon/hisi_uncore_pmu.c | 1 +
drivers/perf/hisilicon/hns3_pmu.c | 1 +
drivers/perf/qcom_l2_pmu.c | 1 +
drivers/perf/qcom_l3_pmu.c | 1 +
drivers/perf/riscv_pmu_legacy.c | 1 +
drivers/perf/riscv_pmu_sbi.c | 1 +
drivers/perf/thunderx2_pmu.c | 1 +
drivers/perf/xgene_pmu.c | 1 +
35 files changed, 43 insertions(+), 18 deletions(-)
rename Documentation/ABI/testing/{sysfs-devices-hisi_ptt => sysfs-bus-event_source-devices-hisi_ptt} (90%)Signature · 1 line
2.39.2
PATCH v2 1/30 perf/hisi-pcie: Assign parent for event_source device
Currently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the PCI device.
--- drivers/perf/hisilicon/hisi_pcie_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/hisilicon/hisi_pcie_pmu.c +1 -0
@@ -807,6 +807,7 @@ static int hisi_pcie_alloc_pmu(struct pci_dev *pdev, struct hisi_pcie_pmu *pcie_ pcie_pmu->pmu = (struct pmu ) { .name = name, .module =THIS_MODULE , + .parent = &pdev->dev, .event_init = hisi_pcie_pmu_event_init, .pmu_enable = hisi_pcie_pmu_enable, .pmu_disable = hisi_pcie_pmu_disable,
Signature · 1 line
2.39.2
PATCH v2 2/30 Documentation: hisi-pmu: Drop reference to /sys/devices path
In reply to Jonathan CameronHaving assigned a parent to the device, the suggested path is no longer valid. As /sys/bus/event_sources based path is also provided, simply drop mention of alternative.
--- Documentation/admin-guide/perf/hisi-pmu.rst | 1 - 1 file changed, 1 deletion(-)
Documentation/admin-guide/perf/hisi-pmu.rst +0 -1
@@ -20,7 +20,6 @@ interrupt, and the PMU driver shall register perf PMU drivers like L3C, HHA and DDRC etc. The available events and configuration options shall be described in the sysfs, see: -/sys/devices/hisi_sccl{X}_<l3c{Y}/hha{Y}/ddrc{Y}>/, or /sys/bus/event_source/devices/hisi_sccl{X}_<l3c{Y}/hha{Y}/ddrc{Y}>. The "perf list" command shall list the available events from sysfs.
Signature · 1 line
2.39.2
PATCH v2 3/30 perf/hisi-uncore: Assign parents for event_source devices
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/perf/hisilicon/hisi_uncore_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/hisilicon/hisi_uncore_pmu.c +1 -0
@@ -538,6 +538,7 @@ void hisi_pmu_init(struct hisi_pmu *hisi_pmu, struct module *module)struct pmu *pmu = &hisi_pmu->pmu; pmu->module = module; + pmu->parent = hisi_pmu->dev; pmu->task_ctx_nr = perf_invalid_context; pmu->event_init = hisi_uncore_pmu_event_init; pmu->pmu_enable = hisi_uncore_pmu_enable;
Signature · 1 line
2.39.2
PATCH v2 4/30 Documentation: hns-pmu: Use /sys/bus/event_source/devices paths
In reply to Jonathan CameronTo allow setting an appropriate parent for the struct pmu device remove existing references to /sys/devices/ path.
--- Documentation/admin-guide/perf/hns3-pmu.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Documentation/admin-guide/perf/hns3-pmu.rst +4 -4
@@ -16,7 +16,7 @@ HNS3 PMU driver The HNS3 PMU driver registers a perf PMU with the name of its sicl id.:: - /sys/devices/hns3_pmu_sicl_<sicl_id> + /sys/bus/event_source/devices/hns3_pmu_sicl_<sicl_id> PMU driver provides description of available events, filter modes, format, identifier and cpumask in sysfs.
@@ -40,9 +40,9 @@ device. Example usage of checking event code and subevent code:: - $# cat /sys/devices/hns3_pmu_sicl_0/events/dly_tx_normal_to_mac_time + $# cat /sys/bus/event_source/devices/hns3_pmu_sicl_0/events/dly_tx_normal_to_mac_time config=0x00204 - $# cat /sys/devices/hns3_pmu_sicl_0/events/dly_tx_normal_to_mac_packet_num + $# cat /sys/bus/event_source/devices/hns3_pmu_sicl_0/events/dly_tx_normal_to_mac_packet_num config=0x10204 Each performance statistic has a pair of events to get two values to
@@ -60,7 +60,7 @@ computation to calculate real performance data is::: Example usage of checking supported filter mode:: - $# cat /sys/devices/hns3_pmu_sicl_0/filtermode/bw_ssu_rpu_byte_num + $# cat /sys/bus/event_source/devices/hns3_pmu_sicl_0/filtermode/bw_ssu_rpu_byte_num filter mode supported: global/port/port-tc/func/func-queue/ Example usage of perf::
Signature · 1 line
2.39.2
PATCH v2 5/30 perf/hisi-hns3: Assign parents for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the PCI device.
--- drivers/perf/hisilicon/hns3_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/hisilicon/hns3_pmu.c +1 -0
@@ -1419,6 +1419,7 @@ static int hns3_pmu_alloc_pmu(struct pci_dev *pdev, struct hns3_pmu *hns3_pmu) hns3_pmu->pmu = (struct pmu ) { .name = name, .module =THIS_MODULE , + .parent = &pdev->dev, .event_init = hns3_pmu_event_init, .pmu_enable = hns3_pmu_enable, .pmu_disable = hns3_pmu_disable,
Signature · 1 line
2.39.2
PATCH v2 6/30 perf/amlogic: Assign parents for event_source devices
In reply to Jonathan CameronCurrently all these devices appear directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parents to be the platform device.
--- drivers/perf/amlogic/meson_ddr_pmu_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/amlogic/meson_ddr_pmu_core.c +1 -0
@@ -492,6 +492,7 @@ int meson_ddr_pmu_create(struct platform_device *pdev) *pmu = (struct ddr_pmu ) { .pmu = { .module =THIS_MODULE , + .parent = &pdev->dev, .capabilities =PERF_PMU_CAP_NO_EXCLUDE , .task_ctx_nr = perf_invalid_context, .attr_groups = attr_groups,
Signature · 1 line
2.39.2
PATCH v2 7/30 perf/arm_cspmu: Assign parents for event_source devices
In reply to Jonathan CameronCurrently all these devices appear directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parents to be the platform device.
--- drivers/perf/arm_cspmu/arm_cspmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/arm_cspmu/arm_cspmu.c +1 -0
@@ -1206,6 +1206,7 @@ static int arm_cspmu_register_pmu(struct arm_cspmu *cspmu) cspmu->pmu = (struct pmu ){ .task_ctx_nr = perf_invalid_context, .module = cspmu->impl.module, + .parent = cspmu->dev, .pmu_enable = arm_cspmu_enable, .pmu_disable = arm_cspmu_disable, .event_init = arm_cspmu_event_init,
Signature · 1 line
2.39.2
PATCH v2 8/30 Documentation: xgene-pmu: Use /sys/bus/event_source/devices paths
In reply to Jonathan CameronTo allow setting an appropriate parent for the struct pmu device remove existing references to /sys/devices/ path.
--- Documentation/admin-guide/perf/xgene-pmu.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/admin-guide/perf/xgene-pmu.rst +1 -1
@@ -13,7 +13,7 @@ PMU (perf) driver The xgene-pmu driver registers several perf PMU drivers. Each of the perf driver provides description of its available events and configuration options -in sysfs, see /sys/devices/<l3cX/iobX/mcbX/mcX>/. +in sysfs, see /sys/bus/event_source/devices/<l3cX/iobX/mcbX/mcX>/. The "format" directory describes format of the config (event ID), config1 (agent ID) fields of the perf_event_attr structure. The "events"
Signature · 1 line
2.39.2
PATCH v2 9/30 perf/xgene: Assign parents for event_source devices
In reply to Jonathan CameronCurrently all these devices appear directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parents to be the hardware related struct device.
--- drivers/perf/xgene_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/xgene_pmu.c +1 -0
@@ -1102,6 +1102,7 @@ static int xgene_init_perf(struct xgene_pmu_dev *pmu_dev, char *name)/* Perf driver registration */ pmu_dev->pmu = (struct pmu ) { + .parent = pmu_dev->parent->dev, .attr_groups = pmu_dev->attr_groups, .task_ctx_nr = perf_invalid_context, .pmu_enable = xgene_perf_pmu_enable,
Signature · 1 line
2.39.2
PATCH v2 10/30 Documentation: thunderx2-pmu: Use /sys/bus/event_source/devices paths
In reply to Jonathan CameronTo allow setting an appropriate parent for the struct pmu device remove existing references to /sys/devices/ path.
--- Documentation/admin-guide/perf/thunderx2-pmu.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/admin-guide/perf/thunderx2-pmu.rst +1 -1
@@ -22,7 +22,7 @@ The thunderx2_pmu driver registers per-socket perf PMUs for the DMC and L3C devices. Each PMU can be used to count up to 4 (DMC/L3C) or up to 8 (CCPI2) events simultaneously. The PMUs provide a description of their available events and configuration options under sysfs, see -/sys/devices/uncore_<l3c_S/dmc_S/ccpi2_S/>; S is the socket id. +/sys/bus/event_source/devices/uncore_<l3c_S/dmc_S/ccpi2_S/>; S is the socket id. The driver does not support sampling, therefore "perf record" will not work. Per-task perf sessions are also not supported.
Signature · 1 line
2.39.2
PATCH v2 11/30 perf/thunderx2: Assign parents for event_source devices
In reply to Jonathan CameronCurrently all these devices appear directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parents to be the platform device.
--- drivers/perf/thunderx2_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/thunderx2_pmu.c +1 -0
@@ -729,6 +729,7 @@ static int tx2_uncore_pmu_register(/* Perf event registration */ tx2_pmu->pmu = (struct pmu ) { .module =THIS_MODULE , + .parent = tx2_pmu->dev, .attr_groups = tx2_pmu->attr_groups, .task_ctx_nr = perf_invalid_context, .event_init = tx2_uncore_event_init,
Signature · 1 line
2.39.2
PATCH v2 12/30 perf/riscv: Assign parents for event_source devices
In reply to Jonathan CameronCurrently all these devices appear directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parents to be the appropriate platform devices.
--- drivers/perf/riscv_pmu_legacy.c | 1 + drivers/perf/riscv_pmu_sbi.c | 1 + 2 files changed, 2 insertions(+)
drivers/perf/riscv_pmu_legacy.c +1 -0
@@ -136,6 +136,7 @@ static int pmu_legacy_device_probe(struct platform_device *pdev) pmu =riscv_pmu_alloc ();if (!pmu)return -ENOMEM ; + pmu->pmu.parent = &pdev->dev;pmu_legacy_init (pmu);return 0 ;
drivers/perf/riscv_pmu_sbi.c +1 -0
@@ -1081,6 +1081,7 @@ static int pmu_sbi_device_probe(struct platform_device *pdev) } pmu->pmu.attr_groups = riscv_pmu_attr_groups; + pmu->pmu.parent = &pdev->dev; pmu->cmask = cmask; pmu->ctr_start = pmu_sbi_ctr_start; pmu->ctr_stop = pmu_sbi_ctr_stop;
Signature · 1 line
2.39.2
PATCH v2 13/30 Documentation: qcom-pmu: Use /sys/bus/event_source/devices paths
In reply to Jonathan CameronTo allow setting an appropriate parent for the struct pmu device remove existing references to /sys/devices/ path.
--- Documentation/admin-guide/perf/qcom_l2_pmu.rst | 2 +- Documentation/admin-guide/perf/qcom_l3_pmu.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/admin-guide/perf/qcom_l2_pmu.rst +1 -1
@@ -10,7 +10,7 @@ There is one logical L2 PMU exposed, which aggregates the results from the physical PMUs. The driver provides a description of its available events and configuration -options in sysfs, see /sys/devices/l2cache_0. +options in sysfs, see /sys/bus/event_source/devices/l2cache_0. The "format" directory describes the format of the events.
Documentation/admin-guide/perf/qcom_l3_pmu.rst +1 -1
@@ -9,7 +9,7 @@ PMU with device name l3cache_<socket>_<instance>. User space is responsible for aggregating across slices. The driver provides a description of its available events and configuration -options in sysfs, see /sys/devices/l3cache*. Given that these are uncore PMUs +options in sysfs, see /sys/bus/event_source/devices/l3cache*. Given that these are uncore PMUs the driver also exposes a "cpumask" sysfs attribute which contains a mask consisting of one CPU per socket which will be used to handle all the PMU events on that socket.
Signature · 1 line
2.39.2
PATCH v2 14/30 perf/qcom: Assign parents for event_source devices
In reply to Jonathan CameronCurrently all these devices appear directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parents to be the platform devices.
--- drivers/perf/qcom_l2_pmu.c | 1 + drivers/perf/qcom_l3_pmu.c | 1 + 2 files changed, 2 insertions(+)
drivers/perf/qcom_l2_pmu.c +1 -0
@@ -904,6 +904,7 @@ static int l2_cache_pmu_probe(struct platform_device *pdev) l2cache_pmu->pmu = (struct pmu ) {/* suffix is instance id for future use with multiple sockets */ .name ="l2cache_0" , + .parent = &pdev->dev, .task_ctx_nr = perf_invalid_context, .pmu_enable = l2_cache_pmu_enable, .pmu_disable = l2_cache_pmu_disable,
drivers/perf/qcom_l3_pmu.c +1 -0
@@ -748,6 +748,7 @@ static int qcom_l3_cache_pmu_probe(struct platform_device *pdev)return -ENOMEM ; l3pmu->pmu = (struct pmu ) { + .parent = &pdev->dev, .task_ctx_nr = perf_invalid_context, .pmu_enable = qcom_l3_cache__pmu_enable,
Signature · 1 line
2.39.2
PATCH v2 15/30 perf/imx_ddr: Assign parents for event_source devices
In reply to Jonathan CameronCurrently all this device appear directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/perf/fsl_imx8_ddr_perf.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/fsl_imx8_ddr_perf.c +1 -0
@@ -651,6 +651,7 @@ static int ddr_perf_init(struct ddr_pmu *pmu, void __iomem *base, *pmu = (struct ddr_pmu ) { .pmu = (struct pmu ) { .module =THIS_MODULE , + .parent = dev, .capabilities =PERF_PMU_CAP_NO_EXCLUDE , .task_ctx_nr = perf_invalid_context, .attr_groups = attr_groups,
Signature · 1 line
2.39.2
PATCH v2 16/30 perf/arm_pmu: Assign parents for event_source devices
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/perf/arm_pmu_platform.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/arm_pmu_platform.c +1 -0
@@ -196,6 +196,7 @@ int arm_pmu_device_probe(struct platform_device *pdev,if (!pmu)return -ENOMEM ; + pmu->pmu.parent = &pdev->dev; pmu->plat_device = pdev; ret =pmu_parse_irqs (pmu);
Signature · 1 line
2.39.2
Re: [PATCH v2 16/30] perf/arm_pmu: Assign parents for event_source devices
Quoted 15 lines · Jonathan Cameron
Currently the PMU device appears directly under
/sys/devices/Only root busses should appear there, so instead assign thepmu->devparent to be the platform device.Signed-off-by Jonathan Cameron <[email protected]>--- drivers/perf/arm_pmu_platform.c | 1 + 1 file changed, 1 insertion(+)drivers/perf/arm_pmu_platform.c +0
-0
drivers/perf/arm_pmu_platform.c int arm_pmu_device_probe(struct platform_device *pdev, · line 202
Quoted 7 lines
drivers/perf/arm_pmu_platform.c +1
-0@@ -196,6 +196,7 @@ int arm_pmu_device_probe(struct platform_device *pdev,if (!pmu)return -ENOMEM ; + pmu->pmu.parent = &pdev->dev; pmu->plat_device = pdev; ret =pmu_parse_irqs (pmu);
PATCH v2 17/30 perf/alibaba_uncore: Assign parents for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/perf/alibaba_uncore_drw_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/alibaba_uncore_drw_pmu.c +1 -0
@@ -709,6 +709,7 @@ static int ali_drw_pmu_probe(struct platform_device *pdev) drw_pmu->pmu = (struct pmu ) { .module =THIS_MODULE , + .parent = &pdev->dev, .task_ctx_nr = perf_invalid_context, .event_init = ali_drw_pmu_event_init, .add = ali_drw_pmu_add,
Signature · 1 line
2.39.2
PATCH v2 18/30 perf/arm-cci: Assign parents for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/perf/arm-cci.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/arm-cci.c +1 -0
@@ -1409,6 +1409,7 @@ static int cci_pmu_init(struct cci_pmu *cci_pmu, struct platform_device *pdev) cci_pmu->pmu = (struct pmu ) { .module =THIS_MODULE , + .parent = &pdev->dev, .name = cci_pmu->model->name, .task_ctx_nr = perf_invalid_context, .pmu_enable = cci_pmu_enable,
Signature · 1 line
2.39.2
PATCH v2 19/30 perf/arm-ccn: Assign parents for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/perf/arm-ccn.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/arm-ccn.c +1 -0
@@ -1265,6 +1265,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)/* Perf driver registration */ ccn->dt.pmu = (struct pmu ) { .module =THIS_MODULE , + .parent = ccn->dev, .attr_groups = arm_ccn_pmu_attr_groups, .task_ctx_nr = perf_invalid_context, .event_init = arm_ccn_pmu_event_init,
Signature · 1 line
2.39.2
PATCH v2 20/30 perf/arm-dmc620: Assign parents for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/perf/arm_dmc620_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/arm_dmc620_pmu.c +1 -0
@@ -673,6 +673,7 @@ static int dmc620_pmu_device_probe(struct platform_device *pdev) dmc620_pmu->pmu = (struct pmu ) { .module =THIS_MODULE , + .parent = &pdev->dev, .capabilities =PERF_PMU_CAP_NO_EXCLUDE , .task_ctx_nr = perf_invalid_context, .event_init = dmc620_pmu_event_init,
Signature · 1 line
2.39.2
PATCH v2 21/30 perf/arm-dsu: Assign parents for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/perf/arm_dsu_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/arm_dsu_pmu.c +1 -0
@@ -751,6 +751,7 @@ static int dsu_pmu_device_probe(struct platform_device *pdev) dsu_pmu->pmu = (struct pmu ) { .task_ctx_nr = perf_invalid_context, + .parent = &pdev->dev, .module =THIS_MODULE , .pmu_enable = dsu_pmu_enable, .pmu_disable = dsu_pmu_disable,
Signature · 1 line
2.39.2
PATCH v2 22/30 perf/arm-smmuv3: Assign parents for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/perf/arm_smmuv3_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/arm_smmuv3_pmu.c +1 -0
@@ -860,6 +860,7 @@ static int smmu_pmu_probe(struct platform_device *pdev) smmu_pmu->pmu = (struct pmu ) { .module =THIS_MODULE , + .parent = &pdev->dev, .task_ctx_nr = perf_invalid_context, .pmu_enable = smmu_pmu_enable, .pmu_disable = smmu_pmu_disable,
Signature · 1 line
2.39.2
PATCH v2 23/30 perf/arm-spe: Assign parents for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/perf/arm_spe_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/arm_spe_pmu.c +1 -0
@@ -932,6 +932,7 @@ static int arm_spe_pmu_perf_init(struct arm_spe_pmu *spe_pmu) spe_pmu->pmu = (struct pmu ) { .module =THIS_MODULE , + .parent = &spe_pmu->pdev->dev, .capabilities =PERF_PMU_CAP_EXCLUSIVE |PERF_PMU_CAP_ITRACE , .attr_groups = arm_spe_pmu_attr_groups,/*
Signature · 1 line
2.39.2
PATCH v2 24/30 arc: Assign parents for event_source devices
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- arch/arc/kernel/perf_event.c | 1 + 1 file changed, 1 insertion(+)
arch/arc/kernel/perf_event.c +1 -0
@@ -788,6 +788,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev) arc_pmu->attr_groups[ARCPMU_ATTR_GR_FORMATS ] = &arc_pmu_format_attr_gr; arc_pmu->pmu = (struct pmu ) { + .parent = &pdev->dev, .pmu_enable = arc_pmu_enable, .pmu_disable = arc_pmu_disable, .event_init = arc_pmu_event_init,
Signature · 1 line
2.39.2
PATCH v2 25/30 ARM: imx: Assign parents for mmdc event_source devices
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- arch/arm/mach-imx/mmdc.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-imx/mmdc.c +1 -0
@@ -437,6 +437,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc, { *pmu_mmdc = (struct mmdc_pmu ) { .pmu = (struct pmu ) { + .parent = dev, .task_ctx_nr = perf_invalid_context, .attr_groups = attr_groups, .event_init = mmdc_pmu_event_init,
Signature · 1 line
2.39.2
Shawn Guo
AppliedRe: [PATCH v2 25/30] ARM: imx: Assign parents for mmdc event_source devices
Quoted 7 lines · Jonathan Cameron
Currently the PMU device appears directly under
/sys/devices/Only root busses should appear there, so instead assign thepmu->devparent to be the platform device.Cc Shawn Guo <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>
Applied, thanks!
PATCH v2 26/30 dmaengine: idxd: Assign parent for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the iDXD PCI Device.
--- drivers/dma/idxd/perfmon.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/idxd/perfmon.c +1 -0
@@ -477,6 +477,7 @@ static void idxd_pmu_init(struct idxd_pmu *idxd_pmu) } idxd_pmu->pmu.name = idxd_pmu->name; + idxd_pmu->pmu.parent = &idxd_pmu->idxd->pdev->dev; idxd_pmu->pmu.attr_groups = perfmon_attr_groups; idxd_pmu->pmu.task_ctx_nr = perf_invalid_context; idxd_pmu->pmu.event_init = perfmon_pmu_event_init;
Signature · 1 line
2.39.2
Re: [PATCH v2 26/30] dmaengine: idxd: Assign parent for event_source device
Quoted 8 lines · Jonathan Cameron
Currently the PMU device appears directly under
/sys/devices/Only root busses should appear there, so instead assign thepmu->devparent to be the iDXD PCI Device.Cc Fenghua Yu <[email protected]>Cc Dave Jiang <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>
Quoted 16 lines
--- drivers/dma/idxd/perfmon.c | 1 + 1 file changed, 1 insertion(+)drivers/dma/idxd/perfmon.c +1
-0@@ -477,6 +477,7 @@ static void idxd_pmu_init(struct idxd_pmu *idxd_pmu) } idxd_pmu->pmu.name = idxd_pmu->name; + idxd_pmu->pmu.parent = &idxd_pmu->idxd->pdev->dev; idxd_pmu->pmu.attr_groups = perfmon_attr_groups; idxd_pmu->pmu.task_ctx_nr = perf_invalid_context; idxd_pmu->pmu.event_init = perfmon_pmu_event_init;
Re: [PATCH v2 26/30] dmaengine: idxd: Assign parent for event_source device
In reply to Jonathan CameronHi, Jonathan,
Quoted 2 lines · Jonathan Cameron
Currently the PMU device appears directly under
/sys/devices/Only root busses should appear there, so instead assign thepmu->dev
s/busses/buses/
Quoted 1 line
parent to be the iDXD PCI Device.
s/iDXD/IDXD/
Quoted 5 lines
Cc Fenghua Yu <[email protected]>Cc Dave Jiang <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>
Other than the typos,
Quoted 9 lines
--- drivers/dma/idxd/perfmon.c | 1 + 1 file changed, 1 insertion(+)drivers/dma/idxd/perfmon.c +0
-0
drivers/dma/idxd/perfmon.c static void idxd_pmu_init(struct idxd_pmu *idxd_pmu) · line 483
Quoted 7 lines
drivers/dma/idxd/perfmon.c +1
-0@@ -477,6 +477,7 @@ static void idxd_pmu_init(struct idxd_pmu *idxd_pmu) } idxd_pmu->pmu.name = idxd_pmu->name; + idxd_pmu->pmu.parent = &idxd_pmu->idxd->pdev->dev; idxd_pmu->pmu.attr_groups = perfmon_attr_groups; idxd_pmu->pmu.task_ctx_nr = perf_invalid_context; idxd_pmu->pmu.event_init = perfmon_pmu_event_init;
Thanks.
-Fenghua
PATCH v2 27/30 fpga: dfl: Assign parent for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the Platform device.
--- drivers/fpga/dfl-fme-perf.c | 1 + 1 file changed, 1 insertion(+)
drivers/fpga/dfl-fme-perf.c +1 -0
@@ -912,6 +912,7 @@ static int fme_perf_pmu_register(struct platform_device *pdev,fme_perf_setup_hardware (priv); + pmu->parent = &pdev->dev; pmu->task_ctx_nr = perf_invalid_context; pmu->attr_groups = fme_perf_groups; pmu->attr_update = fme_perf_events_groups;
Signature · 1 line
2.39.2
PATCH v2 28/30 drivers/nvdimm: Assign parent for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the platform device.
--- drivers/nvdimm/nd_perf.c | 1 + 1 file changed, 1 insertion(+)
drivers/nvdimm/nd_perf.c +1 -0
@@ -292,6 +292,7 @@ int register_nvdimm_pmu(struct nvdimm_pmu *nd_pmu, struct platform_device *pdev)* device data in events functions. */ nd_pmu->dev = &pdev->dev; + nd_pmu->pmu.parent = &pdev->dev;/* Fill attribute groups for the nvdimm pmu device */ nd_pmu->pmu.attr_groups[NVDIMM_PMU_FORMAT_ATTR ] = &nvdimm_pmu_format_group;
Signature · 1 line
2.39.2
PATCH v2 29/30 Documentation: ABI + trace: hisi_ptt: update paths to bus/event_source
In reply to Jonathan CameronTo allow for assigning a suitable parent to the struct pmu device update the documentation to describe the device via the event_source bus where it will remain accessible.
For the ABI documention file also rename the file as it is named after the path.
--- ...i_ptt => sysfs-bus-event_source-devices-hisi_ptt} | 12 ++++++------ Documentation/trace/hisi-ptt.rst | 4 ++-- MAINTAINERS | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)
Documentation/ABI/testing/sysfs-bus-event_source-devices-hisi_ptt renamed from Documentation/ABI/testing/sysfs-devices-hisi_ptt +6 -6
@@ -1,4 +1,4 @@ -What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune +What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune Date: October 2022 KernelVersion: 6.1 Contact: Yicong Yang <[email protected]>
@@ -8,7 +8,7 @@ Description: This directory contains files for tuning the PCIe link See Documentation/trace/hisi-ptt.rst for more information. -What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_cpl +What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_cpl Date: October 2022 KernelVersion: 6.1 Contact: Yicong Yang <[email protected]>
@@ -18,7 +18,7 @@ Description: (RW) Controls the weight of Tx completion TLPs, which influence will return an error, and out of range values will be converted to 2. The value indicates a probable level of the event. -What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_np +What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_np Date: October 2022 KernelVersion: 6.1 Contact: Yicong Yang <[email protected]>
@@ -28,7 +28,7 @@ Description: (RW) Controls the weight of Tx non-posted TLPs, which influence will return an error, and out of range values will be converted to 2. The value indicates a probable level of the event. -What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_p +What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_p Date: October 2022 KernelVersion: 6.1 Contact: Yicong Yang <[email protected]>
@@ -38,7 +38,7 @@ Description: (RW) Controls the weight of Tx posted TLPs, which influence the will return an error, and out of range values will be converted to 2. The value indicates a probable level of the event. -What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune/rx_alloc_buf_level +What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune/rx_alloc_buf_level Date: October 2022 KernelVersion: 6.1 Contact: Yicong Yang <[email protected]>
@@ -49,7 +49,7 @@ Description: (RW) Control the allocated buffer watermark for inbound packets. will return an error, and out of range values will be converted to 2. The value indicates a probable level of the event. -What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune/tx_alloc_buf_level +What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune/tx_alloc_buf_level Date: October 2022 KernelVersion: 6.1 Contact: Yicong Yang <[email protected]>
Documentation/trace/hisi-ptt.rst +2 -2
@@ -40,7 +40,7 @@ IO dies (SICL, Super I/O Cluster), where there's one PCIe Root Complex for each SICL. :: - /sys/devices/hisi_ptt<sicl_id>_<core_id> + /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id> Tune ====
@@ -53,7 +53,7 @@ Each event is presented as a file under $(PTT PMU dir)/tune, and a simple open/read/write/close cycle will be used to tune the event. :: - $ cd /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune + $ cd /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune $ ls qos_tx_cpl qos_tx_np qos_tx_p tx_path_rx_req_alloc_buf_level
MAINTAINERS +1 -1
@@ -9796,7 +9796,7 @@ M: Yicong Yang <[email protected]> M: Jonathan Cameron <[email protected]> L: [email protected] S: Maintained -F: Documentation/ABI/testing/sysfs-devices-hisi_ptt +F: Documentation/ABI/testing/sysfs-bus-event_source-devices-hisi_ptt F: Documentation/trace/hisi-ptt.rst F: drivers/hwtracing/ptt/ F: tools/perf/arch/arm64/util/hisi-ptt.c
Signature · 1 line
2.39.2
PATCH v2 30/30 hwtracing: hisi_ptt: Assign parent for event_source device
In reply to Jonathan CameronCurrently the PMU device appears directly under /sys/devices/ Only root busses should appear there, so instead assign the pmu->dev parent to be the PCI device.
--- drivers/hwtracing/ptt/hisi_ptt.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwtracing/ptt/hisi_ptt.c +1 -0
@@ -1221,6 +1221,7 @@ static int hisi_ptt_register_pmu(struct hisi_ptt *hisi_ptt) hisi_ptt->hisi_ptt_pmu = (struct pmu ) { .module =THIS_MODULE , + .parent = &hisi_ptt->pdev->dev, .capabilities =PERF_PMU_CAP_EXCLUSIVE |PERF_PMU_CAP_NO_EXCLUDE , .task_ctx_nr = perf_sw_context, .attr_groups = hisi_ptt_pmu_groups,
Signature · 1 line
2.39.2
Re: [PATCH v2 30/30] hwtracing: hisi_ptt: Assign parent for event_source device
Quoted 17 lines · Jonathan Cameron
Currently the PMU device appears directly under
/sys/devices/Only root busses should appear there, so instead assign thepmu->devparent to be the PCI device.Cc Suzuki K Poulose <[email protected]>Reviewed-by Yicong Yang <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>--- drivers/hwtracing/ptt/hisi_ptt.c | 1 + 1 file changed, 1 insertion(+)drivers/hwtracing/ptt/hisi_ptt.c +0
-0
drivers/hwtracing/ptt/hisi_ptt.c static int hisi_ptt_register_pmu(struct hisi_ptt *hisi_ptt) · line 1227
Quoted 7 lines
drivers/hwtracing/ptt/hisi_ptt.c +1
-0@@ -1221,6 +1221,7 @@ static int hisi_ptt_register_pmu(struct hisi_ptt *hisi_ptt) hisi_ptt->hisi_ptt_pmu = (struct pmu ) { .module =THIS_MODULE , + .parent = &hisi_ptt->pdev->dev, .capabilities =PERF_PMU_CAP_EXCLUSIVE |PERF_PMU_CAP_NO_EXCLUDE , .task_ctx_nr = perf_sw_context, .attr_groups = hisi_ptt_pmu_groups,
Will Deacon
maintainerQuoted 9 lines · Jonathan Cameron
Robin posted a patch for the cmn and that reminded me that I never sent a v2.
v2: Drop first patch that added a parent to struct pmu as that has been
upstream for a year.
Drop the arm-cmn change as Robin has dealt with that one. Gathered tags.[...]
Applied drivers/perf parts to will (for-next/perf), thanks!
[01/30] perf/hisi-pcie: Assign parent for event_source device
https://git.kernel.org/will/c/1fb8950417a4 [02/30] Documentation: hisi-pmu: Drop reference to /sys/devices path https://git.kernel.org/will/c/d0412b6ecb4e [03/30] perf/hisi-uncore: Assign parents for event_source devices https://git.kernel.org/will/c/16d417f6c45b [04/30] Documentation: hns-pmu: Use /sys/bus/event_source/devices paths https://git.kernel.org/will/c/eff6af531335 [05/30] perf/hisi-hns3: Assign parents for event_source device https://git.kernel.org/will/c/3d957de12c65 [06/30] perf/amlogic: Assign parents for event_source devices https://git.kernel.org/will/c/1b7718fcc3f2 [07/30] perf/arm_cspmu: Assign parents for event_source devices https://git.kernel.org/will/c/3a1bb75ebc1b [08/30] Documentation: xgene-pmu: Use /sys/bus/event_source/devices paths https://git.kernel.org/will/c/867ba6d204f1 [09/30] perf/xgene: Assign parents for event_source devices https://git.kernel.org/will/c/89e34f8bee6c [10/30] Documentation: thunderx2-pmu: Use /sys/bus/event_source/devices paths https://git.kernel.org/will/c/90b4a1a927ee [11/30] perf/thunderx2: Assign parents for event_source devices https://git.kernel.org/will/c/ecb79c21c189 [12/30] perf/riscv: Assign parents for event_source devices https://git.kernel.org/will/c/50650e5f3186 [13/30] Documentation: qcom-pmu: Use /sys/bus/event_source/devices paths https://git.kernel.org/will/c/556da1343452 [14/30] perf/qcom: Assign parents for event_source devices https://git.kernel.org/will/c/6148865dd57c [15/30] perf/imx_ddr: Assign parents for event_source devices https://git.kernel.org/will/c/1d194ab8571b [16/30] perf/arm_pmu: Assign parents for event_source devices https://git.kernel.org/will/c/7bf75431a9ba [17/30] perf/alibaba_uncore: Assign parents for event_source device https://git.kernel.org/will/c/1919bd8e0be0 [18/30] perf/arm-cci: Assign parents for event_source device https://git.kernel.org/will/c/e7ec4791f903 [19/30] perf/arm-ccn: Assign parents for event_source device https://git.kernel.org/will/c/f4144be05a60 [20/30] perf/arm-dmc620: Assign parents for event_source device https://git.kernel.org/will/c/46bed4c740d5 [21/30] perf/arm-dsu: Assign parents for event_source device https://git.kernel.org/will/c/bc81ae2efbb3 [22/30] perf/arm-smmuv3: Assign parents for event_source device https://git.kernel.org/will/c/a8889fbf16bc [23/30] perf/arm-spe: Assign parents for event_source device https://git.kernel.org/will/c/4052ce07d5d7
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev
Suzuki K Poulose
AppliedRe: [PATCH v2 00/30] (subset) Add parents to struct pmu -> dev
In reply to Jonathan CameronQuoted 9 lines · Jonathan Cameron
Robin posted a patch for the cmn and that reminded me that I never sent a v2.
v2: Drop first patch that added a parent to struct pmu as that has been
upstream for a year.
Drop the arm-cmn change as Robin has dealt with that one. Gathered tags.[...]
Applied, subset of patches to coresight/next. thanks!
[29/30] Documentation: ABI + trace: hisi_ptt: update paths to bus/event_source
https://git.kernel.org/coresight/c/1f82d58ddbe21ed75c04d04403d8268a95e0190a [30/30] hwtracing: hisi_ptt: Assign parent for event_source device https://git.kernel.org/coresight/c/9b47d9982d1de5adf0abcb8f1a400e51d68cca1f
Best regards,
Signature · 1 line
Suzuki K Poulose <[email protected]>