From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 E9FF43C4B64 for ; Fri, 31 Jul 2026 08:50:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785487815; cv=none; b=EHcLyw3BcLFsuu70cKxs8LfSaZDMSexHKbOXOnzICocYwhAJDW9/PWu4ADe5novakowBU59C44xisYYBbKkFOE+Ufn6ZXvZgbAmQttEAAIduzUx3M8spc6y4XRXRFyorvzruwf0j0b4xIGZGO6RlatgG3tDbrbjm2PZ5NhlzCC4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785487815; c=relaxed/simple; bh=2gbuA1AjlN179ZHb25jNrxxQxfaAVzkCubGgIeg8DsI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uJQ/SxWRKMRGs8YSje9kkqWrO6jlSdQGIlfcDqQX7IO6iIO/dDVLxK3AKCyv+csUfVKmMbtbDM+e9p6BE7CJ8SaAdvx/EyUmcBwTC97Irw9cDIhi9/3aWePnX/U7nzDmFo30U2D/LcpAncIfwbIlKmsP4CwX0jqJqE3owUXvVyM= 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=DjEgWDmg; arc=none smtp.client-ip=209.85.214.175 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="DjEgWDmg" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2caced6038eso6236545ad.0 for ; Fri, 31 Jul 2026 01:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785487812; x=1786092612; 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:content-type; bh=z8WEQGrgrO2scS8Gd9nnQU/D+8yl6XUvFmWxuOwntXk=; b=DjEgWDmg1HNXGCGm+y8hORXMNoW5FHf6n79jtYO6JQVIEmekXkEMCZAiyTNTcp5Nkf xdzDZwrxeBalReUJqTxjH7PfUuM4lWWfh0gA+5d5KQlD7tvcHoJuymLBxhgjqPBkUMKG bn1vlG0FGpfFkQB2mf4Ymnii5iwToUN6S2z9sUf4rnkJQ+eX8BZChzxiGPdp8HIs+79U 5vLUkOvN5eLZtqoBSvkRZUw99k6u4nx1QU5yK1ux/Ecai8S96WAgas/9E3un4BRi6o5n 4H7io+7GvhMh9IQgs+vMaIiSKD72s3poC2WWXASbXkoOJV7jF0n0zg0jJy/2OXgX6vPe pucQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785487812; x=1786092612; 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:content-type; bh=z8WEQGrgrO2scS8Gd9nnQU/D+8yl6XUvFmWxuOwntXk=; b=Ec4ZFxKEuhG9PQJSAGWV9Cf37l9GogeanVFC3bvhKTNuAfXd1LuyaeO3XzGmhr66Cd 6xK6t/HiCk1+wD9fnGJfanKMZ9mufmmpqaLM7RneL9p7xZrnQ2RjBUmbFngJ/X62jY7V vvcEDKICMB74p3hmCWAiY8ykO+x0QSb6Xk+Y/GJjDqReXtQo9HvXN9M2+GsbHP76AZ/X oVhWGw5e3xG7C4t+xA3PQw0fZa9r6EAz6VumD66RvfIuauP+KZN9g2+MajizOopLiP0b lmbb3bZVQt7BmhYMKSMZz89KOxXqHByYJ7kBYrCag5aIMStNq5SStpGQwLjf5666FeMS 89bQ== X-Forwarded-Encrypted: i=1; AHgh+RrOfUR0o4ReSNuzsR5EinzEd5nZOq76YFSqP6ITKBEREm89N41Zhb5TqPRTpXqFBga2vpeZQesU6ZFw2Dw=@vger.kernel.org X-Gm-Message-State: AOJu0Yyovln4QuTqlLT/lS9TyTUNYDg47d/PdM6TZmP+OuuISzKSSvS1 jDWCL3IXsyJh7M+BZMnWIcvuYEU0DwpjZC6NRLSsOLRAIWSEcYbwQLuB X-Gm-Gg: AR+sD11sIuMqjJAAdLRWJrRiA0SAq1we1873cormdJeaYJMtqidy6jZ+w90q8F1eU+t xcEOnx/1Ynhxm9qx/La7/DZOIKrKjaLs36whIcY3jIY6kf6pAHU7qnUN8K4e2WZd4MyZS9aD1Da WjhKoks4wS6EGBTzB8HUgZbVVZATQmi70wGWPtYB/aZePEVv5LHVKhzQMijhi4/BNpN/SEZFATw 8uLNHKDPAFLn0lsmGKHeW+ebYo3KshbVGqWAOaWZ77nrSVBo6dVXTTM9X3YPsUvC7bEDqlEKOfl UjO+ncsea+ElF0VGKBnjTtmQOPy3cxlep/WrvQ+G6wMjbhlI1GS8dlVhm+XEgsdUYpfMmrTbU9d puiWxFNnJmFwMzDnurMKgswC6WZZvgpTLrgqOtx7FjR9/zad4UsxQaKgG4v07EAc1fs5xByvO3+ RgJnz/3CrXFVti9AM82tHv/coFu9MF6BHmkcfffheKAWAUvF4ju3uz6co66eo89mvp2e1BnNZUN pHzIbc/EN5MshyvHiUReFXxhi8yH1QSls0XcWIfAqtC X-Received: by 2002:a17:903:1786:b0:2cf:70d2:da7c with SMTP id d9443c01a7336-2d047d7921fmr9860715ad.12.1785487811786; Fri, 31 Jul 2026 01:50:11 -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 d9443c01a7336-2d04ae5abaesm2708425ad.27.2026.07.31.01.50.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 01:50:11 -0700 (PDT) From: Anisa Su X-Google-Original-From: Anisa Su To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org, Dave Jiang , Alison Schofield , Jonathan Cameron , Fan Ni , Li Ming , Vishal Verma , Davidlohr Bueso , Ira Weiny , Benjamin Cheatham , Wonjae Lee , Junhee Park , Heesoo Kim , Anisa Su Subject: [PATCH v12 8/8] cxl/core: Enforce partition order/simplify partition calls Date: Fri, 31 Jul 2026 01:48:13 -0700 Message-ID: <20260731084901.1512819-9-anisa.su@samsung.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260731084901.1512819-1-anisa.su@samsung.com> References: <20260731084901.1512819-1-anisa.su@samsung.com> 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 Signed-off-by: Anisa Su Tested-by: Wonjae Lee Tested-by: Junhee Park Tested-by: Heesoo Kim Reviewed-by: Dave Jiang --- 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 7f63b86887f4..d87dfbcac6a5 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -457,6 +457,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); @@ -469,9 +470,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 (info->part[i].mode < info->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 1565a5cf0f32..136443bffcb8 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -77,20 +77,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); } @@ -103,7 +95,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); } @@ -426,10 +418,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; } @@ -440,7 +433,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 = @@ -452,20 +445,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 = @@ -501,7 +487,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)) @@ -520,7 +506,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 666e01326dae..77f6417a1de7 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -412,14 +412,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 798e5c369cfc..9c4ef401cbad 100644 --- a/drivers/cxl/mem.c +++ b/drivers/cxl/mem.c @@ -139,7 +139,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