Commit 4e06bb5e authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

env: pass an spdk_mem_map_ops structure to mem_map_alloc 



This series of changes is aimed at enabling spdk_mem_map_translate to
report back to the user the length of the valid mem_map up to the
function that requested the translation.
This will be useful when retrieving memory regions associated with I/O
buffers in NVMe-oF. For large I/O it will be possible that the buffer is
split over multiple MRs and the I/O will have to be split into multiple
SGLs.

Change-Id: I90da6d4d31c669a3bf046f7721923dd743c5ef21
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/425328


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 55bc3a72

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ The size parameter of spdk_mem_map_translate is now a pointer. This allows the 
function to report back the actual size of the translation relative to the original

request made by the user.



A new structure spdk_mem_map_ops has been introduced to hold memory map related

callbacks. This structure is now passed as the second argument of spdk_mem_map_alloc

in lieu of the notify callback.



### iscsi



Parameter names of `set_iscsi_options` and `get_iscsi_global_params` RPC

include/spdk/env.h

+2 −2
Original line number Diff line number Diff line
@@ -990,13 +990,13 @@ struct spdk_mem_map_ops { 
 * Allocate a virtual memory address translation map.

 *

 * \param default_translation Default translation for the map.

 * \param notify_cb Callback function to notify the mapping.

 * \param ops Table of callback functions for map operations.

 * \param cb_ctx Argument passed to the callback function.

 *

 * \return a pointer to the allocated virtual memory address translation map.

 */

struct spdk_mem_map *spdk_mem_map_alloc(uint64_t default_translation,

					spdk_mem_map_notify_cb notify_cb, void *cb_ctx);

					const struct spdk_mem_map_ops *ops, void *cb_ctx);



/**

 * Free a memory map previously allocated by spdk_mem_map_alloc().

lib/env_dpdk/memory.c

+5 −3
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ spdk_mem_map_notify_walk(struct spdk_mem_map *map, enum spdk_mem_map_notify_acti 
}



struct spdk_mem_map *

spdk_mem_map_alloc(uint64_t default_translation, spdk_mem_map_notify_cb notify_cb, void *cb_ctx)

spdk_mem_map_alloc(uint64_t default_translation, const struct spdk_mem_map_ops *ops, void *cb_ctx)

{

	struct spdk_mem_map *map;
@@ -166,12 +166,14 @@ spdk_mem_map_alloc(uint64_t default_translation, spdk_mem_map_notify_cb notify_c 
	}



	map->default_translation = default_translation;

	map->ops.notify_cb = notify_cb;

	map->cb_ctx = cb_ctx;

	if (ops) {

		map->ops = *ops;

	}



	pthread_mutex_lock(&g_spdk_mem_map_mutex);



	if (notify_cb) {

	if (ops && ops->notify_cb) {

		spdk_mem_map_notify_walk(map, SPDK_MEM_MAP_NOTIFY_REGISTER);

		TAILQ_INSERT_TAIL(&g_spdk_mem_maps, map, tailq);

	}

lib/env_dpdk/vtophys.c

+5 −1
Original line number Diff line number Diff line
@@ -604,11 +604,15 @@ spdk_vtophys_pci_device_removed(struct rte_pci_device *pci_device) 
int

spdk_vtophys_init(void)

{

	const struct spdk_mem_map_ops vtophys_map_ops = {

		.notify_cb = spdk_vtophys_notify

	};



#if SPDK_VFIO_ENABLED

	spdk_vtophys_iommu_init();

#endif



	g_vtophys_map = spdk_mem_map_alloc(SPDK_VTOPHYS_ERROR, spdk_vtophys_notify, NULL);

	g_vtophys_map = spdk_mem_map_alloc(SPDK_VTOPHYS_ERROR, &vtophys_map_ops, NULL);

	if (g_vtophys_map == NULL) {

		DEBUG_PRINT("vtophys map allocation failed\n");

		return -1;

lib/nvme/nvme_rdma.c

+4 −2
Original line number Diff line number Diff line
@@ -631,12 +631,14 @@ nvme_rdma_mr_map_notify(void *cb_ctx, struct spdk_mem_map *map, 
	return rc;

}





static int

nvme_rdma_register_mem(struct nvme_rdma_qpair *rqpair)

{

	struct ibv_pd *pd = rqpair->cm_id->qp->pd;

	struct spdk_nvme_rdma_mr_map *mr_map;

	const struct spdk_mem_map_ops nvme_rdma_map_ops = {

		.notify_cb = nvme_rdma_mr_map_notify

	};



	pthread_mutex_lock(&g_rdma_mr_maps_mutex);
@@ -659,7 +661,7 @@ nvme_rdma_register_mem(struct nvme_rdma_qpair *rqpair) 


	mr_map->ref = 1;

	mr_map->pd = pd;

	mr_map->map = spdk_mem_map_alloc((uint64_t)NULL, nvme_rdma_mr_map_notify, pd);

	mr_map->map = spdk_mem_map_alloc((uint64_t)NULL, &nvme_rdma_map_ops, pd);

	if (mr_map->map == NULL) {

		SPDK_ERRLOG("spdk_mem_map_alloc() failed\n");

		free(mr_map);