| Message ID | 20250218225721.2682235-11-dave.jiang@intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | cxl: Add CXL feature commands support via fwctl | expand |
On Tue, 18 Feb 2025 15:54:39 -0700 Dave Jiang <dave.jiang@intel.com> wrote: > Add helper function to parse the user data from fwctl RPC ioctl and > send the parsed input parameters to cxl_get_feature() call. > > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Reviewed-by: Dan Williams <dan.j.williams@intel.com> > Reviewed-by: Li Ming <ming.li@zohomail.com> > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > --- > v6: > - adjust for embedded input payload > - move get_feature bits here from previous patch One of those flexible arrays gets used here I see.. If this is first place it is needed maybe drag the definition into here? > --- > drivers/cxl/core/features.c | 44 +++++++++++++++++++++++++++++++++++++ > include/uapi/fwctl/cxl.h | 3 +++ > 2 files changed, 47 insertions(+) > > diff --git a/drivers/cxl/core/features.c b/drivers/cxl/core/features.c > index 106ea9e25c82..ec0e3ace1803 100644 > --- a/drivers/cxl/core/features.c > +++ b/drivers/cxl/core/features.c > @@ -427,6 +427,47 @@ static void *cxlctl_get_supported_features(struct cxl_features_state *cxlfs, > return no_free_ptr(rpc_out); > } > > +static void *cxlctl_get_feature(struct cxl_features_state *cxlfs, > + const struct fwctl_rpc_cxl *rpc_in, > + size_t *out_len) > +{ > + struct cxl_mailbox *cxl_mbox = &cxlfs->cxlds->cxl_mbox; > + const struct cxl_mbox_get_feat_in *feat_in; > + u16 offset, count, return_code; > + size_t out_size = *out_len; > + > + if (rpc_in->op_size != sizeof(*feat_in)) > + return ERR_PTR(-EINVAL); > + > + feat_in = &rpc_in->get_feat_in; > + offset = le16_to_cpu(feat_in->offset); > + count = le16_to_cpu(feat_in->count); > + > + if (!count) > + return ERR_PTR(-EINVAL); > + > + struct fwctl_rpc_cxl_out *rpc_out __free(kvfree) = > + kvzalloc(out_size, GFP_KERNEL); > + if (!rpc_out) > + return ERR_PTR(-ENOMEM); > + > + out_size = cxl_get_feature(cxl_mbox, &feat_in->uuid, > + feat_in->selection, rpc_out->payload, Ah. You are using the flexible array here to provide a void * That's fine but maybe drag defining it into this patch. > + count, offset, &return_code); > + *out_len = sizeof(struct fwctl_rpc_cxl_out); > + if (!out_size) { > + rpc_out->size = 0; > + rpc_out->retval = return_code; > + return no_free_ptr(rpc_out); > + } > + > + rpc_out->size = out_size; > + rpc_out->retval = CXL_MBOX_CMD_RC_SUCCESS; > + *out_len += out_size; > + > + return no_free_ptr(rpc_out); > +} > + > static bool cxlctl_validate_hw_command(struct cxl_features_state *cxlfs, > const struct fwctl_rpc_cxl *rpc_in, > enum fwctl_rpc_scope scope, > @@ -436,6 +477,7 @@ static bool cxlctl_validate_hw_command(struct cxl_features_state *cxlfs, > > switch (opcode) { > case CXL_MBOX_OP_GET_SUPPORTED_FEATURES: > + case CXL_MBOX_OP_GET_FEATURE: > if (cxl_mbox->feat_cap < CXL_FEATURES_RO) > return false; > if (scope >= FWCTL_RPC_CONFIGURATION) > @@ -453,6 +495,8 @@ static void *cxlctl_handle_commands(struct cxl_features_state *cxlfs, > switch (opcode) { > case CXL_MBOX_OP_GET_SUPPORTED_FEATURES: > return cxlctl_get_supported_features(cxlfs, rpc_in, out_len); > + case CXL_MBOX_OP_GET_FEATURE: > + return cxlctl_get_feature(cxlfs, rpc_in, out_len); > default: > return ERR_PTR(-EOPNOTSUPP); > } > diff --git a/include/uapi/fwctl/cxl.h b/include/uapi/fwctl/cxl.h > index 39996ec56816..07b7e5bab461 100644 > --- a/include/uapi/fwctl/cxl.h > +++ b/include/uapi/fwctl/cxl.h > @@ -13,6 +13,7 @@ > > struct cxl_mbox_get_sup_feats_in; > struct cxl_mbox_get_sup_feats_out; > +struct cxl_mbox_get_feat_in; > > /** > * struct fwctl_rpc_cxl - ioctl(FWCTL_RPC) input for CXL > @@ -21,6 +22,7 @@ struct cxl_mbox_get_sup_feats_out; > * @op_size: Size of input payload. > * @reserved1: Reserved. Must be 0s. > * @get_sup_feats_in: Get Supported Features input > + * @get_feat_in: Get Feature input > * @op: hardware operation input byte array > */ > struct fwctl_rpc_cxl { > @@ -32,6 +34,7 @@ struct fwctl_rpc_cxl { > ); > union { > struct cxl_mbox_get_sup_feats_in get_sup_feats_in; > + struct cxl_mbox_get_feat_in get_feat_in; > __DECLARE_FLEX_ARRAY(__u8, op); > }; > };
diff --git a/drivers/cxl/core/features.c b/drivers/cxl/core/features.c index 106ea9e25c82..ec0e3ace1803 100644 --- a/drivers/cxl/core/features.c +++ b/drivers/cxl/core/features.c @@ -427,6 +427,47 @@ static void *cxlctl_get_supported_features(struct cxl_features_state *cxlfs, return no_free_ptr(rpc_out); } +static void *cxlctl_get_feature(struct cxl_features_state *cxlfs, + const struct fwctl_rpc_cxl *rpc_in, + size_t *out_len) +{ + struct cxl_mailbox *cxl_mbox = &cxlfs->cxlds->cxl_mbox; + const struct cxl_mbox_get_feat_in *feat_in; + u16 offset, count, return_code; + size_t out_size = *out_len; + + if (rpc_in->op_size != sizeof(*feat_in)) + return ERR_PTR(-EINVAL); + + feat_in = &rpc_in->get_feat_in; + offset = le16_to_cpu(feat_in->offset); + count = le16_to_cpu(feat_in->count); + + if (!count) + return ERR_PTR(-EINVAL); + + struct fwctl_rpc_cxl_out *rpc_out __free(kvfree) = + kvzalloc(out_size, GFP_KERNEL); + if (!rpc_out) + return ERR_PTR(-ENOMEM); + + out_size = cxl_get_feature(cxl_mbox, &feat_in->uuid, + feat_in->selection, rpc_out->payload, + count, offset, &return_code); + *out_len = sizeof(struct fwctl_rpc_cxl_out); + if (!out_size) { + rpc_out->size = 0; + rpc_out->retval = return_code; + return no_free_ptr(rpc_out); + } + + rpc_out->size = out_size; + rpc_out->retval = CXL_MBOX_CMD_RC_SUCCESS; + *out_len += out_size; + + return no_free_ptr(rpc_out); +} + static bool cxlctl_validate_hw_command(struct cxl_features_state *cxlfs, const struct fwctl_rpc_cxl *rpc_in, enum fwctl_rpc_scope scope, @@ -436,6 +477,7 @@ static bool cxlctl_validate_hw_command(struct cxl_features_state *cxlfs, switch (opcode) { case CXL_MBOX_OP_GET_SUPPORTED_FEATURES: + case CXL_MBOX_OP_GET_FEATURE: if (cxl_mbox->feat_cap < CXL_FEATURES_RO) return false; if (scope >= FWCTL_RPC_CONFIGURATION) @@ -453,6 +495,8 @@ static void *cxlctl_handle_commands(struct cxl_features_state *cxlfs, switch (opcode) { case CXL_MBOX_OP_GET_SUPPORTED_FEATURES: return cxlctl_get_supported_features(cxlfs, rpc_in, out_len); + case CXL_MBOX_OP_GET_FEATURE: + return cxlctl_get_feature(cxlfs, rpc_in, out_len); default: return ERR_PTR(-EOPNOTSUPP); } diff --git a/include/uapi/fwctl/cxl.h b/include/uapi/fwctl/cxl.h index 39996ec56816..07b7e5bab461 100644 --- a/include/uapi/fwctl/cxl.h +++ b/include/uapi/fwctl/cxl.h @@ -13,6 +13,7 @@ struct cxl_mbox_get_sup_feats_in; struct cxl_mbox_get_sup_feats_out; +struct cxl_mbox_get_feat_in; /** * struct fwctl_rpc_cxl - ioctl(FWCTL_RPC) input for CXL @@ -21,6 +22,7 @@ struct cxl_mbox_get_sup_feats_out; * @op_size: Size of input payload. * @reserved1: Reserved. Must be 0s. * @get_sup_feats_in: Get Supported Features input + * @get_feat_in: Get Feature input * @op: hardware operation input byte array */ struct fwctl_rpc_cxl { @@ -32,6 +34,7 @@ struct fwctl_rpc_cxl { ); union { struct cxl_mbox_get_sup_feats_in get_sup_feats_in; + struct cxl_mbox_get_feat_in get_feat_in; __DECLARE_FLEX_ARRAY(__u8, op); }; };