Commit 80c4c254 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:
 "Collected driver fixes from the last few weeks, I was surprised how
  significant many of them seemed to be.

   - Fix rdma-core test failures due to wrong startup ordering in rxe

   - Don't crash in bnxt_re if the FW supports more than 64k QPs

   - Fix wrong QP table indexing math in bnxt_re

   - Calculate the max SRQs for userspace properly in bnxt_re

   - Don't try to do math on errno for mlx5's rate calculation

   - Properly allow userspace to control the VLAN in the QP state during
     INIT->RTR for bnxt_re

   - 6 bug fixes for HNS:
      - Soft lockup when processing huge MRs, add a cond_resched()
      - Fix missed error unwind for doorbell allocation
      - Prevent bad send queue parameters from userspace
      - Wrong error unwind in qp creation
      - Missed xa_destroy during driver shutdown
      - Fix reporting to userspace of max_sge_rd, hns doesn't have a
        read/write difference"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/hns: Fix wrong value of max_sge_rd
  RDMA/hns: Fix missing xa_destroy()
  RDMA/hns: Fix a missing rollback in error path of hns_roce_create_qp_common()
  RDMA/hns: Fix invalid sq params not being blocked
  RDMA/hns: Fix unmatched condition in error path of alloc_user_qp_db()
  RDMA/hns: Fix soft lockup during bt pages loop
  RDMA/bnxt_re: Avoid clearing VLAN_ID mask in modify qp path
  RDMA/mlx5: Handle errors returned from mlx5r_ib_rate()
  RDMA/bnxt_re: Fix reporting maximum SRQs on P7 chips
  RDMA/bnxt_re: Add missing paranthesis in map_qp_id_to_tbl_indx
  RDMA/bnxt_re: Fix allocation of QP table
  RDMA/rxe: Fix the failure of ibv_query_device() and ibv_query_device_ex() tests
parents 05b880b1 6b5e41a8

drivers/infiniband/hw/bnxt_re/bnxt_re.h

+0 −6
Original line number Diff line number Diff line
@@ -53,12 +53,6 @@ 
#define BNXT_RE_MAX_MR_SIZE_HIGH	BIT_ULL(39)

#define BNXT_RE_MAX_MR_SIZE		BNXT_RE_MAX_MR_SIZE_HIGH



#define BNXT_RE_MAX_QPC_COUNT		(64 * 1024)

#define BNXT_RE_MAX_MRW_COUNT		(64 * 1024)

#define BNXT_RE_MAX_SRQC_COUNT		(64 * 1024)

#define BNXT_RE_MAX_CQ_COUNT		(64 * 1024)

#define BNXT_RE_MAX_MRW_COUNT_64K	(64 * 1024)

#define BNXT_RE_MAX_MRW_COUNT_256K	(256 * 1024)



/* Number of MRs to reserve for PF, leaving remainder for VFs */

#define BNXT_RE_RESVD_MR_FOR_PF         (32 * 1024)

drivers/infiniband/hw/bnxt_re/main.c

+1 −2
Original line number Diff line number Diff line
@@ -2130,8 +2130,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 op_type) 
	 * memory for the function and all child VFs

	 */

	rc = bnxt_qplib_alloc_rcfw_channel(&rdev->qplib_res, &rdev->rcfw,

					   &rdev->qplib_ctx,

					   BNXT_RE_MAX_QPC_COUNT);

					   &rdev->qplib_ctx);

	if (rc) {

		ibdev_err(&rdev->ibdev,

			  "Failed to allocate RCFW Channel: %#x\n", rc);

drivers/infiniband/hw/bnxt_re/qplib_fp.c

+0 −2
Original line number Diff line number Diff line
@@ -1217,8 +1217,6 @@ static void __modify_flags_from_init_state(struct bnxt_qplib_qp *qp) 
			qp->path_mtu =

				CMDQ_MODIFY_QP_PATH_MTU_MTU_2048;

		}

		qp->modify_flags &=

			~CMDQ_MODIFY_QP_MODIFY_MASK_VLAN_ID;

		/* Bono FW require the max_dest_rd_atomic to be >= 1 */

		if (qp->max_dest_rd_atomic < 1)

			qp->max_dest_rd_atomic = 1;

drivers/infiniband/hw/bnxt_re/qplib_rcfw.c

+1 −9
Original line number Diff line number Diff line
@@ -915,7 +915,6 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw, 


void bnxt_qplib_free_rcfw_channel(struct bnxt_qplib_rcfw *rcfw)

{

	kfree(rcfw->qp_tbl);

	kfree(rcfw->crsqe_tbl);

	bnxt_qplib_free_hwq(rcfw->res, &rcfw->cmdq.hwq);

	bnxt_qplib_free_hwq(rcfw->res, &rcfw->creq.hwq);
@@ -924,8 +923,7 @@ void bnxt_qplib_free_rcfw_channel(struct bnxt_qplib_rcfw *rcfw) 


int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res,

				  struct bnxt_qplib_rcfw *rcfw,

				  struct bnxt_qplib_ctx *ctx,

				  int qp_tbl_sz)

				  struct bnxt_qplib_ctx *ctx)

{

	struct bnxt_qplib_hwq_attr hwq_attr = {};

	struct bnxt_qplib_sg_info sginfo = {};
@@ -969,12 +967,6 @@ int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res, 
	if (!rcfw->crsqe_tbl)

		goto fail;



	/* Allocate one extra to hold the QP1 entries */

	rcfw->qp_tbl_size = qp_tbl_sz + 1;

	rcfw->qp_tbl = kcalloc(rcfw->qp_tbl_size, sizeof(struct bnxt_qplib_qp_node),

			       GFP_KERNEL);

	if (!rcfw->qp_tbl)

		goto fail;

	spin_lock_init(&rcfw->tbl_lock);



	rcfw->max_timeout = res->cctx->hwrm_cmd_max_timeout;

drivers/infiniband/hw/bnxt_re/qplib_rcfw.h

+3 −3
Original line number Diff line number Diff line
@@ -262,8 +262,7 @@ static inline void bnxt_qplib_fill_cmdqmsg(struct bnxt_qplib_cmdqmsg *msg, 
void bnxt_qplib_free_rcfw_channel(struct bnxt_qplib_rcfw *rcfw);

int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res,

				  struct bnxt_qplib_rcfw *rcfw,

				  struct bnxt_qplib_ctx *ctx,

				  int qp_tbl_sz);

				  struct bnxt_qplib_ctx *ctx);

void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill);

void bnxt_qplib_disable_rcfw_channel(struct bnxt_qplib_rcfw *rcfw);

int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector,
@@ -285,9 +284,10 @@ int bnxt_qplib_deinit_rcfw(struct bnxt_qplib_rcfw *rcfw); 
int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw,

			 struct bnxt_qplib_ctx *ctx, int is_virtfn);

void bnxt_qplib_mark_qp_error(void *qp_handle);



static inline u32 map_qp_id_to_tbl_indx(u32 qid, struct bnxt_qplib_rcfw *rcfw)

{

	/* Last index of the qp_tbl is for QP1 ie. qp_tbl_size - 1*/

	return (qid == 1) ? rcfw->qp_tbl_size - 1 : qid % rcfw->qp_tbl_size - 2;

	return (qid == 1) ? rcfw->qp_tbl_size - 1 : (qid % (rcfw->qp_tbl_size - 2));

}

#endif /* __BNXT_QPLIB_RCFW_H__ */