RDMA/core: Introduce ib_map_mr_sg_pi to map data/protection sgl's (2cdfcdd8) · Commits · 戴 / test

drivers/infiniband/core/device.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2497,6 +2497,7 @@ void ib_set_device_ops(struct ib_device dev, const struct ib_device_ops ops)
		SET_DEVICE_OP(dev_ops, iw_reject);
		SET_DEVICE_OP(dev_ops, iw_rem_ref);
		SET_DEVICE_OP(dev_ops, map_mr_sg);
		SET_DEVICE_OP(dev_ops, map_mr_sg_pi);
		SET_DEVICE_OP(dev_ops, map_phys_fmr);
		SET_DEVICE_OP(dev_ops, mmap);
		SET_DEVICE_OP(dev_ops, modify_ah);

drivers/infiniband/core/verbs.c

+39 −1

Original line number	Diff line number	Diff line
		@@ -2049,7 +2049,8 @@ struct ib_mr ib_alloc_mr_integrity(struct ib_pd pd,
		{
		struct ib_mr *mr;

		if (!pd->device->ops.alloc_mr_integrity)
		if (!pd->device->ops.alloc_mr_integrity \|\|
		!pd->device->ops.map_mr_sg_pi)
		return ERR_PTR(-EOPNOTSUPP);

		if (!max_num_meta_sg)
		@@ -2430,6 +2431,43 @@ int ib_set_vf_guid(struct ib_device *device, int vf, u8 port, u64 guid,
		}
		EXPORT_SYMBOL(ib_set_vf_guid);

		/**
		* ib_map_mr_sg_pi() - Map the dma mapped SG lists for PI (protection
		* information) and set an appropriate memory region for registration.
		* @mr: memory region
		* @data_sg: dma mapped scatterlist for data
		* @data_sg_nents: number of entries in data_sg
		* @data_sg_offset: offset in bytes into data_sg
		* @meta_sg: dma mapped scatterlist for metadata
		* @meta_sg_nents: number of entries in meta_sg
		* @meta_sg_offset: offset in bytes into meta_sg
		* @page_size: page vector desired page size
		*
		* Constraints:
		* - The MR must be allocated with type IB_MR_TYPE_INTEGRITY.
		*
		* Return: 0 on success.
		*
		* After this completes successfully, the memory region
		* is ready for registration.
		*/
		int ib_map_mr_sg_pi(struct ib_mr mr, struct scatterlist data_sg,
		int data_sg_nents, unsigned int *data_sg_offset,
		struct scatterlist *meta_sg, int meta_sg_nents,
		unsigned int *meta_sg_offset, unsigned int page_size)
		{
		if (unlikely(!mr->device->ops.map_mr_sg_pi \|\|
		WARN_ON_ONCE(mr->type != IB_MR_TYPE_INTEGRITY)))
		return -EOPNOTSUPP;

		mr->page_size = page_size;

		return mr->device->ops.map_mr_sg_pi(mr, data_sg, data_sg_nents,
		data_sg_offset, meta_sg,
		meta_sg_nents, meta_sg_offset);
		}
		EXPORT_SYMBOL(ib_map_mr_sg_pi);

		/**
		* ib_map_mr_sg() - Map the largest prefix of a dma mapped SG list
		* and set it the memory region.

include/rdma/ib_verbs.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -2437,6 +2437,11 @@ struct ib_device_ops {
		int (read_counters)(struct ib_counters counters,
		struct ib_counters_read_attr *counters_read_attr,
		struct uverbs_attr_bundle *attrs);
		int (map_mr_sg_pi)(struct ib_mr mr, struct scatterlist *data_sg,
		int data_sg_nents, unsigned int *data_sg_offset,
		struct scatterlist *meta_sg, int meta_sg_nents,
		unsigned int *meta_sg_offset);

		/**
		* alloc_hw_stats - Allocate a struct rdma_hw_stats and fill in the
		* driver initialized data. The struct is kfree()'ed by the sysfs
		@@ -4236,6 +4241,10 @@ int ib_destroy_rwq_ind_table(struct ib_rwq_ind_table *wq_ind_table);

		int ib_map_mr_sg(struct ib_mr mr, struct scatterlist sg, int sg_nents,
		unsigned int *sg_offset, unsigned int page_size);
		int ib_map_mr_sg_pi(struct ib_mr mr, struct scatterlist data_sg,
		int data_sg_nents, unsigned int *data_sg_offset,
		struct scatterlist *meta_sg, int meta_sg_nents,
		unsigned int *meta_sg_offset, unsigned int page_size);

		static inline int
		ib_map_mr_sg_zbva(struct ib_mr mr, struct scatterlist sg, int sg_nents,

Admin message