Commit aee3c14e 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:
 "We had a fairly slow cycle on the rc side this time, here are the
  accumulated fixes, mostly in drivers:

   - irdma should not generate extra completions during flushing

   - Fix several memory leaks

   - Do not get confused in irdma's iwarp mode if IPv6 is present

   - Correct a link speed calculation in mlx5

   - Increase the EQ/WQ limits on erdma as they are too small for big
     applications

   - Use the right math for erdma's inline mtt feature

   - Make erdma probing more robust to boot time ordering differences

   - Fix a KMSAN crash in CMA due to uninitialized qkey"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/core: Fix GID entry ref leak when create_ah fails
  RDMA/cma: Allow UD qp_type to join multicast only
  RDMA/erdma: Defer probing if netdevice can not be found
  RDMA/erdma: Inline mtt entries into WQE if supported
  RDMA/erdma: Update default EQ depth to 4096 and max_send_wr to 8192
  RDMA/erdma: Fix some typos
  IB/mlx5: Add support for 400G_8X lane speed
  RDMA/irdma: Add ipv4 check to irdma_find_listener()
  RDMA/irdma: Increase iWARP CM default rexmit count
  RDMA/irdma: Fix memory leak of PBLE objects
  RDMA/irdma: Do not generate SW completions for NOPs
parents 44149752 aca3b0fa

drivers/infiniband/core/cma.c

+34 −26
Original line number Diff line number Diff line
@@ -624,22 +624,11 @@ static inline unsigned short cma_family(struct rdma_id_private *id_priv) 
	return id_priv->id.route.addr.src_addr.ss_family;

}



static int cma_set_qkey(struct rdma_id_private *id_priv, u32 qkey)

static int cma_set_default_qkey(struct rdma_id_private *id_priv)

