Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19286e4a 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:
 "This is the next batch of for-rc patches from RDMA. It includes the
  fix for the ipoib regression I mentioned last time, and the result of
  a fairly major debugging effort to get iser working reliably on cxgb4
  hardware - it turns out the cxgb4 driver was not handling QP error
  flushing properly causing iser to fail.

   - cxgb4 fix for an iser testing failure as debugged by Steve and
     Sagi. The problem was a driver bug in the handling of shutting down
     a QP.

   - Various vmw_pvrdma fixes for bogus WARN_ON, missed resource free on
     error unwind and a use after free bug

   - Improper congestion counter values on mlx5 when link aggregation is
     enabled

   - ipoib lockdep regression introduced in this merge window

   - hfi1 regression supporting the device in a VM introduced in a
     recent patch

   - Typo that breaks future uAPI compatibility in the verbs core

   - More SELinux related oops fixing

   - Fix an oops during error unwind in mlx5"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  IB/mlx5: Fix mlx5_ib_alloc_mr error flow
  IB/core: Verify that QP is security enabled in create and destroy
  IB/uverbs: Fix command checking as part of ib_uverbs_ex_modify_qp()
  IB/mlx5: Serialize access to the VMA list
  IB/hfi: Only read capability registers if the capability exists
  IB/ipoib: Fix lockdep issue found on ipoib_ib_dev_heavy_flush
  IB/mlx5: Fix congestion counters in LAG mode
  RDMA/vmw_pvrdma: Avoid use after free due to QP/CQ/SRQ destroy
  RDMA/vmw_pvrdma: Use refcount_dec_and_test to avoid warning
  RDMA/vmw_pvrdma: Call ib_umem_release on destroy QP path
  iw_cxgb4: when flushing, complete all wrs in a chain
  iw_cxgb4: reflect the original WR opcode in drain cqes
  iw_cxgb4: Only validate the MSN for successful completions
parents 5f520fc3 45e6ae7e

drivers/infiniband/core/security.c

+3 −0
Original line number Diff line number Diff line
@@ -386,6 +386,9 @@ int ib_open_shared_qp_security(struct ib_qp *qp, struct ib_device *dev) 
	if (ret)

		return ret;



	if (!qp->qp_sec)

		return 0;



	mutex_lock(&real_qp->qp_sec->mutex);

	ret = check_qp_port_pkey_settings(real_qp->qp_sec->ports_pkeys,

					  qp->qp_sec);

drivers/infiniband/core/uverbs_cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -2074,7 +2074,7 @@ int ib_uverbs_ex_modify_qp(struct ib_uverbs_file *file, 
		return -EOPNOTSUPP;



	if (ucore->inlen > sizeof(cmd)) {

		if (ib_is_udata_cleared(ucore, sizeof(cmd),

		if (!ib_is_udata_cleared(ucore, sizeof(cmd),

					 ucore->inlen - sizeof(cmd)))

			return -EOPNOTSUPP;

	}

drivers/infiniband/core/verbs.c

+2 −1
Original line number Diff line number Diff line
@@ -1438,6 +1438,7 @@ int ib_close_qp(struct ib_qp *qp) 
	spin_unlock_irqrestore(&real_qp->device->event_handler_lock, flags);



	atomic_dec(&real_qp->usecnt);

	if (qp->qp_sec)

		ib_close_shared_qp_security(qp->qp_sec);

	kfree(qp);

drivers/infiniband/hw/cxgb4/cq.c

+5 −8
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ void c4iw_flush_hw_cq(struct c4iw_cq *chp) 


static int cqe_completes_wr(struct t4_cqe *cqe, struct t4_wq *wq)

{

	if (CQE_OPCODE(cqe) == C4IW_DRAIN_OPCODE) {

	if (DRAIN_CQE(cqe)) {

		WARN_ONCE(1, "Unexpected DRAIN CQE qp id %u!\n", wq->sq.qid);

		return 0;

	}
@@ -494,7 +494,7 @@ static int poll_cq(struct t4_wq *wq, struct t4_cq *cq, struct t4_cqe *cqe, 
	/*

	 * Special cqe for drain WR completions...

	 */

	if (CQE_OPCODE(hw_cqe) == C4IW_DRAIN_OPCODE) {

	if (DRAIN_CQE(hw_cqe)) {

		*cookie = CQE_DRAIN_COOKIE(hw_cqe);

		*cqe = *hw_cqe;

		goto skip_cqe;
@@ -571,10 +571,10 @@ static int poll_cq(struct t4_wq *wq, struct t4_cq *cq, struct t4_cqe *cqe, 
			ret = -EAGAIN;

			goto skip_cqe;

		}

		if (unlikely((CQE_WRID_MSN(hw_cqe) != (wq->rq.msn)))) {

		if (unlikely(!CQE_STATUS(hw_cqe) &&

			     CQE_WRID_MSN(hw_cqe) != wq->rq.msn)) {

			t4_set_wq_in_error(wq);

			hw_cqe->header |= htonl(CQE_STATUS_V(T4_ERR_MSN));

			goto proc_cqe;

			hw_cqe->header |= cpu_to_be32(CQE_STATUS_V(T4_ERR_MSN));

		}

		goto proc_cqe;

	}
@@ -748,9 +748,6 @@ static int c4iw_poll_cq_one(struct c4iw_cq *chp, struct ib_wc *wc) 
				c4iw_invalidate_mr(qhp->rhp,

						   CQE_WRID_FR_STAG(&cqe));

			break;

		case C4IW_DRAIN_OPCODE:

			wc->opcode = IB_WC_SEND;

			break;

		default:

			pr_err("Unexpected opcode %d in the CQE received for QPID=0x%0x\n",

			       CQE_OPCODE(&cqe), CQE_QPID(&cqe));

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+0 −2
Original line number Diff line number Diff line
@@ -693,8 +693,6 @@ static inline int to_ib_qp_state(int c4iw_qp_state) 
	return IB_QPS_ERR;

}



#define C4IW_DRAIN_OPCODE FW_RI_SGE_EC_CR_RETURN



static inline u32 c4iw_ib_to_tpt_access(int a)

{

	return (a & IB_ACCESS_REMOTE_WRITE ? FW_RI_MEM_ACCESS_REM_WRITE : 0) |