Commit 7a374fbc authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Jim Harris
Browse files

nvmf: make zcopy_end void 



Since spdk_bdev_zcopy_end() cannot really fail (it only fails if we pass
a bad bdev_io), we can simplify the nvmf zcopy_end functions by making
them void and always expect asynchronous completion.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I6e88ac28aba13acadea88489ac0dd20d1f52f999
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10790


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAnil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 92d7df1f

include/spdk/nvmf_transport.h

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ void spdk_nvmf_request_exec_fabrics(struct spdk_nvmf_request *req); 
int spdk_nvmf_request_free(struct spdk_nvmf_request *req);

int spdk_nvmf_request_complete(struct spdk_nvmf_request *req);

void spdk_nvmf_request_zcopy_start(struct spdk_nvmf_request *req);

int spdk_nvmf_request_zcopy_end(struct spdk_nvmf_request *req, bool commit);

void spdk_nvmf_request_zcopy_end(struct spdk_nvmf_request *req, bool commit);



static inline bool

spdk_nvmf_request_using_zcopy(const struct spdk_nvmf_request *req)

lib/nvmf/ctrlr.c

+4 −2
Original line number Diff line number Diff line
@@ -3731,11 +3731,13 @@ spdk_nvmf_request_zcopy_start(struct spdk_nvmf_request *req) 
	spdk_nvmf_request_exec(req);

}



int

void

spdk_nvmf_request_zcopy_end(struct spdk_nvmf_request *req, bool commit)

{

	assert(req->zcopy_phase == NVMF_ZCOPY_PHASE_EXECUTE);

	req->zcopy_phase = NVMF_ZCOPY_PHASE_END_PENDING;

	return nvmf_bdev_ctrlr_zcopy_end(req, commit);



	nvmf_bdev_ctrlr_zcopy_end(req, commit);

}



int

lib/nvmf/ctrlr_bdev.c

+1 −3
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ nvmf_bdev_ctrlr_zcopy_end_complete(struct spdk_bdev_io *bdev_io, bool success, 
	spdk_nvmf_request_complete(req);

}



int

void

nvmf_bdev_ctrlr_zcopy_end(struct spdk_nvmf_request *req, bool commit)

{

	int rc __attribute__((unused));
@@ -918,6 +918,4 @@ nvmf_bdev_ctrlr_zcopy_end(struct spdk_nvmf_request *req, bool commit) 


	/* The only way spdk_bdev_zcopy_end() can fail is if we pass a bdev_io type that isn't ZCOPY */

	assert(rc == 0);



	return SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS;

}

lib/nvmf/nvmf_internal.h

+1 −6
Original line number Diff line number Diff line
@@ -498,12 +498,7 @@ int nvmf_bdev_ctrlr_zcopy_start(struct spdk_bdev *bdev, 
 *

 * \param req The NVMe-oF request

 * \param commit Flag indicating whether the buffers should be committed

 *

 * \return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE if the command was completed immediately or

 *         SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS if the command was submitted and will be

 *         completed asynchronously.  Asynchronous completions are notified through

 *         spdk_nvmf_request_complete().

 */

int nvmf_bdev_ctrlr_zcopy_end(struct spdk_nvmf_request *req, bool commit);

void nvmf_bdev_ctrlr_zcopy_end(struct spdk_nvmf_request *req, bool commit);



#endif /* __NVMF_INTERNAL_H__ */

test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c

+1 −2
Original line number Diff line number Diff line
@@ -294,12 +294,11 @@ nvmf_bdev_ctrlr_zcopy_start(struct spdk_bdev *bdev, 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



int

void

nvmf_bdev_ctrlr_zcopy_end(struct spdk_nvmf_request *req, bool commit)

{

	req->zcopy_bdev_io = NULL;

	spdk_nvmf_request_complete(req);

	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static void