Commit 11839b80 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Changpeng Liu
Browse files

bdev/null: Check if the number of blocks of read I/O is not larger than allowed. 



Add a check if the number of blocks of read I/O is not larger
than allowed. This is a preparation to the subsequent patches that
support DIF in NULL bdev.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarwuzhouhui <wuzhouhui@kingsoft.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 6716729c

lib/bdev/null/bdev_null.c

+12 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "spdk/thread.h"

#include "spdk/json.h"

#include "spdk/string.h"

#include "spdk/likely.h"



#include "spdk/bdev_module.h"

#include "spdk_internal/log.h"
@@ -93,8 +94,17 @@ bdev_null_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_ 
	case SPDK_BDEV_IO_TYPE_READ:

		if (bdev_io->u.bdev.iovs[0].iov_base == NULL) {

			assert(bdev_io->u.bdev.iovcnt == 1);

			if (spdk_likely(bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen <=

					SPDK_BDEV_LARGE_BUF_MAX_SIZE)) {

				bdev_io->u.bdev.iovs[0].iov_base = g_null_read_buf;

				bdev_io->u.bdev.iovs[0].iov_len = bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen;

			} else {

				SPDK_ERRLOG("Overflow occurred. Read I/O size %" PRIu64 " was larger than permitted %d\n",

					    bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen,

					    SPDK_BDEV_LARGE_BUF_MAX_SIZE);

				spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);

				return;

			}

		}

		TAILQ_INSERT_TAIL(&ch->io, bdev_io, module_link);

		break;