The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 0718588c7aaa7a1510b4de972370535b61dddd0d # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023112307-hardened-pureblood-48c1@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
0718588c7aaa ("cxl/region: Do not try to cleanup after cxl_region_setup_targets() fails") 9995576cef48 ("cxl/region: Move region-position validation to a helper") 86987c766276 ("cxl/region: Cleanup target list on attach error") 1b9b7a6fd618 ("cxl/region: Validate region mode vs decoder mode")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0718588c7aaa7a1510b4de972370535b61dddd0d Mon Sep 17 00:00:00 2001 From: Jim Harris jim.harris@samsung.com Date: Wed, 11 Oct 2023 14:51:31 +0000 Subject: [PATCH] cxl/region: Do not try to cleanup after cxl_region_setup_targets() fails
Commit 5e42bcbc3fef ("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 86987c766276 ("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 8d4285425714 ("cxl/region: Fix port setup uninitialized variable warnings") which was merged a few days after 5e42bcbc3fef.
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: 5e42bcbc3fef ("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@bg... Signed-off-by: Dan Williams dan.j.williams@intel.com
diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index d74bf1b664b6..a3bc6424f175 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -1652,6 +1652,12 @@ static int cxl_region_attach(struct cxl_region *cxlr, return -ENXIO; }
+ if (p->nr_targets >= p->interleave_ways) { + dev_dbg(&cxlr->dev, "region already has %d endpoints\n", + p->nr_targets); + return -EINVAL; + } + ep_port = cxled_to_port(cxled); root_port = cxlrd_to_port(cxlrd); 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, if (p->nr_targets == p->interleave_ways) { rc = cxl_region_setup_targets(cxlr); if (rc) - goto err_decrement; + return rc; p->state = CXL_CONFIG_ACTIVE; }
@@ -1756,12 +1762,6 @@ static int cxl_region_attach(struct cxl_region *cxlr, };
return 0; - -err_decrement: - p->nr_targets--; - cxled->pos = -1; - p->targets[pos] = NULL; - return rc; }
static int cxl_region_detach(struct cxl_endpoint_decoder *cxled)