Commit ab2aa486 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:
 "Nothing very exciting here, it has been a quiet cycle overall. Usual
  collection of small bug fixes:

   - irdma issues with CQ entries, VLAN completions and a mutex deadlock

   - Incorrect DCT packets in mlx5

   - Userspace triggered overflows in qib

   - Locking error in hfi

   - Typo in errno value in qib/hfi1

   - Double free in qedr

   - Leak of random kernel memory to userspace with a netlink callback"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/sa_query: Use strscpy_pad instead of memcpy to copy a string
  RDMA/irdma: Do not hold qos mutex twice on QP resume
  RDMA/irdma: Set VLAN in UD work completion correctly
  RDMA/mlx5: Initialize the ODP xarray when creating an ODP MR
  rdma/qedr: Fix crash due to redundant release of device's qp memory
  RDMA/rdmavt: Fix error code in rvt_create_qp()
  IB/hfi1: Fix abba locking issue with sc_disable()
  IB/qib: Protect from buffer overflow in struct qib_user_sdma_pkt fields
  RDMA/mlx5: Set user priority for DCT
  RDMA/irdma: Process extended CQ entries correctly
parents d25f2743 64733956

drivers/infiniband/core/sa_query.c

+3 −2
Original line number Diff line number Diff line
@@ -706,7 +706,8 @@ static void ib_nl_set_path_rec_attrs(struct sk_buff *skb, 


	/* Construct the family header first */

	header = skb_put(skb, NLMSG_ALIGN(sizeof(*header)));

	memcpy(header->device_name, dev_name(&query->port->agent->device->dev),

	strscpy_pad(header->device_name,

		    dev_name(&query->port->agent->device->dev),

		    LS_DEVICE_NAME_MAX);

	header->port_num = query->port->port_num;

drivers/infiniband/hw/hfi1/pio.c

+6 −3
Original line number Diff line number Diff line
@@ -878,6 +878,7 @@ void sc_disable(struct send_context *sc) 
{

	u64 reg;

	struct pio_buf *pbuf;

	LIST_HEAD(wake_list);



	if (!sc)

		return;
@@ -912,19 +913,21 @@ void sc_disable(struct send_context *sc) 
	spin_unlock(&sc->release_lock);



	write_seqlock(&sc->waitlock);

	while (!list_empty(&sc->piowait)) {

	if (!list_empty(&sc->piowait))

		list_move(&sc->piowait, &wake_list);

	write_sequnlock(&sc->waitlock);

	while (!list_empty(&wake_list)) {

		struct iowait *wait;

		struct rvt_qp *qp;

		struct hfi1_qp_priv *priv;



		wait = list_first_entry(&sc->piowait, struct iowait, list);

		wait = list_first_entry(&wake_list, struct iowait, list);

		qp = iowait_to_qp(wait);

		priv = qp->priv;

		list_del_init(&priv->s_iowait.list);

		priv->s_iowait.lock = NULL;

		hfi1_qp_wakeup(qp, RVT_S_WAIT_PIO | HFI1_S_WAIT_PIO_DRAIN);

	}

	write_sequnlock(&sc->waitlock);



	spin_unlock_irq(&sc->alloc_lock);

}

drivers/infiniband/hw/irdma/uk.c

+2 −2
Original line number Diff line number Diff line
@@ -1092,12 +1092,12 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, struct irdma_cq_poll_info *info) 
		if (cq->avoid_mem_cflct) {

			ext_cqe = (__le64 *)((u8 *)cqe + 32);

			get_64bit_val(ext_cqe, 24, &qword7);

			polarity = (u8)FIELD_GET(IRDMA_CQ_VALID, qword3);

			polarity = (u8)FIELD_GET(IRDMA_CQ_VALID, qword7);

		} else {

			peek_head = (cq->cq_ring.head + 1) % cq->cq_ring.size;

			ext_cqe = cq->cq_base[peek_head].buf;

			get_64bit_val(ext_cqe, 24, &qword7);

			polarity = (u8)FIELD_GET(IRDMA_CQ_VALID, qword3);

			polarity = (u8)FIELD_GET(IRDMA_CQ_VALID, qword7);

			if (!peek_head)

				polarity ^= 1;

		}

drivers/infiniband/hw/irdma/verbs.c

+6 −2
Original line number Diff line number Diff line
@@ -3399,9 +3399,13 @@ static void irdma_process_cqe(struct ib_wc *entry, 
		}



		if (cq_poll_info->ud_vlan_valid) {

			entry->vlan_id = cq_poll_info->ud_vlan & VLAN_VID_MASK;

			entry->wc_flags |= IB_WC_WITH_VLAN;

			u16 vlan = cq_poll_info->ud_vlan & VLAN_VID_MASK;



			entry->sl = cq_poll_info->ud_vlan >> VLAN_PRIO_SHIFT;

			if (vlan) {

				entry->vlan_id = vlan;

				entry->wc_flags |= IB_WC_WITH_VLAN;

			}

		} else {

			entry->sl = 0;

		}

drivers/infiniband/hw/irdma/ws.c

+7 −6
Original line number Diff line number Diff line
@@ -330,9 +330,11 @@ enum irdma_status_code irdma_ws_add(struct irdma_sc_vsi *vsi, u8 user_pri) 


		tc_node->enable = true;

		ret = irdma_ws_cqp_cmd(vsi, tc_node, IRDMA_OP_WS_MODIFY_NODE);

		if (ret)

		if (ret) {

			vsi->unregister_qset(vsi, tc_node);

			goto reg_err;

		}

	}

	ibdev_dbg(to_ibdev(vsi->dev),

		  "WS: Using node %d which represents VSI %d TC %d\n",

		  tc_node->index, vsi->vsi_idx, traffic_class);
@@ -350,6 +352,10 @@ enum irdma_status_code irdma_ws_add(struct irdma_sc_vsi *vsi, u8 user_pri) 
	}

	goto exit;



reg_err:

	irdma_ws_cqp_cmd(vsi, tc_node, IRDMA_OP_WS_DELETE_NODE);

	list_del(&tc_node->siblings);

	irdma_free_node(vsi, tc_node);

leaf_add_err:

	if (list_empty(&vsi_node->child_list_head)) {

		if (irdma_ws_cqp_cmd(vsi, vsi_node, IRDMA_OP_WS_DELETE_NODE))
@@ -369,11 +375,6 @@ enum irdma_status_code irdma_ws_add(struct irdma_sc_vsi *vsi, u8 user_pri) 
exit:

	mutex_unlock(&vsi->dev->ws_mutex);

	return ret;



reg_err:

	mutex_unlock(&vsi->dev->ws_mutex);

	irdma_ws_remove(vsi, user_pri);

	return ret;

}



/**