| Message ID | 20250122235159.2716036-16-dave.jiang@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | cxl: Add CXL feature commands support via fwctl | expand |
On Wed, 22 Jan 2025 16:50:46 -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. > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> Trivial comment inline. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/cxl/features.c | 46 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > diff --git a/drivers/cxl/features.c b/drivers/cxl/features.c > index e65fc8479d21..7c726f1512d0 100644 > --- a/drivers/cxl/features.c > +++ b/drivers/cxl/features.c > @@ -146,6 +146,51 @@ static void *cxlctl_get_supported_features(struct cxl_features_state *cfs, > return no_free_ptr(rpc_out); > } > > +static void *cxlctl_get_feature(struct cxl_features_state *cfs, > + const struct fwctl_rpc_cxl *rpc_in, > + size_t *out_len) > +{ > + struct cxl_mbox_get_feat_in feat_in; > + u16 offset, count, return_code; > + size_t out_size = *out_len; > + void *feat_out; > + > + 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); > + > + 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); > + > + feat_out = (void *)rpc_out->payload; Fairly sure no need for the cast. Should be fine given it's a void * that you are assigning it to from another pointer type. As such, maybe just use it inline in next call? > + out_size = cxl_get_feature(cfs->features, feat_in.uuid, > + feat_in.selection, feat_out, > + 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); > +}
Dave Jiang wrote: > Add helper function to parse the user data from fwctl RPC ioctl and > send the parsed input parameters to cxl_get_feature() call. > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > --- Looks good to me: Reviewed-by: Dan Williams <dan.j.williams@intel.com> ...modulo reworking @cfs related entanglements.
diff --git a/drivers/cxl/features.c b/drivers/cxl/features.c index e65fc8479d21..7c726f1512d0 100644 --- a/drivers/cxl/features.c +++ b/drivers/cxl/features.c @@ -146,6 +146,51 @@ static void *cxlctl_get_supported_features(struct cxl_features_state *cfs, return no_free_ptr(rpc_out); } +static void *cxlctl_get_feature(struct cxl_features_state *cfs, + const struct fwctl_rpc_cxl *rpc_in, + size_t *out_len) +{ + struct cxl_mbox_get_feat_in feat_in; + u16 offset, count, return_code; + size_t out_size = *out_len; + void *feat_out; + + 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); + + 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); + + feat_out = (void *)rpc_out->payload; + out_size = cxl_get_feature(cfs->features, feat_in.uuid, + feat_in.selection, feat_out, + 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_set_features(struct cxl_features_state *cfs, const struct fwctl_rpc_cxl *rpc_in, enum fwctl_rpc_scope scope) @@ -228,6 +273,7 @@ static void *cxlctl_handle_commands(struct cxl_features_state *cfs, case CXL_MBOX_OP_GET_SUPPORTED_FEATURES: return cxlctl_get_supported_features(cfs, rpc_in, out_len); case CXL_MBOX_OP_GET_FEATURE: + return cxlctl_get_feature(cfs, rpc_in, out_len); case CXL_MBOX_OP_SET_FEATURE: default: return ERR_PTR(-EOPNOTSUPP);
Add helper function to parse the user data from fwctl RPC ioctl and send the parsed input parameters to cxl_get_feature() call. Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- drivers/cxl/features.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)