Commit 96f29261 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

dif: Rename bitmask macros from SPDK_DIF_*_CHECK to SPDK_DIF_FLAGS_*_CHECK 



Next patch will introduce enum spdk_dif_check_type for user to
know easily if checking DIF field is enabled or not.

This patch renames bitmask macros from SPDK_DIF_*_CHECK to
SPDK_DIF_FLAGS_*_CHECK to avoid mis-interpretation .

Using FLAGS was derived from SPDK_NVME_IO_FLAGS_PRCHK_* in
include/spdk/nvme_spec.h.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 139da44c

include/spdk/dif.h

+3 −3
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ 
#include "spdk/stdinc.h"

#include "spdk/assert.h"



#define SPDK_DIF_REFTAG_CHECK	(1U << 26)

#define SPDK_DIF_APPTAG_CHECK	(1U << 27)

#define SPDK_DIF_GUARD_CHECK	(1U << 28)

#define SPDK_DIF_FLAGS_REFTAG_CHECK	(1U << 26)

#define SPDK_DIF_FLAGS_APPTAG_CHECK	(1U << 27)

#define SPDK_DIF_FLAGS_GUARD_CHECK	(1U << 28)



#define SPDK_DIF_REFTAG_ERROR	0x1

#define SPDK_DIF_APPTAG_ERROR	0x2

lib/util/dif.c

