Commit 884fe9da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma fixes from Jason Gunthorpe:

 - Fix 64K ARM page size support in bnxt_re and efa

 - bnxt_re fixes for a memory leak, incorrect error handling and a
   remove a bogus FW failure when running on a VF

 - Update MAINTAINERS for hns and efa

 - Fix two rxe regressions added this merge window in error unwind and
   incorrect spinlock primitives

 - hns gets a better algorithm for allocating page tables to avoid
   running out of resources, and a timeout adjustment

 - Fix a text case failure in hns

 - Use after free in irdma and fix incorrect construction of a WQE
   causing mis-execution

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/irdma: Fix Local Invalidate fencing
  RDMA/irdma: Prevent QP use after free
  MAINTAINERS: Update maintainer of Amazon EFA driver
  RDMA/bnxt_re: Do not enable congestion control on VFs
  RDMA/bnxt_re: Fix return value of bnxt_re_process_raw_qp_pkt_rx
  RDMA/bnxt_re: Fix a possible memory leak
  RDMA/hns: Modify the value of long message loopback slice
  RDMA/hns: Fix base address table allocation
  RDMA/hns: Fix timeout attr in query qp for HIP08
  RDMA/efa: Fix unsupported page sizes in device
  RDMA/rxe: Convert spin_{lock_bh,unlock_bh} to spin_{lock_irqsave,unlock_irqrestore}
  RDMA/rxe: Fix double unlock in rxe_qp.c
  MAINTAINERS: Update maintainers of HiSilicon RoCE
  RDMA/bnxt_re: Fix the page_size used during the MR creation
parents fd2186d1 5842d1d9

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -956,7 +956,8 @@ F: Documentation/networking/device_drivers/ethernet/amazon/ena.rst 
F:	drivers/net/ethernet/amazon/









AMAZON RDMA EFA DRIVER









M:	Gal Pressman <galpress@amazon.com>









M:	Michael Margolin <mrgolin@amazon.com>









R:	Gal Pressman <gal.pressman@linux.dev>









R:	Yossi Leybovich <sleybo@amazon.com>









L:	linux-rdma@vger.kernel.org









S:	Supported








@@ -9343,7 +9344,7 @@ F:	include/linux/hisi_acc_qm.h















HISILICON ROCE DRIVER









M:	Haoyue Xu <xuhaoyue1@hisilicon.com>









M:	Wenpeng Liang <liangwenpeng@huawei.com>









M:	Junxian Huang <huangjunxian6@hisilicon.com>









L:	linux-rdma@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt
































drivers/infiniband/hw/bnxt_re/ib_verbs.c



+1
−3






























Original line number
Diff line number
Diff line







@@ -3341,9 +3341,7 @@ static int bnxt_re_process_raw_qp_pkt_rx(struct bnxt_re_qp *gsi_qp,







	udwr.remote_qkey = gsi_sqp->qplib_qp.qkey;



















	/* post data received  in the send queue */









	rc = bnxt_re_post_send_shadow_qp(rdev, gsi_sqp, swr);



















	return 0;









	return bnxt_re_post_send_shadow_qp(rdev, gsi_sqp, swr);









}



















static void bnxt_re_process_res_rawqp1_wc(struct ib_wc *wc,
































drivers/infiniband/hw/bnxt_re/main.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -1336,6 +1336,10 @@ static void bnxt_re_setup_cc(struct bnxt_re_dev *rdev, bool enable)







{









	struct bnxt_qplib_cc_param cc_param = {};



















	/* Do not enable congestion control on VFs */









	if (rdev->is_virtfn)









		return;



















	/* Currently enabling only for GenP5 adapters */









	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx))









		return;
































drivers/infiniband/hw/bnxt_re/qplib_fp.c



+6
−5






























Original line number
Diff line number
Diff line







@@ -2056,6 +2056,12 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq)







	u32 pg_sz_lvl;









	int rc;



















	if (!cq->dpi) {









		dev_err(&rcfw->pdev->dev,









			"FP: CREATE_CQ failed due to NULL DPI\n");









		return -EINVAL;









	}



















	hwq_attr.res = res;









	hwq_attr.depth = cq->max_wqe;









	hwq_attr.stride = sizeof(struct cq_base);








@@ -2069,11 +2075,6 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq)







				 CMDQ_BASE_OPCODE_CREATE_CQ,









				 sizeof(req));



















	if (!cq->dpi) {









		dev_err(&rcfw->pdev->dev,









			"FP: CREATE_CQ failed due to NULL DPI\n");









		return -EINVAL;









	}









	req.dpi = cpu_to_le32(cq->dpi->dpi);









	req.cq_handle = cpu_to_le64(cq->cq_handle);









	req.cq_size = cpu_to_le32(cq->hwq.max_elements);
































drivers/infiniband/hw/bnxt_re/qplib_res.c



+2
−10






























Original line number
Diff line number
Diff line







@@ -215,17 +215,9 @@ int bnxt_qplib_alloc_init_hwq(struct bnxt_qplib_hwq *hwq,







			return -EINVAL;









		hwq_attr->sginfo->npages = npages;









	} else {









		unsigned long sginfo_num_pages = ib_umem_num_dma_blocks(









			hwq_attr->sginfo->umem, hwq_attr->sginfo->pgsize);



















		npages = ib_umem_num_dma_blocks(hwq_attr->sginfo->umem,









						hwq_attr->sginfo->pgsize);









		hwq->is_user = true;









		npages = sginfo_num_pages;









		npages = (npages * PAGE_SIZE) /









			  BIT_ULL(hwq_attr->sginfo->pgshft);









		if ((sginfo_num_pages * PAGE_SIZE) %









		     BIT_ULL(hwq_attr->sginfo->pgshft))









			if (!npages)









				npages++;









	}



















	if (npages == MAX_PBL_LVL_0_PGS && !hwq_attr->sginfo->nopte) {