From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795029754; b=mQzumslxUmPWVQl6pyRDKf0XJ3KKF7MjZlPs33yRZAgnlYDXRwz15BmZmN/N6MIpfIP8 rUy4QeANCPmpcSZhcFLIQD0ZLZPc+Gaq8JPz8paznpSlzKsihfR+VF8Vqivnd/Im+5jfH /NyGaH9x+sC/rNbaCh/arw6zQp2mErwdmNwFbAyYFMI0x7xyPzhu5YQzzcfs5LEOLNUgd 90z2WyWl0I9PSLIOlOLZXjKdyIPCTEyuCwBAYIi/OvDEH4ZOZvsCR159Cu0jBGEbajCKf 9muGwIz2M5SGrtKScPyFRReOgn2dGr5TboqUmfA3x3B6jjOWi4nz4pjAaLkb4G+64fA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795029754; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=DPqYYinyLk8UVpZyyF0l/Ac+JP8PwHqWo/at1w4Dpr4=; b=TXYexiFi035CSncmB+yfkMgg6+8m8Um1KeW7H0OMB4rrwa92lz/Z9guGS3Shl0Vqvzdv FpFR4Gf+q13GO1o6tYrHKIXVcnQIIxBj/R674GdknFuOISGYOLjnMvhQdCULVkdDl3VrM VjmUp5GoxCNW+FAqKCoDx4zWfYsJ45RgPqOl+GQiSqO5I8s/Co4MKe6jhJSa+w/Zbgsp5 oTueIUmuYD8OxklpwVbQMt9SblqW59Rjf4VPaSLtyrcfDiPoLwDQPISLWNnxxKRuqz9py g5kEHB5QVYdSxu/0OgToXRbBmLlk65UvP9Wd8hAtOT2/HPwRVZQGOGGEOeQQe9G3yKA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=tWOio4gW; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42CF5606A333; Wed, 18 Nov 2026 19:22:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=tWOio4gW Received: by smtp.kernel.org (Postfix) with ESMTPSA id 975691F000C8; Wed, 18 Nov 2026 19:22:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795029754; bh=DPqYYinyLk8UVpZyyF0l/Ac+JP8PwHqWo/at1w4Dpr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tWOio4gWBHV9WcMuVeDYxCFB0J7Xv+hfLVW7SIPuhJvlju9ybzRhT1P5K3ZYlc+rI jLCCELIIuImuILH1lRXc2CnhOWI1oapwj+ziECR9HAZ9NycCd0glMsHsNP3sXDsJyL ML7mcA6gDD+/hLVzFHyh9cyicpGFFt3tZiJT5UeQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Davidlohr Bueso , Richard Cheng , Alison Schofield , Li Ming , Dave Jiang , Sasha Levin Subject: [PATCH 6.12 0425/1756] cxl/hdm: Reject switch decoder interleave ways that overflow targets Date: Wed, 18 Nov 2026 15:42:32 +0100 Message-ID: <20261118150025.677993025@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alison Schofield [ Upstream commit 3696326ca14cf018788d64232a068fdf26b1ff31 ] Switch decoder enumeration validates that the interleave ways encoding is legal, but not that the resulting number of ways fits the available targets. This can overrun the target array (target_list.target_id[]) during enumeration of 12 or 16 way interleaves. Bound the target count where it is established rather than at each use. Reject an HDM capability whose reported target count is zero or exceeds the target list register capacity, and reject a zero target switch decoder allocation in cxl_switch_decoder_init(). Enumeration is then left with a single check: reject a decoder whose interleave ways exceed the targets it has. Add a clarifying comment that target_count is a direct count, not 0-based like decoder_count. Link: https://sashiko.dev/#/patchset/20260711180755.1779002-1-alison.schofield@intel.com?part=1 Fixes: d17d0540a0db ("cxl/core/hdm: Add CXL standard decoder enumeration to the core") Tested-by: Davidlohr Bueso Reviewed-by: Davidlohr Bueso Reviewed-by: Richard Cheng Signed-off-by: Alison Schofield Reviewed-by: Li Ming Link: https://patch.msgid.link/af094094813d7f51d86cbf608936270b7d85526e.1786143520.git.alison.schofield@intel.com Signed-off-by: Dave Jiang Signed-off-by: Sasha Levin --- drivers/cxl/core/hdm.c | 24 ++++++++++++++++++++++++ drivers/cxl/core/port.c | 2 +- drivers/cxl/cxl.h | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 5b4ddc1262d7c..1e3b485c89051 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -81,6 +81,8 @@ static void parse_hdm_decoder_caps(struct cxl_hdm *cxlhdm) hdm_cap = readl(cxlhdm->regs.hdm_decoder + CXL_HDM_DECODER_CAP_OFFSET); cxlhdm->decoder_count = cxl_hdm_decoder_count(hdm_cap); + + /* target_count is a direct count (1h..8h), not 0-based like decoder_count */ cxlhdm->target_count = FIELD_GET(CXL_HDM_DECODER_TARGET_COUNT_MASK, hdm_cap); if (FIELD_GET(CXL_HDM_DECODER_INTERLEAVE_11_8, hdm_cap)) @@ -938,6 +940,16 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, cxld->interleave_ways, cxld->interleave_granularity); if (!cxled) { + struct cxl_switch_decoder *cxlsd = to_cxl_switch_decoder(&cxld->dev); + + if (cxld->interleave_ways > cxlsd->nr_targets) { + dev_err(&port->dev, + "decoder%d.%d: interleave ways: %d exceeds targets: %d\n", + port->id, cxld->id, cxld->interleave_ways, + cxlsd->nr_targets); + return -ENXIO; + } + lo = readl(hdm + CXL_HDM_DECODER0_TL_LOW(which)); hi = readl(hdm + CXL_HDM_DECODER0_TL_HIGH(which)); target_list.value = (hi << 32) + lo; @@ -1015,6 +1027,18 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm, int i; u64 dpa_base = 0; + /* + * Per CXL 4.0 8.2.4.20.1 Target Count is the number of target ports + * per decoder, max 8. Endpoint decoders have no targets. + */ + if (!is_cxl_endpoint(port) && + (cxlhdm->target_count < 1 || + cxlhdm->target_count > CXL_HDM_DECODER0_TL_TARGETS)) { + dev_err(&port->dev, "Invalid decoder target count: %u\n", + cxlhdm->target_count); + return -ENXIO; + } + cxl_settle_decoders(cxlhdm); for (i = 0; i < cxlhdm->decoder_count; i++) { diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 9c5835eaa22d7..723574f58f48c 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -1787,7 +1787,7 @@ static int cxl_switch_decoder_init(struct cxl_port *port, struct cxl_switch_decoder *cxlsd, int nr_targets) { - if (nr_targets > CXL_DECODER_MAX_INTERLEAVE) + if (nr_targets < 1 || nr_targets > CXL_DECODER_MAX_INTERLEAVE) return -EINVAL; cxlsd->nr_targets = nr_targets; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index e2b7e398d4d57..22cd757b71936 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -65,6 +65,8 @@ extern const struct nvdimm_security_ops *cxl_security_ops; #define CXL_HDM_DECODER0_CTRL_HOSTONLY BIT(12) #define CXL_HDM_DECODER0_TL_LOW(i) (0x20 * (i) + 0x24) #define CXL_HDM_DECODER0_TL_HIGH(i) (0x20 * (i) + 0x28) +/* Target list capacity, i.e. max interleave ways for a non-endpoint decoder */ +#define CXL_HDM_DECODER0_TL_TARGETS 8 #define CXL_HDM_DECODER0_SKIP_LOW(i) CXL_HDM_DECODER0_TL_LOW(i) #define CXL_HDM_DECODER0_SKIP_HIGH(i) CXL_HDM_DECODER0_TL_HIGH(i) -- 2.53.0