+23 −23
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ _dif_type_is_valid(enum spdk_dif_type dif_type, uint32_t dif_flags) 
	case SPDK_DIF_DISABLE:

		break;

	case SPDK_DIF_TYPE3:

		if (dif_flags & SPDK_DIF_REFTAG_CHECK) {

		if (dif_flags & SPDK_DIF_FLAGS_REFTAG_CHECK) {

			SPDK_ERRLOG("Reference Tag should not be checked for Type 3\n");

			return false;

		}
@@ -227,15 +227,15 @@ _dif_generate(void *_dif, uint16_t guard, uint32_t offset_blocks, 
	struct spdk_dif *dif = _dif;

	uint32_t ref_tag;



	if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

	if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

		to_be16(&dif->guard, guard);

	}



	if (ctx->dif_flags & SPDK_DIF_APPTAG_CHECK) {

	if (ctx->dif_flags & SPDK_DIF_FLAGS_APPTAG_CHECK) {

		to_be16(&dif->app_tag, ctx->app_tag);

	}



	if (ctx->dif_flags & SPDK_DIF_REFTAG_CHECK) {

	if (ctx->dif_flags & SPDK_DIF_FLAGS_REFTAG_CHECK) {

		/* For type 1 and 2, the reference tag is incremented for each

		 * subsequent logical block. For type 3, the reference tag

		 * remains the same as the initial reference tag.
@@ -265,7 +265,7 @@ dif_generate(struct iovec *iovs, int iovcnt, uint32_t num_blocks, 
	while (offset_blocks < num_blocks) {

		_iov_iter_get_buf(&iter, &buf, NULL);



		if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

		if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

			guard = spdk_crc16_t10dif(0, buf, ctx->guard_interval);

		}
@@ -294,7 +294,7 @@ _dif_generate_split(struct _iov_iter *iter, uint32_t offset_blocks, 
		if (offset_in_block < ctx->guard_interval) {

			buf_len = spdk_min(buf_len, ctx->guard_interval - offset_in_block);



			if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

			if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

				/* Compute CRC over split logical block data. */

				guard = spdk_crc16_t10dif(guard, buf, buf_len);

			}
@@ -412,7 +412,7 @@ _dif_verify(void *_dif, uint16_t guard, uint32_t offset_blocks, 
		ref_tag = ctx->init_ref_tag;

	}



	if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

	if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

		/* Compare the DIF Guard field to the CRC computed over the logical

		 * block data.

		 */
@@ -427,7 +427,7 @@ _dif_verify(void *_dif, uint16_t guard, uint32_t offset_blocks, 
		}

	}



	if (ctx->dif_flags & SPDK_DIF_APPTAG_CHECK) {

	if (ctx->dif_flags & SPDK_DIF_FLAGS_APPTAG_CHECK) {

		/* Compare unmasked bits in the DIF Application Tag field to the

		 * passed Application Tag.

		 */
@@ -442,7 +442,7 @@ _dif_verify(void *_dif, uint16_t guard, uint32_t offset_blocks, 
		}

	}



	if (ctx->dif_flags & SPDK_DIF_REFTAG_CHECK) {

	if (ctx->dif_flags & SPDK_DIF_FLAGS_REFTAG_CHECK) {

		switch (ctx->dif_type) {

		case SPDK_DIF_TYPE1:

		case SPDK_DIF_TYPE2:
@@ -490,7 +490,7 @@ dif_verify(struct iovec *iovs, int iovcnt, uint32_t num_blocks, 
	while (offset_blocks < num_blocks) {

		_iov_iter_get_buf(&iter, &buf, NULL);



		if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

		if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

			guard = spdk_crc16_t10dif(0, buf, ctx->guard_interval);

		}
@@ -524,7 +524,7 @@ _dif_verify_split(struct _iov_iter *iter, uint32_t offset_blocks, 
		if (offset_in_block < ctx->guard_interval) {

			buf_len = spdk_min(buf_len, ctx->guard_interval - offset_in_block);



			if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

			if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

				/* Compute CRC over split logical block data. */

				guard = spdk_crc16_t10dif(guard, buf, buf_len);

			}
@@ -609,7 +609,7 @@ dif_generate_copy(struct iovec *iovs, int iovcnt, struct iovec *bounce_iov, 
		_iov_iter_get_buf(&dst_iter, &dst, NULL);



		guard = 0;

		if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

		if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

			guard = spdk_crc16_t10dif_copy(0, dst, src, data_block_size);

			guard = spdk_crc16_t10dif(guard, dst + data_block_size,

						  ctx->guard_interval - data_block_size);
@@ -647,7 +647,7 @@ _dif_generate_copy_split(struct _iov_iter *src_iter, struct _iov_iter *dst_iter, 
		_iov_iter_get_buf(src_iter, &src, &src_len);

		src_len = spdk_min(src_len, data_block_size - offset_in_block);



		if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

		if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

			guard = spdk_crc16_t10dif_copy(guard, dst + offset_in_block,

						       src, src_len);

		} else {
@@ -658,7 +658,7 @@ _dif_generate_copy_split(struct _iov_iter *src_iter, struct _iov_iter *dst_iter, 
		offset_in_block += src_len;

	}



	if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

	if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

		guard = spdk_crc16_t10dif(guard, dst + data_block_size,

					  ctx->guard_interval - data_block_size);

	}
@@ -735,7 +735,7 @@ dif_verify_copy(struct iovec *iovs, int iovcnt, struct iovec *bounce_iov, 
		_iov_iter_get_buf(&dst_iter, &dst, NULL);



		guard = 0;

		if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

		if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

			guard = spdk_crc16_t10dif_copy(0, dst, src, data_block_size);

			guard = spdk_crc16_t10dif(guard, src + data_block_size,

						  ctx->guard_interval - data_block_size);
@@ -779,7 +779,7 @@ _dif_verify_copy_split(struct _iov_iter *src_iter, struct _iov_iter *dst_iter, 
		_iov_iter_get_buf(dst_iter, &dst, &dst_len);

		dst_len = spdk_min(dst_len, data_block_size - offset_in_block);



		if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

		if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

			guard = spdk_crc16_t10dif_copy(guard, dst,

						       src + offset_in_block, dst_len);

		} else {
@@ -790,7 +790,7 @@ _dif_verify_copy_split(struct _iov_iter *src_iter, struct _iov_iter *dst_iter, 
		offset_in_block += dst_len;

	}



	if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

	if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

		guard = spdk_crc16_t10dif(guard, src + data_block_size,

					  ctx->guard_interval - data_block_size);

	}
@@ -1014,7 +1014,7 @@ dix_generate(struct iovec *iovs, int iovcnt, struct iovec *md_iov, 
		_iov_iter_get_buf(&md_iter, &md_buf, NULL);



		guard = 0;

		if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

		if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

			guard = spdk_crc16_t10dif(0, data_buf, ctx->block_size);

			guard = spdk_crc16_t10dif(guard, md_buf, ctx->guard_interval);

		}
@@ -1044,7 +1044,7 @@ _dix_generate_split(struct _iov_iter *data_iter, struct _iov_iter *md_iter, 
		_iov_iter_get_buf(data_iter, &data_buf, &data_buf_len);

		data_buf_len = spdk_min(data_buf_len, ctx->block_size - offset_in_block);



		if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

		if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

			guard = spdk_crc16_t10dif(guard, data_buf, data_buf_len);

		}
@@ -1052,7 +1052,7 @@ _dix_generate_split(struct _iov_iter *data_iter, struct _iov_iter *md_iter, 
		offset_in_block += data_buf_len;

	}



	if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

	if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

		guard = spdk_crc16_t10dif(guard, md_buf, ctx->guard_interval);

	}
@@ -1122,7 +1122,7 @@ dix_verify(struct iovec *iovs, int iovcnt, struct iovec *md_iov, 
		_iov_iter_get_buf(&md_iter, &md_buf, NULL);



		guard = 0;

		if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

		if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

			guard = spdk_crc16_t10dif(0, data_buf, ctx->block_size);

			guard = spdk_crc16_t10dif(guard, md_buf, ctx->guard_interval);

		}
@@ -1158,7 +1158,7 @@ _dix_verify_split(struct _iov_iter *data_iter, struct _iov_iter *md_iter, 
		_iov_iter_get_buf(data_iter, &data_buf, &data_buf_len);

		data_buf_len = spdk_min(data_buf_len, ctx->block_size - offset_in_block);



		if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

		if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

			guard = spdk_crc16_t10dif(guard, data_buf, data_buf_len);

		}
@@ -1166,7 +1166,7 @@ _dix_verify_split(struct _iov_iter *data_iter, struct _iov_iter *md_iter, 
		offset_in_block += data_buf_len;

	}



	if (ctx->dif_flags & SPDK_DIF_GUARD_CHECK) {

	if (ctx->dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

		guard = spdk_crc16_t10dif(guard, md_buf, ctx->guard_interval);

	}

test/unit/lib/util/dif.c/dif_ut.c

+48 −29
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ _dif_generate_and_verify(struct iovec *iov, 
	ctx.init_ref_tag = ref_tag;

	ctx.app_tag = app_tag;



	if (dif_flags & SPDK_DIF_GUARD_CHECK) {

	if (dif_flags & SPDK_DIF_FLAGS_GUARD_CHECK) {

		guard = spdk_crc16_t10dif(0, iov->iov_base, guard_interval);

	}
@@ -175,7 +175,8 @@ dif_generate_and_verify_test(void) 
	struct iovec iov;

	uint32_t dif_flags;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	_iov_alloc_buf(&iov, 4096 + 128);
@@ -224,7 +225,8 @@ dif_disable_check_test(void) 
	struct iovec iov;

	uint32_t dif_flags;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	_iov_alloc_buf(&iov, 4096 + 128);
@@ -341,13 +343,13 @@ dif_sec_512_md_8_prchk_0_1_2_4_multi_iovs_test(void) 
				0, 22, 0xFFFF, 0x22);



	dif_generate_and_verify(iovs, 4, 512 + 8, 8, num_blocks, false, SPDK_DIF_TYPE1,

				SPDK_DIF_GUARD_CHECK, 22, 0xFFFF, 0x22);

				SPDK_DIF_FLAGS_GUARD_CHECK, 22, 0xFFFF, 0x22);



	dif_generate_and_verify(iovs, 4, 512 + 8, 8, num_blocks, false, SPDK_DIF_TYPE1,

				SPDK_DIF_APPTAG_CHECK, 22, 0xFFFF, 0x22);

				SPDK_DIF_FLAGS_APPTAG_CHECK, 22, 0xFFFF, 0x22);



	dif_generate_and_verify(iovs, 4, 512 + 8, 8, num_blocks, false, SPDK_DIF_TYPE1,

				SPDK_DIF_REFTAG_CHECK, 22, 0xFFFF, 0x22);

				SPDK_DIF_FLAGS_REFTAG_CHECK, 22, 0xFFFF, 0x22);



	for (i = 0; i < 4; i++) {

		_iov_free_buf(&iovs[i]);
@@ -361,7 +363,8 @@ dif_sec_4096_md_128_prchk_7_multi_iovs_test(void) 
	int i, num_blocks;

	uint32_t dif_flags;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	num_blocks = 0;
@@ -387,7 +390,8 @@ dif_sec_512_md_8_prchk_7_multi_iovs_split_data_and_md_test(void) 
	struct iovec iovs[2];

	uint32_t dif_flags;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	_iov_alloc_buf(&iovs[0], 512);

	_iov_alloc_buf(&iovs[1], 8);
@@ -405,7 +409,8 @@ dif_sec_512_md_8_prchk_7_multi_iovs_split_data_test(void) 
	struct iovec iovs[2];

	uint32_t dif_flags;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	_iov_alloc_buf(&iovs[0], 256);

	_iov_alloc_buf(&iovs[1], 264);
@@ -423,7 +428,8 @@ dif_sec_512_md_8_prchk_7_multi_iovs_split_guard_test(void) 
	struct iovec iovs[2];

	uint32_t dif_flags;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	_iov_alloc_buf(&iovs[0], 513);

	_iov_alloc_buf(&iovs[1], 7);
@@ -441,7 +447,8 @@ dif_sec_512_md_8_prchk_7_multi_iovs_split_apptag_test(void) 
	struct iovec iovs[2];

	uint32_t dif_flags;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	_iov_alloc_buf(&iovs[0], 515);

	_iov_alloc_buf(&iovs[1], 5);
@@ -459,7 +466,8 @@ dif_sec_512_md_8_prchk_7_multi_iovs_split_reftag_test(void) 
	struct iovec iovs[2];

	uint32_t dif_flags;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	_iov_alloc_buf(&iovs[0], 518);

	_iov_alloc_buf(&iovs[1], 2);
@@ -478,7 +486,8 @@ dif_sec_512_md_8_prchk_7_multi_iovs_complex_splits_test(void) 
	uint32_t dif_flags;

	int i;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	/* data[0][255:0] */

	_iov_alloc_buf(&iovs[0], 256);
@@ -522,7 +531,8 @@ dif_sec_4096_md_128_prchk_7_multi_iovs_complex_splits_test(void) 
	uint32_t dif_flags;

	int i;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	/* data[0][1000:0] */

	_iov_alloc_buf(&iovs[0], 1000);
@@ -577,7 +587,8 @@ _dif_inject_error_and_verify(struct iovec *iovs, int iovcnt, 
	uint32_t inject_offset = 0, dif_flags;

	int rc;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	rc = ut_data_pattern_generate(iovs, iovcnt, block_size, md_size, num_blocks);

	CU_ASSERT(rc == 0);
@@ -790,13 +801,13 @@ dif_copy_sec_512_md_8_prchk_0_1_2_4_multi_iovs(void) 
				false, SPDK_DIF_TYPE1, 0, 22, 0xFFFF, 0x22);



	dif_copy_gen_and_verify(iovs, 4, &bounce_iov, 512 + 8, 8, num_blocks,

				false, SPDK_DIF_TYPE1, SPDK_DIF_GUARD_CHECK, 22, 0xFFFF, 0x22);

				false, SPDK_DIF_TYPE1, SPDK_DIF_FLAGS_GUARD_CHECK, 22, 0xFFFF, 0x22);



	dif_copy_gen_and_verify(iovs, 4, &bounce_iov, 512 + 8, 8, num_blocks,

				false, SPDK_DIF_TYPE1, SPDK_DIF_APPTAG_CHECK, 22, 0xFFFF, 0x22);

				false, SPDK_DIF_TYPE1, SPDK_DIF_FLAGS_APPTAG_CHECK, 22, 0xFFFF, 0x22);



	dif_copy_gen_and_verify(iovs, 4, &bounce_iov, 512 + 8, 8, num_blocks,

				false, SPDK_DIF_TYPE1, SPDK_DIF_REFTAG_CHECK, 22, 0xFFFF, 0x22);

				false, SPDK_DIF_TYPE1, SPDK_DIF_FLAGS_REFTAG_CHECK, 22, 0xFFFF, 0x22);



	for (i = 0; i < 4; i++) {

		_iov_free_buf(&iovs[i]);
@@ -811,7 +822,8 @@ dif_copy_sec_4096_md_128_prchk_7_multi_iovs(void) 
	uint32_t dif_flags;

	int i, num_blocks;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	num_blocks = 0;
@@ -839,7 +851,8 @@ dif_copy_sec_512_md_8_prchk_7_multi_iovs_split_data(void) 
	struct iovec iovs[2], bounce_iov;

	uint32_t dif_flags;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	_iov_alloc_buf(&iovs[0], 256);

	_iov_alloc_buf(&iovs[1], 256);
@@ -861,7 +874,8 @@ dif_copy_sec_512_md_8_prchk_7_multi_iovs_complex_splits(void) 
	uint32_t dif_flags;

	int i;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	/* data[0][255:0] */

	_iov_alloc_buf(&iovs[0], 256);
@@ -902,7 +916,8 @@ _dif_copy_inject_error_and_verify(struct iovec *iovs, int iovcnt, struct iovec * 
	uint32_t inject_offset = 0, dif_flags;

	int rc;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	rc = ut_data_pattern_generate(iovs, iovcnt, block_size - md_size, 0, num_blocks);

	CU_ASSERT(rc == 0);
@@ -1076,13 +1091,13 @@ dix_sec_512_md_8_prchk_0_1_2_4_multi_iovs(void) 
				0, 22, 0xFFFF, 0x22);



	dix_generate_and_verify(iovs, 4, &md_iov, 512, 8, num_blocks, false, SPDK_DIF_TYPE1,

				SPDK_DIF_GUARD_CHECK, 22, 0xFFFF, 0x22);

				SPDK_DIF_FLAGS_GUARD_CHECK, 22, 0xFFFF, 0x22);



	dix_generate_and_verify(iovs, 4, &md_iov, 512, 8, num_blocks, false, SPDK_DIF_TYPE1,

				SPDK_DIF_APPTAG_CHECK, 22, 0xFFFF, 0x22);

				SPDK_DIF_FLAGS_APPTAG_CHECK, 22, 0xFFFF, 0x22);



	dix_generate_and_verify(iovs, 4, &md_iov, 512, 8, num_blocks, false, SPDK_DIF_TYPE1,

				SPDK_DIF_REFTAG_CHECK, 22, 0xFFFF, 0x22);

				SPDK_DIF_FLAGS_REFTAG_CHECK, 22, 0xFFFF, 0x22);



	for (i = 0; i < 4; i++) {

		_iov_free_buf(&iovs[i]);
@@ -1097,7 +1112,8 @@ dix_sec_4096_md_128_prchk_7_multi_iovs(void) 
	uint32_t dif_flags;

	int i, num_blocks;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	num_blocks = 0;
@@ -1124,7 +1140,8 @@ dix_sec_512_md_8_prchk_7_multi_iovs_split_data(void) 
	struct iovec iovs[2], md_iov;

	uint32_t dif_flags;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	_iov_alloc_buf(&iovs[0], 256);

	_iov_alloc_buf(&iovs[1], 256);
@@ -1145,7 +1162,8 @@ dix_sec_512_md_8_prchk_7_multi_iovs_complex_splits(void) 
	uint32_t dif_flags;

	int i;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	/* data[0][255:0] */

	_iov_alloc_buf(&iovs[0], 256);
@@ -1186,7 +1204,8 @@ _dix_inject_error_and_verify(struct iovec *iovs, int iovcnt, struct iovec *md_io 
	uint32_t inject_offset = 0, dif_flags;

	int rc;



	dif_flags = SPDK_DIF_GUARD_CHECK | SPDK_DIF_APPTAG_CHECK | SPDK_DIF_REFTAG_CHECK;

	dif_flags = SPDK_DIF_FLAGS_GUARD_CHECK | SPDK_DIF_FLAGS_APPTAG_CHECK |

		    SPDK_DIF_FLAGS_REFTAG_CHECK;



	rc = ut_data_pattern_generate(iovs, iovcnt, block_size, 0, num_blocks);

	CU_ASSERT(rc == 0);