From: Wenpeng Liang <liangwenpeng@huawei.com>

Date: Fri, 1 Nov 2019 10:33:30 +0800

Subject: RDMA/hns: Correct the value of srq_desc_size

Patch-mainline: v5.4-rc8

Git-commit: 411c1e6774e2e1f96b1ccce4f119376b94ade3e4

References: bsc#1104427 FATE#326416

srq_desc_size should be rounded up to pow of two before used, or related

calculation may cause allocating wrong size of memory for srq buffer.

Fixes: c7bcb13442e1 ("RDMA/hns: Add SRQ support for hip08 kernel mode")

Link: https://lore.kernel.org/r/1572575610-52530-3-git-send-email-liweihang@hisilicon.com

Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>

Signed-off-by: Weihang Li <liweihang@hisilicon.com>

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/infiniband/hw/hns/hns_roce_srq.c |    2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/infiniband/hw/hns/hns_roce_srq.c

+++ b/drivers/infiniband/hw/hns/hns_roce_srq.c

@@ -233,7 +233,7 @@ struct ib_srq *hns_roce_create_srq(struc

 	srq->max = roundup_pow_of_two(srq_init_attr->attr.max_wr + 1);

 	srq->max_gs = srq_init_attr->attr.max_sge;

-	srq_desc_size = max(16, 16 * srq->max_gs);

+	srq_desc_size = roundup_pow_of_two(max(16, 16 * srq->max_gs));

 	srq->wqe_shift = ilog2(srq_desc_size);