Commit 73204fe2 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Ben Walker
Browse files

dif: Add data offset to DIF context separately from start block address 



Data offset are intended to correspond to DATAO in NVMe/TCP and
Buffer Offset in iSCSI.

Previously for iSCSI, buffer offset had been merged to start block
address, but passing buffer offset separately from start block address
clarifies the logic more.

On the other hand, for NVMe/TCP, passing DATAO separately from start
block address will be critically important because DATAO will bave any
alignment and will be necessary to use for not only reference tag
but also guard computation.

This patch adds data_offset to struct spdk_dif_ctx and adds it to the
parameters of spdk_dif_ctx_init(). ref_tag_offset is also added to struct
spdk_dif_ctx and it is computed by dividing data_offset by data_block_size
and is used to compute reference tag.

The next patch will use this change when getting DIF context in SCSI.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Id0e12ca9b1dc75d0589787520feb0c2ee0f844a5
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457540


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent d9ec66df

examples/nvme/fio_plugin/fio_plugin.c

+2 −2
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ fio_extended_lba_setup_pi(struct spdk_fio_qpair *fio_qpair, struct io_u *io_u) 
	rc = spdk_dif_ctx_init(&fio_req->dif_ctx, extended_lba_size, md_size,

			       true, fio_qpair->md_start,

			       (enum spdk_dif_type)spdk_nvme_ns_get_pi_type(ns),

			       fio_qpair->io_flags, lba, g_spdk_apptag_mask, g_spdk_apptag, 0);

			       fio_qpair->io_flags, lba, g_spdk_apptag_mask, g_spdk_apptag, 0, 0);

	if (rc != 0) {

		fprintf(stderr, "Initialization of DIF context failed\n");

		return rc;
@@ -609,7 +609,7 @@ fio_separate_md_setup_pi(struct spdk_fio_qpair *fio_qpair, struct io_u *io_u) 
	rc = spdk_dif_ctx_init(&fio_req->dif_ctx, block_size, md_size,

			       false, fio_qpair->md_start,

			       (enum spdk_dif_type)spdk_nvme_ns_get_pi_type(ns),

			       fio_qpair->io_flags, lba, g_spdk_apptag_mask, g_spdk_apptag, 0);

			       fio_qpair->io_flags, lba, g_spdk_apptag_mask, g_spdk_apptag, 0, 0);

	if (rc != 0) {

		fprintf(stderr, "Initialization of DIF context failed\n");

		return rc;

examples/nvme/perf/perf.c

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ nvme_submit_io(struct perf_task *task, struct ns_worker_ctx *ns_ctx, 
		rc = spdk_dif_ctx_init(&task->dif_ctx, entry->block_size, entry->md_size,

				       entry->md_interleave, entry->pi_loc,

				       (enum spdk_dif_type)entry->pi_type, entry->io_flags,

				       lba, 0xFFFF, (uint16_t)entry->io_size_blocks, 0);

				       lba, 0xFFFF, (uint16_t)entry->io_size_blocks, 0, 0);

		if (rc != 0) {

			fprintf(stderr, "Initialization of DIF context failed\n");

			exit(1);

include/spdk/dif.h

+8 −1
Original line number Diff line number Diff line
@@ -92,6 +92,12 @@ struct spdk_dif_ctx { 
	/* Application tag mask */

	uint16_t		apptag_mask;



	/* Byte offset from the start of the whole data buffer. */

	uint32_t		data_offset;



	/* Offset to initial reference tag */

	uint32_t		ref_tag_offset;



	/* Seed value for guard computation */

	uint16_t		guard_seed;

};
@@ -127,6 +133,7 @@ struct spdk_dif_error { 
 * starting block address.

 * \param apptag_mask Application tag mask.

 * \param app_tag Application tag.

 * \param data_offset Byte offset from the start of the whole data buffer.

 * \param guard_seed Seed value for guard computation.

 *

 * \return 0 on success and negated errno otherwise.
@@ -134,7 +141,7 @@ struct spdk_dif_error { 
int spdk_dif_ctx_init(struct spdk_dif_ctx *ctx, uint32_t block_size, uint32_t md_size,

		      bool md_interleave, bool dif_loc, enum spdk_dif_type dif_type, uint32_t dif_flags,

		      uint32_t init_ref_tag, uint16_t apptag_mask, uint16_t app_tag,

		      uint16_t guard_seed);

		      uint32_t data_offset, uint16_t guard_seed);



/**

 * Generate DIF for extended LBA payload.

include/spdk/scsi.h

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ void spdk_scsi_lun_free_io_channel(struct spdk_scsi_lun_desc *desc); 
 *

 * \param lun Logical unit.

 * \param cdb SCSI CDB.

 * \param offset Offset in the payload.

 * \param offset Byte offset in the payload.

 * \param dif_ctx Output parameter which will contain initialized DIF context.

 *

 * \return true on success or false otherwise.

lib/bdev/nvme/bdev_nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -1631,7 +1631,7 @@ bdev_nvme_verify_pi_error(struct spdk_bdev_io *bdev_io) 
	rc = spdk_dif_ctx_init(&dif_ctx,

			       bdev->blocklen, bdev->md_len, bdev->md_interleave,

			       bdev->dif_is_head_of_md, bdev->dif_type, bdev->dif_check_flags,

			       bdev_io->u.bdev.offset_blocks, 0, 0, 0);

			       bdev_io->u.bdev.offset_blocks, 0, 0, 0, 0);

	if (rc != 0) {

		SPDK_ERRLOG("Initialization of DIF context failed\n");

		return;