core: Remove the ib_reg_phys_mr() and ib_rereg_phys_mr() verbs (1241d7bf) · Commits · 戴 / test

drivers/infiniband/core/verbs.c

+0 −67

Original line number	Diff line number	Diff line
		@@ -1144,73 +1144,6 @@ struct ib_mr ib_get_dma_mr(struct ib_pd pd, int mr_access_flags)
		}
		EXPORT_SYMBOL(ib_get_dma_mr);

		struct ib_mr ib_reg_phys_mr(struct ib_pd pd,
		struct ib_phys_buf *phys_buf_array,
		int num_phys_buf,
		int mr_access_flags,
		u64 *iova_start)
		{
		struct ib_mr *mr;
		int err;

		err = ib_check_mr_access(mr_access_flags);
		if (err)
		return ERR_PTR(err);

		if (!pd->device->reg_phys_mr)
		return ERR_PTR(-ENOSYS);

		mr = pd->device->reg_phys_mr(pd, phys_buf_array, num_phys_buf,
		mr_access_flags, iova_start);

		if (!IS_ERR(mr)) {
		mr->device = pd->device;
		mr->pd = pd;
		mr->uobject = NULL;
		atomic_inc(&pd->usecnt);
		atomic_set(&mr->usecnt, 0);
		}

		return mr;
		}
		EXPORT_SYMBOL(ib_reg_phys_mr);

		int ib_rereg_phys_mr(struct ib_mr *mr,
		int mr_rereg_mask,
		struct ib_pd *pd,
		struct ib_phys_buf *phys_buf_array,
		int num_phys_buf,
		int mr_access_flags,
		u64 *iova_start)
		{
		struct ib_pd *old_pd;
		int ret;

		ret = ib_check_mr_access(mr_access_flags);
		if (ret)
		return ret;

		if (!mr->device->rereg_phys_mr)
		return -ENOSYS;

		if (atomic_read(&mr->usecnt))
		return -EBUSY;

		old_pd = mr->pd;

		ret = mr->device->rereg_phys_mr(mr, mr_rereg_mask, pd,
		phys_buf_array, num_phys_buf,
		mr_access_flags, iova_start);

		if (!ret && (mr_rereg_mask & IB_MR_REREG_PD)) {
		atomic_dec(&old_pd->usecnt);
		atomic_inc(&pd->usecnt);
		}

		return ret;
		}
		EXPORT_SYMBOL(ib_rereg_phys_mr);

		int ib_query_mr(struct ib_mr mr, struct ib_mr_attr mr_attr)
		{
		return mr->device->query_mr ?

include/rdma/ib_verbs.h

+0 −46

Original line number	Diff line number	Diff line
		@@ -2759,52 +2759,6 @@ static inline void ib_dma_free_coherent(struct ib_device *dev,
		dma_free_coherent(dev->dma_device, size, cpu_addr, dma_handle);
		}

		/**
		* ib_reg_phys_mr - Prepares a virtually addressed memory region for use
		* by an HCA.
		* @pd: The protection domain associated assigned to the registered region.
		* @phys_buf_array: Specifies a list of physical buffers to use in the
		* memory region.
		* @num_phys_buf: Specifies the size of the phys_buf_array.
		* @mr_access_flags: Specifies the memory access rights.
		* @iova_start: The offset of the region's starting I/O virtual address.
		*/
		struct ib_mr ib_reg_phys_mr(struct ib_pd pd,
		struct ib_phys_buf *phys_buf_array,
		int num_phys_buf,
		int mr_access_flags,
		u64 *iova_start);

		/**
		* ib_rereg_phys_mr - Modifies the attributes of an existing memory region.
		* Conceptually, this call performs the functions deregister memory region
		* followed by register physical memory region. Where possible,
		* resources are reused instead of deallocated and reallocated.
		* @mr: The memory region to modify.
		* @mr_rereg_mask: A bit-mask used to indicate which of the following
		* properties of the memory region are being modified.
		* @pd: If %IB_MR_REREG_PD is set in mr_rereg_mask, this field specifies
		* the new protection domain to associated with the memory region,
		* otherwise, this parameter is ignored.
		* @phys_buf_array: If %IB_MR_REREG_TRANS is set in mr_rereg_mask, this
		* field specifies a list of physical buffers to use in the new
		* translation, otherwise, this parameter is ignored.
		* @num_phys_buf: If %IB_MR_REREG_TRANS is set in mr_rereg_mask, this
		* field specifies the size of the phys_buf_array, otherwise, this
		* parameter is ignored.
		* @mr_access_flags: If %IB_MR_REREG_ACCESS is set in mr_rereg_mask, this
		* field specifies the new memory access rights, otherwise, this
		* parameter is ignored.
		* @iova_start: The offset of the region's starting I/O virtual address.
		*/
		int ib_rereg_phys_mr(struct ib_mr *mr,
		int mr_rereg_mask,
		struct ib_pd *pd,
		struct ib_phys_buf *phys_buf_array,
		int num_phys_buf,
		int mr_access_flags,
		u64 *iova_start);

		/**
		* ib_query_mr - Retrieves information about a specific memory region.
		* @mr: The memory region to retrieve information about.

Admin message