Skip to contentSkip to conversation

hwtracing: hisi_ptt: Only add the supported devices to the filters list

PATCH In review Yicong Yang 2 participants 5 messages Jan 12, 2023 – Jan 20, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 hwtracing: hisi_ptt: Only add the supported devices to the filters list

From: Yicong Yang <[email protected]>

The PTT device can only support the devices on the same PCIe core, within BDF range [lower_bdf, upper_bdf]. It's not correct to assume the devices on the root bus are from the same PCIe core, there are cases that root ports from different PCIe core are sharing the same bus. So check when initializing the filters list.

Fixes ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")

---
Change since v2:
- Refine the commit per Bjorn

Change since v1:
- Add tags from Jonathan

 drivers/hwtracing/ptt/hisi_ptt.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/hwtracing/ptt/hisi_ptt.c +10 -0
index 5d5526aa60c4..30f1525639b5 100644
@@ -356,8 +356,18 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)
 
 static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data)
 {
+	struct pci_dev *root_port = pcie_find_root_port(pdev);
 	struct hisi_ptt_filter_desc *filter;
 	struct hisi_ptt *hisi_ptt = data;
+	u32 port_devid;
+
+	if (!root_port)
+		return 0;
+
+	port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn);
+	if (port_devid < hisi_ptt->lower_bdf ||
+	    port_devid > hisi_ptt->upper_bdf)
+		return 0;
 
 	/*
 	 * We won't fail the probe if filter allocation failed here. The filters
Signature · 1 line
2.24.0
#1 lore raw

PATCH v3 2/2 MAINTAINERS: Update the entries for HiSilicon PTT device driver

From: Yicong Yang <[email protected]>

Add missing entries for the perf userspace part of this driver. Also add Jonathan as the maintainer for his expertise on this driver and PCIe stuffs.

---
No Change since v2:

Change since v1:
- Add tag from Jonathan

 MAINTAINERS | 4 ++++
 1 file changed, 4 insertions(+)
MAINTAINERS +4 -0
index a36df9ed283d..0cfd358da378 100644
@@ -9375,11 +9375,15 @@ F:	drivers/perf/hisilicon/hns3_pmu.c
 
 HISILICON PTT DRIVER
 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/trace/hisi-ptt.rst
 F:	drivers/hwtracing/ptt/
+F:	tools/perf/arch/arm64/util/hisi-ptt.c
+F:	tools/perf/util/hisi-ptt*
+F:	tools/perf/util/hisi-ptt-decoder/*
 
 HISILICON QM DRIVER
 M:	Weili Qian <[email protected]>
Signature · 1 line
2.24.0
#2 lore raw
In reply to Yicong Yang

Hi Suzuki,

Any comments or is it ok to pick these two patches? Hope to not miss this cycle since there's one fix :)

Thanks,
Yicong

Quoted 47 lines · Yicong Yang

From: Yicong Yang <[email protected]>

The PTT device can only support the devices on the same PCIe core, within BDF range [lower_bdf, upper_bdf]. It's not correct to assume the devices on the root bus are from the same PCIe core, there are cases that root ports from different PCIe core are sharing the same bus. So check when initializing the filters list.

Fixes ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")

---
Change since v2:
- Refine the commit per Bjorn

Change since v1:
- Add tags from Jonathan

 drivers/hwtracing/ptt/hisi_ptt.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/hwtracing/ptt/hisi_ptt.c +10 -0
index 5d5526aa60c4..30f1525639b5 100644
@@ -356,8 +356,18 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)
 
 static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data)
 {
+	struct pci_dev *root_port = pcie_find_root_port(pdev);
 	struct hisi_ptt_filter_desc *filter;
 	struct hisi_ptt *hisi_ptt = data;
+	u32 port_devid;
+
+	if (!root_port)
+		return 0;
+
+	port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn);
+	if (port_devid < hisi_ptt->lower_bdf ||
+	    port_devid > hisi_ptt->upper_bdf)
+		return 0;
 
 	/*
 	 * We won't fail the probe if filter allocation failed here. The filters
#3 lore raw
Quoted 4 lines · Yicong Yang

Hi Suzuki,

Any comments or is it ok to pick these two patches? Hope to not miss this cycle since there's one fix :)

Apologies, I will queue this, once I clear my queue.

Thanks
Suzuki

Quoted 52 lines

Thanks,
Yicong

Quoted 47 lines · Yicong Yang

From: Yicong Yang <[email protected]>

The PTT device can only support the devices on the same PCIe core, within BDF range [lower_bdf, upper_bdf]. It's not correct to assume the devices on the root bus are from the same PCIe core, there are cases that root ports from different PCIe core are sharing the same bus. So check when initializing the filters list.

Fixes ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")

---
Change since v2:
- Refine the commit per Bjorn

Change since v1:
- Add tags from Jonathan

  drivers/hwtracing/ptt/hisi_ptt.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
drivers/hwtracing/ptt/hisi_ptt.c +10 -0
index 5d5526aa60c4..30f1525639b5 100644
@@ -356,8 +356,18 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)
 
  static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data)
  {
+	struct pci_dev *root_port = pcie_find_root_port(pdev);
  	struct hisi_ptt_filter_desc *filter;
  	struct hisi_ptt *hisi_ptt = data;
+	u32 port_devid;
+
+	if (!root_port)
+		return 0;
+
+	port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn);
+	if (port_devid < hisi_ptt->lower_bdf ||
+	    port_devid > hisi_ptt->upper_bdf)
+		return 0;
 
  	/*
  	 * We won't fail the probe if filter allocation failed here. The filters
#4 lore raw
Quoted 7 lines · Suzuki K Poulose
Quoted 4 lines · Yicong Yang

Hi Suzuki,

Any comments or is it ok to pick these two patches? Hope to not miss this cycle since there's one fix :)

Apologies, I will queue this, once I clear my queue.

Never mind! Thanks a lot for taking this!

Quoted 58 lines

Thanks
Suzuki

Quoted 42 lines

Thanks,
Yicong

Quoted 37 lines · Yicong Yang

From: Yicong Yang <[email protected]>

The PTT device can only support the devices on the same PCIe core, within BDF range [lower_bdf, upper_bdf]. It's not correct to assume the devices on the root bus are from the same PCIe core, there are cases that root ports from different PCIe core are sharing the same bus. So check when initializing the filters list.

Fixes ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")

---
Change since v2:
- Refine the commit per Bjorn

Change since v1:
- Add tags from Jonathan

  drivers/hwtracing/ptt/hisi_ptt.c | 10 ++++++++++

  1 file changed, 10 insertions(+)
drivers/hwtracing/ptt/hisi_ptt.c +5 -0
index 5d5526aa60c4..30f1525639b5 100644
@@ -356,8 +356,18 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)
     static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data)
   {
+    struct pci_dev *root_port = pcie_find_root_port(pdev);
       struct hisi_ptt_filter_desc *filter;
       struct hisi_ptt *hisi_ptt = data;
+    u32 port_devid;
+
+    if (!root_port)
+        return 0;
Quoted 8 lines

drivers/hwtracing/ptt/hisi_ptt.c static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)

Quoted 8 lines
drivers/hwtracing/ptt/hisi_ptt.c +5 -0
+
+    port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn);
+    if (port_devid < hisi_ptt->lower_bdf ||
+        port_devid > hisi_ptt->upper_bdf)
+        return 0;
         /*
        * We won't fail the probe if filter allocation failed here. The filters
 

.