Commit b163a887 authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

nvmf/vfio-user: calculate MDTS based on transport iovcnt 



This will ensure that we can't exceed the iovcnt when parse
NVMe PRP list to req->iov.

Also comment that the iovcnt in vfio-user transport is used to track
each gpa_to_vva map, for NVMe PRP list command, the PRP2 itself also
will use one entry, so we need add one more entry for this case.

Fix issue #1864.

Change-Id: I06c7137e2c4637c9501f82a9eb1c8e4395d819cd
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7264


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatar <dongx.yi@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent bc279db4

lib/nvmf/vfio_user.c

+5 −4
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ 
#define NVMF_VFIO_USER_DEFAULT_AQ_DEPTH 32

#define NVMF_VFIO_USER_DEFAULT_MAX_QPAIRS_PER_CTRLR 64

#define NVMF_VFIO_USER_DEFAULT_IN_CAPSULE_DATA_SIZE 0

#define NVMF_VFIO_USER_DEFAULT_MAX_IO_SIZE 131072

#define NVMF_VFIO_USER_DEFAULT_IO_UNIT_SIZE 131072

#define NVMF_VFIO_USER_DEFAULT_MAX_IO_SIZE ((NVMF_REQ_MAX_BUFFERS - 1) << SHIFT_4KB)

#define NVMF_VFIO_USER_DEFAULT_IO_UNIT_SIZE NVMF_VFIO_USER_DEFAULT_MAX_IO_SIZE

#define NVMF_VFIO_USER_DEFAULT_NUM_SHARED_BUFFERS 512 /* internal buf size */

#define NVMF_VFIO_USER_DEFAULT_BUFFER_CACHE_SIZE 0
@@ -73,8 +73,8 @@ struct nvmf_vfio_user_qpair; 


typedef int (*nvmf_vfio_user_req_cb_fn)(struct nvmf_vfio_user_req *req, void *cb_arg);



#define NVMF_VFIO_USER_MDTS	32

#define NVMF_VFIO_USER_MAX_IOVECS	(NVMF_VFIO_USER_MDTS + 1)

/* 1 more for PRP2 list itself */

#define NVMF_VFIO_USER_MAX_IOVECS	(NVMF_REQ_MAX_BUFFERS + 1)



struct nvmf_vfio_user_req  {

	struct spdk_nvmf_request		req;
@@ -85,6 +85,7 @@ struct nvmf_vfio_user_req { 
	nvmf_vfio_user_req_cb_fn		cb_fn;

	void					*cb_arg;



	/* placeholder for gpa_to_vva memory map table, the IO buffer doesn't use it */

	dma_sg_t				sg[NVMF_VFIO_USER_MAX_IOVECS];

	struct iovec				iov[NVMF_VFIO_USER_MAX_IOVECS];

	uint8_t					iovcnt;