All of lore.kernel.org
 help / color / mirror / Atom feed
From: ira.weiny@intel.com
To: Dave Jiang <dave.jiang@intel.com>, Fan Ni <fan.ni@samsung.com>,
	 Jonathan Cameron <Jonathan.Cameron@huawei.com>,
	 Navneet Singh <navneet.singh@intel.com>,
	Jonathan Corbet <corbet@lwn.net>,
	 Andrew Morton <akpm@linux-foundation.org>
Cc: Dan Williams <dan.j.williams@intel.com>,
	 Davidlohr Bueso <dave@stgolabs.net>,
	 Alison Schofield <alison.schofield@intel.com>,
	 Vishal Verma <vishal.l.verma@intel.com>,
	Ira Weiny <ira.weiny@intel.com>,
	 linux-cxl@vger.kernel.org, linux-doc@vger.kernel.org,
	 nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH v5 14/27] cxl/port: Add endpoint decoder DC mode support to sysfs
Date: Tue, 29 Oct 2024 15:34:49 -0500	[thread overview]
Message-ID: <20241029-dcd-type2-upstream-v5-14-8739cb67c374@intel.com> (raw)
In-Reply-To: <20241029-dcd-type2-upstream-v5-0-8739cb67c374@intel.com>

From: Navneet Singh <navneet.singh@intel.com>

Endpoint decoder mode is used to represent the partition the decoder
points to such as ram or pmem.

Expand the mode to allow a decoder to point to a specific DC partition
(Region).

Signed-off-by: Navneet Singh <navneet.singh@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Co-developed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>

---
Changes:
[iweiny: push sysfs versions to 6.13]
[Jonathan: adjust to the use of guard()]
[Jonathan: clean up documentation]
[Jonathan: adjust decoder mode enum]
---
 Documentation/ABI/testing/sysfs-bus-cxl | 25 +++++++++++++------------
 drivers/cxl/core/hdm.c                  | 16 ++++++++++++++++
 drivers/cxl/core/port.c                 | 16 +++++++++++-----
 drivers/cxl/cxl.h                       | 33 +++++++++++++++++----------------
 4 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl
index ff3ae83477f0876c0ee2d3955d27a11fa9d16d83..8d990d702f63363879150cf523c0be6229f315e0 100644
--- a/Documentation/ABI/testing/sysfs-bus-cxl
+++ b/Documentation/ABI/testing/sysfs-bus-cxl
@@ -361,23 +361,24 @@ Description:
 
 
 What:		/sys/bus/cxl/devices/decoderX.Y/mode
-Date:		May, 2022
-KernelVersion:	v6.0
+Date:		May, 2022, October 2024
+KernelVersion:	v6.0, v6.13 (dcY)
 Contact:	linux-cxl@vger.kernel.org
 Description:
 		(RW) When a CXL decoder is of devtype "cxl_decoder_endpoint" it
-		translates from a host physical address range, to a device local
-		address range. Device-local address ranges are further split
-		into a 'ram' (volatile memory) range and 'pmem' (persistent
-		memory) range. The 'mode' attribute emits one of 'ram', 'pmem',
-		'mixed', or 'none'. The 'mixed' indication is for error cases
-		when a decoder straddles the volatile/persistent partition
-		boundary, and 'none' indicates the decoder is not actively
-		decoding, or no DPA allocation policy has been set.
+		translates from a host physical address range, to a device
+		local address range. Device-local address ranges are further
+		split into a 'ram' (volatile memory) range, 'pmem' (persistent
+		memory) range, and Dynamic Capacity (DC) ranges. The 'mode'
+		attribute emits one of 'ram', 'pmem', 'dcY', 'mixed', or
+		'none'. The 'mixed' indication is for error cases when a
+		decoder straddles partition boundaries, and 'none' indicates
+		the decoder is not actively decoding, or no DPA allocation
+		policy has been set.
 
 		'mode' can be written, when the decoder is in the 'disabled'
-		state, with either 'ram' or 'pmem' to set the boundaries for the
-		next allocation.
+		state, with 'ram', 'pmem', or 'dcY' to set the boundaries for
+		the next allocation.
 
 
 What:		/sys/bus/cxl/devices/decoderX.Y/dpa_resource
diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c
index 998aed17d7e47fc18a05fb2e8cca25de0e92a6d4..40799a0ca1d7af89b9af53cc098381e83b8c7e82 100644
--- a/drivers/cxl/core/hdm.c
+++ b/drivers/cxl/core/hdm.c
@@ -548,6 +548,7 @@ int cxl_dpa_set_mode(struct cxl_endpoint_decoder *cxled,
 	switch (mode) {
 	case CXL_DECODER_RAM:
 	case CXL_DECODER_PMEM:
+	case CXL_DECODER_DC0 ... CXL_DECODER_DC7:
 		break;
 	default:
 		dev_dbg(dev, "unsupported mode: %d\n", mode);
@@ -571,6 +572,21 @@ int cxl_dpa_set_mode(struct cxl_endpoint_decoder *cxled,
 		return -ENXIO;
 	}
 
+	if (mode >= CXL_DECODER_DC0 && mode <= CXL_DECODER_DC7) {
+		struct cxl_memdev_state *mds = to_cxl_memdev_state(cxlds);
+		int index;
+
+		index = dc_mode_to_region_index(mode);
+		if (!resource_size(&cxlds->dc_res[index])) {
+			dev_dbg(dev, "no available dynamic capacity\n");
+			return -ENXIO;
+		}
+		if (mds->dc_region[index].shareable) {
+			dev_err(dev, "DC region %d is shareable\n", index);
+			return -EINVAL;
+		}
+	}
+
 	cxled->mode = mode;
 	return 0;
 }
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
index 85b912c11f04d2c743936eaac1f356975cb3cc71..2f42c8717a65586c769f0fd2016e8addc2552f9d 100644
--- a/drivers/cxl/core/port.c
+++ b/drivers/cxl/core/port.c
@@ -205,11 +205,17 @@ static ssize_t mode_store(struct device *dev, struct device_attribute *attr,
 	enum cxl_decoder_mode mode;
 	ssize_t rc;
 
-	if (sysfs_streq(buf, "pmem"))
-		mode = CXL_DECODER_PMEM;
-	else if (sysfs_streq(buf, "ram"))
-		mode = CXL_DECODER_RAM;
-	else
+	for (mode = 0; mode < CXL_DECODER_MODE_MAX; mode++)
+		if (sysfs_streq(buf, cxl_decoder_mode_names[mode]))
+			break;
+
+	if (mode == CXL_DECODER_NONE ||
+	    mode == CXL_DECODER_DEAD ||
+	    mode == CXL_DECODER_MODE_MAX)
+		return -EINVAL;
+
+	/* Not yet supported */
+	if (mode >= CXL_DECODER_MIXED)
 		return -EINVAL;
 
 	rc = cxl_dpa_set_mode(cxled, mode);
diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
index 8b7099c38a40d842e4f11137c3e9107031fbdf6a..486ceaafa85c3ac1efd438b6d6b9ccd0860dde45 100644
--- a/drivers/cxl/cxl.h
+++ b/drivers/cxl/cxl.h
@@ -380,27 +380,28 @@ enum cxl_decoder_mode {
 	CXL_DECODER_DC7,
 	CXL_DECODER_MIXED,
 	CXL_DECODER_DEAD,
+	CXL_DECODER_MODE_MAX,
+};
+
+static const char * const cxl_decoder_mode_names[] = {
+	[CXL_DECODER_NONE] = "none",
+	[CXL_DECODER_RAM] = "ram",
+	[CXL_DECODER_PMEM] = "pmem",
+	[CXL_DECODER_DC0] = "dc0",
+	[CXL_DECODER_DC1] = "dc1",
+	[CXL_DECODER_DC2] = "dc2",
+	[CXL_DECODER_DC3] = "dc3",
+	[CXL_DECODER_DC4] = "dc4",
+	[CXL_DECODER_DC5] = "dc5",
+	[CXL_DECODER_DC6] = "dc6",
+	[CXL_DECODER_DC7] = "dc7",
+	[CXL_DECODER_MIXED] = "mixed",
 };
 
 static inline const char *cxl_decoder_mode_name(enum cxl_decoder_mode mode)
 {
-	static const char * const names[] = {
-		[CXL_DECODER_NONE] = "none",
-		[CXL_DECODER_RAM] = "ram",
-		[CXL_DECODER_PMEM] = "pmem",
-		[CXL_DECODER_DC0] = "dc0",
-		[CXL_DECODER_DC1] = "dc1",
-		[CXL_DECODER_DC2] = "dc2",
-		[CXL_DECODER_DC3] = "dc3",
-		[CXL_DECODER_DC4] = "dc4",
-		[CXL_DECODER_DC5] = "dc5",
-		[CXL_DECODER_DC6] = "dc6",
-		[CXL_DECODER_DC7] = "dc7",
-		[CXL_DECODER_MIXED] = "mixed",
-	};
-
 	if (mode >= CXL_DECODER_NONE && mode <= CXL_DECODER_MIXED)
-		return names[mode];
+		return cxl_decoder_mode_names[mode];
 	return "mixed";
 }
 

-- 
2.47.0


  parent reply	other threads:[~2024-10-29 20:35 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-29 20:34 [PATCH v5 00/27] DCD: Add support for Dynamic Capacity Devices (DCD) Ira Weiny
2024-10-29 20:34 ` [PATCH v5 01/27] range: Add range_overlaps() Ira Weiny
2024-10-29 20:34 ` [PATCH v5 02/27] ACPI/CDAT: Add CDAT/DSMAS shared and read only flag values Ira Weiny
2024-10-29 20:34 ` [PATCH v5 03/27] dax: Document struct dev_dax_range Ira Weiny
2024-10-30 13:28   ` Jonathan Cameron
2024-10-29 20:34 ` [PATCH v5 04/27] cxl/pci: Delay event buffer allocation Ira Weiny
2024-10-29 20:34 ` [PATCH v5 05/27] cxl/hdm: Use guard() in cxl_dpa_set_mode() Ira Weiny
2024-10-30 13:29   ` Jonathan Cameron
2024-10-31  0:16   ` Davidlohr Bueso
2024-10-29 20:34 ` [PATCH v5 06/27] cxl/region: Refactor common create region code Ira Weiny
2024-10-29 20:34 ` [PATCH v5 07/27] cxl/mbox: Flag support for Dynamic Capacity Devices (DCD) ira.weiny
2024-10-29 20:34 ` [PATCH v5 08/27] cxl/mem: Read dynamic capacity configuration from the device ira.weiny
2024-10-30 14:05   ` Jonathan Cameron
2024-10-30 16:28     ` Ira Weiny
2024-10-31  0:24   ` Davidlohr Bueso
2024-10-31 14:48     ` Ira Weiny
2024-10-31  1:34   ` Davidlohr Bueso
2024-10-31 16:00     ` Fan Ni
2024-10-31 22:16       ` Ira Weiny
2024-11-04 17:09   ` Davidlohr Bueso
2024-11-05  1:53     ` Ira Weiny
2024-10-29 20:34 ` [PATCH v5 09/27] cxl/core: Separate region mode from decoder mode ira.weiny
2024-10-29 20:34 ` [PATCH v5 10/27] cxl/region: Add dynamic capacity decoder and region modes ira.weiny
2024-10-29 20:34 ` [PATCH v5 11/27] cxl/hdm: Add dynamic capacity size support to endpoint decoders ira.weiny
2024-10-29 20:34 ` [PATCH v5 12/27] cxl/cdat: Gather DSMAS data for DCD regions Ira Weiny
2024-10-30 18:32   ` Dave Jiang
2024-10-29 20:34 ` [PATCH v5 13/27] cxl/mem: Expose DCD partition capabilities in sysfs ira.weiny
2024-10-30 17:50   ` Fan Ni
2024-10-29 20:34 ` ira.weiny [this message]
2024-10-29 20:34 ` [PATCH v5 15/27] cxl/region: Add sparse DAX region support ira.weiny
2024-10-29 20:34 ` [PATCH v5 16/27] cxl/events: Split event msgnum configuration from irq setup Ira Weiny
2024-10-29 20:34 ` [PATCH v5 17/27] cxl/pci: Factor out interrupt policy check Ira Weiny
2024-10-29 20:34 ` [PATCH v5 18/27] cxl/mem: Configure dynamic capacity interrupts ira.weiny
2024-10-30 17:58   ` Fan Ni
2024-10-29 20:34 ` [PATCH v5 19/27] cxl/core: Return endpoint decoder information from region search Ira Weiny
2024-10-29 20:34 ` [PATCH v5 20/27] cxl/extent: Process DCD events and realize region extents ira.weiny
2024-10-30 14:32   ` Jonathan Cameron
2024-10-30 16:36     ` Ira Weiny
2024-11-01 12:07       ` Jonathan Cameron
2024-10-29 20:34 ` [PATCH v5 21/27] cxl/region/extent: Expose region extent information in sysfs ira.weiny
2024-10-29 20:34 ` [PATCH v5 22/27] dax/bus: Factor out dev dax resize logic Ira Weiny
2024-10-29 20:34 ` [PATCH v5 23/27] dax/region: Create resources on sparse DAX regions ira.weiny
2024-10-30 14:44   ` Jonathan Cameron
2024-10-29 20:34 ` [PATCH v5 24/27] cxl/region: Read existing extents on region creation ira.weiny
2024-10-29 20:35 ` [PATCH v5 25/27] cxl/mem: Trace Dynamic capacity Event Record ira.weiny
2024-10-29 20:35 ` [PATCH v5 26/27] tools/testing/cxl: Make event logs dynamic Ira Weiny
2024-10-29 20:35 ` [PATCH v5 27/27] tools/testing/cxl: Add DC Regions to mock mem data Ira Weiny
2024-10-30 14:48 ` [PATCH v5 00/27] DCD: Add support for Dynamic Capacity Devices (DCD) Jonathan Cameron
2024-10-31 15:55   ` Dave Jiang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241029-dcd-type2-upstream-v5-14-8739cb67c374@intel.com \
    --to=ira.weiny@intel.com \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=alison.schofield@intel.com \
    --cc=corbet@lwn.net \
    --cc=dan.j.williams@intel.com \
    --cc=dave.jiang@intel.com \
    --cc=dave@stgolabs.net \
    --cc=fan.ni@samsung.com \
    --cc=linux-cxl@vger.kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=navneet.singh@intel.com \
    --cc=nvdimm@lists.linux.dev \
    --cc=vishal.l.verma@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.