From: Shiju Jose <shiju.jose@xxxxxxxxxx>
Add scrub control attributes for ACPI RAS2 patrol scrub feature.
Co-developed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Signed-off-by: Shiju Jose <shiju.jose@xxxxxxxxxx>
---
.../ABI/testing/sysfs-class-scrub-configure | 28 +++-
drivers/ras/memory_scrub.c | 131 ++++++++++++++++++
include/linux/memory_scrub.h | 8 ++
3 files changed, 165 insertions(+), 2 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-class-scrub-configure b/Documentation/ABI/testing/sysfs-class-scrub-configure
index 3ed77dbb00ad..7178776249f8 100644
--- a/Documentation/ABI/testing/sysfs-class-scrub-configure
+++ b/Documentation/ABI/testing/sysfs-class-scrub-configure
@@ -15,12 +15,21 @@ Description:
correspond to each scrub device registered with the
scrub subsystem.
-What: /sys/class/ras/rasX/scrub/name
+What: /sys/class/ras/rasX/scrub/addr_range_base
Date: March 2024
KernelVersion: 6.9
Contact: linux-kernel@xxxxxxxxxxxxxxx
Description:
- (RO) name of the memory scrubber
+ (RW) The base of the address range of the memory region
+ to be scrubbed (on-demand scrubbing).
+
+What: /sys/class/ras/rasX/scrub/addr_range_size
+Date: March 2024
+KernelVersion: 6.9
+Contact: linux-kernel@xxxxxxxxxxxxxxx
+Description:
+ (RW) The size of the address range of the memory region
+ to be scrubbed (on-demand scrubbing).
What: /sys/class/ras/rasX/scrub/enable_background
Date: March 2024
@@ -29,6 +38,21 @@ Contact: linux-kernel@xxxxxxxxxxxxxxx
Description:
(RW) Enable/Disable background(patrol) scrubbing if supported.
+What: /sys/class/ras/rasX/scrub/enable_on_demand
+Date: March 2024
+KernelVersion: 6.9
+Contact: linux-kernel@xxxxxxxxxxxxxxx
+Description:
+ (RW) Enable/Disable on-demand scrubbing the memory region
+ if supported.
+
+What: /sys/class/ras/rasX/scrub/name
+Date: March 2024
+KernelVersion: 6.9
+Contact: linux-kernel@xxxxxxxxxxxxxxx
+Description:
+ (RO) name of the memory scrubber
+
What: /sys/class/ras/rasX/scrub/rate_available
Date: March 2024
KernelVersion: 6.9
diff --git a/drivers/ras/memory_scrub.c b/drivers/ras/memory_scrub.c
index 7e995380ec3a..ace6c59b8993 100755
--- a/drivers/ras/memory_scrub.c
+++ b/drivers/ras/memory_scrub.c
@@ -29,6 +29,83 @@ struct scrub_device {
};
#define to_scrub_device(d) container_of(d, struct scrub_device, dev)
+static ssize_t addr_range_base_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct scrub_device *scrub_dev = to_scrub_device(dev);
+ u64 base, size;
+ int ret;
+
+ ret = scrub_dev->ops->read_range(dev, &base, &size);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "0x%llx\n", base);
+}
+
+static ssize_t addr_range_size_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct scrub_device *scrub_dev = to_scrub_device(dev);
+ u64 base, size;
+ int ret;
+
+ ret = scrub_dev->ops->read_range(dev, &base, &size);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "0x%llx\n", size);
+}
+
+static ssize_t addr_range_base_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct scrub_device *scrub_dev = to_scrub_device(dev);
+ u64 base, size;
+ int ret;
+
+ ret = scrub_dev->ops->read_range(dev, &base, &size);
+ if (ret)
+ return ret;
+
+ ret = kstrtou64(buf, 16, &base);
+ if (ret < 0)
+ return ret;
+
+ ret = scrub_dev->ops->write_range(dev, base, size);
+ if (ret)
+ return ret;
+
+ return len;
+}
+
+static ssize_t addr_range_size_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf,
+ size_t len)
+{
+ struct scrub_device *scrub_dev = to_scrub_device(dev);
+ u64 base, size;
+ int ret;
+
+ ret = scrub_dev->ops->read_range(dev, &base, &size);
+ if (ret)
+ return ret;
+
+ ret = kstrtou64(buf, 16, &size);
+ if (ret < 0)
+ return ret;
+
+ ret = scrub_dev->ops->write_range(dev, base, size);
+ if (ret)
+ return ret;
+
+ return len;
+}
+
static ssize_t enable_background_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t len)
@@ -62,6 +139,39 @@ static ssize_t enable_background_show(struct device *dev,
return sysfs_emit(buf, "%d\n", enable);
}
+static ssize_t enable_on_demand_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct scrub_device *scrub_dev = to_scrub_device(dev);
+ bool enable;
+ int ret;
+
+ ret = scrub_dev->ops->get_enabled_od(dev, &enable);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%d\n", enable);
+}
+
+static ssize_t enable_on_demand_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct scrub_device *scrub_dev = to_scrub_device(dev);
+ bool enable;
+ int ret;
+
+ ret = kstrtobool(buf, &enable);
+ if (ret < 0)
+ return ret;
+
+ ret = scrub_dev->ops->set_enabled_od(dev, enable);
+ if (ret)
+ return ret;
+
+ return len;
+}
+
static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -122,13 +232,19 @@ static ssize_t rate_available_show(struct device *dev,
return sysfs_emit(buf, "0x%llx-0x%llx\n", min_sr, max_sr);
}
+DEVICE_ATTR_RW(addr_range_base);
+DEVICE_ATTR_RW(addr_range_size);
DEVICE_ATTR_RW(enable_background);
+DEVICE_ATTR_RW(enable_on_demand);
DEVICE_ATTR_RO(name);
DEVICE_ATTR_RW(rate);
DEVICE_ATTR_RO(rate_available);
static struct attribute *scrub_attrs[] = {
+ &dev_attr_addr_range_base.attr,
+ &dev_attr_addr_range_size.attr,
&dev_attr_enable_background.attr,
+ &dev_attr_enable_on_demand.attr,
&dev_attr_name.attr,
&dev_attr_rate.attr,
&dev_attr_rate_available.attr,
@@ -142,6 +258,14 @@ static umode_t scrub_attr_visible(struct kobject *kobj,
struct scrub_device *scrub_dev = to_scrub_device(dev);
const struct scrub_ops *ops = scrub_dev->ops;
+ if (a == &dev_attr_addr_range_base.attr ||
+ a == &dev_attr_addr_range_size.attr) {
+ if (ops->read_range && ops->write_range)
+ return a->mode;
+ if (ops->read_range)
+ return 0444;
+ return 0;
+ }
if (a == &dev_attr_enable_background.attr) {
if (ops->set_enabled_bg && ops->get_enabled_bg)
return a->mode;
@@ -149,6 +273,13 @@ static umode_t scrub_attr_visible(struct kobject *kobj,
return 0444;
return 0;
}
+ if (a == &dev_attr_enable_on_demand.attr) {
+ if (ops->set_enabled_od && ops->get_enabled_od)
+ return a->mode;
+ if (ops->get_enabled_od)
+ return 0444;
+ return 0;
+ }
if (a == &dev_attr_name.attr)
return ops->get_name ? a->mode : 0;
if (a == &dev_attr_rate_available.attr)
diff --git a/include/linux/memory_scrub.h b/include/linux/memory_scrub.h
index f0e1657a5072..d8edb48677c9 100755
--- a/include/linux/memory_scrub.h
+++ b/include/linux/memory_scrub.h
@@ -15,16 +15,24 @@ struct device;
/**
* struct scrub_ops - scrub device operations (all elements optional)
+ * @read_range: read base and offset of scrubbing range.
+ * @write_range: set the base and offset of the scrubbing range.
* @get_enabled_bg: check if currently performing background scrub.
* @set_enabled_bg: start or stop a bg-scrub.
+ * @get_enabled_od: check if currently performing on-demand scrub.
+ * @set_enabled_od: start or stop an on-demand scrub.
* @get_name: get the memory scrubber name.
* @rate_avail_range: retrieve limits on supported rates.
* @rate_read: read the scrub rate
* @rate_write: set the scrub rate
*/
struct scrub_ops {
+ int (*read_range)(struct device *dev, u64 *base, u64 *size);
+ int (*write_range)(struct device *dev, u64 base, u64 size);
int (*get_enabled_bg)(struct device *dev, bool *enable);
int (*set_enabled_bg)(struct device *dev, bool enable);
+ int (*get_enabled_od)(struct device *dev, bool *enable);
+ int (*set_enabled_od)(struct device *dev, bool enable);
int (*get_name)(struct device *dev, char *buf);
int (*rate_avail_range)(struct device *dev, u64 *min, u64 *max);
int (*rate_read)(struct device *dev, u64 *rate);
--
2.34.1
