Commit 5f1e4681 authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

bdev/crypto: clean up _complete_internal_read 



Also remove an unnecessary empty line and fix typos

Change-Id: I54e63e39dda23063c3fcbdd709cafec4278b130a
Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/451921


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent e72445c4

lib/bdev/crypto/vbdev_crypto.c

+7 −7
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ _crypto_operation(struct spdk_bdev_io *bdev_io, enum rte_crypto_cipher_operation 
	io_ctx->cryop_cnt_remaining = cryop_cnt;



	/* As we don't support chaining because of a decision to use LBA as IV, construction

	 * of crypto operaations is straightforward. We build both the op, the mbuf and the

	 * of crypto operations is straightforward. We build both the op, the mbuf and the

	 * dst_mbuf in our local arrays by looping through the length of the bdev IO and

	 * picking off LBA sized blocks of memory from the IOVs as we walk through them. Each

	 * LBA sized chunck of memory will correspond 1:1 to a crypto operation and a single
@@ -889,17 +889,18 @@ _complete_internal_read(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg 
		/* Save off this bdev_io so it can be freed after decryption. */

		orig_ctx->read_io = bdev_io;



		if (_crypto_operation(orig_io, RTE_CRYPTO_CIPHER_OP_DECRYPT)) {

		if (!_crypto_operation(orig_io, RTE_CRYPTO_CIPHER_OP_DECRYPT)) {

			return;

		} else {

			SPDK_ERRLOG("ERROR decrypting\n");

			spdk_bdev_io_complete(orig_io, SPDK_BDEV_IO_STATUS_FAILED);

			spdk_bdev_free_io(bdev_io);

		}

	} else {

		SPDK_ERRLOG("ERROR on read prior to decrypting\n");

	}



	spdk_bdev_io_complete(orig_io, SPDK_BDEV_IO_STATUS_FAILED);

	spdk_bdev_free_io(bdev_io);

}

}



/* Callback for getting a buf from the bdev pool in the event that the caller passed

 * in NULL, we need to own the buffer so it doesn't get freed by another vbdev module
@@ -1553,7 +1554,6 @@ vbdev_crypto_claim(struct spdk_bdev *bdev) 
			goto error_claim;

		}





		/* To init the session we have to get the cryptoDev device ID for this vbdev */

		TAILQ_FOREACH(device, &g_vbdev_devs, link) {

			if (strcmp(device->cdev_info.driver_name, vbdev->drv_name) == 0) {