RDMA/hns: Support owner mode doorbell

The doorbell needs to store PI information into QPC, so the RoCEE should
wait for the results of storing, that is, it needs two bus operations to
complete a doorbell. When ROCEE is in SDI mode, multiple doorbells may be
interlocked because the RoCEE can only handle bus operations serially. So a
flag to mark if HIP09 is working in SDI mode is added. When the SDI flag is
set, the ROCEE will ignore the PI information of the doorbell, continue to
fetch wqe and verify its validity by it's owner_bit.

Link: https://lore.kernel.org/r/1603195493-22741-1-git-send-email-liweihang@huawei.com
Signed-off-by: Lang Cheng <chenglang@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.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 6d2acff..07c95d8 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -129,9 +129,10 @@ enum {
        SERV_TYPE_UD,
 };
 
-enum {
+enum hns_roce_qp_caps {
        HNS_ROCE_QP_CAP_RQ_RECORD_DB = BIT(0),
        HNS_ROCE_QP_CAP_SQ_RECORD_DB = BIT(1),
+       HNS_ROCE_QP_CAP_OWNER_DB = BIT(2),
 };
 
 enum hns_roce_cq_flags {
@@ -221,6 +222,7 @@ enum {
        HNS_ROCE_CAP_FLAG_FRMR                  = BIT(8),
        HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL          = BIT(9),
        HNS_ROCE_CAP_FLAG_ATOMIC                = BIT(10),
+       HNS_ROCE_CAP_FLAG_SDI_MODE              = BIT(14),
 };
 
 #define HNS_ROCE_DB_TYPE_COUNT                 2

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index a0b6792..7741d9f 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -474,9 +474,6 @@ static inline int set_ud_wqe(struct hns_roce_qp *qp,
        roce_set_bit(ud_sq_wqe->byte_4, V2_UD_SEND_WQE_BYTE_4_SE_S,
                     (wr->send_flags & IB_SEND_SOLICITED) ? 1 : 0);
 
-       roce_set_bit(ud_sq_wqe->byte_4, V2_UD_SEND_WQE_BYTE_4_OWNER_S,
-                    owner_bit);
-
        roce_set_field(ud_sq_wqe->byte_16, V2_UD_SEND_WQE_BYTE_16_PD_M,
                       V2_UD_SEND_WQE_BYTE_16_PD_S, to_hr_pd(qp->ibqp.pd)->pdn);
 
@@ -517,7 +514,18 @@ static inline int set_ud_wqe(struct hns_roce_qp *qp,
 
        set_extend_sge(qp, wr, &curr_idx, valid_num_sge);
 
+       /*
+        * The pipeline can sequentially post all valid WQEs into WQ buffer,
+        * including new WQEs waiting for the doorbell to update the PI again.
+        * Therefore, the owner bit of WQE MUST be updated after all fields
+        * and extSGEs have been written into DDR instead of cache.
+        */
+       if (qp->en_flags & HNS_ROCE_QP_CAP_OWNER_DB)
+               dma_wmb();
+
        *sge_idx = curr_idx;
+       roce_set_bit(ud_sq_wqe->byte_4, V2_UD_SEND_WQE_BYTE_4_OWNER_S,
+                    owner_bit);
 
        return 0;
 }
@@ -591,9 +599,6 @@ static inline int set_rc_wqe(struct hns_roce_qp *qp,
        roce_set_bit(rc_sq_wqe->byte_4, V2_RC_SEND_WQE_BYTE_4_CQE_S,
                     (wr->send_flags & IB_SEND_SIGNALED) ? 1 : 0);
 
-       roce_set_bit(rc_sq_wqe->byte_4, V2_RC_SEND_WQE_BYTE_4_OWNER_S,
-                    owner_bit);
-
        if (wr->opcode == IB_WR_ATOMIC_CMP_AND_SWP ||
            wr->opcode == IB_WR_ATOMIC_FETCH_AND_ADD)
                set_atomic_seg(wr, rc_sq_wqe, valid_num_sge);
@@ -601,7 +606,18 @@ static inline int set_rc_wqe(struct hns_roce_qp *qp,
                ret = set_rwqe_data_seg(&qp->ibqp, wr, rc_sq_wqe,
                                        &curr_idx, valid_num_sge);
 
+       /*
+        * The pipeline can sequentially post all valid WQEs into WQ buffer,
+        * including new WQEs waiting for the doorbell to update the PI again.
+        * Therefore, the owner bit of WQE MUST be updated after all fields
+        * and extSGEs have been written into DDR instead of cache.
+        */
+       if (qp->en_flags & HNS_ROCE_QP_CAP_OWNER_DB)
+               dma_wmb();
+
        *sge_idx = curr_idx;
+       roce_set_bit(rc_sq_wqe->byte_4, V2_RC_SEND_WQE_BYTE_4_OWNER_S,
+                    owner_bit);
 
        return ret;
 }

diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c
index 04a7068..e288946 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_qp.c
+++ b/drivers/infiniband/hw/hns/hns_roce_qp.c
@@ -725,6 +725,9 @@ static int alloc_qp_db(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp,
        struct ib_device *ibdev = &hr_dev->ib_dev;
        int ret;
 
+       if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_SDI_MODE)
+               hr_qp->en_flags |= HNS_ROCE_QP_CAP_OWNER_DB;
+
        if (udata) {
                if (user_qp_has_sdb(hr_dev, init_attr, udata, resp, ucmd)) {
                        ret = hns_roce_db_map_user(uctx, udata, ucmd->sdb_addr,