@@ -159,3 +159,43 @@ Description:
region driver before being deleted. The attributes expects a
region in the form "regionX.Y:Z". The region's name, allocated
by reading create_region, will also be released.
+
+What: /sys/bus/cxl/devices/decoderX.Y/regionX.Y:Z/offset
+Date: November, 2021
+KernelVersion: v5.17
+Contact: linux-cxl@vger.kernel.org
+Description:
+ (RO) A region resides within an address space that is claimed by
+ a decoder. Region space allocation is handled by the driver, but
+ the offset may be read by userspace tooling in order to
+ determine fragmentation, and available size for new regions.
+
+What:
+/sys/bus/cxl/devices/decoderX.Y/regionX.Y:Z/{interleave,size,uuid,target[0-15]}
+Date: November, 2021
+KernelVersion: v5.17
+Contact: linux-cxl@vger.kernel.org
+Description:
+ (RW) Configuring regions requires a minimal set of parameters in
+ order for the subsequent bind operation to succeed. The
+ following parameters are defined:
+
+ == ========================================================
+ interleave_granularity Mandatory. Number of consecutive bytes
+ each device in the interleave set will claim. The
+ possible interleave granularity values are determined by
+ the CXL spec and the participating devices.
+ interleave_ways Mandatory. Number of devices participating in the
+ region. Each device will provide 1/interleave of storage
+ for the region.
+ size Manadatory. Phsyical address space the region will
+ consume.
+ target Mandatory. Memory devices are the backing storage for a
+ region. There will be N targets based on the number of
+ interleave ways that the top level decoder is configured
+ for. Each target must be set with a memdev device ie.
+ 'mem1'. This attribute only becomes available after
+ setting the 'interleave' attribute.
+ uuid Optional. A unique identifier for the region. If none is
+ selected, the kernel will create one.
+ == ========================================================
@@ -3,9 +3,12 @@
#include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/device.h>
#include <linux/module.h>
+#include <linux/sizes.h>
#include <linux/slab.h>
+#include <linux/uuid.h>
#include <linux/idr.h>
#include <region.h>
+#include <cxlmem.h>
#include <cxl.h>
#include "core.h"
@@ -18,11 +21,300 @@
* (programming the hardware) is handled by a separate region driver.
*/
+struct cxl_region *to_cxl_region(struct device *dev);
+static const struct attribute_group region_interleave_group;
+
+static bool is_region_active(struct cxl_region *region)
+{
+ /* TODO: Regions can't be activated yet. */
+ return false;
+}
+
+static void remove_target(struct cxl_region *region, int target)
+{
+ struct cxl_memdev *cxlmd;
+
+ cxlmd = region->config.targets[target];
+ if (cxlmd)
+ put_device(&cxlmd->dev);
+ region->config.targets[target] = NULL;
+}
+
+static ssize_t interleave_ways_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct cxl_region *region = to_cxl_region(dev);
+
+ return sysfs_emit(buf, "%d\n", region->config.eniw);
+}
+
+static ssize_t interleave_ways_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct cxl_region *region = to_cxl_region(dev);
+ int ret, prev_eniw;
+ int val;
+
+ prev_eniw = region->config.eniw;
+ ret = kstrtoint(buf, 0, &val);
+ if (ret)
+ return ret;
+ if (ret < 0 || ret > CXL_DECODER_MAX_INTERLEAVE)
+ return -EINVAL;
+
+ region->config.eniw = val;
+
+ ret = sysfs_update_group(&dev->kobj, ®ion_interleave_group);
+ if (ret < 0)
+ goto err;
+
+ sysfs_notify(&dev->kobj, NULL, "target_interleave");
+
+ while (prev_eniw > region->config.eniw)
+ remove_target(region, --prev_eniw);
+
+ return len;
+
+err:
+ region->config.eniw = prev_eniw;
+ return ret;
+}
+static DEVICE_ATTR_RW(interleave_ways);
+
+static ssize_t interleave_granularity_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct cxl_region *region = to_cxl_region(dev);
+
+ return sysfs_emit(buf, "%d\n", region->config.ig);
+}
+
+static ssize_t interleave_granularity_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct cxl_region *region = to_cxl_region(dev);
+ int val, ret;
+
+ ret = kstrtoint(buf, 0, &val);
+ if (ret)
+ return ret;
+ region->config.ig = val;
+
+ return len;
+}
+static DEVICE_ATTR_RW(interleave_granularity);
+
+static ssize_t offset_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct cxl_region *region = to_cxl_region(dev);
+ struct cxl_decoder *cxld = to_cxl_decoder(dev->parent);
+
+ if (!region->res)
+ return sysfs_emit(buf, "\n");
+
+ return sysfs_emit(buf, "%#llx\n", cxld->platform_res.start - region->res->start);
+}
+static DEVICE_ATTR_RO(offset);
+
+static ssize_t size_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct cxl_region *region = to_cxl_region(dev);
+
+ return sysfs_emit(buf, "%llu\n", region->config.size);
+}
+
+static ssize_t size_store(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct cxl_region *region = to_cxl_region(dev);
+ unsigned long long val;
+ ssize_t rc;
+
+ rc = kstrtoull(buf, 0, &val);
+ if (rc)
+ return rc;
+
+ device_lock(®ion->dev);
+ if (is_region_active(region))
+ rc = -EBUSY;
+ else
+ region->config.size = val;
+ device_unlock(®ion->dev);
+
+ return rc ? rc : len;
+}
+static DEVICE_ATTR_RW(size);
+
+static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct cxl_region *region = to_cxl_region(dev);
+
+ return sysfs_emit(buf, "%pUb\n", ®ion->config.uuid);
+}
+
+static ssize_t uuid_store(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct cxl_region *region = to_cxl_region(dev);
+ ssize_t rc;
+
+ if (len != UUID_STRING_LEN + 1)
+ return -EINVAL;
+
+ device_lock(®ion->dev);
+ if (is_region_active(region))
+ rc = -EBUSY;
+ else
+ rc = uuid_parse(buf, ®ion->config.uuid);
+ device_unlock(®ion->dev);
+
+ return rc ? rc : len;
+}
+static DEVICE_ATTR_RW(uuid);
+
+static struct attribute *region_attrs[] = {
+ &dev_attr_interleave_ways.attr,
+ &dev_attr_interleave_granularity.attr,
+ &dev_attr_offset.attr,
+ &dev_attr_size.attr,
+ &dev_attr_uuid.attr,
+ NULL,
+};
+
+static const struct attribute_group region_group = {
+ .attrs = region_attrs,
+};
+
+static size_t show_targetN(struct cxl_region *region, char *buf, int n)
+{
+ int ret;
+
+ device_lock(®ion->dev);
+ if (!region->config.targets[n])
+ ret = sysfs_emit(buf, "\n");
+ else
+ ret = sysfs_emit(buf, "%s\n",
+ dev_name(®ion->config.targets[n]->dev));
+ device_unlock(®ion->dev);
+
+ return ret;
+}
+
+static size_t set_targetN(struct cxl_region *region, const char *buf, int n,
+ size_t len)
+{
+ struct device *memdev_dev;
+ struct cxl_memdev *cxlmd;
+
+ device_lock(®ion->dev);
+
+ if (len == 1 || region->config.targets[n])
+ remove_target(region, n);
+
+ /* Remove target special case */
+ if (len == 1) {
+ device_unlock(®ion->dev);
+ return len;
+ }
+
+ memdev_dev = bus_find_device_by_name(&cxl_bus_type, NULL, buf);
+ if (!memdev_dev)
+ return -ENOENT;
+
+ /* reference to memdev held until target is unset or region goes away */
+
+ cxlmd = to_cxl_memdev(memdev_dev);
+ region->config.targets[n] = cxlmd;
+
+ device_unlock(®ion->dev);
+
+ return len;
+}
+
+#define TARGET_ATTR_RW(n) \
+ static ssize_t target##n##_show( \
+ struct device *dev, struct device_attribute *attr, char *buf) \
+ { \
+ return show_targetN(to_cxl_region(dev), buf, (n)); \
+ } \
+ static ssize_t target##n##_store(struct device *dev, \
+ struct device_attribute *attr, \
+ const char *buf, size_t len) \
+ { \
+ return set_targetN(to_cxl_region(dev), buf, (n), len); \
+ } \
+ static DEVICE_ATTR_RW(target##n)
+
+TARGET_ATTR_RW(0);
+TARGET_ATTR_RW(1);
+TARGET_ATTR_RW(2);
+TARGET_ATTR_RW(3);
+TARGET_ATTR_RW(4);
+TARGET_ATTR_RW(5);
+TARGET_ATTR_RW(6);
+TARGET_ATTR_RW(7);
+TARGET_ATTR_RW(8);
+TARGET_ATTR_RW(9);
+TARGET_ATTR_RW(10);
+TARGET_ATTR_RW(11);
+TARGET_ATTR_RW(12);
+TARGET_ATTR_RW(13);
+TARGET_ATTR_RW(14);
+TARGET_ATTR_RW(15);
+
+static struct attribute *interleave_attrs[] = {
+ &dev_attr_target0.attr,
+ &dev_attr_target1.attr,
+ &dev_attr_target2.attr,
+ &dev_attr_target3.attr,
+ &dev_attr_target4.attr,
+ &dev_attr_target5.attr,
+ &dev_attr_target6.attr,
+ &dev_attr_target7.attr,
+ &dev_attr_target8.attr,
+ &dev_attr_target9.attr,
+ &dev_attr_target10.attr,
+ &dev_attr_target11.attr,
+ &dev_attr_target12.attr,
+ &dev_attr_target13.attr,
+ &dev_attr_target14.attr,
+ &dev_attr_target15.attr,
+ NULL,
+};
+
+static umode_t visible_targets(struct kobject *kobj, struct attribute *a, int n)
+{
+ struct device *dev = container_of(kobj, struct device, kobj);
+ struct cxl_region *region = to_cxl_region(dev);
+
+ if (n < region->config.eniw)
+ return a->mode;
+ return 0;
+}
+
+static const struct attribute_group region_interleave_group = {
+ .attrs = interleave_attrs,
+ .is_visible = visible_targets,
+};
+
+static const struct attribute_group *region_groups[] = {
+ ®ion_group,
+ ®ion_interleave_group,
+ NULL,
+};
+
static void cxl_region_release(struct device *dev);
static const struct device_type cxl_region_type = {
.name = "cxl_region",
.release = cxl_region_release,
+ .groups = region_groups
};
static ssize_t create_region_show(struct device *dev,
@@ -108,8 +400,11 @@ static void cxl_region_release(struct device *dev)
{
struct cxl_decoder *cxld = to_cxl_decoder(dev->parent);
struct cxl_region *region = to_cxl_region(dev);
+ int i;
ida_free(&cxld->region_ida, region->id);
+ for (i = 0; i < region->config.eniw; i++)
+ remove_target(region, i);
kfree(region);
}
The region creation APIs create a vacant region. Configuring the region works in the same way as similar subsystems such as devdax. Sysfs attrs will be provided to allow userspace to configure the region. Finally once all configuration is complete, userspace may activate the region. Introduced here are the most basic attributes needed to configure a region. Details of these attribute are described in the ABI Documentation. A example is provided below: /sys/bus/cxl/devices/region0.0:0 ├── interleave_granularity ├── interleave_ways ├── offset ├── size ├── subsystem -> ../../../../../../bus/cxl ├── target0 ├── uevent └── uuid Signed-off-by: Ben Widawsky <ben.widawsky@intel.com> --- Documentation/ABI/testing/sysfs-bus-cxl | 40 ++++ drivers/cxl/core/region.c | 295 ++++++++++++++++++++++++ 2 files changed, 335 insertions(+)