{

	struct ib_sa_mcmember_rec rec;

	int ret = 0;



	if (id_priv->qkey) {

		if (qkey && id_priv->qkey != qkey)

			return -EINVAL;

		return 0;

	}



	if (qkey) {

		id_priv->qkey = qkey;

		return 0;

	}



	switch (id_priv->id.ps) {

	case RDMA_PS_UDP:

	case RDMA_PS_IB:
@@ -659,6 +648,16 @@ static int cma_set_qkey(struct rdma_id_private *id_priv, u32 qkey) 
	return ret;

}



static int cma_set_qkey(struct rdma_id_private *id_priv, u32 qkey)

{

	if (!qkey ||

	    (id_priv->qkey && (id_priv->qkey != qkey)))

		return -EINVAL;



	id_priv->qkey = qkey;

	return 0;

}



static void cma_translate_ib(struct sockaddr_ib *sib, struct rdma_dev_addr *dev_addr)

{

	dev_addr->dev_type = ARPHRD_INFINIBAND;
@@ -1229,7 +1228,7 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv, 
	*qp_attr_mask = IB_QP_STATE | IB_QP_PKEY_INDEX | IB_QP_PORT;



	if (id_priv->id.qp_type == IB_QPT_UD) {

		ret = cma_set_qkey(id_priv, 0);

		ret = cma_set_default_qkey(id_priv);

		if (ret)

			return ret;
@@ -4569,7 +4568,10 @@ static int cma_send_sidr_rep(struct rdma_id_private *id_priv, 
	memset(&rep, 0, sizeof rep);

	rep.status = status;

	if (status == IB_SIDR_SUCCESS) {

		if (qkey)

			ret = cma_set_qkey(id_priv, qkey);

		else

			ret = cma_set_default_qkey(id_priv);

		if (ret)

			return ret;

		rep.qp_num = id_priv->qp_num;
@@ -4774,9 +4776,7 @@ static void cma_make_mc_event(int status, struct rdma_id_private *id_priv, 
	enum ib_gid_type gid_type;

	struct net_device *ndev;



	if (!status)

		status = cma_set_qkey(id_priv, be32_to_cpu(multicast->rec.qkey));

	else

	if (status)

		pr_debug_ratelimited("RDMA CM: MULTICAST_ERROR: failed to join multicast. status %d\n",

				     status);
@@ -4804,7 +4804,7 @@ static void cma_make_mc_event(int status, struct rdma_id_private *id_priv, 
	}



	event->param.ud.qp_num = 0xFFFFFF;

	event->param.ud.qkey = be32_to_cpu(multicast->rec.qkey);

	event->param.ud.qkey = id_priv->qkey;



out:

	if (ndev)
@@ -4823,8 +4823,11 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast) 
	    READ_ONCE(id_priv->state) == RDMA_CM_DESTROYING)

		goto out;



	ret = cma_set_qkey(id_priv, be32_to_cpu(multicast->rec.qkey));

	if (!ret) {

		cma_make_mc_event(status, id_priv, multicast, &event, mc);

		ret = cma_cm_event_handler(id_priv, &event);

	}

	rdma_destroy_ah_attr(&event.param.ud.ah_attr);

	WARN_ON(ret);
@@ -4877,9 +4880,11 @@ static int cma_join_ib_multicast(struct rdma_id_private *id_priv, 
	if (ret)

		return ret;



	ret = cma_set_qkey(id_priv, 0);

	if (!id_priv->qkey) {

		ret = cma_set_default_qkey(id_priv);

		if (ret)

			return ret;

	}



	cma_set_mgid(id_priv, (struct sockaddr *) &mc->addr, &rec.mgid);

	rec.qkey = cpu_to_be32(id_priv->qkey);
@@ -4956,9 +4961,6 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv, 
	cma_iboe_set_mgid(addr, &ib.rec.mgid, gid_type);



	ib.rec.pkey = cpu_to_be16(0xffff);

	if (id_priv->id.ps == RDMA_PS_UDP)

		ib.rec.qkey = cpu_to_be32(RDMA_UDP_QKEY);



	if (dev_addr->bound_dev_if)

		ndev = dev_get_by_index(dev_addr->net, dev_addr->bound_dev_if);

	if (!ndev)
@@ -4984,6 +4986,9 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv, 
	if (err || !ib.rec.mtu)

		return err ?: -EINVAL;



	if (!id_priv->qkey)

		cma_set_default_qkey(id_priv);



	rdma_ip2gid((struct sockaddr *)&id_priv->id.route.addr.src_addr,

		    &ib.rec.port_gid);

	INIT_WORK(&mc->iboe_join.work, cma_iboe_join_work_handler);
@@ -5009,6 +5014,9 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr, 
			    READ_ONCE(id_priv->state) != RDMA_CM_ADDR_RESOLVED))

		return -EINVAL;



	if (id_priv->id.qp_type != IB_QPT_UD)

		return -EINVAL;



	mc = kzalloc(sizeof(*mc), GFP_KERNEL);

	if (!mc)

		return -ENOMEM;

drivers/infiniband/core/verbs.c

+2 −0
Original line number Diff line number Diff line
@@ -532,6 +532,8 @@ static struct ib_ah *_rdma_create_ah(struct ib_pd *pd, 
	else

		ret = device->ops.create_ah(ah, &init_attr, NULL);

	if (ret) {

		if (ah->sgid_attr)

			rdma_put_gid_attr(ah->sgid_attr);

		kfree(ah);

		return ERR_PTR(ret);

	}

drivers/infiniband/hw/erdma/erdma_cq.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static const enum ib_wc_opcode wc_mapping_table[ERDMA_NUM_OPCODES] = { 
	[ERDMA_OP_LOCAL_INV] = IB_WC_LOCAL_INV,

	[ERDMA_OP_READ_WITH_INV] = IB_WC_RDMA_READ,

	[ERDMA_OP_ATOMIC_CAS] = IB_WC_COMP_SWAP,

	[ERDMA_OP_ATOMIC_FAD] = IB_WC_FETCH_ADD,

	[ERDMA_OP_ATOMIC_FAA] = IB_WC_FETCH_ADD,

};



static const struct {

drivers/infiniband/hw/erdma/erdma_hw.h

+2 −2
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ struct erdma_reg_mr_sqe { 
};



/* EQ related. */

#define ERDMA_DEFAULT_EQ_DEPTH 256

#define ERDMA_DEFAULT_EQ_DEPTH 4096



/* ceqe */

#define ERDMA_CEQE_HDR_DB_MASK BIT_ULL(63)
@@ -491,7 +491,7 @@ enum erdma_opcode { 
	ERDMA_OP_LOCAL_INV = 15,

	ERDMA_OP_READ_WITH_INV = 16,

	ERDMA_OP_ATOMIC_CAS = 17,

	ERDMA_OP_ATOMIC_FAD = 18,

	ERDMA_OP_ATOMIC_FAA = 18,

	ERDMA_NUM_OPCODES = 19,

	ERDMA_OP_INVALID = ERDMA_NUM_OPCODES + 1

};

drivers/infiniband/hw/erdma/erdma_main.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int erdma_netdev_event(struct notifier_block *nb, unsigned long event, 
static int erdma_enum_and_get_netdev(struct erdma_dev *dev)

{

	struct net_device *netdev;

	int ret = -ENODEV;

	int ret = -EPROBE_DEFER;



	/* Already binded to a net_device, so we skip. */

	if (dev->netdev)