Commit 12b5439b authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

Revert "bdevperf: Set dif_check_flags_exclude_mask by negating job->dif_check_flags" 



This reverts commit 058f4cfe.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23233

 (master)

(cherry picked from commit dace7d3a)
Change-Id: I2e1790a11a731e48d0fdc6ce44d6abe8683d4929
Signed-off-by: default avatarMarek Chomnicki <marek.chomnicki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23352


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent a4384085

examples/bdev/bdevperf/bdevperf.c

+4 −6
Original line number Diff line number Diff line
@@ -963,13 +963,11 @@ bdevperf_complete(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) 
}



static inline void

bdevperf_init_ext_io_opts(struct spdk_bdev_ext_io_opts *opts, void *md_buf,

			  uint32_t dif_check_flags_exclude_mask)

bdevperf_init_ext_io_opts(struct spdk_bdev_ext_io_opts *opts, void *md_buf)

{

	memset(opts, 0, sizeof(*opts));

	opts->size = sizeof(*opts);

	opts->metadata = md_buf;

	opts->dif_check_flags_exclude_mask = dif_check_flags_exclude_mask;

}



static void
@@ -984,7 +982,7 @@ bdevperf_verify_submit_read(void *cb_arg) 


	task->iov.iov_base = task->verify_buf;

	task->iov.iov_len = job->buf_size;

	bdevperf_init_ext_io_opts(&opts, NULL, ~job->dif_check_flags);

	bdevperf_init_ext_io_opts(&opts, NULL);



	/* Read the data back in */

	rc = spdk_bdev_readv_blocks_ext(job->bdev_desc, job->ch, &task->iov, 1,
@@ -1092,7 +1090,7 @@ bdevperf_submit_task(void *arg) 
				spdk_bdev_zcopy_end(task->bdev_io, true, cb_fn, task);

				return;

			} else {

				bdevperf_init_ext_io_opts(&opts, task->md_buf, ~job->dif_check_flags);

				bdevperf_init_ext_io_opts(&opts, task->md_buf);

				rc = spdk_bdev_writev_blocks_ext(desc, ch, &task->iov, 1,

								 task->offset_blocks,

								 job->io_size_blocks,
@@ -1117,7 +1115,7 @@ bdevperf_submit_task(void *arg) 
			rc = spdk_bdev_zcopy_start(desc, ch, NULL, 0, task->offset_blocks, job->io_size_blocks,

						   true, bdevperf_zcopy_populate_complete, task);

		} else {

			bdevperf_init_ext_io_opts(&opts, task->md_buf, ~job->dif_check_flags);

			bdevperf_init_ext_io_opts(&opts, task->md_buf);

			rc = spdk_bdev_readv_blocks_ext(desc, ch, &task->iov, 1,

							task->offset_blocks,

							job->io_size_blocks,