Commit 704830b3 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

bdev/ocssd: zone reset command 



Added zone reset command.  It's very similar to a regular data set
management deallocate command with the only difference being that it
operates on zones instead of blocks.

Change-Id: Iae4d77c6877b6906231336b13fad1167de149f20
Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467920


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarWojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
parent b9395621

module/bdev/nvme/bdev_ocssd.c

+53 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include "spdk/stdinc.h"

#include "spdk/bdev_module.h"

#include "spdk/bdev_zone.h"

#include "spdk/likely.h"

#include "spdk/log.h"

#include "spdk/string.h"
@@ -53,6 +54,7 @@ struct bdev_ocssd_lba_offsets { 
struct bdev_ocssd_io {

	size_t		iov_pos;

	size_t		iov_off;

	uint64_t	lba[SPDK_NVME_OCSSD_MAX_LBAL_ENTRIES];

};



struct ocssd_bdev {
@@ -297,6 +299,50 @@ bdev_ocssd_io_get_buf_cb(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev 
	}

}



static void

bdev_ocssd_reset_zone_cb(void *ctx, const struct spdk_nvme_cpl *cpl)

{

	struct spdk_bdev_io *bdev_io = ctx;



	spdk_bdev_io_complete_nvme_status(bdev_io, 0, cpl->status.sct, cpl->status.sc);

}



static int

bdev_ocssd_reset_zone(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io,

		      uint64_t slba, size_t num_zones)

{

	struct ocssd_bdev *ocssd_bdev = bdev_io->bdev->ctxt;

	struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev;

	struct nvme_io_channel *nvme_ioch = spdk_io_channel_get_ctx(ioch);

	struct bdev_ocssd_io *ocdev_io = (struct bdev_ocssd_io *)bdev_io->driver_ctx;

	uint64_t offset, zone_size = nvme_bdev->disk.zone_size;



	if (num_zones > 1) {

		SPDK_ERRLOG("Exceeded maximum number of zones per single reset: 1\n");

		return -EINVAL;

	}



	for (offset = 0; offset < num_zones; ++offset) {

		ocdev_io->lba[offset] = bdev_ocssd_to_disk_lba(ocssd_bdev,

					slba + offset * zone_size);

	}



	return spdk_nvme_ocssd_ns_cmd_vector_reset(nvme_bdev->nvme_ns->ns, nvme_ioch->qpair, ocdev_io->lba,

			num_zones, NULL, bdev_ocssd_reset_zone_cb, bdev_io);

}



static int

bdev_ocssd_zone_management(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io)

{

	switch (bdev_io->u.zone_mgmt.zone_action) {

	case SPDK_BDEV_ZONE_RESET:

		return bdev_ocssd_reset_zone(ioch, bdev_io, bdev_io->u.zone_mgmt.zone_id,

					     bdev_io->u.zone_mgmt.num_zones);

	default:

		return -EINVAL;

	}

}



static void

bdev_ocssd_submit_request(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io)

{
@@ -312,6 +358,10 @@ bdev_ocssd_submit_request(struct spdk_io_channel *ioch, struct spdk_bdev_io *bde 
		rc = bdev_ocssd_write(ioch, bdev_io);

		break;



	case SPDK_BDEV_IO_TYPE_ZONE_MANAGEMENT:

		rc = bdev_ocssd_zone_management(ioch, bdev_io);

		break;



	default:

		rc = -EINVAL;

		break;
@@ -332,6 +382,7 @@ bdev_ocssd_io_type_supported(void *ctx, enum spdk_bdev_io_type type) 
	switch (type) {

	case SPDK_BDEV_IO_TYPE_READ:

	case SPDK_BDEV_IO_TYPE_WRITE:

	case SPDK_BDEV_IO_TYPE_ZONE_MANAGEMENT:

		return true;



	default:

test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c

+21 −0
Original line number Diff line number Diff line
@@ -287,6 +287,12 @@ spdk_bdev_unregister(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, void 
	}

}



size_t

spdk_bdev_get_zone_size(const struct spdk_bdev *bdev)

{

	return bdev->zone_size;

}



int

spdk_nvme_ocssd_ctrlr_cmd_geometry(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid,

				   void *payload, uint32_t payload_size,
@@ -399,6 +405,21 @@ spdk_nvme_ns_cmd_writev_with_md(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair 
	return 0;

}



int

spdk_nvme_ocssd_ns_cmd_vector_reset(struct spdk_nvme_ns *ns,

				    struct spdk_nvme_qpair *qpair,

				    uint64_t *lba_list, uint32_t num_lbas,

				    struct spdk_ocssd_chunk_information_entry *chunk_info,

				    spdk_nvme_cmd_cb cb_fn, void *cb_arg)

{

	struct nvme_request *req;



	req = alloc_request(cb_fn, cb_arg);

	TAILQ_INSERT_TAIL(&qpair->requests, req, tailq);



	return 0;

}



static void

create_bdev_cb(const char *bdev_name, int status, void *ctx)

{