From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f174.google.com (mail-dy1-f174.google.com [74.125.82.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3FCD9385503 for ; Sat, 23 May 2026 09:43:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779529426; cv=none; b=ebycxTMkE28Vhj2SeXR4tnnAxQ6YUjSvCwFYnm9eBCefNEsivxpnPRwwCevux/V6CWf6crBt7c/U6uuxQXBG0ob4IvgpBhP++41JamHt02FrENXkVzKvYthklXUSei4dOvs6KLA+mp46BoHGHIsw419dEAZjAZO08JS0CTegnhY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779529426; c=relaxed/simple; bh=mimTWYFTaHY+FLSmEscwRLS2qecNH3JETIBfD4afc9g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k+n1thxybUoj6K7tM6+WB/ubs727ag89Rw8ostEKq4HyHMPnLQShM6hrLh2meg7J7X0Q84zRURUq603MwRr8Cg/zkjVpDTr+qve3nzSVmgJRYOBoP/GWDtWH+hsmA2DYJ+9QUjING+XZZiIQnv1du6YBo1OO19Y+YLwIW47IzG4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JyLJGjlN; arc=none smtp.client-ip=74.125.82.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JyLJGjlN" Received: by mail-dy1-f174.google.com with SMTP id 5a478bee46e88-3042a388168so1871293eec.1 for ; Sat, 23 May 2026 02:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779529424; x=1780134224; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=snhhVzpNXLnSXNel0j3XIF8QPv37i0IqA2Elwz6NcMg=; b=JyLJGjlN9X1A6O8HY253x6SRS7KuoeOyc/Hj7DrMbsHappKVNozN4SyMKsYfCEUXuu /GXO67ZFG/HphCHoxfl0itJ2O5TEdt722iw8V9/GRt3IXywMDUjW0P1IqfLkXRZYPlnd uo9TVdyaoRCLxVBNLjW0N38uBsldANdCP6UlXIo0HOH/Gx6e8IwppfkoZVWtaM0YK1Yv 9gR5dIEnAvMNCLs5LMcPDYXuZPywMQKzikH8AU2LkXB8pZgqqEmyL8SUCqzRp2ZzkMSw xJMbR/CwPIiyptlb9VN9UrGZK+smI28Y1Iat7jvbBCjEeYfJ0iF1V83Y+v9i2dqUKjun SeKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779529424; x=1780134224; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=snhhVzpNXLnSXNel0j3XIF8QPv37i0IqA2Elwz6NcMg=; b=o1LpiAc8rMDvP3xvjdjJniz9IT6OkXAXYpVaUEA8mcqXx7Q8zdkIwygQLDBoGzd848 i+bVezFbOcdLIJudYpUkW8zhLXaRO6kACJGjZFvLl7x5+DO3HlveNBaAADh0rTshVjLz BSWV45zyy4QvKu0hS7bwiAdxZgaILwPaPa676UqRYGhf4zSZ0ggKF5ODrtbYtYm5uIDr 8AkG+5S+j8NC5M8UgOSir/ZoHFQIpeuQwEeJQ6qbgLKX/rHs6Vhgt+1mi8tcBn6N3TlV jht5Ajd0hTM66PCYKd+werlpx4zIDTWeVjalSkrQKwbDk7qIOkJDI3EZ457SZdAcVV3N 09Ew== X-Forwarded-Encrypted: i=1; AFNElJ/g2hRH46I2DDSmuiBfZlq0GEuLlNJlmOBlgHR+lOu5Mk+goFGX9ZOZuz5uYVMs4yRmThdIWdb3so6efJc=@vger.kernel.org X-Gm-Message-State: AOJu0YyC55okeQnddRBIotSsJNntDHpViyLNTZf3vRQ6Tb4R0xdwpn3i L5pCeOMqyFToF0XVUjmI34I/X+TLePpwIe7UC9+lWxzqaZinPqO2ZMEg X-Gm-Gg: Acq92OEZoRtEgXB4+OHDdeSEL8voLc/JMA9wjreTIiRWSy8Chge7Q41jJDRHqipL5Sp UdGZC5vKpLqqsnuxS4x2oEvElhM9H0bMHSEYtj9lHHx0KY/926V9Tfob33I4GPp0hPVS/hCot6p 8VvFgVScQr+MBmXWp2z/47hmmoj19/9ldBceBf9LuPSzLSfAAUOxgm9iPgMThAgBCYG/Gwz56ms Q0EnxNa1221OOADgZgQebmO5I8tw97I4XK+QfpvwI3O+sf+EeIFxRIEkp1D2k98gcnJfr0Vty0q Diil8vUd3JEYM7ImUI41w7HFYxaSEdfVKnoy+EmQB7AEMVh4JBh5B4wvppa5tf6hoWRBA0YP55p 0rKuOxoTA6XBIA6PMZwni4ZiAnoO1dIkWEouWFRCtvAaEXoQRbIC5LtmDzUmYQn6w/k2XcmYIQi ND1eCgVVNHD2zJk8wYtgdMYt8Eoe4aKFXlCPrToarKyJT5AR/lS11C62miLbnzpAXeHZD5HUh71 P4zMLo= X-Received: by 2002:a05:7022:609c:b0:11a:fb0a:ceca with SMTP id a92af1059eb24-13633eb60b4mr3619709c88.16.1779529424123; Sat, 23 May 2026 02:43:44 -0700 (PDT) Received: from AnisaLaptop.localdomain (c-73-170-217-179.hsd1.ca.comcast.net. [73.170.217.179]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1366a40305csm2376358c88.7.2026.05.23.02.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2026 02:43:43 -0700 (PDT) From: Anisa Su X-Google-Original-From: Anisa Su To: linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org Cc: nvdimm@lists.linux.dev, Dan Williams , Jonathan Cameron , Davidlohr Bueso , Dave Jiang , Vishal Verma , Ira Weiny , Alison Schofield , John Groves , Gregory Price , Ira Weiny Subject: [PATCH v10 04/31] cxl/core: Enforce partition order/simplify partition calls Date: Sat, 23 May 2026 02:42:58 -0700 Message-ID: <22ae445b8a99d26299520e2429c5bf4e64b0d9e6.1779528761.git.anisa.su@samsung.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ira Weiny Device partitions have an implied order which is made more complex by the addition of a dynamic partition. Remove the ram special case information calls in favor of generic calls with a check ahead of time to ensure the preservation of the implied partition order. Signed-off-by: Ira Weiny --- Changes:: [anisa: rebase] [davidlohr: core/hdm.c: return -EINVAL instead of 0 in cxl_dpa_setup if partitions are out of order] --- drivers/cxl/core/hdm.c | 11 ++++++++++- drivers/cxl/core/memdev.c | 32 +++++++++----------------------- drivers/cxl/cxlmem.h | 9 +++------ drivers/cxl/mem.c | 2 +- 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 28974adaab75..7a5812971f8f 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -464,6 +464,7 @@ static const char *cxl_mode_name(enum cxl_partition_mode mode) int cxl_dpa_setup(struct cxl_dev_state *cxlds, const struct cxl_dpa_info *info) { struct device *dev = cxlds->dev; + int i; guard(rwsem_write)(&cxl_rwsem.dpa); @@ -476,9 +477,17 @@ int cxl_dpa_setup(struct cxl_dev_state *cxlds, const struct cxl_dpa_info *info) return 0; } + /* Verify partitions are in expected order. */ + for (i = 1; i < info->nr_partitions; i++) { + if (cxlds->part[i].mode < cxlds->part[i-1].mode) { + dev_err(dev, "Partition order mismatch\n"); + return -EINVAL; + } + } + cxlds->dpa_res = DEFINE_RES_MEM(0, info->size); - for (int i = 0; i < info->nr_partitions; i++) { + for (i = 0; i < info->nr_partitions; i++) { const struct cxl_dpa_part_info *part = &info->part[i]; int rc; diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c index 80e65690eb77..71602820f896 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -75,20 +75,12 @@ static ssize_t label_storage_size_show(struct device *dev, } static DEVICE_ATTR_RO(label_storage_size); -static resource_size_t cxl_ram_size(struct cxl_dev_state *cxlds) -{ - /* Static RAM is only expected at partition 0. */ - if (cxlds->part[0].mode != CXL_PARTMODE_RAM) - return 0; - return resource_size(&cxlds->part[0].res); -} - static ssize_t ram_size_show(struct device *dev, struct device_attribute *attr, char *buf) { struct cxl_memdev *cxlmd = to_cxl_memdev(dev); struct cxl_dev_state *cxlds = cxlmd->cxlds; - unsigned long long len = cxl_ram_size(cxlds); + unsigned long long len = cxl_part_size(cxlds, CXL_PARTMODE_RAM); return sysfs_emit(buf, "%#llx\n", len); } @@ -101,7 +93,7 @@ static ssize_t pmem_size_show(struct device *dev, struct device_attribute *attr, { struct cxl_memdev *cxlmd = to_cxl_memdev(dev); struct cxl_dev_state *cxlds = cxlmd->cxlds; - unsigned long long len = cxl_pmem_size(cxlds); + unsigned long long len = cxl_part_size(cxlds, CXL_PARTMODE_PMEM); return sysfs_emit(buf, "%#llx\n", len); } @@ -424,10 +416,11 @@ static struct attribute *cxl_memdev_attributes[] = { NULL, }; -static struct cxl_dpa_perf *to_pmem_perf(struct cxl_dev_state *cxlds) +static struct cxl_dpa_perf *part_perf(struct cxl_dev_state *cxlds, + enum cxl_partition_mode mode) { for (int i = 0; i < cxlds->nr_partitions; i++) - if (cxlds->part[i].mode == CXL_PARTMODE_PMEM) + if (cxlds->part[i].mode == mode) return &cxlds->part[i].perf; return NULL; } @@ -438,7 +431,7 @@ static ssize_t pmem_qos_class_show(struct device *dev, struct cxl_memdev *cxlmd = to_cxl_memdev(dev); struct cxl_dev_state *cxlds = cxlmd->cxlds; - return sysfs_emit(buf, "%d\n", to_pmem_perf(cxlds)->qos_class); + return sysfs_emit(buf, "%d\n", part_perf(cxlds, CXL_PARTMODE_PMEM)->qos_class); } static struct device_attribute dev_attr_pmem_qos_class = @@ -450,20 +443,13 @@ static struct attribute *cxl_memdev_pmem_attributes[] = { NULL, }; -static struct cxl_dpa_perf *to_ram_perf(struct cxl_dev_state *cxlds) -{ - if (cxlds->part[0].mode != CXL_PARTMODE_RAM) - return NULL; - return &cxlds->part[0].perf; -} - static ssize_t ram_qos_class_show(struct device *dev, struct device_attribute *attr, char *buf) { struct cxl_memdev *cxlmd = to_cxl_memdev(dev); struct cxl_dev_state *cxlds = cxlmd->cxlds; - return sysfs_emit(buf, "%d\n", to_ram_perf(cxlds)->qos_class); + return sysfs_emit(buf, "%d\n", part_perf(cxlds, CXL_PARTMODE_RAM)->qos_class); } static struct device_attribute dev_attr_ram_qos_class = @@ -499,7 +485,7 @@ static umode_t cxl_ram_visible(struct kobject *kobj, struct attribute *a, int n) { struct device *dev = kobj_to_dev(kobj); struct cxl_memdev *cxlmd = to_cxl_memdev(dev); - struct cxl_dpa_perf *perf = to_ram_perf(cxlmd->cxlds); + struct cxl_dpa_perf *perf = part_perf(cxlmd->cxlds, CXL_PARTMODE_RAM); if (a == &dev_attr_ram_qos_class.attr && (!perf || perf->qos_class == CXL_QOS_CLASS_INVALID)) @@ -518,7 +504,7 @@ static umode_t cxl_pmem_visible(struct kobject *kobj, struct attribute *a, int n { struct device *dev = kobj_to_dev(kobj); struct cxl_memdev *cxlmd = to_cxl_memdev(dev); - struct cxl_dpa_perf *perf = to_pmem_perf(cxlmd->cxlds); + struct cxl_dpa_perf *perf = part_perf(cxlmd->cxlds, CXL_PARTMODE_PMEM); if (a == &dev_attr_pmem_qos_class.attr && (!perf || perf->qos_class == CXL_QOS_CLASS_INVALID)) diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index cee936fb3d03..10175ca3b7ee 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -383,14 +383,11 @@ struct cxl_security_state { #define CXL_MAX_DC_PARTITIONS 8 -static inline resource_size_t cxl_pmem_size(struct cxl_dev_state *cxlds) +static inline resource_size_t cxl_part_size(struct cxl_dev_state *cxlds, + enum cxl_partition_mode mode) { - /* - * Static PMEM may be at partition index 0 when there is no static RAM - * capacity. - */ for (int i = 0; i < cxlds->nr_partitions; i++) - if (cxlds->part[i].mode == CXL_PARTMODE_PMEM) + if (cxlds->part[i].mode == mode) return resource_size(&cxlds->part[i].res); return 0; } diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c index fcffe24dcb42..f19e08279ec7 100644 --- a/drivers/cxl/mem.c +++ b/drivers/cxl/mem.c @@ -114,7 +114,7 @@ static int cxl_mem_probe(struct device *dev) return -ENXIO; } - if (cxl_pmem_size(cxlds) && IS_ENABLED(CONFIG_CXL_PMEM)) { + if (cxl_part_size(cxlds, CXL_PARTMODE_PMEM) && IS_ENABLED(CONFIG_CXL_PMEM)) { rc = devm_cxl_add_nvdimm(dev, parent_port, cxlmd); if (rc) { if (rc == -ENODEV) -- 2.43.0