Merge branch 'for-79/disable-region-check' into pending
Add a check for memdev disable to see if there are active regions present
before disabling the device.
diff --git a/Documentation/cxl/cxl-disable-memdev.txt b/Documentation/cxl/cxl-disable-memdev.txt
index c4edb93..34b7202 100644
--- a/Documentation/cxl/cxl-disable-memdev.txt
+++ b/Documentation/cxl/cxl-disable-memdev.txt
@@ -27,7 +27,9 @@
a device if the tool determines the memdev is in active usage. Recall
that CXL memory ranges might have been established by platform
firmware and disabling an active device is akin to force removing
- memory from a running system.
+ memory from a running system. Going down this path does not offline
+ active memory if they are currently online. User is recommended to
+ offline and disable the appropriate regions before disabling the memdevs.
-v::
Turn on verbose debug messages in the library (if libcxl was built with
diff --git a/Documentation/cxl/lib/libcxl.txt b/Documentation/cxl/lib/libcxl.txt
index 13a77ac..40598a0 100644
--- a/Documentation/cxl/lib/libcxl.txt
+++ b/Documentation/cxl/lib/libcxl.txt
@@ -300,6 +300,7 @@
int cxl_port_get_depth(struct cxl_port *port);
bool cxl_port_hosts_memdev(struct cxl_port *port, struct cxl_memdev *memdev);
int cxl_port_get_nr_dports(struct cxl_port *port);
+int cxl_port_decoders_committed(struct cxl_port *port);
----
The port type is communicated via cxl_port_is_<type>(). An 'enabled' port
is one that has succeeded in discovering the CXL component registers in
diff --git a/cxl/json.c b/cxl/json.c
index fbe41c7..0c27aba 100644
--- a/cxl/json.c
+++ b/cxl/json.c
@@ -1151,6 +1151,10 @@
json_object_object_add(jport, "state", jobj);
}
+ jobj = json_object_new_int(cxl_port_decoders_committed(port));
+ if (jobj)
+ json_object_object_add(jport, "decoders_committed", jobj);
+
json_object_set_userdata(jport, port, NULL);
return jport;
}
diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c
index ff27cdf..91725ac 100644
--- a/cxl/lib/libcxl.c
+++ b/cxl/lib/libcxl.c
@@ -1947,6 +1947,10 @@
if (sysfs_read_attr(ctx, path, buf) == 0)
port->module = util_modalias_to_module(ctx, buf);
+ sprintf(path, "%s/decoders_committed", cxlport_base);
+ if (sysfs_read_attr(ctx, path, buf) == 0)
+ port->decoders_committed = strtoul(buf, NULL, 0);
+
free(path);
return 0;
err:
@@ -3202,6 +3206,11 @@
return NULL;
}
+CXL_EXPORT int cxl_port_decoders_committed(struct cxl_port *port)
+{
+ return port->decoders_committed;
+}
+
static void *add_cxl_bus(void *parent, int id, const char *cxlbus_base)
{
const char *devname = devpath_to_devname(cxlbus_base);
diff --git a/cxl/lib/libcxl.sym b/cxl/lib/libcxl.sym
index de2cd84..304d7fa 100644
--- a/cxl/lib/libcxl.sym
+++ b/cxl/lib/libcxl.sym
@@ -280,4 +280,5 @@
cxl_memdev_get_pmem_qos_class;
cxl_memdev_get_ram_qos_class;
cxl_region_qos_class_mismatch;
+ cxl_port_decoders_committed;
} LIBCXL_6;
diff --git a/cxl/lib/private.h b/cxl/lib/private.h
index 07dc8c7..b6cd910 100644
--- a/cxl/lib/private.h
+++ b/cxl/lib/private.h
@@ -89,6 +89,7 @@
int dports_init;
int nr_dports;
int depth;
+ int decoders_committed;
struct cxl_ctx *ctx;
struct cxl_bus *bus;
enum cxl_port_type type;
diff --git a/cxl/libcxl.h b/cxl/libcxl.h
index a6af3fb..fc6dd00 100644
--- a/cxl/libcxl.h
+++ b/cxl/libcxl.h
@@ -148,6 +148,7 @@
int cxl_port_get_nr_dports(struct cxl_port *port);
int cxl_port_disable_invalidate(struct cxl_port *port);
int cxl_port_enable(struct cxl_port *port);
+int cxl_port_decoders_committed(struct cxl_port *port);
struct cxl_port *cxl_port_get_next_all(struct cxl_port *port,
const struct cxl_port *top);
diff --git a/cxl/memdev.c b/cxl/memdev.c
index 81f0799..35920fc 100644
--- a/cxl/memdev.c
+++ b/cxl/memdev.c
@@ -450,14 +450,28 @@
static int action_disable(struct cxl_memdev *memdev, struct action_context *actx)
{
+ struct cxl_endpoint *ep;
+ struct cxl_port *port;
+
if (!cxl_memdev_is_enabled(memdev))
return 0;
- if (!param.force) {
- /* TODO: actually detect rather than assume active */
+ ep = cxl_memdev_get_endpoint(memdev);
+ if (!ep)
+ return -ENODEV;
+
+ port = cxl_endpoint_get_port(ep);
+ if (!port)
+ return -ENODEV;
+
+ if (cxl_port_decoders_committed(port)) {
log_err(&ml, "%s is part of an active region\n",
cxl_memdev_get_devname(memdev));
- return -EBUSY;
+ if (!param.force)
+ return -EBUSY;
+
+ log_err(&ml, "Forcing %s disable with an active region!\n",
+ cxl_memdev_get_devname(memdev));
}
return cxl_memdev_disable_invalidate(memdev);
