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

Commit 46c8217c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull rdma fixes from Doug Ledford:
 - Fixes for mlx5 related issues
 - Fixes for ipoib multicast handling

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/ipoib: increase the max mcast backlog queue
  IB/ipoib: Make sendonly multicast joins create the mcast group
  IB/ipoib: Expire sendonly multicast joins
  IB/mlx5: Remove pa_lkey usages
  IB/mlx5: Remove support for IB_DEVICE_LOCAL_DMA_LKEY
  IB/iser: Add module parameter for always register memory
  xprtrdma: Replace global lkey with lkey local to PD
parents f97b870e 2866196f

drivers/infiniband/hw/mlx5/main.c

+1 −66
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, 
		props->device_cap_flags |= IB_DEVICE_BAD_QKEY_CNTR;

	if (MLX5_CAP_GEN(mdev, apm))

		props->device_cap_flags |= IB_DEVICE_AUTO_PATH_MIG;

	props->device_cap_flags |= IB_DEVICE_LOCAL_DMA_LKEY;

	if (MLX5_CAP_GEN(mdev, xrc))

		props->device_cap_flags |= IB_DEVICE_XRC;

	props->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;
@@ -795,53 +794,6 @@ static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vm 
	return 0;

}



static int alloc_pa_mkey(struct mlx5_ib_dev *dev, u32 *key, u32 pdn)

{

	struct mlx5_create_mkey_mbox_in *in;

	struct mlx5_mkey_seg *seg;

	struct mlx5_core_mr mr;

	int err;



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

	if (!in)

		return -ENOMEM;



	seg = &in->seg;

	seg->flags = MLX5_PERM_LOCAL_READ | MLX5_ACCESS_MODE_PA;

	seg->flags_pd = cpu_to_be32(pdn | MLX5_MKEY_LEN64);

	seg->qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);

	seg->start_addr = 0;



	err = mlx5_core_create_mkey(dev->mdev, &mr, in, sizeof(*in),

				    NULL, NULL, NULL);

	if (err) {

		mlx5_ib_warn(dev, "failed to create mkey, %d\n", err);

		goto err_in;

	}



	kfree(in);

	*key = mr.key;



	return 0;



err_in:

	kfree(in);



	return err;

}



static void free_pa_mkey(struct mlx5_ib_dev *dev, u32 key)

{

	struct mlx5_core_mr mr;

	int err;



	memset(&mr, 0, sizeof(mr));

	mr.key = key;

	err = mlx5_core_destroy_mkey(dev->mdev, &mr);

	if (err)

		mlx5_ib_warn(dev, "failed to destroy mkey 0x%x\n", key);

}



static struct ib_pd *mlx5_ib_alloc_pd(struct ib_device *ibdev,

				      struct ib_ucontext *context,

				      struct ib_udata *udata)
@@ -867,13 +819,6 @@ static struct ib_pd *mlx5_ib_alloc_pd(struct ib_device *ibdev, 
			kfree(pd);

			return ERR_PTR(-EFAULT);

		}

	} else {

		err = alloc_pa_mkey(to_mdev(ibdev), &pd->pa_lkey, pd->pdn);

		if (err) {

			mlx5_core_dealloc_pd(to_mdev(ibdev)->mdev, pd->pdn);

			kfree(pd);

			return ERR_PTR(err);

		}

	}



	return &pd->ibpd;
@@ -884,9 +829,6 @@ static int mlx5_ib_dealloc_pd(struct ib_pd *pd) 
	struct mlx5_ib_dev *mdev = to_mdev(pd->device);

	struct mlx5_ib_pd *mpd = to_mpd(pd);



	if (!pd->uobject)

		free_pa_mkey(mdev, mpd->pa_lkey);



	mlx5_core_dealloc_pd(mdev->mdev, mpd->pdn);

	kfree(mpd);
