@@ -43,6 +43,7 @@
enum opcode {
CXL_MBOX_OP_INVALID = 0x0000,
+#define CXL_MBOX_OP_RAW CXL_MBOX_OP_INVALID
CXL_MBOX_OP_IDENTIFY = 0x4000,
CXL_MBOX_OP_MAX = 0x10000
};
@@ -139,6 +140,7 @@ struct cxl_mem_command {
static struct cxl_mem_command mem_commands[] = {
CXL_CMD(INVALID, KERNEL, 0, 0, HIDDEN),
CXL_CMD(IDENTIFY, NONE, 0, 0x43, MANDATORY),
+ CXL_CMD(RAW, NONE, ~0, ~0, MANDATORY),
};
#define cxl_for_each_cmd(cmd) \
@@ -520,6 +522,9 @@ static int handle_mailbox_cmd_from_user(struct cxl_memdev *cxlmd,
command_names[cmd->info.id].name, mbox_cmd.opcode,
cmd->info.size_in);
+ if (cmd->info.id == CXL_MEM_COMMAND_ID_RAW)
+ add_taint(TAINT_RAW_PASSTHROUGH, LOCKDEP_STILL_OK);
+
rc = cxl_mem_mbox_send_cmd(cxlmd->cxlm, &mbox_cmd);
cxl_mem_mbox_put(cxlmd->cxlm);
if (rc)
@@ -581,6 +586,28 @@ static int cxl_validate_cmd_from_user(struct cxl_mem *cxlm,
if (send_cmd->size_in > cxlm->mbox.payload_size)
return -EINVAL;
+ /* Checks are bypassed for raw commands but along comes the taint! */
+ if (send_cmd->id == CXL_MEM_COMMAND_ID_RAW) {
+ const struct cxl_mem_command temp = {
+ {
+ .id = CXL_MEM_COMMAND_ID_RAW,
+ .flags = CXL_MEM_COMMAND_FLAG_NONE,
+ .size_in = send_cmd->size_in,
+ .size_out = send_cmd->size_out,
+ },
+ .flags = 0,
+ .opcode = send_cmd->raw.opcode
+ };
+
+ if (send_cmd->raw.rsvd)
+ return -EINVAL;
+
+ if (cxl_mem_find_command(send_cmd->raw.opcode))
+ return -EPERM;
+
+ return PTR_ERR_OR_ZERO(memcpy(out_cmd, &temp, sizeof(temp)));
+ }
+
if (send_cmd->flags & CXL_MEM_COMMAND_FLAG_MASK)
return -EINVAL;
@@ -32,6 +32,7 @@ extern "C" {
#define CMDS \
C(INVALID, "Invalid Command"), \
C(IDENTIFY, "Identify Command"), \
+ C(RAW, "Raw device command"), \
C(MAX, "Last command")
#undef C
#define C(a, b) CXL_MEM_COMMAND_ID_##a
@@ -117,6 +118,9 @@ struct cxl_mem_query_commands {
* @id: The command to send to the memory device. This must be one of the
* commands returned by the query command.
* @flags: Flags for the command (input).
+ * @raw: Special fields for raw commands
+ * @raw.opcode: Opcode passed to hardware when using the RAW command.
+ * @raw.rsvd: Must be zero.
* @rsvd: Must be zero.
* @retval: Return value from the memory device (output).
* @size_in: Size of the payload to provide to the device (input).
@@ -135,7 +139,13 @@ struct cxl_mem_query_commands {
struct cxl_send_command {
__u32 id;
__u32 flags;
- __u32 rsvd;
+ union {
+ struct {
+ __u16 opcode;
+ __u16 rsvd;
+ } raw;
+ __u32 rsvd;
+ };
__u32 retval;
struct {
The CXL memory device send interface will have a number of supported commands. The raw command is not such a command. Raw commands allow userspace to send a specified opcode to the underlying hardware and bypass all driver checks on the command. This is useful for a couple of usecases, mainly: 1. Undocumented vendor specific hardware commands 2. Prototyping new hardware commands not yet supported by the driver While this all sounds very powerful it comes with a couple of caveats: 1. Bug reports using raw commands will not get the same level of attention as bug reports using supported commands (via taint). 2. Supported commands will be rejected by the RAW command. Signed-off-by: Ben Widawsky <ben.widawsky@intel.com> --- drivers/cxl/mem.c | 27 +++++++++++++++++++++++++++ include/uapi/linux/cxl_mem.h | 12 +++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-)