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

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

IB/core: rename pd->local_mr to pd->__internal_mr 



This has two reasons: a) to clearly mark that drivers don't have any
business using it, and b) because we're going to use it for the
(dangerous) global rkey soon, so that drivers don't create on themselves.

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 64278fe8

drivers/infiniband/core/uverbs_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file, 


	pd->device  = ib_dev;

	pd->uobject = uobj;

	pd->local_mr = NULL;

	pd->__internal_mr = NULL;

	atomic_set(&pd->usecnt, 0);



	uobj->object = pd;

drivers/infiniband/core/verbs.c

+6 −6
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ struct ib_pd *ib_alloc_pd(struct ib_device *device) 


	pd->device = device;

	pd->uobject = NULL;

	pd->local_mr = NULL;

	pd->__internal_mr = NULL;

	atomic_set(&pd->usecnt, 0);



	if (device->attrs.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY)
@@ -251,8 +251,8 @@ struct ib_pd *ib_alloc_pd(struct ib_device *device) 
			return (struct ib_pd *)mr;

		}



		pd->local_mr = mr;

		pd->local_dma_lkey = pd->local_mr->lkey;

		pd->__internal_mr = mr;

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

	}

	return pd;

}
@@ -270,10 +270,10 @@ void ib_dealloc_pd(struct ib_pd *pd) 
{

	int ret;



	if (pd->local_mr) {

		ret = ib_dereg_mr(pd->local_mr);

	if (pd->__internal_mr) {

		ret = ib_dereg_mr(pd->__internal_mr);

		WARN_ON(ret);

		pd->local_mr = NULL;

		pd->__internal_mr = NULL;

	}



	/* uverbs manipulates usecnt with proper locking, while the kabi

include/rdma/ib_verbs.h

+5 −1
Original line number Diff line number Diff line
@@ -1373,7 +1373,11 @@ struct ib_pd { 
	struct ib_device       *device;

	struct ib_uobject      *uobject;

	atomic_t          	usecnt; /* count all resources */

	struct ib_mr	       *local_mr;



	/*

	 * Implementation details of the RDMA core, don't use in drivers:

	 */

	struct ib_mr	       *__internal_mr;

};



struct ib_xrcd {