RDMA/hns: Add compatibility handling for only support userspace rq inline

The rq inline makes some changes as follows, Firstly, it is only used in
user space. Secondly, it should notify hardware in QP RTR status. Thirdly,
Add compatibility processing between different user space and kernel
space.

Link: https://lore.kernel.org/r/20221224102201.3114536-3-xuhaoyue1@hisilicon.com
Signed-off-by: Luoyouming <luoyouming@huawei.com>
Signed-off-by: Haoyue Xu <xuhaoyue1@hisilicon.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
index b73307d0e21029bca13f317b97a19c0af63b1f1a..e9957fc51ffca61b572176786e35e2449bb870c7 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -871,7 +871,7 @@ struct hns_roce_hw {
                         u32 step_idx);
        int (*modify_qp)(struct ib_qp *ibqp, const struct ib_qp_attr *attr,
                         int attr_mask, enum ib_qp_state cur_state,
-                        enum ib_qp_state new_state);
+                        enum ib_qp_state new_state, struct ib_udata *udata);
        int (*qp_flow_control_init)(struct hns_roce_dev *hr_dev,
                         struct hns_roce_qp *hr_qp);
        void (*dereg_mr)(struct hns_roce_dev *hr_dev);

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index c0c57b9ba452951f516d371de6f4518b92b5c2da..c0b487bcd3493cdafef15fd5de0d22d4588832be 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -2837,7 +2837,7 @@ static int free_mr_modify_rsv_qp(struct hns_roce_dev *hr_dev,
        attr->port_num = 1;
        attr->qp_access_flags = IB_ACCESS_REMOTE_WRITE;
        ret = hr_dev->hw->modify_qp(&hr_qp->ibqp, attr, mask, IB_QPS_INIT,
-                                   IB_QPS_INIT);
+                                   IB_QPS_INIT, NULL);
        if (ret) {
                ibdev_err(ibdev, "failed to modify qp to init, ret = %d.\n",
                          ret);
@@ -2859,7 +2859,7 @@ static int free_mr_modify_rsv_qp(struct hns_roce_dev *hr_dev,
        rdma_ah_set_sl(&attr->ah_attr, (u8)sl_num);
 
        ret = hr_dev->hw->modify_qp(&hr_qp->ibqp, attr, mask, IB_QPS_INIT,
-                                   IB_QPS_RTR);
+                                   IB_QPS_RTR, NULL);
        hr_dev->loop_idc = loopback;
        if (ret) {
                ibdev_err(ibdev, "failed to modify qp to rtr, ret = %d.\n",
@@ -2874,7 +2874,7 @@ static int free_mr_modify_rsv_qp(struct hns_roce_dev *hr_dev,
        attr->retry_cnt = HNS_ROCE_FREE_MR_USED_QP_RETRY_CNT;
        attr->timeout = HNS_ROCE_FREE_MR_USED_QP_TIMEOUT;
        ret = hr_dev->hw->modify_qp(&hr_qp->ibqp, attr, mask, IB_QPS_RTR,
-                                   IB_QPS_RTS);
+                                   IB_QPS_RTS, NULL);
        if (ret)
                ibdev_err(ibdev, "failed to modify qp to rts, ret = %d.\n",
                          ret);
@@ -4572,8 +4572,11 @@ static inline enum ib_mtu get_mtu(struct ib_qp *ibqp,
 static int modify_qp_init_to_rtr(struct ib_qp *ibqp,
                                 const struct ib_qp_attr *attr, int attr_mask,
                                 struct hns_roce_v2_qp_context *context,
-                                struct hns_roce_v2_qp_context *qpc_mask)
+                                struct hns_roce_v2_qp_context *qpc_mask,
+                                struct ib_udata *udata)
 {
+       struct hns_roce_ucontext *uctx = rdma_udata_to_drv_context(udata,
+                                         struct hns_roce_ucontext, ibucontext);
        struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device);
        struct hns_roce_qp *hr_qp = to_hr_qp(ibqp);
        struct ib_device *ibdev = &hr_dev->ib_dev;
@@ -4693,6 +4696,14 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,
        hr_reg_write(context, QPC_LP_SGEN_INI, 3);
        hr_reg_clear(qpc_mask, QPC_LP_SGEN_INI);
 
+       if (udata && ibqp->qp_type == IB_QPT_RC &&
+           (uctx->config & HNS_ROCE_RQ_INLINE_FLAGS)) {
+               hr_reg_write_bool(context, QPC_RQIE,
+                                 hr_dev->caps.flags &
+                                 HNS_ROCE_CAP_FLAG_RQ_INLINE);
+               hr_reg_clear(qpc_mask, QPC_RQIE);
+       }
+
        return 0;
 }
 
@@ -5040,7 +5051,8 @@ static int hns_roce_v2_set_abs_fields(struct ib_qp *ibqp,
                                      enum ib_qp_state cur_state,
                                      enum ib_qp_state new_state,
                                      struct hns_roce_v2_qp_context *context,
-                                     struct hns_roce_v2_qp_context *qpc_mask)
+                                     struct hns_roce_v2_qp_context *qpc_mask,
+                                     struct ib_udata *udata)
 {
        struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device);
        int ret = 0;
@@ -5057,7 +5069,7 @@ static int hns_roce_v2_set_abs_fields(struct ib_qp *ibqp,
                modify_qp_init_to_init(ibqp, attr, context, qpc_mask);
        } else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_RTR) {
                ret = modify_qp_init_to_rtr(ibqp, attr, attr_mask, context,
-                                           qpc_mask);
+                                           qpc_mask, udata);
        } else if (cur_state == IB_QPS_RTR && new_state == IB_QPS_RTS) {
                ret = modify_qp_rtr_to_rts(ibqp, attr, attr_mask, context,
                                           qpc_mask);
@@ -5262,7 +5274,7 @@ static void v2_set_flushed_fields(struct ib_qp *ibqp,
 static int hns_roce_v2_modify_qp(struct ib_qp *ibqp,
                                 const struct ib_qp_attr *attr,
                                 int attr_mask, enum ib_qp_state cur_state,
-                                enum ib_qp_state new_state)
+                                enum ib_qp_state new_state, struct ib_udata *udata)
 {
        struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device);
        struct hns_roce_qp *hr_qp = to_hr_qp(ibqp);
@@ -5285,7 +5297,7 @@ static int hns_roce_v2_modify_qp(struct ib_qp *ibqp,
        memset(qpc_mask, 0xff, hr_dev->caps.qpc_sz);
 
        ret = hns_roce_v2_set_abs_fields(ibqp, attr, attr_mask, cur_state,
-                                        new_state, context, qpc_mask);
+                                        new_state, context, qpc_mask, udata);
        if (ret)
                goto out;
 
@@ -5488,7 +5500,7 @@ static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev,
        if (modify_qp_is_ok(hr_qp)) {
                /* Modify qp to reset before destroying qp */
                ret = hns_roce_v2_modify_qp(&hr_qp->ibqp, NULL, 0,
-                                           hr_qp->state, IB_QPS_RESET);
+                                           hr_qp->state, IB_QPS_RESET, udata);
                if (ret)
                        ibdev_err(ibdev,
                                  "failed to modify QP to RST, ret = %d.\n",

diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
index 946ba1109e878a3b2342b9c7151a31a0306dd3c7..3e3ece03dec321d51126827be300402fc03d7eb1 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -379,6 +379,12 @@ static int hns_roce_alloc_ucontext(struct ib_ucontext *uctx,
                resp.max_inline_data = hr_dev->caps.max_sq_inline;
        }
 
+       if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RQ_INLINE) {
+               context->config |= ucmd.config & HNS_ROCE_RQ_INLINE_FLAGS;
+               if (context->config & HNS_ROCE_RQ_INLINE_FLAGS)
+                       resp.config |= HNS_ROCE_RSP_RQ_INLINE_FLAGS;
+       }
+
        ret = hns_roce_uar_alloc(hr_dev, &context->uar);
        if (ret)
                goto error_fail_uar_alloc;

diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c
index 53121422a915bddca2481c74ff3d40b85e242728..d855a917f4cfa5c95458c93d97a9dd427eb58af1 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_qp.c
+++ b/drivers/infiniband/hw/hns/hns_roce_qp.c
@@ -1346,7 +1346,7 @@ int hns_roce_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                goto out;
 
        ret = hr_dev->hw->modify_qp(ibqp, attr, attr_mask, cur_state,
-                                   new_state);
+                                   new_state, udata);
 
 out:
        mutex_unlock(&hr_qp->mutex);

diff --git a/include/uapi/rdma/hns-abi.h b/include/uapi/rdma/hns-abi.h
index 745790ce3c261e869b066c2b0722b574aac38185..6c0940837d93d7ade5d785037b492c2b8ed8783e 100644 (file)
--- a/include/uapi/rdma/hns-abi.h
+++ b/include/uapi/rdma/hns-abi.h
@@ -87,10 +87,12 @@ struct hns_roce_ib_create_qp_resp {
 
 enum {
        HNS_ROCE_EXSGE_FLAGS = 1 << 0,
+       HNS_ROCE_RQ_INLINE_FLAGS = 1 << 1,
 };
 
 enum {
        HNS_ROCE_RSP_EXSGE_FLAGS = 1 << 0,
+       HNS_ROCE_RSP_RQ_INLINE_FLAGS = 1 << 1,
 };
 
 struct hns_roce_ib_alloc_ucontext_resp {