RDMA/hns: Repacing 'dseg_len' by macros in fill_ext_sge_inl_data()
authorLuoyouming <luoyouming@huawei.com>
Thu, 22 Sep 2022 12:33:13 +0000 (20:33 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:14:23 +0000 (13:14 +0100)
[ Upstream commit 3b1f864c904915b3baebffb31ea05ee704b0df3c ]

The sge size is known to be constant, so it's unnecessary to use sizeof to
calculate.

Link: https://lore.kernel.org/r/20220922123315.3732205-11-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>
Stable-dep-of: 8eaa6f7d569b ("RDMA/hns: Fix ext_sge num error when post send")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/hw/hns/hns_roce_hw_v2.c

index 1421896abaf09d3d632a35858b1341bee70100c0..5875ccf86f6676981748ef482b6d76d419efda81 100644 (file)
@@ -156,8 +156,7 @@ static int fill_ext_sge_inl_data(struct hns_roce_qp *qp,
                                 unsigned int *sge_idx, u32 msg_len)
 {
        struct ib_device *ibdev = &(to_hr_dev(qp->ibqp.device))->ib_dev;
-       unsigned int dseg_len = sizeof(struct hns_roce_v2_wqe_data_seg);
-       unsigned int ext_sge_sz = qp->sq.max_gs * dseg_len;
+       unsigned int ext_sge_sz = qp->sq.max_gs * HNS_ROCE_SGE_SIZE;
        unsigned int left_len_in_pg;
        unsigned int idx = *sge_idx;
        unsigned int i = 0;
@@ -185,7 +184,7 @@ static int fill_ext_sge_inl_data(struct hns_roce_qp *qp,
                if (len <= left_len_in_pg) {
                        memcpy(dseg, addr, len);
 
-                       idx += len / dseg_len;
+                       idx += len / HNS_ROCE_SGE_SIZE;
 
                        i++;
                        if (i >= wr->num_sge)
@@ -200,7 +199,7 @@ static int fill_ext_sge_inl_data(struct hns_roce_qp *qp,
 
                        len -= left_len_in_pg;
                        addr += left_len_in_pg;
-                       idx += left_len_in_pg / dseg_len;
+                       idx += left_len_in_pg / HNS_ROCE_SGE_SIZE;
                        dseg = hns_roce_get_extend_sge(qp,
                                                idx & (qp->sge.sge_cnt - 1));
                        left_len_in_pg = 1 << HNS_HW_PAGE_SHIFT;