RDMA/mlx5: Use new command interface API

DEVX can now use mlx5_cmd_do() which will not intercept the command
execution status and will provide full information of the return code.

DEVX can now propagate the error code safely to upper layers, to
indicate to the callers if the command was actually executed and the
error code indicates the command execution status availability in
the command outbox buffer.

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Artemy Kovalyov <artemyko@mellanox.com>
Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index 1f62c0ede0480b55b1211d49d0c8c51da3691841..fc036b4794fd45fd1111dd4f205c586675d52474 100644 (file)
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -1055,7 +1055,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OTHER)(
        int cmd_out_len = uverbs_attr_get_len(attrs,
                                        MLX5_IB_ATTR_DEVX_OTHER_CMD_OUT);
        void *cmd_out;
-       int err;
+       int err, err2;
        int uid;
 
        c = devx_ufile2uctx(attrs);
@@ -1076,14 +1076,16 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OTHER)(
                return PTR_ERR(cmd_out);
 
        MLX5_SET(general_obj_in_cmd_hdr, cmd_in, uid, uid);
-       err = mlx5_cmd_exec(dev->mdev, cmd_in,
-                           uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OTHER_CMD_IN),
-                           cmd_out, cmd_out_len);
-       if (err)
+       err = mlx5_cmd_do(dev->mdev, cmd_in,
+                         uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OTHER_CMD_IN),
+                         cmd_out, cmd_out_len);
+       if (err && err != -EREMOTEIO)
                return err;
 
-       return uverbs_copy_to(attrs, MLX5_IB_ATTR_DEVX_OTHER_CMD_OUT, cmd_out,
+       err2 = uverbs_copy_to(attrs, MLX5_IB_ATTR_DEVX_OTHER_CMD_OUT, cmd_out,
                              cmd_out_len);
+
+       return err2 ?: err;
 }
 
 static void devx_obj_build_destroy_cmd(void *in, void *out, void *din,
@@ -1457,7 +1459,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
        u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)];
        struct devx_obj *obj;
        u16 obj_type = 0;
-       int err;
+       int err, err2 = 0;
        int uid;
        u32 obj_id;
        u16 opcode;
@@ -1501,11 +1503,14 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
                                     cmd_in, cmd_in_len, cmd_out,
                                     cmd_out_len);
        } else {
-               err = mlx5_cmd_exec(dev->mdev, cmd_in,
-                                   cmd_in_len,
-                                   cmd_out, cmd_out_len);
+               err = mlx5_cmd_do(dev->mdev, cmd_in, cmd_in_len,
+                                 cmd_out, cmd_out_len);
        }
 
+       if (err == -EREMOTEIO)
+               err2 = uverbs_copy_to(attrs,
+                                     MLX5_IB_ATTR_DEVX_OBJ_CREATE_CMD_OUT,
+                                     cmd_out, cmd_out_len);
        if (err)
                goto obj_free;
 
@@ -1548,7 +1553,7 @@ obj_destroy:
                              sizeof(out));
 obj_free:
        kfree(obj);
-       return err;
+       return err2 ?: err;
 }
 
 static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_MODIFY)(
@@ -1563,7 +1568,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_MODIFY)(
                &attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
        struct mlx5_ib_dev *mdev = to_mdev(c->ibucontext.device);
        void *cmd_out;
-       int err;
+       int err, err2;
        int uid;
 
        if (MLX5_GET(general_obj_in_cmd_hdr, cmd_in, vhca_tunnel_id))
@@ -1586,14 +1591,16 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_MODIFY)(
        MLX5_SET(general_obj_in_cmd_hdr, cmd_in, uid, uid);
        devx_set_umem_valid(cmd_in);
 
-       err = mlx5_cmd_exec(mdev->mdev, cmd_in,
-                           uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OBJ_MODIFY_CMD_IN),
-                           cmd_out, cmd_out_len);
-       if (err)
+       err = mlx5_cmd_do(mdev->mdev, cmd_in,
+                         uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OBJ_MODIFY_CMD_IN),
+                         cmd_out, cmd_out_len);
+       if (err && err != -EREMOTEIO)
                return err;
 
-       return uverbs_copy_to(attrs, MLX5_IB_ATTR_DEVX_OBJ_MODIFY_CMD_OUT,
+       err2 = uverbs_copy_to(attrs, MLX5_IB_ATTR_DEVX_OBJ_MODIFY_CMD_OUT,
                              cmd_out, cmd_out_len);
+
+       return err2 ?: err;
 }
 
 static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_QUERY)(
@@ -1607,7 +1614,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_QUERY)(
        struct mlx5_ib_ucontext *c = rdma_udata_to_drv_context(
                &attrs->driver_udata, struct mlx5_ib_ucontext, ibucontext);
        void *cmd_out;
-       int err;
+       int err, err2;
        int uid;
        struct mlx5_ib_dev *mdev = to_mdev(c->ibucontext.device);
 
@@ -1629,14 +1636,16 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_QUERY)(
                return PTR_ERR(cmd_out);
 
        MLX5_SET(general_obj_in_cmd_hdr, cmd_in, uid, uid);
-       err = mlx5_cmd_exec(mdev->mdev, cmd_in,
-                           uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OBJ_QUERY_CMD_IN),
-                           cmd_out, cmd_out_len);
-       if (err)
+       err = mlx5_cmd_do(mdev->mdev, cmd_in,
+                         uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OBJ_QUERY_CMD_IN),
+                         cmd_out, cmd_out_len);
+       if (err && err != -EREMOTEIO)
                return err;
 
-       return uverbs_copy_to(attrs, MLX5_IB_ATTR_DEVX_OBJ_QUERY_CMD_OUT,
+       err2 = uverbs_copy_to(attrs, MLX5_IB_ATTR_DEVX_OBJ_QUERY_CMD_OUT,
                              cmd_out, cmd_out_len);
+
+       return err2 ?: err;
 }
 
 struct devx_async_event_queue {