Skip to content

Commit 0718588

Browse files
jimharrisdjbw
authored andcommitted
cxl/region: Do not try to cleanup after cxl_region_setup_targets() fails
Commit 5e42bcb ("cxl/region: decrement ->nr_targets on error in cxl_region_attach()") tried to avoid 'eiw' initialization errors when ->nr_targets exceeded 16, by just decrementing ->nr_targets when cxl_region_setup_targets() failed. Commit 86987c7 ("cxl/region: Cleanup target list on attach error") extended that cleanup to also clear cxled->pos and p->targets[pos]. The initialization error was incidentally fixed separately by: Commit 8d42854 ("cxl/region: Fix port setup uninitialized variable warnings") which was merged a few days after 5e42bcb. But now the original cleanup when cxl_region_setup_targets() fails prevents endpoint and switch decoder resources from being reused: 1) the cleanup does not set the decoder's region to NULL, which results in future dpa_size_store() calls returning -EBUSY 2) the decoder is not properly freed, which results in future commit errors associated with the upstream switch Now that the initialization errors were fixed separately, the proper cleanup for this case is to just return immediately. Then the resources associated with this target get cleanup up as normal when the failed region is deleted. The ->nr_targets decrement in the error case also helped prevent a p->targets[] array overflow, so add a new check to prevent against that overflow. Tested by trying to create an invalid region for a 2 switch * 2 endpoint topology, and then following up with creating a valid region. Fixes: 5e42bcb ("cxl/region: decrement ->nr_targets on error in cxl_region_attach()") Cc: <stable@vger.kernel.org> Signed-off-by: Jim Harris <jim.harris@samsung.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Acked-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Link: https://lore.kernel.org/r/169703589120.1202031.14696100866518083806.stgit@bgt-140510-bm03.eng.stellus.in Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent cf009d4 commit 0718588

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/cxl/core/region.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,6 +1652,12 @@ static int cxl_region_attach(struct cxl_region *cxlr,
16521652
return -ENXIO;
16531653
}
16541654

1655+
if (p->nr_targets >= p->interleave_ways) {
1656+
dev_dbg(&cxlr->dev, "region already has %d endpoints\n",
1657+
p->nr_targets);
1658+
return -EINVAL;
1659+
}
1660+
16551661
ep_port = cxled_to_port(cxled);
16561662
root_port = cxlrd_to_port(cxlrd);
16571663
dport = cxl_find_dport_by_dev(root_port, ep_port->host_bridge);
@@ -1744,7 +1750,7 @@ static int cxl_region_attach(struct cxl_region *cxlr,
17441750
if (p->nr_targets == p->interleave_ways) {
17451751
rc = cxl_region_setup_targets(cxlr);
17461752
if (rc)
1747-
goto err_decrement;
1753+
return rc;
17481754
p->state = CXL_CONFIG_ACTIVE;
17491755
}
17501756

@@ -1756,12 +1762,6 @@ static int cxl_region_attach(struct cxl_region *cxlr,
17561762
};
17571763

17581764
return 0;
1759-
1760-
err_decrement:
1761-
p->nr_targets--;
1762-
cxled->pos = -1;
1763-
p->targets[pos] = NULL;
1764-
return rc;
17651765
}
17661766

17671767
static int cxl_region_detach(struct cxl_endpoint_decoder *cxled)

0 commit comments

Comments
 (0)