@@ -1245,18 +1187,10 @@ static int create_dev_resources(struct mlx5_ib_resources *devr) 
	struct ib_srq_init_attr attr;

	struct mlx5_ib_dev *dev;

	struct ib_cq_init_attr cq_attr = {.cqe = 1};

	u32 rsvd_lkey;

	int ret = 0;



	dev = container_of(devr, struct mlx5_ib_dev, devr);



	ret = mlx5_core_query_special_context(dev->mdev, &rsvd_lkey);

	if (ret) {

		pr_err("Failed to query special context %d\n", ret);

		return ret;

	}

	dev->ib_dev.local_dma_lkey = rsvd_lkey;



	devr->p0 = mlx5_ib_alloc_pd(&dev->ib_dev, NULL, NULL);

	if (IS_ERR(devr->p0)) {

		ret = PTR_ERR(devr->p0);
@@ -1418,6 +1352,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	strlcpy(dev->ib_dev.name, "mlx5_%d", IB_DEVICE_NAME_MAX);

	dev->ib_dev.owner		= THIS_MODULE;

	dev->ib_dev.node_type		= RDMA_NODE_IB_CA;

	dev->ib_dev.local_dma_lkey	= 0 /* not supported for now */;

	dev->num_ports		= MLX5_CAP_GEN(mdev, num_ports);

	dev->ib_dev.phys_port_cnt     = dev->num_ports;

	dev->ib_dev.num_comp_vectors    =

drivers/infiniband/hw/mlx5/mlx5_ib.h

+0 −2
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ static inline struct mlx5_ib_ucontext *to_mucontext(struct ib_ucontext *ibuconte 
struct mlx5_ib_pd {

	struct ib_pd		ibpd;

	u32			pdn;

	u32			pa_lkey;

};



/* Use macros here so that don't have to duplicate
@@ -213,7 +212,6 @@ struct mlx5_ib_qp { 
	int			uuarn;



	int			create_type;

	u32			pa_lkey;



	/* Store signature errors */

	bool			signature_en;

drivers/infiniband/hw/mlx5/qp.c

+1 −3
Original line number Diff line number Diff line
@@ -925,8 +925,6 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd, 
			err = create_kernel_qp(dev, init_attr, qp, &in, &inlen);

			if (err)

				mlx5_ib_dbg(dev, "err %d\n", err);

			else

				qp->pa_lkey = to_mpd(pd)->pa_lkey;

		}



		if (err)
@@ -2045,7 +2043,7 @@ static void set_frwr_pages(struct mlx5_wqe_data_seg *dseg, 
		mfrpl->mapped_page_list[i] = cpu_to_be64(page_list[i] | perm);

	dseg->addr = cpu_to_be64(mfrpl->map);

	dseg->byte_count = cpu_to_be32(ALIGN(sizeof(u64) * wr->wr.fast_reg.page_list_len, 64));

	dseg->lkey = cpu_to_be32(pd->pa_lkey);

	dseg->lkey = cpu_to_be32(pd->ibpd.local_dma_lkey);

}



static __be32 send_ieth(struct ib_send_wr *wr)

drivers/infiniband/ulp/ipoib/ipoib.h

+3 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ enum { 
	IPOIB_NUM_WC		  = 4,



	IPOIB_MAX_PATH_REC_QUEUE  = 3,

	IPOIB_MAX_MCAST_QUEUE	  = 3,

	IPOIB_MAX_MCAST_QUEUE	  = 64,



	IPOIB_FLAG_OPER_UP	  = 0,

	IPOIB_FLAG_INITIALIZED	  = 1,
@@ -548,6 +548,8 @@ void ipoib_path_iter_read(struct ipoib_path_iter *iter, 


int ipoib_mcast_attach(struct net_device *dev, u16 mlid,

		       union ib_gid *mgid, int set_qkey);

int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast);

struct ipoib_mcast *__ipoib_mcast_find(struct net_device *dev, void *mgid);



int ipoib_init_qp(struct net_device *dev);

int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca);

drivers/infiniband/ulp/ipoib/ipoib_main.c

+18 −0
Original line number Diff line number Diff line
@@ -1149,6 +1149,9 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) 
	unsigned long dt;

	unsigned long flags;

	int i;

	LIST_HEAD(remove_list);

	struct ipoib_mcast *mcast, *tmcast;

	struct net_device *dev = priv->dev;



	if (test_bit(IPOIB_STOP_NEIGH_GC, &priv->flags))

		return;
@@ -1176,6 +1179,19 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) 
							  lockdep_is_held(&priv->lock))) != NULL) {

			/* was the neigh idle for two GC periods */

			if (time_after(neigh_obsolete, neigh->alive)) {

				u8 *mgid = neigh->daddr + 4;



				/* Is this multicast ? */

				if (*mgid == 0xff) {

					mcast = __ipoib_mcast_find(dev, mgid);



					if (mcast && test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {

						list_del(&mcast->list);

						rb_erase(&mcast->rb_node, &priv->multicast_tree);

						list_add_tail(&mcast->list, &remove_list);

					}

				}



				rcu_assign_pointer(*np,

						   rcu_dereference_protected(neigh->hnext,

									     lockdep_is_held(&priv->lock)));
@@ -1191,6 +1207,8 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) 


out_unlock:

	spin_unlock_irqrestore(&priv->lock, flags);

	list_for_each_entry_safe(mcast, tmcast, &remove_list, list)

		ipoib_mcast_leave(dev, mcast);

}



static void ipoib_reap_neigh(struct work_struct *work)