From: Dave Jiang <dave.jiang@intel.com>
To: linux-cxl@vger.kernel.org
Cc: dan.j.williams@intel.com, ira.weiny@intel.com,
vishal.l.verma@intel.com, alison.schofield@intel.com,
Jonathan.Cameron@huawei.com, dave@stgolabs.net, jgg@nvidia.com,
shiju.jose@huawei.com
Subject: [PATCH v1 14/19] cxl: Add support for fwctl RPC command to enable CXL feature commands
Date: Wed, 22 Jan 2025 16:50:45 -0700 [thread overview]
Message-ID: <20250122235159.2716036-15-dave.jiang@intel.com> (raw)
In-Reply-To: <20250122235159.2716036-1-dave.jiang@intel.com>
fwctl provides a fwctl_ops->fw_rpc() callback in order to issue ioctls
to a device. The cxl fwctl driver will start by supporting the CXL
feature commands: Get Supported Features, Get Feature, and Set Feature.
The fw_rpc() callback provides 'enum fwctl_rpc_scope' parameter where
it indicates the security scope of the call. The Get Supported Features
and Get Feature calls can be executed with the scope of
FWCTL_RPC_CONFIGRATION. The Set Feature call is gated by the effects
of the feature reported by Get Supported Features call for the specific
feature.
Only "get supported features" is supported in this patch. Additional
commands will be added in follow on patches. "Get supported features"
will filter the features that are exclusive to the kernel and only
report out features that are not kernel only.
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
drivers/cxl/core/mbox.c | 12 +++
drivers/cxl/features.c | 198 +++++++++++++++++++++++++++++++++++-
include/cxl/features.h | 1 +
include/uapi/cxl/features.h | 13 +++
include/uapi/fwctl/cxl.h | 29 ++++++
5 files changed, 250 insertions(+), 3 deletions(-)
diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index 0b4946205910..f818e452dbca 100644
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -246,6 +246,18 @@ struct cxl_mem_command *cxl_find_feature_command(u16 opcode)
}
EXPORT_SYMBOL_NS_GPL(cxl_find_feature_command, "CXL");
+struct cxl_mem_command *cxl_find_feature_command_by_id(u32 id)
+{
+ struct cxl_mem_command *c;
+
+ cxl_for_each_feature_cmd(c)
+ if (c->info.id == id)
+ return c;
+
+ return NULL;
+}
+EXPORT_SYMBOL_NS_GPL(cxl_find_feature_command_by_id, "CXL");
+
static const char *cxl_mem_opcode_to_name(u16 opcode)
{
struct cxl_mem_command *c;
diff --git a/drivers/cxl/features.c b/drivers/cxl/features.c
index cc72e73ae8d6..e65fc8479d21 100644
--- a/drivers/cxl/features.c
+++ b/drivers/cxl/features.c
@@ -50,11 +50,203 @@ static void *cxlctl_info(struct fwctl_uctx *uctx, size_t *length)
return info;
}
+static struct cxl_feat_entry *
+get_support_feature_info(struct cxl_features_state *cfs,
+ const struct fwctl_rpc_cxl *rpc_in)
+{
+ struct cxl_feat_entry *feat;
+ uuid_t uuid;
+
+ if (rpc_in->op_size < sizeof(uuid))
+ return ERR_PTR(-EINVAL);
+
+ if (copy_from_user(&uuid, u64_to_user_ptr(rpc_in->in_payload),
+ sizeof(uuid)))
+ return ERR_PTR(-EFAULT);
+
+ for (int i = 0; i < cfs->num_features; i++) {
+ feat = &cfs->entries[i];
+ if (uuid_equal(&uuid, &feat->uuid))
+ return feat;
+ }
+
+ return ERR_PTR(-ENOENT);
+}
+
+static void *cxlctl_get_supported_features(struct cxl_features_state *cfs,
+ const struct fwctl_rpc_cxl *rpc_in,
+ size_t *out_len)
+{
+ struct cxl_mbox_get_sup_feats_out *feat_out;
+ struct cxl_mbox_get_sup_feats_in feat_in;
+ struct cxl_feat_entry *saved, *pos;
+ int requested, copied;
+ size_t out_size;
+ u32 count;
+ u16 start;
+
+ if (rpc_in->op_size != sizeof(feat_in))
+ return ERR_PTR(-EINVAL);
+
+ if (copy_from_user(&feat_in, u64_to_user_ptr(rpc_in->in_payload),
+ rpc_in->op_size))
+ return ERR_PTR(-EFAULT);
+
+ count = le32_to_cpu(feat_in.count);
+ start = le16_to_cpu(feat_in.start_idx);
+ requested = count / sizeof(*pos);
+
+ /*
+ * Make sure that the total requested number of entries is not greater
+ * than the total number of supported features allowed for userspace.
+ */
+ if (start >= cfs->num_user_features)
+ return ERR_PTR(-EINVAL);
+
+ requested = min_t(int, requested, cfs->num_user_features - start);
+
+ out_size = sizeof(struct fwctl_rpc_cxl_out) + sizeof(*feat_out) +
+ requested * sizeof(*pos);
+
+ struct fwctl_rpc_cxl_out *rpc_out __free(kvfree) =
+ kvzalloc(out_size, GFP_KERNEL);
+ if (!rpc_out)
+ return ERR_PTR(-ENOMEM);
+
+ rpc_out->size = sizeof(*feat_out) + requested * sizeof(*pos);
+ feat_out = (struct cxl_mbox_get_sup_feats_out *)rpc_out->payload;
+ if (requested == 0) {
+ feat_out->num_entries = cpu_to_le16(requested);
+ feat_out->supported_feats = cpu_to_le16(cfs->num_user_features);
+ rpc_out->retval = CXL_MBOX_CMD_RC_SUCCESS;
+ *out_len = out_size;
+ return no_free_ptr(rpc_out);
+ }
+
+ pos = &feat_out->ents[0];
+ saved = &cfs->entries[0];
+
+ copied = 0;
+ for (int i = 0; i < cfs->num_features; i++, saved++) {
+ if (is_cxl_feature_exclusive(saved))
+ continue;
+
+ memcpy(pos, saved, sizeof(*saved));
+ copied++;
+ if (copied == requested)
+ break;
+ pos++;
+ }
+
+ feat_out->num_entries = cpu_to_le16(requested);
+ feat_out->supported_feats = cpu_to_le16(cfs->num_user_features);
+ rpc_out->retval = CXL_MBOX_CMD_RC_SUCCESS;
+ *out_len = out_size;
+
+ return no_free_ptr(rpc_out);
+}
+
+static bool cxlctl_validate_set_features(struct cxl_features_state *cfs,
+ const struct fwctl_rpc_cxl *rpc_in,
+ enum fwctl_rpc_scope scope)
+{
+ struct cxl_feat_entry *feat;
+ u16 effects, mask;
+ u32 flags;
+
+ feat = get_support_feature_info(cfs, rpc_in);
+ if (IS_ERR(feat))
+ return false;
+
+ /* Ensure that the attribute is changeable */
+ flags = le32_to_cpu(feat->flags);
+ if (!(flags & CXL_FEATURE_F_CHANGEABLE))
+ return false;
+
+ effects = le16_to_cpu(feat->effects);
+ /* Currently no user background command support */
+ if (effects & CXL_CMD_BACKGROUND)
+ return false;
+
+ mask = CXL_CMD_CONFIG_CHANGE_IMMEDIATE |
+ CXL_CMD_DATA_CHANGE_IMMEDIATE |
+ CXL_CMD_POLICY_CHANGE_IMMEDIATE |
+ CXL_CMD_LOG_CHANGE_IMMEDIATE;
+ if (effects & mask && scope >= FWCTL_RPC_DEBUG_WRITE_FULL)
+ return true;
+
+ /* These effects supported for all scope */
+ if ((effects & CXL_CMD_CONFIG_CHANGE_COLD_RESET ||
+ (effects & CXL_CMD_EFFECTS_EXTEND &&
+ (effects & CXL_CMD_CONFIG_CHANGE_CONV_RESET ||
+ effects & CXL_CMD_CONFIG_CHANGE_CXL_RESET))) &&
+ scope >= FWCTL_RPC_DEBUG_WRITE)
+ return true;
+
+ return false;
+}
+
+static struct cxl_mem_command *
+cxlctl_get_valid_hw_command(struct cxl_features_state *cfs,
+ const struct fwctl_rpc_cxl *rpc_in,
+ enum fwctl_rpc_scope scope)
+{
+ struct cxl_mem_command *cmd;
+
+ if (!cfs->num_features)
+ return ERR_PTR(-EOPNOTSUPP);
+
+ cmd = cxl_find_feature_command_by_id(rpc_in->command_id);
+ if (!cmd)
+ return ERR_PTR(-ENOENT);
+
+ if (!cxl_feature_enabled(cfs, cmd->opcode))
+ return ERR_PTR(-EPERM);
+
+ switch (cmd->opcode) {
+ case CXL_MBOX_OP_GET_SUPPORTED_FEATURES:
+ case CXL_MBOX_OP_GET_FEATURE:
+ if (scope >= FWCTL_RPC_CONFIGURATION)
+ return cmd;
+ break;
+ case CXL_MBOX_OP_SET_FEATURE:
+ if (cxlctl_validate_set_features(cfs, rpc_in, scope))
+ return cmd;
+ break;
+ default:
+ return ERR_PTR(-EINVAL);
+ }
+
+ return ERR_PTR(-EINVAL);
+}
+
+static void *cxlctl_handle_commands(struct cxl_features_state *cfs,
+ const struct fwctl_rpc_cxl *rpc_in,
+ size_t *out_len, struct cxl_mem_command *cmd)
+{
+ switch (cmd->opcode) {
+ case CXL_MBOX_OP_GET_SUPPORTED_FEATURES:
+ return cxlctl_get_supported_features(cfs, rpc_in, out_len);
+ case CXL_MBOX_OP_GET_FEATURE:
+ case CXL_MBOX_OP_SET_FEATURE:
+ default:
+ return ERR_PTR(-EOPNOTSUPP);
+ }
+}
+
static void *cxlctl_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope,
- void *rpc_in, size_t in_len, size_t *out_len)
+ void *in, size_t in_len, size_t *out_len)
{
- /* Place holder */
- return ERR_PTR(-EOPNOTSUPP);
+ struct fwctl_device *fwctl = uctx->fwctl;
+ struct cxl_features_state *cfs = to_cxl_features_state(fwctl);
+ const struct fwctl_rpc_cxl *rpc_in = in;
+ struct cxl_mem_command *cmd;
+
+ cmd = cxlctl_get_valid_hw_command(cfs, rpc_in, scope);
+ if (IS_ERR(cmd))
+ return (void *)cmd;
+
+ return cxlctl_handle_commands(cfs, rpc_in, out_len, cmd);
}
static const struct fwctl_ops cxlctl_ops = {
diff --git a/include/cxl/features.h b/include/cxl/features.h
index 9f234659ca2d..b5dacc1665c7 100644
--- a/include/cxl/features.h
+++ b/include/cxl/features.h
@@ -69,6 +69,7 @@ size_t cxl_get_feature(struct cxl_features *features, const uuid_t feat_uuid,
int cxl_set_feature(struct cxl_features *features, const uuid_t feat_uuid,
u8 feat_version, void *feat_data, size_t feat_data_size,
u32 feat_flag, u16 offset, u16 *return_code);
+struct cxl_mem_command *cxl_find_feature_command_by_id(u32 id);
bool is_cxl_feature_exclusive(struct cxl_feat_entry *entry);
#endif
diff --git a/include/uapi/cxl/features.h b/include/uapi/cxl/features.h
index 18b74252058a..55fa5b2a5d17 100644
--- a/include/uapi/cxl/features.h
+++ b/include/uapi/cxl/features.h
@@ -14,6 +14,19 @@
#include <linux/uuid.h>
#endif
+/* CXL spec r3.2 Table 8-87 command effects */
+#define CXL_CMD_CONFIG_CHANGE_COLD_RESET BIT(0)
+#define CXL_CMD_CONFIG_CHANGE_IMMEDIATE BIT(1)
+#define CXL_CMD_DATA_CHANGE_IMMEDIATE BIT(2)
+#define CXL_CMD_POLICY_CHANGE_IMMEDIATE BIT(3)
+#define CXL_CMD_LOG_CHANGE_IMMEDIATE BIT(4)
+#define CXL_CMD_SECURITY_STATE_CHANGE BIT(5)
+#define CXL_CMD_BACKGROUND BIT(6)
+#define CXL_CMD_BGCMD_ABORT_SUPPORTED BIT(7)
+#define CXL_CMD_EFFECTS_EXTEND BIT(9)
+#define CXL_CMD_CONFIG_CHANGE_CONV_RESET BIT(10)
+#define CXL_CMD_CONFIG_CHANGE_CXL_RESET BIT(11)
+
/* Get Supported Features (0x500h) CXL r3.1 8.2.9.6.1 */
struct cxl_mbox_get_sup_feats_in {
__le32 count;
diff --git a/include/uapi/fwctl/cxl.h b/include/uapi/fwctl/cxl.h
index 79b822dbfafd..ad23c65ce724 100644
--- a/include/uapi/fwctl/cxl.h
+++ b/include/uapi/fwctl/cxl.h
@@ -28,4 +28,33 @@ enum feature_cmds {
struct fwctl_info_cxl {
__u32 cmd_mask;
};
+
+/**
+ * struct fwctl_rpc_cxl - ioctl(FWCTL_RPC) input for CXL
+ * @command_id: the defined command id by 'enum feature_cmds'
+ * @flags: Flags for the command (input).
+ * @op_size: Size of input payload.
+ * @reserved1: Reserved. Must be 0s.
+ * @in_payload: User address of the hardware op input structure
+ */
+struct fwctl_rpc_cxl {
+ __u32 command_id;
+ __u32 flags;
+ __u32 op_size;
+ __u32 reserved1;
+ __aligned_u64 in_payload;
+};
+
+/**
+ * struct fwctl_rpc_cxl_out - ioctl(FWCTL_RPC) output for CXL
+ * @size: Size of the output payload
+ * @retval: Return value from device
+ * @payload: Return data from device
+ */
+struct fwctl_rpc_cxl_out {
+ __u32 size;
+ __u32 retval;
+ __u8 payload[] __counted_by(size);
+};
+
#endif
--
2.47.1
next prev parent reply other threads:[~2025-01-22 23:52 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-22 23:50 [PATCH v1 0/19] cxl: Add CXL feature commands support via fwctl Dave Jiang
2025-01-22 23:50 ` [PATCH v1 01/19] cxl: Refactor user ioctl command path from mds to mailbox Dave Jiang
2025-01-22 23:50 ` [PATCH v1 02/19] cxl: Add skeletal features driver Dave Jiang
2025-01-23 3:59 ` Dan Williams
2025-01-23 15:49 ` Dave Jiang
2025-01-23 19:57 ` Dan Williams
2025-01-23 17:24 ` Jonathan Cameron
2025-01-22 23:50 ` [PATCH v1 03/19] cxl: Enumerate feature commands Dave Jiang
2025-01-23 17:33 ` Jonathan Cameron
2025-01-23 23:55 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 04/19] cxl: Add Get Supported Features command for kernel usage Dave Jiang
2025-01-23 17:43 ` Jonathan Cameron
2025-01-24 0:30 ` Dan Williams
2025-01-24 15:01 ` Jason Gunthorpe
2025-01-27 11:10 ` Jonathan Cameron
2025-01-28 0:54 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 05/19] cxl: Add features driver attribute to emit number of features supported Dave Jiang
2025-01-23 17:44 ` Jonathan Cameron
2025-01-24 0:35 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 06/19] cxl/test: Add Get Supported Features mailbox command support Dave Jiang
2025-01-23 17:47 ` Jonathan Cameron
2025-01-24 0:42 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 07/19] cxl/mbox: Add GET_FEATURE mailbox command Dave Jiang
2025-01-23 17:50 ` Jonathan Cameron
2025-01-24 22:58 ` Dan Williams
2025-01-29 0:14 ` Dave Jiang
2025-01-22 23:50 ` [PATCH v1 08/19] cxl/mbox: Add SET_FEATURE " Dave Jiang
2025-01-23 17:52 ` Jonathan Cameron
2025-01-24 23:01 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 09/19] cxl: Setup exclusive CXL features that are reserved for the kernel Dave Jiang
2025-01-23 17:59 ` Jonathan Cameron
2025-01-24 23:05 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 10/19] cxl: Add FWCTL support to the CXL features driver Dave Jiang
2025-01-23 18:04 ` Jonathan Cameron
2025-01-23 18:53 ` Jason Gunthorpe
2025-01-24 23:14 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 11/19] cxl: Add support for get driver information Dave Jiang
2025-01-23 18:09 ` Jonathan Cameron
2025-01-25 1:26 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 12/19] cxl: Move cxl_mem.h under uapi to cxl exclusive directory Dave Jiang
2025-01-23 18:10 ` Jonathan Cameron
2025-01-25 1:29 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 13/19] cxl: Move cxl feature command structs to user header Dave Jiang
2025-01-23 18:12 ` Jonathan Cameron
2025-01-23 18:13 ` Jonathan Cameron
2025-01-25 1:34 ` Dan Williams
2025-01-22 23:50 ` Dave Jiang [this message]
2025-01-23 18:21 ` [PATCH v1 14/19] cxl: Add support for fwctl RPC command to enable CXL feature commands Jonathan Cameron
2025-01-25 2:08 ` Dan Williams
2025-01-27 10:51 ` Jonathan Cameron
2025-01-28 0:40 ` Dan Williams
2025-01-28 12:01 ` Jonathan Cameron
2025-01-28 15:55 ` Dave Jiang
2025-01-30 13:42 ` Jonathan Cameron
2025-02-04 1:43 ` Dan Williams
2025-02-04 10:04 ` Jonathan Cameron
2025-02-04 22:26 ` Dan Williams
2025-02-05 17:36 ` Jonathan Cameron
2025-02-05 18:02 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 15/19] cxl: Add support to handle user feature commands for get feature Dave Jiang
2025-01-23 18:25 ` Jonathan Cameron
2025-01-25 2:23 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 16/19] cxl: Add support to handle user feature commands for set feature Dave Jiang
2025-01-23 18:26 ` Jonathan Cameron
2025-01-25 2:29 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 17/19] cxl/test: Add Get Feature support to cxl_test Dave Jiang
2025-01-25 2:33 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 18/19] cxl/test: Add Set " Dave Jiang
2025-01-25 2:36 ` Dan Williams
2025-01-22 23:50 ` [PATCH v1 19/19] fwctl/cxl: Add documentation to FWCTL CXL Dave Jiang
2025-01-25 2:55 ` Dan Williams
2025-01-23 17:03 ` [PATCH v1 0/19] cxl: Add CXL feature commands support via fwctl Jonathan Cameron
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=20250122235159.2716036-15-dave.jiang@intel.com \
--to=dave.jiang@intel.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=alison.schofield@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave@stgolabs.net \
--cc=ira.weiny@intel.com \
--cc=jgg@nvidia.com \
--cc=linux-cxl@vger.kernel.org \
--cc=shiju.jose@huawei.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox