cxl: access_coordinate validity fixes for 6.9
Dave Jiang
maintainerv6 cover cxl: access_coordinate validity fixes for 6.9
v6:
- Simplify commit log for 1/4. (Dan)
- Normalize values from CDAT to nanoseconds. (Dan)
- Fix cxl_test for dpa_perf multi-class.
Hi Jonathan and Davidlohr,
Please take a look at 2/4 again and also review 3/4 which is new. The introduction of the 2 access level for 'struct access_coordinate' caused a bit of adjustment to the code. To keep flow of looping through the dports without additional existance check, I made the setting of both access class coordinates from the beginning of the calculation. Thank you!
[1/4] cxl: Remove checking of iter in cxl_endpoint_get_perf_coordinates() [2/4] cxl: Consolidate dport access_coordinate ->hb_coord and ->sw_coord into ->coord [3/4] cxl: Fix incorrect region perf data calculation
[4/4] cxl: Add checks to access_coordinate calculation to fail missing data
Dave Jiang
maintainerPATCH v6 1/4 cxl: Remove checking of iter in cxl_endpoint_get_perf_coordinates()
The while() loop in cxl_endpoint_get_perf_coordinates() checks to see if 'iter' is valid as part of the condition breaking out of the loop. is_cxl_root() will stop the loop before the next iteration could go NULL. Remove the iter check.
The presence of the iter or removing the iter does not impact the behavior of the code. This is a code clean up and not a bug fix.
---
v6:
- Simplify commit log. (Dan)
--- drivers/cxl/core/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cxl/core/port.c +1 -1
@@ -2197,7 +2197,7 @@ int cxl_endpoint_get_perf_coordinates(struct cxl_port *port,* port each iteration. If the parent is cxl root then there is * nothing to gather. */ -while (iter && !is_cxl_root (to_cxl_port (iter->dev.parent))) { +while (!is_cxl_root (to_cxl_port (iter->dev.parent))) {cxl_coordinates_combine (&c, &c, &dport->sw_coord); c.write_latency += dport->link_latency; c.read_latency += dport->link_latency;
Signature · 1 line
2.44.0
Dave Jiang
maintainerPATCH v6 2/4 cxl: Consolidate dport access_coordinate ->hb_coord and ->sw_coord into ->coord
In reply to Dave JiangThe driver stores access_coordinate for host bridge in ->hb_coord and switch CDAT access_coordinate in ->sw_coord. Since neither of these access_coordinate clobber each other, the variable name can be consolidated into ->coord to simplify the code. This change also simplifies the iteration loop in cxl_endpoint_get_perf_coordinates() and allow all the access_coordinate to be picked up in the loop.
---
v6:
- Fix cxl_test for dpa_perf.
--- drivers/cxl/acpi.c | 6 +-- drivers/cxl/core/cdat.c | 99 ++++++++++++++++-------------------- drivers/cxl/core/port.c | 67 +++++++++++------------- drivers/cxl/cxl.h | 6 +-- drivers/cxl/cxlmem.h | 2 +- tools/testing/cxl/test/cxl.c | 10 ++-- 6 files changed, 87 insertions(+), 103 deletions(-)
drivers/cxl/acpi.c +3 -3
@@ -530,14 +530,14 @@ static int get_genport_coordinates(struct device *dev, struct cxl_dport *dport)if (kstrtou32 (acpi_device_uid (hb),0 , &uid))return -EINVAL ; - rc =acpi_get_genport_coordinates (uid, dport->hb_coord); + rc =acpi_get_genport_coordinates (uid, dport->coord);if (rc <0 )return rc;/* Adjust back to picoseconds from nanoseconds */ for (int i =0 ; i <ACCESS_COORDINATE_MAX ; i++) { - dport->hb_coord[i].read_latency *=1000 ; - dport->hb_coord[i].write_latency *=1000 ; + dport->coord[i].read_latency *=1000 ; + dport->coord[i].write_latency *=1000 ; }return 0 ;
drivers/cxl/core/cdat.c +45 -54
203 lines not on this page · raw message
drivers/cxl/core/port.c +30 -37
96 lines not on this page · raw message
drivers/cxl/cxl.h +2 -4
@@ -663,8 +663,7 @@ struct cxl_rcrb_info {* @rch: Indicate whether this dport was enumerated in RCH or VH mode * @port: reference to cxl_port that contains this downstream port * @regs: Dport parsed register blocks -* @sw_coord: access coordinates (performance) for switch from CDAT -* @hb_coord: access coordinates (performance) from ACPI generic port (host bridge) +* @coord: access coordinates (bandwidth and latency performance attributes) * @link_latency: calculated PCIe downstream latency */ struct cxl_dport {
@@ -675,8 +674,7 @@ struct cxl_dport {bool rch;struct cxl_port *port;struct cxl_regs regs; -struct access_coordinate sw_coord; -struct access_coordinate hb_coord[ACCESS_COORDINATE_MAX ]; +struct access_coordinate coord[ACCESS_COORDINATE_MAX ];long link_latency; };
drivers/cxl/cxlmem.h +1 -1
@@ -401,7 +401,7 @@ enum cxl_devtype {*/ struct cxl_dpa_perf {struct range dpa_range; -struct access_coordinate coord; +struct access_coordinate coord[ACCESS_COORDINATE_MAX ];int qos_class; };
tools/testing/cxl/test/cxl.c +6 -4
@@ -986,10 +986,12 @@ static void dpa_perf_setup(struct cxl_port *endpoint, struct range *range, { dpa_perf->qos_class =FAKE_QTG_ID ; dpa_perf->dpa_range = *range; - dpa_perf->coord.read_latency =500 ; - dpa_perf->coord.write_latency =500 ; - dpa_perf->coord.read_bandwidth =1000 ; - dpa_perf->coord.write_bandwidth =1000 ; +for (int i =0 ; i <ACCESS_COORDINATE_MAX ; i++) { + dpa_perf->coord[i].read_latency =500 ; + dpa_perf->coord[i].write_latency =500 ; + dpa_perf->coord[i].read_bandwidth =1000 ; + dpa_perf->coord[i].write_bandwidth =1000 ; + } }static void mock_cxl_endpoint_parse_cdat (struct cxl_port *port)
Signature · 1 line
2.44.0
Dave Jiang
maintainerPATCH v6 3/4 cxl: Fix incorrect region perf data calculation
In reply to Dave JiangCurrent math in cxl_region_perf_data_calculate divides the latency by 1000 every time the function gets called. This causes the region latency to be divided by 1000 per memory device and the math is incorrect. This is user visible as the latency access_coordinate exposed via sysfs will show incorrect latency data.
Normalize values from CDAT to nanoseconds. Adjust sub-nanoseconds latency to at least 1. Remove adjustment of perf numbers from the generic target since hmat handling code has already normalized those numbers. Now all computation and stored numbers should be in nanoseconds.
---
v6:
- Normalize values from CDAT to nanoseconds. (Dan)
--- drivers/cxl/acpi.c | 13 +--------- drivers/cxl/core/cdat.c | 54 ++++++++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 31 deletions(-)
drivers/cxl/acpi.c +1 -12
@@ -525,22 +525,11 @@ static int get_genport_coordinates(struct device *dev, struct cxl_dport *dport) {struct acpi_device *hb =to_cxl_host_bridge (NULL , dev);u32 uid; -int rc;if (kstrtou32 (acpi_device_uid (hb),0 , &uid))return -EINVAL ; - rc =acpi_get_genport_coordinates (uid, dport->coord); -if (rc <0 ) -return rc; - -/* Adjust back to picoseconds from nanoseconds */ -for (int i =0 ; i <ACCESS_COORDINATE_MAX ; i++) { - dport->coord[i].read_latency *=1000 ; - dport->coord[i].write_latency *=1000 ; - } - -return 0 ; +return acpi_get_genport_coordinates (uid, dport->coord); }static int add_host_bridge_dport (struct device *match,void *arg)
drivers/cxl/core/cdat.c +35 -19
84 lines not on this page · raw message
Signature · 1 line
2.44.0
Dave Jiang
maintainerPATCH v6 4/4 cxl: Add checks to access_coordinate calculation to fail missing data
In reply to Dave JiangJonathan noted that when the coordinates for host bridge and switches can be 0s if no actual data are retrieved and the calculation continues. The resulting number would be inaccurate. Add checks to ensure that the calculation would complete only if the numbers are valid.
While not seen in the wild, issue may show up with a BIOS that reported CXL root ports via Generic Ports (via a PCI handle in the SRAT entry).
--- drivers/cxl/core/port.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-)
drivers/cxl/core/port.c +27 -11
@@ -2141,6 +2141,18 @@ static void add_latency(struct access_coordinate *c, long latency) } } +static bool coordinates_valid (struct access_coordinate *c) +{ +for (int i =0 ; i <ACCESS_COORDINATE_MAX ; i++) { +if (c[i].read_bandwidth && c[i].write_bandwidth && + c[i].read_latency && c[i].write_latency) +continue ; +return false; + } + +return true; +} +static void set_min_bandwidth (struct access_coordinate *c,unsigned int bw) {for (int i =0 ; i <ACCESS_COORDINATE_MAX ; i++) {
@@ -2156,6 +2168,11 @@ static void set_access_coordinates(struct access_coordinate *out, out[i] = in[i]; } +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
@@ -2185,21 +2202,20 @@ int cxl_endpoint_get_perf_coordinates(struct cxl_port *port,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))) { - iter =to_cxl_port (iter->dev.parent); +do { + dport = iter->parent_dport; +if (!coordinates_valid (dport->coord)) +return -EINVAL ;cxl_coordinates_combine (c, c, dport->coord);add_latency (c, dport->link_latency); - dport = iter->parent_dport; - } + iter =to_cxl_port (iter->dev.parent); + }while (!parent_port_is_cxl_root (iter));/* Get the calculated PCI paths bandwidth */ pdev =to_pci_dev (port->uport_dev->parent);
Signature · 1 line
2.44.0