On Thu, Nov 5, 2015 at 7:40 PM, Eli Cohen <[email protected]> wrote:
> When an extended verbs is an extension to a legacy verb, the original
> functionality is preserved. Hence we do not require each hardware driver
> to set the extended capability. This will allow to use the extended verb
> in its simple form with drivers that do not support the extended
> capability.
>
> Signed-off-by: Eli Cohen <[email protected]>
> ---
> drivers/infiniband/core/uverbs_main.c | 29 +++++++++++++++++++----------
> 1 file changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/infiniband/core/uverbs_main.c
> b/drivers/infiniband/core/uverbs_main.c
> index e93ba9125198..1740a03e6ac6 100644
> --- a/drivers/infiniband/core/uverbs_main.c
> +++ b/drivers/infiniband/core/uverbs_main.c
> @@ -672,6 +672,21 @@ out:
> return ev_file;
> }
>
> +static int verify_command_mask(struct ib_device *ib_dev, __u32 command)
> +{
> + u64 mask;
> +
> + if (command <= IB_USER_VERBS_CMD_OPEN_QP)
I think using IB_USER_VERBS_CMD_THRESHOLD is clearer, but I don't
think we need two uverbs_cmd_mask vendor variables.
IMHO, a vendor shouldn't care if it's an extended/legacy uverb
command. Maybe we should replace uverbs_cmd_mask with a bitmap.
> + mask = ib_dev->uverbs_cmd_mask;
> + else
> + mask = ib_dev->uverbs_ex_cmd_mask;
> +
> + if (mask & ((u64)1 << command))
> + return 0;
> +
> + return -1;
> +}
> +
> static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
> size_t count, loff_t *pos)
> {
> @@ -704,6 +719,10 @@ static ssize_t ib_uverbs_write(struct file *filp, const
> char __user *buf,
> }
>
> command = hdr.command & IB_USER_VERBS_CMD_COMMAND_MASK;
> + if (verify_command_mask(ib_dev, command)) {
> + ret = -EINVAL;
Why did you replace ENOSYS with EINVAL?
> + goto out;
> + }
>
> flags = (hdr.command &
> IB_USER_VERBS_CMD_FLAGS_MASK) >>
> IB_USER_VERBS_CMD_FLAGS_SHIFT;
> @@ -721,11 +740,6 @@ static ssize_t ib_uverbs_write(struct file *filp, const
> char __user *buf,
> goto out;
> }
>
> - if (!(ib_dev->uverbs_cmd_mask & (1ull << command))) {
> - ret = -ENOSYS;
> - goto out;
> - }
> -
> if (hdr.in_words * 4 != count) {
> ret = -EINVAL;
> goto out;
> @@ -753,11 +767,6 @@ static ssize_t ib_uverbs_write(struct file *filp, const
> char __user *buf,
> goto out;
> }
>
> - if (!(ib_dev->uverbs_ex_cmd_mask & (1ull << command))) {
> - ret = -ENOSYS;
> - goto out;
> - }
> -
> if (count < (sizeof(hdr) + sizeof(ex_hdr))) {
> ret = -EINVAL;
> goto out;
> --
> 2.6.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
