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

Commit ed082d36 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Doug Ledford
Browse files

IB/core: add support to create a unsafe global rkey to ib_create_pd 



Instead of exposing ib_get_dma_mr to ULPs and letting them use it more or
less unchecked, this moves the capability of creating a global rkey into
the RDMA core, where it can be easily audited.  It also prints a warning
everytime this feature is used as well.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 50d46335

drivers/infiniband/core/mad.c

+1 −1
Original line number Diff line number Diff line
@@ -3160,7 +3160,7 @@ static int ib_mad_port_open(struct ib_device *device, 
		goto error3;

	}



	port_priv->pd = ib_alloc_pd(device);

	port_priv->pd = ib_alloc_pd(device, 0);

	if (IS_ERR(port_priv->pd)) {

		dev_err(&device->dev, "Couldn't create ib_mad PD\n");

		ret = PTR_ERR(port_priv->pd);

drivers/infiniband/core/verbs.c

+22 −5
Original line number Diff line number Diff line
@@ -227,9 +227,11 @@ EXPORT_SYMBOL(rdma_port_get_link_layer); 
 * Every PD has a local_dma_lkey which can be used as the lkey value for local

 * memory operations.

 */

struct ib_pd *ib_alloc_pd(struct ib_device *device)

struct ib_pd *__ib_alloc_pd(struct ib_device *device, unsigned int flags,

		const char *caller)

{

	struct ib_pd *pd;

	int mr_access_flags = 0;



	pd = device->alloc_pd(device, NULL, NULL);

	if (IS_ERR(pd))
@@ -239,24 +241,39 @@ struct ib_pd *ib_alloc_pd(struct ib_device *device) 
	pd->uobject = NULL;

	pd->__internal_mr = NULL;

	atomic_set(&pd->usecnt, 0);

	pd->flags = flags;



	if (device->attrs.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY)

		pd->local_dma_lkey = device->local_dma_lkey;

	else {

	else

		mr_access_flags |= IB_ACCESS_LOCAL_WRITE;



	if (flags & IB_PD_UNSAFE_GLOBAL_RKEY) {

		pr_warn("%s: enabling unsafe global rkey\n", caller);

		mr_access_flags |= IB_ACCESS_REMOTE_READ | IB_ACCESS_REMOTE_WRITE;

	}



	if (mr_access_flags) {

		struct ib_mr *mr;



		mr = ib_get_dma_mr(pd, IB_ACCESS_LOCAL_WRITE);

		mr = ib_get_dma_mr(pd, mr_access_flags);

		if (IS_ERR(mr)) {

			ib_dealloc_pd(pd);

			return (struct ib_pd *)mr;

		}



		pd->__internal_mr = mr;



		if (!(device->attrs.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY))

			pd->local_dma_lkey = pd->__internal_mr->lkey;



		if (flags & IB_PD_UNSAFE_GLOBAL_RKEY)

			pd->unsafe_global_rkey = pd->__internal_mr->rkey;

	}



	return pd;

}

EXPORT_SYMBOL(ib_alloc_pd);

EXPORT_SYMBOL(__ib_alloc_pd);



/**

 * ib_dealloc_pd - Deallocates a protection domain.

drivers/infiniband/hw/mlx4/mad.c

+1 −1
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port, 
		goto err_buf;

	}



	ctx->pd = ib_alloc_pd(ctx->ib_dev);

	ctx->pd = ib_alloc_pd(ctx->ib_dev, 0);

	if (IS_ERR(ctx->pd)) {

		ret = PTR_ERR(ctx->pd);

		pr_err("Couldn't create tunnel PD (%d)\n", ret);

drivers/infiniband/hw/mlx4/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ static struct ib_xrcd *mlx4_ib_alloc_xrcd(struct ib_device *ibdev, 
	if (err)

		goto err1;



	xrcd->pd = ib_alloc_pd(ibdev);

	xrcd->pd = ib_alloc_pd(ibdev, 0);

	if (IS_ERR(xrcd->pd)) {

		err = PTR_ERR(xrcd->pd);

		goto err2;

drivers/infiniband/hw/mlx5/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2223,7 +2223,7 @@ static int create_umr_res(struct mlx5_ib_dev *dev) 
		goto error_0;

	}



	pd = ib_alloc_pd(&dev->ib_dev);

	pd = ib_alloc_pd(&dev->ib_dev, 0);

	if (IS_ERR(pd)) {

		mlx5_ib_dbg(dev, "Couldn't create PD for sync UMR QP\n");

		ret = PTR_ERR(pd);