| Message ID | 20240403154844.3403859-3-dave.jiang@intel.com |
|---|---|
| State | Accepted |
| Commit | c2db06c1a27eddd4f07d6be889086ea8f0801310 |
| Headers | show |
| Series | cxl: access_coordinate validity fixes for 6.9 | expand |
On Wed, 3 Apr 2024 08:47:13 -0700 Dave Jiang <dave.jiang@intel.com> wrote: > Current loop in cxl_endpoint_get_perf_coordinates() incorrectly assumes > the Root Port (RP) dport is the one with generic port access_coordinate. > However those coordinates are one level up in the Host Bridge (HB). > Current code causes the computation code to pick up 0s as the coordinates > and cause minimal bandwidth to result in 0. > > Add check to skip RP when combining coordinates. > > Fixes: 4d59ba915318 ("cxl: Fix retrieving of access_coordinates in PCIe path") > Reported-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Signed-off-by: Dave Jiang <dave.jiang@intel.com> I've only tested this with direct connect, but can't see why it wouldn't work with switches in the path. So Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/cxl/core/port.c | 35 ++++++++++++++++++++++------------- > 1 file changed, 22 insertions(+), 13 deletions(-) > > diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c > index 6cbde50a742b..7aadcec4fc64 100644 > --- a/drivers/cxl/core/port.c > +++ b/drivers/cxl/core/port.c > @@ -2165,6 +2165,11 @@ int cxl_hb_get_perf_coordinates(struct cxl_port *port, > return 0; > } > > +static bool parent_port_is_cxl_root(struct cxl_port *port) > +{ > + return is_cxl_root(to_cxl_port(port->dev.parent)); > +} > + > /** > * cxl_endpoint_get_perf_coordinates - Retrieve performance numbers stored in dports > * of CXL path > @@ -2184,27 +2189,31 @@ int cxl_endpoint_get_perf_coordinates(struct cxl_port *port, > struct cxl_dport *dport; > struct pci_dev *pdev; > unsigned int bw; > + bool is_cxl_root; > > if (!is_cxl_endpoint(port)) > return -EINVAL; > > - dport = iter->parent_dport; > - > /* > - * Exit the loop when the parent port of the current port is cxl root. > - * The iterative loop starts at the endpoint and gathers the > - * latency of the CXL link from the current iter to the next downstream > - * port each iteration. If the parent is cxl root then there is > - * nothing to gather. > + * Exit the loop when the parent port of the current iter port is cxl > + * root. The iterative loop starts at the endpoint and gathers the > + * latency of the CXL link from the current device/port to the connected > + * downstream port each iteration. > */ > - while (!is_cxl_root(to_cxl_port(iter->dev.parent))) { > - cxl_coordinates_combine(&c, &c, &dport->sw_coord); > + do { > + dport = iter->parent_dport; > + iter = to_cxl_port(iter->dev.parent); > + is_cxl_root = parent_port_is_cxl_root(iter); > + > + /* > + * There's no valid access_coordinate for a root port since RPs do not > + * have CDAT and therefore needs to be skipped. > + */ > + if (!is_cxl_root) > + cxl_coordinates_combine(&c, &c, &dport->sw_coord); > c.write_latency += dport->link_latency; > c.read_latency += dport->link_latency; > - > - iter = to_cxl_port(iter->dev.parent); > - dport = iter->parent_dport; > - } > + } while (!is_cxl_root); > > /* Get the calculated PCI paths bandwidth */ > pdev = to_pci_dev(port->uport_dev->parent);
Dave Jiang wrote: > Current loop in cxl_endpoint_get_perf_coordinates() incorrectly assumes > the Root Port (RP) dport is the one with generic port access_coordinate. > However those coordinates are one level up in the Host Bridge (HB). > Current code causes the computation code to pick up 0s as the coordinates > and cause minimal bandwidth to result in 0. > > Add check to skip RP when combining coordinates. > > Fixes: 4d59ba915318 ("cxl: Fix retrieving of access_coordinates in PCIe path") > Reported-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Signed-off-by: Dave Jiang <dave.jiang@intel.com> Looks ok to me, and I see the Generic Port details are considered right after this walk to the root-port. Reviewed-by: Dan Williams <dan.j.williams@intel.com>
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 6cbde50a742b..7aadcec4fc64 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -2165,6 +2165,11 @@ int cxl_hb_get_perf_coordinates(struct cxl_port *port, return 0; } +static bool parent_port_is_cxl_root(struct cxl_port *port) +{ + return is_cxl_root(to_cxl_port(port->dev.parent)); +} + /** * cxl_endpoint_get_perf_coordinates - Retrieve performance numbers stored in dports * of CXL path @@ -2184,27 +2189,31 @@ int cxl_endpoint_get_perf_coordinates(struct cxl_port *port, struct cxl_dport *dport; struct pci_dev *pdev; unsigned int bw; + bool is_cxl_root; if (!is_cxl_endpoint(port)) return -EINVAL; - dport = iter->parent_dport; - /* - * Exit the loop when the parent port of the current port is cxl root. - * The iterative loop starts at the endpoint and gathers the - * latency of the CXL link from the current iter to the next downstream - * port each iteration. If the parent is cxl root then there is - * nothing to gather. + * Exit the loop when the parent port of the current iter port is cxl + * root. The iterative loop starts at the endpoint and gathers the + * latency of the CXL link from the current device/port to the connected + * downstream port each iteration. */ - while (!is_cxl_root(to_cxl_port(iter->dev.parent))) { - cxl_coordinates_combine(&c, &c, &dport->sw_coord); + do { + dport = iter->parent_dport; + iter = to_cxl_port(iter->dev.parent); + is_cxl_root = parent_port_is_cxl_root(iter); + + /* + * There's no valid access_coordinate for a root port since RPs do not + * have CDAT and therefore needs to be skipped. + */ + if (!is_cxl_root) + cxl_coordinates_combine(&c, &c, &dport->sw_coord); c.write_latency += dport->link_latency; c.read_latency += dport->link_latency; - - iter = to_cxl_port(iter->dev.parent); - dport = iter->parent_dport; - } + } while (!is_cxl_root); /* Get the calculated PCI paths bandwidth */ pdev = to_pci_dev(port->uport_dev->parent);
Current loop in cxl_endpoint_get_perf_coordinates() incorrectly assumes the Root Port (RP) dport is the one with generic port access_coordinate. However those coordinates are one level up in the Host Bridge (HB). Current code causes the computation code to pick up 0s as the coordinates and cause minimal bandwidth to result in 0. Add check to skip RP when combining coordinates. Fixes: 4d59ba915318 ("cxl: Fix retrieving of access_coordinates in PCIe path") Reported-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- drivers/cxl/core/port.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)