Support PCIe3 uncore PMU on Snow Ridge
Subsystems (2)
v2 cover Support PCIe3 uncore PMU on Snow Ridge
From: Kan Liang <[email protected]>
Changes since V1:
- Drop the platform device solution
- A new uncore PCI sub driver solution is introduced which searches the PCIe Root Port device via pci_get_device() and id table. Register a PCI bus notifier for the remove notification. Once the device is removed, the uncore driver can be notified to unregister the corresponding PMU.
- Modify the parameters of uncore_pci_pmu_unregister() function.
The Snow Ridge integrated PCIe3 uncore performance monitoring unit (PMU) can be used to collect the performance data, e.g., the utilization between the PCIe devices and the components (in M2IOSF) which are responsible for translating and managing the requests to/from the device. The performance data is very useful for analyzing the performance of the PCIe devices.
The PCIe3 uncore PMU was once supported in the Linux kernel, but it was removed by the commit 2167f1625c2f ("perf/x86/intel/uncore: Remove PCIe3 unit for SNR") due to the conflict between the PCIe Root Port driver and the perf uncore driver. The counters of the PCIe3 uncore PMU are located in the configuration space of the PCIe Root Port device, which already has a bonded driver portdrv_pci. One device can only have one bonded driver. The uncore driver is always failed to be loaded.
To re-enable the PCIe3 uncore PMU support in the uncore driver, a new solution should be introduced, which has to meet the requirements as below:
- must have a reliable way to find the PCIe Root Port device from the uncore driver;
- must be able to access the uncore counters of the PCIe Root Port device from the uncore driver;
- must support hotplug. When the PCIe Root Port device is removed, the uncore driver has to be notified and unregisters the PCIe3 uncore PMU.
In the v1 patch set, a new platform device solution is implemented to address the issue, but it's rejected.
https://lkml.kernel.org/r/20200708183034.GA466341@bjorn-Precision-5520
A new uncore PCI sub driver solution is introduced from the V2 patch set, which:
- searches the PCIe Root Port device via pci_get_device() and id table. The matched pci_dev can be used to register a PMU for accessing the counters in the PCIe Root Port device.
- register a PCI bus notifier. Once the device is removed, the uncore driver can be notified to unregister the corresponding PMU.
Kan Liang (6):
perf/x86/intel/uncore: Factor out uncore_pci_get_dev_die_info() perf/x86/intel/uncore: Factor out uncore_pci_find_dev_pmu() perf/x86/intel/uncore: Factor out uncore_pci_pmu_register() perf/x86/intel/uncore: Factor out uncore_pci_pmu_unregister() perf/x86/intel/uncore: Generic support for the PCI sub driver perf/x86/intel/uncore: Support PCIe3 unit on Snow Ridge
arch/x86/events/intel/uncore.c | 273 +++++++++++++++++++++++++++-------- arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snbep.c | 53 +++++++ 3 files changed, 265 insertions(+), 62 deletions(-)
Signature · 1 line
2.7.4
PATCH RESEND v2 1/6 perf/x86/intel/uncore: Factor out uncore_pci_get_dev_die_info()
From: Kan Liang <[email protected]>
The socket and die information is required to register/unregister a PMU in the uncore PCI sub driver. The codes, which get the socket and die information from a BUS number, can be shared.
Factor out uncore_pci_get_dev_die_info(), which will be used later.
There is no functional change.
--- arch/x86/events/intel/uncore.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
arch/x86/events/intel/uncore.c +23 -8
@@ -989,6 +989,26 @@ uncore_types_init(struct intel_uncore_type **types, bool setid) }/* +* Get the die information of a PCI device. +* @pdev: The PCI device. +* @phys_id: The physical socket id which the device maps to. +* @die: The die id which the device maps to. +*/ +static int uncore_pci_get_dev_die_info (struct pci_dev *pdev, +int *phys_id,int *die) +{ + *phys_id =uncore_pcibus_to_physid (pdev->bus); +if (*phys_id <0 ) +return -ENODEV ; + + *die = (topology_max_die_per_package () >1 ) ? *phys_id : +topology_phys_to_logical_pkg (*phys_id); +if (*die <0 ) +return -EINVAL ; + +return 0 ; +} +/* * add a pci uncore device */ static int uncore_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id)
@@ -998,14 +1018,9 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *idstruct intel_uncore_box *box;int phys_id, die, ret; - phys_id =uncore_pcibus_to_physid (pdev->bus); -if (phys_id <0 ) -return -ENODEV ; - - die = (topology_max_die_per_package () >1 ) ? phys_id : -topology_phys_to_logical_pkg (phys_id); -if (die <0 ) -return -EINVAL ; + ret =uncore_pci_get_dev_die_info (pdev, &phys_id, &die); +if (ret) +return ret;if (UNCORE_PCI_DEV_TYPE (id->driver_data) ==UNCORE_EXTRA_PCI_DEV ) {int idx =UNCORE_PCI_DEV_IDX (id->driver_data);
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Factor out uncore_pci_get_dev_die_info()
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: fe6507338d635f283e9618b5eaa35f503a8c375b Gitweb: https://git.kernel.org/tip/fe6507338d635f283e9618b5eaa35f503a8c375b Author: Kan Liang <[email protected]> AuthorDate: Mon, 14 Sep 2020 07:34:15 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 24 Sep 2020 15:55:50 +02:00
perf/x86/intel/uncore: Factor out uncore_pci_get_dev_die_info()
The socket and die information is required to register/unregister a PMU in the uncore PCI sub driver. The codes, which get the socket and die information from a BUS number, can be shared.
Factor out uncore_pci_get_dev_die_info(), which will be used later.
There is no functional change.
--- arch/x86/events/intel/uncore.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
arch/x86/events/intel/uncore.c +23 -8
@@ -989,6 +989,26 @@ uncore_types_init(struct intel_uncore_type **types, bool setid) }/* +* Get the die information of a PCI device. +* @pdev: The PCI device. +* @phys_id: The physical socket id which the device maps to. +* @die: The die id which the device maps to. +*/ +static int uncore_pci_get_dev_die_info (struct pci_dev *pdev, +int *phys_id,int *die) +{ + *phys_id =uncore_pcibus_to_physid (pdev->bus); +if (*phys_id <0 ) +return -ENODEV ; + + *die = (topology_max_die_per_package () >1 ) ? *phys_id : +topology_phys_to_logical_pkg (*phys_id); +if (*die <0 ) +return -EINVAL ; + +return 0 ; +} +/* * add a pci uncore device */ static int uncore_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id)
@@ -998,14 +1018,9 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *idstruct intel_uncore_box *box;int phys_id, die, ret; - phys_id =uncore_pcibus_to_physid (pdev->bus); -if (phys_id <0 ) -return -ENODEV ; - - die = (topology_max_die_per_package () >1 ) ? phys_id : -topology_phys_to_logical_pkg (phys_id); -if (die <0 ) -return -EINVAL ; + ret =uncore_pci_get_dev_die_info (pdev, &phys_id, &die); +if (ret) +return ret;if (UNCORE_PCI_DEV_TYPE (id->driver_data) ==UNCORE_EXTRA_PCI_DEV ) {int idx =UNCORE_PCI_DEV_IDX (id->driver_data);
PATCH RESEND v2 2/6 perf/x86/intel/uncore: Factor out uncore_pci_find_dev_pmu()
In reply to [email protected]From: Kan Liang <[email protected]>
When an uncore PCI sub driver gets a remove notification, the corresponding PMU has to be retrieved and unregistered. The codes, which find the corresponding PMU by comparing the pci_device_id table, can be shared.
Factor out uncore_pci_find_dev_pmu(), which will be used later.
There is no functional change.
--- arch/x86/events/intel/uncore.c | 48 +++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 15 deletions(-)
arch/x86/events/intel/uncore.c +33 -15
@@ -1008,6 +1008,37 @@ static int uncore_pci_get_dev_die_info(struct pci_dev *pdev,return 0 ; } + +/* +* Find the PMU of a PCI device. +* @pdev: The PCI device. +* @ids: The ID table of the available PCI devices with a PMU. +*/ +static struct intel_uncore_pmu * +uncore_pci_find_dev_pmu (struct pci_dev *pdev,const struct pci_device_id *ids) +{ +struct intel_uncore_pmu *pmu =NULL ; +struct intel_uncore_type *type; +kernel_ulong_t data; +unsigned int devfn; + +while (ids && ids->vendor) { +if ((ids->vendor == pdev->vendor) && + (ids->device == pdev->device)) { + data = ids->driver_data; + devfn =PCI_DEVFN (UNCORE_PCI_DEV_DEV (data), +UNCORE_PCI_DEV_FUNC (data)); +if (devfn == pdev->devfn) { + type = uncore_pci_uncores[UNCORE_PCI_DEV_TYPE (data)]; + pmu = &type->pmus[UNCORE_PCI_DEV_IDX (data)]; +break ; + } + } + ids++; + } +return pmu; +} +/* * add a pci uncore device */
@@ -1039,21 +1070,8 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id*/ if (id->driver_data & ~0xffff ) {struct pci_driver *pci_drv = pdev->driver; -const struct pci_device_id *ids = pci_drv->id_table; -unsigned int devfn; - -while (ids && ids->vendor) { -if ((ids->vendor == pdev->vendor) && - (ids->device == pdev->device)) { - devfn =PCI_DEVFN (UNCORE_PCI_DEV_DEV (ids->driver_data), -UNCORE_PCI_DEV_FUNC (ids->driver_data)); -if (devfn == pdev->devfn) { - pmu = &type->pmus[UNCORE_PCI_DEV_IDX (ids->driver_data)]; -break ; - } - } - ids++; - } + + pmu =uncore_pci_find_dev_pmu (pdev, pci_drv->id_table);if (pmu ==NULL )return -ENODEV ; }else {
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Factor out uncore_pci_find_dev_pmu()
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 8ed2ccaa3fa990be61619a61b9bc3914eefdc18f Gitweb: https://git.kernel.org/tip/8ed2ccaa3fa990be61619a61b9bc3914eefdc18f Author: Kan Liang <[email protected]> AuthorDate: Mon, 14 Sep 2020 07:34:16 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 24 Sep 2020 15:55:50 +02:00
perf/x86/intel/uncore: Factor out uncore_pci_find_dev_pmu()
When an uncore PCI sub driver gets a remove notification, the corresponding PMU has to be retrieved and unregistered. The codes, which find the corresponding PMU by comparing the pci_device_id table, can be shared.
Factor out uncore_pci_find_dev_pmu(), which will be used later.
There is no functional change.
--- arch/x86/events/intel/uncore.c | 48 ++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 15 deletions(-)
arch/x86/events/intel/uncore.c +33 -15
@@ -1008,6 +1008,37 @@ static int uncore_pci_get_dev_die_info(struct pci_dev *pdev,return 0 ; } + +/* +* Find the PMU of a PCI device. +* @pdev: The PCI device. +* @ids: The ID table of the available PCI devices with a PMU. +*/ +static struct intel_uncore_pmu * +uncore_pci_find_dev_pmu (struct pci_dev *pdev,const struct pci_device_id *ids) +{ +struct intel_uncore_pmu *pmu =NULL ; +struct intel_uncore_type *type; +kernel_ulong_t data; +unsigned int devfn; + +while (ids && ids->vendor) { +if ((ids->vendor == pdev->vendor) && + (ids->device == pdev->device)) { + data = ids->driver_data; + devfn =PCI_DEVFN (UNCORE_PCI_DEV_DEV (data), +UNCORE_PCI_DEV_FUNC (data)); +if (devfn == pdev->devfn) { + type = uncore_pci_uncores[UNCORE_PCI_DEV_TYPE (data)]; + pmu = &type->pmus[UNCORE_PCI_DEV_IDX (data)]; +break ; + } + } + ids++; + } +return pmu; +} +/* * add a pci uncore device */
@@ -1039,21 +1070,8 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id*/ if (id->driver_data & ~0xffff ) {struct pci_driver *pci_drv = pdev->driver; -const struct pci_device_id *ids = pci_drv->id_table; -unsigned int devfn; - -while (ids && ids->vendor) { -if ((ids->vendor == pdev->vendor) && - (ids->device == pdev->device)) { - devfn =PCI_DEVFN (UNCORE_PCI_DEV_DEV (ids->driver_data), -UNCORE_PCI_DEV_FUNC (ids->driver_data)); -if (devfn == pdev->devfn) { - pmu = &type->pmus[UNCORE_PCI_DEV_IDX (ids->driver_data)]; -break ; - } - } - ids++; - } + + pmu =uncore_pci_find_dev_pmu (pdev, pci_drv->id_table);if (pmu ==NULL )return -ENODEV ; }else {
PATCH RESEND v2 3/6 perf/x86/intel/uncore: Factor out uncore_pci_pmu_register()
In reply to [email protected]From: Kan Liang <[email protected]>
The PMU registration in the uncore PCI sub driver is similar as the normal PMU registration for a PCI device. The codes to register a PCI PMU can be shared.
Factor out uncore_pci_pmu_register(), which will be used later.
The pci_set_drvdata() is not included in uncore_pci_pmu_register(). The uncore PCI sub driver doesn't own the PCI device. It will not touch the private driver data pointer for the device.
--- arch/x86/events/intel/uncore.c | 82 ++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 31 deletions(-)
arch/x86/events/intel/uncore.c +51 -31
@@ -1040,13 +1040,61 @@ uncore_pci_find_dev_pmu(struct pci_dev *pdev, const struct pci_device_id *ids) }/* +* Register the PMU for a PCI device +* @pdev: The PCI device. +* @type: The corresponding PMU type of the device. +* @pmu: The corresponding PMU of the device. +* @phys_id: The physical socket id which the device maps to. +* @die: The die id which the device maps to. +*/ +static int uncore_pci_pmu_register (struct pci_dev *pdev, +struct intel_uncore_type *type, +struct intel_uncore_pmu *pmu, +int phys_id,int die) +{ +struct intel_uncore_box *box; +int ret; + +if (WARN_ON_ONCE (pmu->boxes[die] !=NULL )) +return -EINVAL ; + + box =uncore_alloc_box (type,NUMA_NO_NODE ); +if (!box) +return -ENOMEM ; + +if (pmu->func_id <0 ) + pmu->func_id = pdev->devfn; +else +WARN_ON_ONCE (pmu->func_id != pdev->devfn); + +atomic_inc (&box->refcnt); + box->pci_phys_id = phys_id; + box->dieid = die; + box->pci_dev = pdev; + box->pmu = pmu; +uncore_box_init (box); + + pmu->boxes[die] = box; +if (atomic_inc_return (&pmu->activeboxes) >1 ) +return 0 ; + +/* First active box registers the pmu */ + ret =uncore_pmu_register (pmu); +if (ret) { + pmu->boxes[die] =NULL ; +uncore_box_exit (box); +kfree (box); + } +return ret; +} + +/* * add a pci uncore device */ static int uncore_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct intel_uncore_type *type;struct intel_uncore_pmu *pmu =NULL ; -struct intel_uncore_box *box;int phys_id, die, ret; ret =uncore_pci_get_dev_die_info (pdev, &phys_id, &die);
@@ -1082,38 +1130,10 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id pmu = &type->pmus[UNCORE_PCI_DEV_IDX (id->driver_data)]; } -if (WARN_ON_ONCE (pmu->boxes[die] !=NULL )) -return -EINVAL ; - - box =uncore_alloc_box (type,NUMA_NO_NODE ); -if (!box) -return -ENOMEM ; + ret =uncore_pci_pmu_register (pdev, type, pmu, phys_id, die); -if (pmu->func_id <0 ) - pmu->func_id = pdev->devfn; -else -WARN_ON_ONCE (pmu->func_id != pdev->devfn); +pci_set_drvdata (pdev, pmu->boxes[die]); -atomic_inc (&box->refcnt); - box->pci_phys_id = phys_id; - box->dieid = die; - box->pci_dev = pdev; - box->pmu = pmu; -uncore_box_init (box); -pci_set_drvdata (pdev, box); - - pmu->boxes[die] = box; -if (atomic_inc_return (&pmu->activeboxes) >1 ) -return 0 ; - -/* First active box registers the pmu */ - ret =uncore_pmu_register (pmu); -if (ret) { -pci_set_drvdata (pdev,NULL ); - pmu->boxes[die] =NULL ; -uncore_box_exit (box); -kfree (box); - }return ret; }
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Factor out uncore_pci_pmu_register()
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 16fa64315c1bd2a61fb20d6aa9a542dd5bf52971 Gitweb: https://git.kernel.org/tip/16fa64315c1bd2a61fb20d6aa9a542dd5bf52971 Author: Kan Liang <[email protected]> AuthorDate: Mon, 14 Sep 2020 07:34:17 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 24 Sep 2020 15:55:51 +02:00
perf/x86/intel/uncore: Factor out uncore_pci_pmu_register()
The PMU registration in the uncore PCI sub driver is similar as the normal PMU registration for a PCI device. The codes to register a PCI PMU can be shared.
Factor out uncore_pci_pmu_register(), which will be used later.
The pci_set_drvdata() is not included in uncore_pci_pmu_register(). The uncore PCI sub driver doesn't own the PCI device. It will not touch the private driver data pointer for the device.
--- arch/x86/events/intel/uncore.c | 82 ++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 31 deletions(-)
arch/x86/events/intel/uncore.c +51 -31
@@ -1040,13 +1040,61 @@ uncore_pci_find_dev_pmu(struct pci_dev *pdev, const struct pci_device_id *ids) }/* +* Register the PMU for a PCI device +* @pdev: The PCI device. +* @type: The corresponding PMU type of the device. +* @pmu: The corresponding PMU of the device. +* @phys_id: The physical socket id which the device maps to. +* @die: The die id which the device maps to. +*/ +static int uncore_pci_pmu_register (struct pci_dev *pdev, +struct intel_uncore_type *type, +struct intel_uncore_pmu *pmu, +int phys_id,int die) +{ +struct intel_uncore_box *box; +int ret; + +if (WARN_ON_ONCE (pmu->boxes[die] !=NULL )) +return -EINVAL ; + + box =uncore_alloc_box (type,NUMA_NO_NODE ); +if (!box) +return -ENOMEM ; + +if (pmu->func_id <0 ) + pmu->func_id = pdev->devfn; +else +WARN_ON_ONCE (pmu->func_id != pdev->devfn); + +atomic_inc (&box->refcnt); + box->pci_phys_id = phys_id; + box->dieid = die; + box->pci_dev = pdev; + box->pmu = pmu; +uncore_box_init (box); + + pmu->boxes[die] = box; +if (atomic_inc_return (&pmu->activeboxes) >1 ) +return 0 ; + +/* First active box registers the pmu */ + ret =uncore_pmu_register (pmu); +if (ret) { + pmu->boxes[die] =NULL ; +uncore_box_exit (box); +kfree (box); + } +return ret; +} + +/* * add a pci uncore device */ static int uncore_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct intel_uncore_type *type;struct intel_uncore_pmu *pmu =NULL ; -struct intel_uncore_box *box;int phys_id, die, ret; ret =uncore_pci_get_dev_die_info (pdev, &phys_id, &die);
@@ -1082,38 +1130,10 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id pmu = &type->pmus[UNCORE_PCI_DEV_IDX (id->driver_data)]; } -if (WARN_ON_ONCE (pmu->boxes[die] !=NULL )) -return -EINVAL ; - - box =uncore_alloc_box (type,NUMA_NO_NODE ); -if (!box) -return -ENOMEM ; - -if (pmu->func_id <0 ) - pmu->func_id = pdev->devfn; -else -WARN_ON_ONCE (pmu->func_id != pdev->devfn); - -atomic_inc (&box->refcnt); - box->pci_phys_id = phys_id; - box->dieid = die; - box->pci_dev = pdev; - box->pmu = pmu; -uncore_box_init (box); -pci_set_drvdata (pdev, box); + ret =uncore_pci_pmu_register (pdev, type, pmu, phys_id, die); - pmu->boxes[die] = box; -if (atomic_inc_return (&pmu->activeboxes) >1 ) -return 0 ; +pci_set_drvdata (pdev, pmu->boxes[die]); -/* First active box registers the pmu */ - ret =uncore_pmu_register (pmu); -if (ret) { -pci_set_drvdata (pdev,NULL ); - pmu->boxes[die] =NULL ; -uncore_box_exit (box); -kfree (box); - }return ret; }
PATCH RESEND v2 4/6 perf/x86/intel/uncore: Factor out uncore_pci_pmu_unregister()
In reply to [email protected]From: Kan Liang <[email protected]>
The PMU unregistration in the uncore PCI sub driver is similar as the normal PMU unregistration for a PCI device. The codes to unregister a PCI PMU can be shared.
Factor out uncore_pci_pmu_unregister(), which will be used later.
Use uncore_pci_get_dev_die_info() to replace the codes which retrieve the socket and die informaion.
The pci_set_drvdata() is not included in uncore_pci_pmu_unregister() as well, because the uncore PCI sub driver will not touch the private driver data pointer of the device.
--- arch/x86/events/intel/uncore.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
arch/x86/events/intel/uncore.c +25 -10
@@ -1137,18 +1137,38 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *idreturn ret; } +/* +* Unregister the PMU of a PCI device +* @pmu: The corresponding PMU is unregistered. +* @phys_id: The physical socket id which the device maps to. +* @die: The die id which the device maps to. +*/ +static void uncore_pci_pmu_unregister (struct intel_uncore_pmu *pmu, +int phys_id,int die) +{ +struct intel_uncore_box *box = pmu->boxes[die]; + +if (WARN_ON_ONCE (phys_id != box->pci_phys_id)) +return ; + + pmu->boxes[die] =NULL ; +if (atomic_dec_return (&pmu->activeboxes) ==0 ) +uncore_pmu_unregister (pmu); +uncore_box_exit (box); +kfree (box); +} +static void uncore_pci_remove (struct pci_dev *pdev) {struct intel_uncore_box *box;struct intel_uncore_pmu *pmu;int i, phys_id, die; - phys_id =uncore_pcibus_to_physid (pdev->bus); +if (uncore_pci_get_dev_die_info (pdev, &phys_id, &die)) +return ; box =pci_get_drvdata (pdev);if (!box) { - die = (topology_max_die_per_package () >1 ) ? phys_id : -topology_phys_to_logical_pkg (phys_id);for (i =0 ; i <UNCORE_EXTRA_PCI_DEV_MAX ; i++) {if (uncore_extra_pci_dev[die].dev[i] == pdev) { uncore_extra_pci_dev[die].dev[i] =NULL ;
@@ -1160,15 +1180,10 @@ static void uncore_pci_remove(struct pci_dev *pdev) } pmu = box->pmu; -if (WARN_ON_ONCE (phys_id != box->pci_phys_id)) -return ;pci_set_drvdata (pdev,NULL ); - pmu->boxes[box->dieid] =NULL ; -if (atomic_dec_return (&pmu->activeboxes) ==0 ) -uncore_pmu_unregister (pmu); -uncore_box_exit (box); -kfree (box); + +uncore_pci_pmu_unregister (pmu, phys_id, die); }static int __init uncore_pci_init (void )
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Factor out uncore_pci_pmu_unregister()
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: cdcce92a3a03bccbb0b4a0342fc7e279fc507bc3 Gitweb: https://git.kernel.org/tip/cdcce92a3a03bccbb0b4a0342fc7e279fc507bc3 Author: Kan Liang <[email protected]> AuthorDate: Mon, 14 Sep 2020 07:34:18 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 24 Sep 2020 15:55:51 +02:00
perf/x86/intel/uncore: Factor out uncore_pci_pmu_unregister()
The PMU unregistration in the uncore PCI sub driver is similar as the normal PMU unregistration for a PCI device. The codes to unregister a PCI PMU can be shared.
Factor out uncore_pci_pmu_unregister(), which will be used later.
Use uncore_pci_get_dev_die_info() to replace the codes which retrieve the socket and die informaion.
The pci_set_drvdata() is not included in uncore_pci_pmu_unregister() as well, because the uncore PCI sub driver will not touch the private driver data pointer of the device.
--- arch/x86/events/intel/uncore.c | 35 +++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
arch/x86/events/intel/uncore.c +25 -10
@@ -1137,18 +1137,38 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *idreturn ret; } +/* +* Unregister the PMU of a PCI device +* @pmu: The corresponding PMU is unregistered. +* @phys_id: The physical socket id which the device maps to. +* @die: The die id which the device maps to. +*/ +static void uncore_pci_pmu_unregister (struct intel_uncore_pmu *pmu, +int phys_id,int die) +{ +struct intel_uncore_box *box = pmu->boxes[die]; + +if (WARN_ON_ONCE (phys_id != box->pci_phys_id)) +return ; + + pmu->boxes[die] =NULL ; +if (atomic_dec_return (&pmu->activeboxes) ==0 ) +uncore_pmu_unregister (pmu); +uncore_box_exit (box); +kfree (box); +} +static void uncore_pci_remove (struct pci_dev *pdev) {struct intel_uncore_box *box;struct intel_uncore_pmu *pmu;int i, phys_id, die; - phys_id =uncore_pcibus_to_physid (pdev->bus); +if (uncore_pci_get_dev_die_info (pdev, &phys_id, &die)) +return ; box =pci_get_drvdata (pdev);if (!box) { - die = (topology_max_die_per_package () >1 ) ? phys_id : -topology_phys_to_logical_pkg (phys_id);for (i =0 ; i <UNCORE_EXTRA_PCI_DEV_MAX ; i++) {if (uncore_extra_pci_dev[die].dev[i] == pdev) { uncore_extra_pci_dev[die].dev[i] =NULL ;
@@ -1160,15 +1180,10 @@ static void uncore_pci_remove(struct pci_dev *pdev) } pmu = box->pmu; -if (WARN_ON_ONCE (phys_id != box->pci_phys_id)) -return ;pci_set_drvdata (pdev,NULL ); - pmu->boxes[box->dieid] =NULL ; -if (atomic_dec_return (&pmu->activeboxes) ==0 ) -uncore_pmu_unregister (pmu); -uncore_box_exit (box); -kfree (box); + +uncore_pci_pmu_unregister (pmu, phys_id, die); }static int __init uncore_pci_init (void )
PATCH RESEND v2 5/6 perf/x86/intel/uncore: Generic support for the PCI sub driver
In reply to [email protected]From: Kan Liang <[email protected]>
Some uncore counters may be located in the configuration space of a PCI device, which already has a bonded driver. Currently, the uncore driver cannot register a PCI uncore PMU for these counters, because, to register a PCI uncore PMU, the uncore driver must be bond to the device. However, one device can only have one bonded driver.
Add an uncore PCI sub driver to support such kind of devices.
The sub driver doesn't own the device. In initialization, the sub driver searches the device via pci_get_device(), and register the corresponding PMU for the device. In the meantime, the sub driver registeris a PCI bus notifier, which is used to notify the sub driver once the device is removed. The sub driver can unregister the PMU accordingly.
The sub driver only searches the devices defined in its id table. The id table varies on different platforms, which will be implemented in the following platform-specific patch.
--- arch/x86/events/intel/uncore.c | 81 ++++++++++++++++++++++++++++++++++++++++++ arch/x86/events/intel/uncore.h | 1 + 2 files changed, 82 insertions(+)
arch/x86/events/intel/uncore.c +81 -0
@@ -12,6 +12,8 @@ struct intel_uncore_type **uncore_mmio_uncores = empty_uncore;static bool pcidrv_registered;struct pci_driver *uncore_pci_driver; +/* The PCI driver for the device which the uncore doesn't own. */ +struct pci_driver *uncore_pci_sub_driver;/* pci bus to socket mapping */ DEFINE_RAW_SPINLOCK (pci2phy_map_lock);struct list_head pci2phy_map_head =LIST_HEAD_INIT (pci2phy_map_head);
@@ -1186,6 +1188,80 @@ static void uncore_pci_remove(struct pci_dev *pdev)uncore_pci_pmu_unregister (pmu, phys_id, die); } +static int uncore_bus_notify (struct notifier_block *nb, +unsigned long action,void *data) +{ +struct device *dev = data; +struct pci_dev *pdev =to_pci_dev (dev); +struct intel_uncore_pmu *pmu; +int phys_id, die; + +/* Unregister the PMU when the device is going to be deleted. */ +if (action !=BUS_NOTIFY_DEL_DEVICE ) +return NOTIFY_DONE ; + + pmu =uncore_pci_find_dev_pmu (pdev, uncore_pci_sub_driver->id_table); +if (!pmu) +return NOTIFY_DONE ; + +if (uncore_pci_get_dev_die_info (pdev, &phys_id, &die)) +return NOTIFY_DONE ; + +uncore_pci_pmu_unregister (pmu, phys_id, die); + +return NOTIFY_OK ; +} + +static struct notifier_block uncore_notifier = { + .notifier_call = uncore_bus_notify, +}; + +static void uncore_pci_sub_driver_init (void ) +{ +const struct pci_device_id *ids = uncore_pci_sub_driver->id_table; +struct intel_uncore_type *type; +struct intel_uncore_pmu *pmu; +struct pci_dev *pci_sub_dev; +bool notify = false; +unsigned int devfn; +int phys_id, die; + +while (ids && ids->vendor) { + pci_sub_dev =NULL ; + type = uncore_pci_uncores[UNCORE_PCI_DEV_TYPE (ids->driver_data)]; +/* +* Search the available device, and register the +* corresponding PMU. +*/ +while ((pci_sub_dev =pci_get_device (PCI_VENDOR_ID_INTEL , + ids->device, pci_sub_dev))) { + devfn =PCI_DEVFN (UNCORE_PCI_DEV_DEV (ids->driver_data), +UNCORE_PCI_DEV_FUNC (ids->driver_data)); +if (devfn != pci_sub_dev->devfn) +continue ; + + pmu = &type->pmus[UNCORE_PCI_DEV_IDX (ids->driver_data)]; +if (!pmu) +continue ; + +if (uncore_pci_get_dev_die_info (pci_sub_dev, + &phys_id, &die)) +continue ; + +if (!uncore_pci_pmu_register (pci_sub_dev, type, pmu, + phys_id, die)) + notify = true; + } + ids++; + } + +if (notify &&bus_register_notifier (&pci_bus_type, &uncore_notifier)) + notify = false; + +if (!notify) + uncore_pci_sub_driver =NULL ; +} +static int __init uncore_pci_init (void ) {size_t size;
@@ -1209,6 +1285,9 @@ static int __init uncore_pci_init(void)if (ret) goto errtype; +if (uncore_pci_sub_driver) +uncore_pci_sub_driver_init (); + pcidrv_registered = true;return 0 ;
@@ -1226,6 +1305,8 @@ static void uncore_pci_exit(void) {if (pcidrv_registered) { pcidrv_registered = false; +if (uncore_pci_sub_driver) +bus_unregister_notifier (&pci_bus_type, &uncore_notifier);pci_unregister_driver (uncore_pci_driver);uncore_types_exit (uncore_pci_uncores);kfree (uncore_extra_pci_dev);
arch/x86/events/intel/uncore.h +1 -0
@@ -552,6 +552,7 @@ extern struct intel_uncore_type **uncore_msr_uncores;extern struct intel_uncore_type **uncore_pci_uncores;extern struct intel_uncore_type **uncore_mmio_uncores;extern struct pci_driver *uncore_pci_driver; +extern struct pci_driver *uncore_pci_sub_driver;extern raw_spinlock_t pci2phy_map_lock;extern struct list_head pci2phy_map_head;extern struct pci_extra_dev *uncore_extra_pci_dev;
Signature · 1 line
2.7.4
Re: [RESEND PATCH V2 5/6] perf/x86/intel/uncore: Generic support for the PCI sub driver
Quoted 8 lines · On Mon, Sep 14, 2020 at 07:34:19AM -0700, [email protected] wrote:
From: Kan Liang <[email protected]>
Some uncore counters may be located in the configuration space of a PCI device, which already has a bonded driver. Currently, the uncore driver cannot register a PCI uncore PMU for these counters, because, to register a PCI uncore PMU, the uncore driver must be bond to the device. However, one device can only have one bonded driver.
Quoted 8 lines
Add an uncore PCI sub driver to support such kind of devices.
The sub driver doesn't own the device. In initialization, the sub driver searches the device via
pci_get_device(), and register the corresponding PMU for the device. In the meantime, the sub driver registeris a PCI bus notifier, which is used to notify the sub driver once the device is removed. The sub driver can unregister the PMU accordingly.
s/registeris/registers/
It looks like this only handles hot-remove of the device, not hot-add. Maybe that's OK for your use case, I dunno, so just pointing it out.
Re: [RESEND PATCH V2 5/6] perf/x86/intel/uncore: Generic support for the PCI sub driver
Quoted 18 lines · Bjorn Helgaas
Quoted 8 lines · On Mon, Sep 14, 2020 at 07:34:19AM -0700, [email protected] wrote:
From: Kan Liang <[email protected]>
Some uncore counters may be located in the configuration space of a PCI device, which already has a bonded driver. Currently, the uncore driver cannot register a PCI uncore PMU for these counters, because, to register a PCI uncore PMU, the uncore driver must be bond to the device. However, one device can only have one bonded driver.
Quoted 8 lines
Add an uncore PCI sub driver to support such kind of devices.
The sub driver doesn't own the device. In initialization, the sub driver searches the device via
pci_get_device(), and register the corresponding PMU for the device. In the meantime, the sub driver registeris a PCI bus notifier, which is used to notify the sub driver once the device is removed. The sub driver can unregister the PMU accordingly.
Quoted 5 lines
s/registeris/registers/
It looks like this only handles hot-remove of the device, not hot-add. Maybe that's OK for your use case, I dunno, so just pointing it out.
Hi Bjorn,
Thanks for the review.
Yes, the patch only supports the hot-remove for now, because
- I didn't get any requests for the hot-add support. I doubt anyone hot-adds a Root Port device in practice.
- To be honest, I don't have a test case to verify the hot-add of a Root Port device.
I used the command line below to test the hot-remove.
sudo bash -c 'echo 1 > /sys/bus/pci/devices/0000\:14\:04.0/remove'
Then the device is gone. I have no idea how to add it back.
So I only implemented the hot-remove in this patch. If anyone requires the hot-add, I can add it later separately.
Thanks,
Kan
[tip: perf/core] perf/x86/intel/uncore: Generic support for the PCI sub driver
In reply to [email protected]The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 95a7fc77443328ac8b68378df8e137a044ece5e8 Gitweb: https://git.kernel.org/tip/95a7fc77443328ac8b68378df8e137a044ece5e8 Author: Kan Liang <[email protected]> AuthorDate: Mon, 14 Sep 2020 07:34:19 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 24 Sep 2020 15:55:51 +02:00
perf/x86/intel/uncore: Generic support for the PCI sub driver
Some uncore counters may be located in the configuration space of a PCI device, which already has a bonded driver. Currently, the uncore driver cannot register a PCI uncore PMU for these counters, because, to register a PCI uncore PMU, the uncore driver must be bond to the device. However, one device can only have one bonded driver.
Add an uncore PCI sub driver to support such kind of devices.
The sub driver doesn't own the device. In initialization, the sub driver searches the device via pci_get_device(), and register the corresponding PMU for the device. In the meantime, the sub driver registers a PCI bus notifier, which is used to notify the sub driver once the device is removed. The sub driver can unregister the PMU accordingly.
The sub driver only searches the devices defined in its id table. The id table varies on different platforms, which will be implemented in the following platform-specific patch.
--- arch/x86/events/intel/uncore.c | 81 +++++++++++++++++++++++++++++++++- arch/x86/events/intel/uncore.h | 1 +- 2 files changed, 82 insertions(+)
arch/x86/events/intel/uncore.c +81 -0
@@ -12,6 +12,8 @@ struct intel_uncore_type **uncore_mmio_uncores = empty_uncore;static bool pcidrv_registered;struct pci_driver *uncore_pci_driver; +/* The PCI driver for the device which the uncore doesn't own. */ +struct pci_driver *uncore_pci_sub_driver;/* pci bus to socket mapping */ DEFINE_RAW_SPINLOCK (pci2phy_map_lock);struct list_head pci2phy_map_head =LIST_HEAD_INIT (pci2phy_map_head);
@@ -1186,6 +1188,80 @@ static void uncore_pci_remove(struct pci_dev *pdev)uncore_pci_pmu_unregister (pmu, phys_id, die); } +static int uncore_bus_notify (struct notifier_block *nb, +unsigned long action,void *data) +{ +struct device *dev = data; +struct pci_dev *pdev =to_pci_dev (dev); +struct intel_uncore_pmu *pmu; +int phys_id, die; + +/* Unregister the PMU when the device is going to be deleted. */ +if (action !=BUS_NOTIFY_DEL_DEVICE ) +return NOTIFY_DONE ; + + pmu =uncore_pci_find_dev_pmu (pdev, uncore_pci_sub_driver->id_table); +if (!pmu) +return NOTIFY_DONE ; + +if (uncore_pci_get_dev_die_info (pdev, &phys_id, &die)) +return NOTIFY_DONE ; + +uncore_pci_pmu_unregister (pmu, phys_id, die); + +return NOTIFY_OK ; +} + +static struct notifier_block uncore_notifier = { + .notifier_call = uncore_bus_notify, +}; + +static void uncore_pci_sub_driver_init (void ) +{ +const struct pci_device_id *ids = uncore_pci_sub_driver->id_table; +struct intel_uncore_type *type; +struct intel_uncore_pmu *pmu; +struct pci_dev *pci_sub_dev; +bool notify = false; +unsigned int devfn; +int phys_id, die; + +while (ids && ids->vendor) { + pci_sub_dev =NULL ; + type = uncore_pci_uncores[UNCORE_PCI_DEV_TYPE (ids->driver_data)]; +/* +* Search the available device, and register the +* corresponding PMU. +*/ +while ((pci_sub_dev =pci_get_device (PCI_VENDOR_ID_INTEL , + ids->device, pci_sub_dev))) { + devfn =PCI_DEVFN (UNCORE_PCI_DEV_DEV (ids->driver_data), +UNCORE_PCI_DEV_FUNC (ids->driver_data)); +if (devfn != pci_sub_dev->devfn) +continue ; + + pmu = &type->pmus[UNCORE_PCI_DEV_IDX (ids->driver_data)]; +if (!pmu) +continue ; + +if (uncore_pci_get_dev_die_info (pci_sub_dev, + &phys_id, &die)) +continue ; + +if (!uncore_pci_pmu_register (pci_sub_dev, type, pmu, + phys_id, die)) + notify = true; + } + ids++; + } + +if (notify &&bus_register_notifier (&pci_bus_type, &uncore_notifier)) + notify = false; + +if (!notify) + uncore_pci_sub_driver =NULL ; +} +static int __init uncore_pci_init (void ) {size_t size;
@@ -1209,6 +1285,9 @@ static int __init uncore_pci_init(void)if (ret) goto errtype; +if (uncore_pci_sub_driver) +uncore_pci_sub_driver_init (); + pcidrv_registered = true;return 0 ;
@@ -1226,6 +1305,8 @@ static void uncore_pci_exit(void) {if (pcidrv_registered) { pcidrv_registered = false; +if (uncore_pci_sub_driver) +bus_unregister_notifier (&pci_bus_type, &uncore_notifier);pci_unregister_driver (uncore_pci_driver);uncore_types_exit (uncore_pci_uncores);kfree (uncore_extra_pci_dev);
arch/x86/events/intel/uncore.h +1 -0
@@ -552,6 +552,7 @@ extern struct intel_uncore_type **uncore_msr_uncores;extern struct intel_uncore_type **uncore_pci_uncores;extern struct intel_uncore_type **uncore_mmio_uncores;extern struct pci_driver *uncore_pci_driver; +extern struct pci_driver *uncore_pci_sub_driver;extern raw_spinlock_t pci2phy_map_lock;extern struct list_head pci2phy_map_head;extern struct pci_extra_dev *uncore_extra_pci_dev;
PATCH RESEND v2 6/6 perf/x86/intel/uncore: Support PCIe3 unit on Snow Ridge
In reply to [email protected]From: Kan Liang <[email protected]>
The Snow Ridge integrated PCIe3 uncore unit can be used to collect performance data, e.g. utilization, between PCIe devices, plugged into the PCIe port, and the components (in M2IOSF) responsible for translating and managing requests to/from the device. The performance data is very useful for analyzing the performance of PCIe devices.
The device with the PCIe3 uncore PMON units is owned by the portdrv_pci driver. Create a PCI sub driver for the PCIe3 uncore PMON units.
Here are some difference between PCIe3 uncore unit and other uncore pci units.
- There may be several Root Ports on a system. But the uncore counters only exist in the Root Port A. A user can configure the channel mask to collect the data from other Root Ports.
- The event format of the PCIe3 uncore unit is the same as IIO unit of SKX.
- The Control Register of PCIe3 uncore unit is 64 bits.
- The offset of each counters is 8, which is the same as M2M unit of SNR.
- New MSR addresses for unit control, counter and counter config.
--- arch/x86/events/intel/uncore_snbep.c | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)
arch/x86/events/intel/uncore_snbep.c +53 -0
@@ -393,6 +393,11 @@#define SNR_M2M_PCI_PMON_BOX_CTL 0x438#define SNR_M2M_PCI_PMON_UMASK_EXT 0xff +/* SNR PCIE3 */ +#define SNR_PCIE3_PCI_PMON_CTL0 0x508 +#define SNR_PCIE3_PCI_PMON_CTR0 0x4e8 +#define SNR_PCIE3_PCI_PMON_BOX_CTL 0x4e0 +/* SNR IMC */ #define SNR_IMC_MMIO_PMON_FIXED_CTL 0x54#define SNR_IMC_MMIO_PMON_FIXED_CTR 0x38
@@ -4551,12 +4556,46 @@ static struct intel_uncore_type snr_uncore_m2m = { .format_group = &snr_m2m_uncore_format_group, }; +static void snr_uncore_pci_enable_event (struct intel_uncore_box *box,struct perf_event *event) +{ +struct pci_dev *pdev = box->pci_dev; +struct hw_perf_event *hwc = &event->hw; + +pci_write_config_dword (pdev, hwc->config_base, (u32)(hwc->config |SNBEP_PMON_CTL_EN )); +pci_write_config_dword (pdev, hwc->config_base +4 , (u32)(hwc->config >>32 )); +} + +static struct intel_uncore_ops snr_pcie3_uncore_pci_ops = { + .init_box = snr_m2m_uncore_pci_init_box, + .disable_box = snbep_uncore_pci_disable_box, + .enable_box = snbep_uncore_pci_enable_box, + .disable_event = snbep_uncore_pci_disable_event, + .enable_event = snr_uncore_pci_enable_event, + .read_counter = snbep_uncore_pci_read_counter, +}; + +static struct intel_uncore_type snr_uncore_pcie3 = { + .name ="pcie3" , + .num_counters =4 , + .num_boxes =1 , + .perf_ctr_bits =48 , + .perf_ctr =SNR_PCIE3_PCI_PMON_CTR0 , + .event_ctl =SNR_PCIE3_PCI_PMON_CTL0 , + .event_mask =SKX_IIO_PMON_RAW_EVENT_MASK , + .event_mask_ext =SKX_IIO_PMON_RAW_EVENT_MASK_EXT , + .box_ctl =SNR_PCIE3_PCI_PMON_BOX_CTL , + .ops = &snr_pcie3_uncore_pci_ops, + .format_group = &skx_uncore_iio_format_group, +}; +enum {SNR_PCI_UNCORE_M2M , +SNR_PCI_UNCORE_PCIE3 , };static struct intel_uncore_type *snr_pci_uncores[] = { [SNR_PCI_UNCORE_M2M ] = &snr_uncore_m2m, + [SNR_PCI_UNCORE_PCIE3 ] = &snr_uncore_pcie3,NULL , };
@@ -4573,6 +4612,19 @@ static struct pci_driver snr_uncore_pci_driver = { .id_table = snr_uncore_pci_ids, }; +static const struct pci_device_id snr_uncore_pci_sub_ids[] = { + {/* PCIe3 RP */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x334a ), + .driver_data =UNCORE_PCI_DEV_FULL_DATA (4 ,0 ,SNR_PCI_UNCORE_PCIE3 ,0 ), + }, + {/* end: all zeroes */ } +}; + +static struct pci_driver snr_uncore_pci_sub_driver = { + .name ="snr_uncore_sub" , + .id_table = snr_uncore_pci_sub_ids, +}; +int snr_uncore_pci_init (void ) {/* SNR UBOX DID */
@@ -4584,6 +4636,7 @@ int snr_uncore_pci_init(void) uncore_pci_uncores = snr_pci_uncores; uncore_pci_driver = &snr_uncore_pci_driver; + uncore_pci_sub_driver = &snr_uncore_pci_sub_driver;return 0 ; }
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Support PCIe3 unit on Snow Ridge
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: a3b1e8451d3fd54fe0df661c2c4f983932b3c0bc Gitweb: https://git.kernel.org/tip/a3b1e8451d3fd54fe0df661c2c4f983932b3c0bc Author: Kan Liang <[email protected]> AuthorDate: Mon, 14 Sep 2020 07:34:20 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 24 Sep 2020 15:55:52 +02:00
perf/x86/intel/uncore: Support PCIe3 unit on Snow Ridge
The Snow Ridge integrated PCIe3 uncore unit can be used to collect performance data, e.g. utilization, between PCIe devices, plugged into the PCIe port, and the components (in M2IOSF) responsible for translating and managing requests to/from the device. The performance data is very useful for analyzing the performance of PCIe devices.
The device with the PCIe3 uncore PMON units is owned by the portdrv_pci driver. Create a PCI sub driver for the PCIe3 uncore PMON units.
Here are some difference between PCIe3 uncore unit and other uncore pci units.
- There may be several Root Ports on a system. But the uncore counters only exist in the Root Port A. A user can configure the channel mask to collect the data from other Root Ports.
- The event format of the PCIe3 uncore unit is the same as IIO unit of SKX.
- The Control Register of PCIe3 uncore unit is 64 bits.
- The offset of each counters is 8, which is the same as M2M unit of SNR.
- New MSR addresses for unit control, counter and counter config.
--- arch/x86/events/intel/uncore_snbep.c | 53 +++++++++++++++++++++++++++- 1 file changed, 53 insertions(+)
arch/x86/events/intel/uncore_snbep.c +53 -0
@@ -393,6 +393,11 @@#define SNR_M2M_PCI_PMON_BOX_CTL 0x438#define SNR_M2M_PCI_PMON_UMASK_EXT 0xff +/* SNR PCIE3 */ +#define SNR_PCIE3_PCI_PMON_CTL0 0x508 +#define SNR_PCIE3_PCI_PMON_CTR0 0x4e8 +#define SNR_PCIE3_PCI_PMON_BOX_CTL 0x4e0 +/* SNR IMC */ #define SNR_IMC_MMIO_PMON_FIXED_CTL 0x54#define SNR_IMC_MMIO_PMON_FIXED_CTR 0x38
@@ -4551,12 +4556,46 @@ static struct intel_uncore_type snr_uncore_m2m = { .format_group = &snr_m2m_uncore_format_group, }; +static void snr_uncore_pci_enable_event (struct intel_uncore_box *box,struct perf_event *event) +{ +struct pci_dev *pdev = box->pci_dev; +struct hw_perf_event *hwc = &event->hw; + +pci_write_config_dword (pdev, hwc->config_base, (u32)(hwc->config |SNBEP_PMON_CTL_EN )); +pci_write_config_dword (pdev, hwc->config_base +4 , (u32)(hwc->config >>32 )); +} + +static struct intel_uncore_ops snr_pcie3_uncore_pci_ops = { + .init_box = snr_m2m_uncore_pci_init_box, + .disable_box = snbep_uncore_pci_disable_box, + .enable_box = snbep_uncore_pci_enable_box, + .disable_event = snbep_uncore_pci_disable_event, + .enable_event = snr_uncore_pci_enable_event, + .read_counter = snbep_uncore_pci_read_counter, +}; + +static struct intel_uncore_type snr_uncore_pcie3 = { + .name ="pcie3" , + .num_counters =4 , + .num_boxes =1 , + .perf_ctr_bits =48 , + .perf_ctr =SNR_PCIE3_PCI_PMON_CTR0 , + .event_ctl =SNR_PCIE3_PCI_PMON_CTL0 , + .event_mask =SKX_IIO_PMON_RAW_EVENT_MASK , + .event_mask_ext =SKX_IIO_PMON_RAW_EVENT_MASK_EXT , + .box_ctl =SNR_PCIE3_PCI_PMON_BOX_CTL , + .ops = &snr_pcie3_uncore_pci_ops, + .format_group = &skx_uncore_iio_format_group, +}; +enum {SNR_PCI_UNCORE_M2M , +SNR_PCI_UNCORE_PCIE3 , };static struct intel_uncore_type *snr_pci_uncores[] = { [SNR_PCI_UNCORE_M2M ] = &snr_uncore_m2m, + [SNR_PCI_UNCORE_PCIE3 ] = &snr_uncore_pcie3,NULL , };
@@ -4573,6 +4612,19 @@ static struct pci_driver snr_uncore_pci_driver = { .id_table = snr_uncore_pci_ids, }; +static const struct pci_device_id snr_uncore_pci_sub_ids[] = { + {/* PCIe3 RP */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x334a ), + .driver_data =UNCORE_PCI_DEV_FULL_DATA (4 ,0 ,SNR_PCI_UNCORE_PCIE3 ,0 ), + }, + {/* end: all zeroes */ } +}; + +static struct pci_driver snr_uncore_pci_sub_driver = { + .name ="snr_uncore_sub" , + .id_table = snr_uncore_pci_sub_ids, +}; +int snr_uncore_pci_init (void ) {/* SNR UBOX DID */
@@ -4584,6 +4636,7 @@ int snr_uncore_pci_init(void) uncore_pci_uncores = snr_pci_uncores; uncore_pci_driver = &snr_uncore_pci_driver; + uncore_pci_sub_driver = &snr_uncore_pci_sub_driver;return 0 ; }
[email protected]
maintainerQuoted 10 lines · On Mon, Sep 14, 2020 at 07:34:14AM -0700, [email protected] wrote:
From: Kan Liang <[email protected]>
Changes since V1:
- Drop the platform device solution
- A new uncore PCI sub driver solution is introduced which searches the PCIe Root Port device viapci_get_device()and id table. Register a PCI bus notifier for the remove notification. Once the device is removed, the uncore driver can be notified to unregister the corresponding PMU.
- Modify the parameters ofuncore_pci_pmu_unregister()function.
Bjorn, you hated on the last version of this thing, are you OK with this one?
Quoted 12 lines · On Mon, Sep 21, 2020 at 05:06:31PM +0200, [email protected] wrote:
Quoted 10 lines · On Mon, Sep 14, 2020 at 07:34:14AM -0700, [email protected] wrote:
From: Kan Liang <[email protected]>
Changes since V1:
- Drop the platform device solution
- A new uncore PCI sub driver solution is introduced which searches the PCIe Root Port device viapci_get_device()and id table. Register a PCI bus notifier for the remove notification. Once the device is removed, the uncore driver can be notified to unregister the corresponding PMU.
- Modify the parameters ofuncore_pci_pmu_unregister()function.
Quoted 2 lines
Bjorn, you hated on the last version of this thing, are you OK with this one?
Yep, this is OK with me.
Peter Zijlstra
maintainerQuoted 13 lines · Bjorn Helgaas
Quoted 12 lines · On Mon, Sep 21, 2020 at 05:06:31PM +0200, [email protected] wrote:
Quoted 10 lines · On Mon, Sep 14, 2020 at 07:34:14AM -0700, [email protected] wrote:
From: Kan Liang <[email protected]>
Changes since V1:
- Drop the platform device solution
- A new uncore PCI sub driver solution is introduced which searches the PCIe Root Port device viapci_get_device()and id table. Register a PCI bus notifier for the remove notification. Once the device is removed, the uncore driver can be notified to unregister the corresponding PMU.
- Modify the parameters ofuncore_pci_pmu_unregister()function.
Quoted 4 lines
Quoted 2 lines
Bjorn, you hated on the last version of this thing, are you OK with this one?
Yep, this is OK with me.
Thanks!