* [PATCH v9 01/10] block: add persistent reservation in/out api
2024-07-12 2:36 [PATCH v9 00/10] Support persistent reservation operations Changqi Lu
@ 2024-07-12 2:36 ` Changqi Lu
2024-07-12 2:36 ` [PATCH v9 02/10] block/raw: add persistent reservation in/out driver Changqi Lu
` (8 subsequent siblings)
9 siblings, 0 replies; 24+ messages in thread
From: Changqi Lu @ 2024-07-12 2:36 UTC (permalink / raw)
To: qemu-block, qemu-devel
Cc: kwolf, hreitz, stefanha, fam, ronniesahlberg, pbonzini, pl,
kbusch, its, foss, philmd, pizhenwei, Changqi Lu
Add persistent reservation in/out operations
at the block level. The following operations
are included:
- read_keys: retrieves the list of registered keys.
- read_reservation: retrieves the current reservation status.
- register: registers a new reservation key.
- reserve: initiates a reservation for a specific key.
- release: releases a reservation for a specific key.
- clear: clears all existing reservations.
- preempt: preempts a reservation held by another key.
Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/block-backend.c | 403 ++++++++++++++++++++++++++++++
block/io.c | 164 ++++++++++++
include/block/block-common.h | 40 +++
include/block/block-io.h | 20 ++
include/block/block_int-common.h | 84 +++++++
include/sysemu/block-backend-io.h | 24 ++
6 files changed, 735 insertions(+)
diff --git a/block/block-backend.c b/block/block-backend.c
index db6f9b92a3..b74aaba23f 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1770,6 +1770,409 @@ BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned long int req, void *buf,
return blk_aio_prwv(blk, req, 0, buf, blk_aio_ioctl_entry, 0, cb, opaque);
}
+typedef struct BlkPrInCo {
+ BlockBackend *blk;
+ uint32_t *generation;
+ uint32_t num_keys;
+ BlockPrType *type;
+ uint64_t *keys;
+ int ret;
+} BlkPrInCo;
+
+typedef struct BlkPrInCB {
+ BlockAIOCB common;
+ BlkPrInCo prco;
+ bool has_returned;
+} BlkPrInCB;
+
+static const AIOCBInfo blk_pr_in_aiocb_info = {
+ .aiocb_size = sizeof(BlkPrInCB),
+};
+
+static void blk_pr_in_complete(BlkPrInCB *acb)
+{
+ if (acb->has_returned) {
+ acb->common.cb(acb->common.opaque, acb->prco.ret);
+
+ /* This is paired with blk_inc_in_flight() in blk_aio_pr_in(). */
+ blk_dec_in_flight(acb->prco.blk);
+ qemu_aio_unref(acb);
+ }
+}
+
+static void blk_pr_in_complete_bh(void *opaque)
+{
+ BlkPrInCB *acb = opaque;
+ assert(acb->has_returned);
+ blk_pr_in_complete(acb);
+}
+
+static BlockAIOCB *blk_aio_pr_in(BlockBackend *blk, uint32_t *generation,
+ uint32_t num_keys, BlockPrType *type,
+ uint64_t *keys, CoroutineEntry co_entry,
+ BlockCompletionFunc *cb, void *opaque)
+{
+ BlkPrInCB *acb;
+ Coroutine *co;
+
+ /* This is paired with blk_dec_in_flight() in blk_pr_in_complete(). */
+ blk_inc_in_flight(blk);
+ acb = blk_aio_get(&blk_pr_in_aiocb_info, blk, cb, opaque);
+ acb->prco = (BlkPrInCo) {
+ .blk = blk,
+ .generation = generation,
+ .num_keys = num_keys,
+ .type = type,
+ .ret = NOT_DONE,
+ .keys = keys,
+ };
+ acb->has_returned = false;
+
+ co = qemu_coroutine_create(co_entry, acb);
+ aio_co_enter(qemu_get_current_aio_context(), co);
+
+ acb->has_returned = true;
+ if (acb->prco.ret != NOT_DONE) {
+ replay_bh_schedule_oneshot_event(qemu_get_current_aio_context(),
+ blk_pr_in_complete_bh, acb);
+ }
+
+ return &acb->common;
+}
+
+/* To be called between exactly one pair of blk_inc/dec_in_flight() */
+static int coroutine_fn
+blk_aio_pr_do_read_keys(BlockBackend *blk, uint32_t *generation,
+ uint32_t num_keys, uint64_t *keys)
+{
+ IO_CODE();
+
+ blk_wait_while_drained(blk);
+ GRAPH_RDLOCK_GUARD();
+
+ if (!blk_co_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
+ return bdrv_co_pr_read_keys(blk_bs(blk), generation, num_keys, keys);
+}
+
+static void coroutine_fn blk_aio_pr_read_keys_entry(void *opaque)
+{
+ BlkPrInCB *acb = opaque;
+ BlkPrInCo *prco = &acb->prco;
+
+ prco->ret = blk_aio_pr_do_read_keys(prco->blk, prco->generation,
+ prco->num_keys, prco->keys);
+ blk_pr_in_complete(acb);
+}
+
+BlockAIOCB *blk_aio_pr_read_keys(BlockBackend *blk, uint32_t *generation,
+ uint32_t num_keys, uint64_t *keys,
+ BlockCompletionFunc *cb, void *opaque)
+{
+ IO_CODE();
+ return blk_aio_pr_in(blk, generation, num_keys, NULL, keys,
+ blk_aio_pr_read_keys_entry, cb, opaque);
+}
+
+/* To be called between exactly one pair of blk_inc/dec_in_flight() */
+static int coroutine_fn
+blk_aio_pr_do_read_reservation(BlockBackend *blk, uint32_t *generation,
+ uint64_t *key, BlockPrType *type)
+{
+ IO_CODE();
+
+ blk_wait_while_drained(blk);
+ GRAPH_RDLOCK_GUARD();
+
+ if (!blk_co_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
+ return bdrv_co_pr_read_reservation(blk_bs(blk), generation, key, type);
+}
+
+static void coroutine_fn blk_aio_pr_read_reservation_entry(void *opaque)
+{
+ BlkPrInCB *acb = opaque;
+ BlkPrInCo *prco = &acb->prco;
+
+ prco->ret = blk_aio_pr_do_read_reservation(prco->blk, prco->generation,
+ prco->keys, prco->type);
+ blk_pr_in_complete(acb);
+}
+
+BlockAIOCB *blk_aio_pr_read_reservation(BlockBackend *blk, uint32_t *generation,
+ uint64_t *key, BlockPrType *type,
+ BlockCompletionFunc *cb, void *opaque)
+{
+ IO_CODE();
+ return blk_aio_pr_in(blk, generation, 0, type, key,
+ blk_aio_pr_read_reservation_entry, cb, opaque);
+}
+
+typedef struct BlkPrOutCo {
+ BlockBackend *blk;
+ uint64_t old_key;
+ uint64_t new_key;
+ bool ptpl;
+ BlockPrType type;
+ bool ignore_key;
+ bool abort;
+ int ret;
+} BlkPrOutCo;
+
+typedef struct BlkPrOutCB {
+ BlockAIOCB common;
+ BlkPrOutCo prco;
+ bool has_returned;
+} BlkPrOutCB;
+
+static const AIOCBInfo blk_pr_out_aiocb_info = {
+ .aiocb_size = sizeof(BlkPrOutCB),
+};
+
+static void blk_pr_out_complete(BlkPrOutCB *acb)
+{
+ if (acb->has_returned) {
+ acb->common.cb(acb->common.opaque, acb->prco.ret);
+
+ /* This is paired with blk_inc_in_flight() in blk_aio_pr_out(). */
+ blk_dec_in_flight(acb->prco.blk);
+ qemu_aio_unref(acb);
+ }
+}
+
+static void blk_pr_out_complete_bh(void *opaque)
+{
+ BlkPrOutCB *acb = opaque;
+ assert(acb->has_returned);
+ blk_pr_out_complete(acb);
+}
+
+static BlockAIOCB *blk_aio_pr_out(BlockBackend *blk, uint64_t old_key,
+ uint64_t new_key, bool ptpl,
+ BlockPrType type, bool ignore_key,
+ bool abort, CoroutineEntry co_entry,
+ BlockCompletionFunc *cb, void *opaque)
+{
+ BlkPrOutCB *acb;
+ Coroutine *co;
+
+ /* This is paired with blk_dec_in_flight() in blk_pr_out_complete(). */
+ blk_inc_in_flight(blk);
+ acb = blk_aio_get(&blk_pr_out_aiocb_info, blk, cb, opaque);
+ acb->prco = (BlkPrOutCo) {
+ .blk = blk,
+ .old_key = old_key,
+ .new_key = new_key,
+ .ptpl = ptpl,
+ .type = type,
+ .ignore_key = ignore_key,
+ .abort = abort,
+ .ret = NOT_DONE,
+ };
+ acb->has_returned = false;
+
+ co = qemu_coroutine_create(co_entry, acb);
+ aio_co_enter(qemu_get_current_aio_context(), co);
+
+ acb->has_returned = true;
+ if (acb->prco.ret != NOT_DONE) {
+ replay_bh_schedule_oneshot_event(qemu_get_current_aio_context(),
+ blk_pr_out_complete_bh, acb);
+ }
+
+ return &acb->common;
+}
+
+/* To be called between exactly one pair of blk_inc/dec_in_flight() */
+static int coroutine_fn
+blk_aio_pr_do_register(BlockBackend *blk, uint64_t old_key,
+ uint64_t new_key, BlockPrType type,
+ bool ptpl, bool ignore_key)
+{
+ IO_CODE();
+
+ blk_wait_while_drained(blk);
+ GRAPH_RDLOCK_GUARD();
+
+ if (!blk_co_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
+ return bdrv_co_pr_register(blk_bs(blk), old_key, new_key, type,
+ ptpl, ignore_key);
+}
+
+static void coroutine_fn blk_aio_pr_register_entry(void *opaque)
+{
+ BlkPrOutCB *acb = opaque;
+ BlkPrOutCo *prco = &acb->prco;
+
+ prco->ret = blk_aio_pr_do_register(prco->blk, prco->old_key, prco->new_key,
+ prco->type, prco->ptpl,
+ prco->ignore_key);
+ blk_pr_out_complete(acb);
+}
+
+BlockAIOCB *blk_aio_pr_register(BlockBackend *blk, uint64_t old_key,
+ uint64_t new_key, BlockPrType type,
+ bool ptpl, bool ignore_key,
+ BlockCompletionFunc *cb,
+ void *opaque)
+{
+ IO_CODE();
+ return blk_aio_pr_out(blk, old_key, new_key, ptpl, type, ignore_key, false,
+ blk_aio_pr_register_entry, cb, opaque);
+}
+
+/* To be called between exactly one pair of blk_inc/dec_in_flight() */
+static int coroutine_fn
+blk_aio_pr_do_reserve(BlockBackend *blk, uint64_t key, BlockPrType type)
+{
+ IO_CODE();
+
+ blk_wait_while_drained(blk);
+ GRAPH_RDLOCK_GUARD();
+
+ if (!blk_co_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
+ return bdrv_co_pr_reserve(blk_bs(blk), key, type);
+}
+
+static void coroutine_fn blk_aio_pr_reserve_entry(void *opaque)
+{
+ BlkPrOutCB *acb = opaque;
+ BlkPrOutCo *prco = &acb->prco;
+
+ prco->ret = blk_aio_pr_do_reserve(prco->blk, prco->old_key,
+ prco->type);
+ blk_pr_out_complete(acb);
+}
+
+
+BlockAIOCB *blk_aio_pr_reserve(BlockBackend *blk, uint64_t key,
+ BlockPrType type,
+ BlockCompletionFunc *cb,
+ void *opaque)
+{
+ IO_CODE();
+ return blk_aio_pr_out(blk, key, 0, false, type, false, false,
+ blk_aio_pr_reserve_entry, cb, opaque);
+}
+
+/* To be called between exactly one pair of blk_inc/dec_in_flight() */
+static int coroutine_fn
+blk_aio_pr_do_release(BlockBackend *blk, uint64_t key, BlockPrType type)
+{
+ IO_CODE();
+
+ blk_wait_while_drained(blk);
+ GRAPH_RDLOCK_GUARD();
+
+ if (!blk_co_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
+ return bdrv_co_pr_release(blk_bs(blk), key, type);
+}
+
+static void coroutine_fn blk_aio_pr_release_entry(void *opaque)
+{
+ BlkPrOutCB *acb = opaque;
+ BlkPrOutCo *prco = &acb->prco;
+
+ prco->ret = blk_aio_pr_do_release(prco->blk, prco->old_key, prco->type);
+ blk_pr_out_complete(acb);
+}
+
+
+BlockAIOCB *blk_aio_pr_release(BlockBackend *blk, uint64_t key,
+ BlockPrType type, BlockCompletionFunc *cb,
+ void *opaque)
+{
+ IO_CODE();
+ return blk_aio_pr_out(blk, key, 0, false, type, false, false,
+ blk_aio_pr_release_entry, cb, opaque);
+}
+
+/* To be called between exactly one pair of blk_inc/dec_in_flight() */
+static int coroutine_fn
+blk_aio_pr_do_clear(BlockBackend *blk, uint64_t key)
+{
+ IO_CODE();
+
+ blk_wait_while_drained(blk);
+ GRAPH_RDLOCK_GUARD();
+
+ if (!blk_co_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
+ return bdrv_co_pr_clear(blk_bs(blk), key);
+}
+
+static void coroutine_fn blk_aio_pr_clear_entry(void *opaque)
+{
+ BlkPrOutCB *acb = opaque;
+ BlkPrOutCo *prco = &acb->prco;
+
+ prco->ret = blk_aio_pr_do_clear(prco->blk, prco->old_key);
+ blk_pr_out_complete(acb);
+}
+
+
+BlockAIOCB *blk_aio_pr_clear(BlockBackend *blk, uint64_t key,
+ BlockCompletionFunc *cb, void *opaque)
+{
+ IO_CODE();
+ return blk_aio_pr_out(blk, key, 0, false, 0, false, false,
+ blk_aio_pr_clear_entry, cb, opaque);
+}
+
+/* To be called between exactly one pair of blk_inc/dec_in_flight() */
+static int coroutine_fn
+blk_aio_pr_do_preempt(BlockBackend *blk, uint64_t cr_key,
+ uint64_t pr_key, BlockPrType type, bool abort)
+{
+ IO_CODE();
+
+ blk_wait_while_drained(blk);
+ GRAPH_RDLOCK_GUARD();
+
+ if (!blk_co_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
+ return bdrv_co_pr_preempt(blk_bs(blk), cr_key, pr_key, type, abort);
+}
+
+static void coroutine_fn blk_aio_pr_preempt_entry(void *opaque)
+{
+ BlkPrOutCB *acb = opaque;
+ BlkPrOutCo *prco = &acb->prco;
+
+ prco->ret = blk_aio_pr_do_preempt(prco->blk, prco->old_key,
+ prco->new_key, prco->type,
+ prco->abort);
+ blk_pr_out_complete(acb);
+}
+
+
+BlockAIOCB *blk_aio_pr_preempt(BlockBackend *blk, uint64_t cr_key,
+ uint64_t pr_key, BlockPrType type,
+ bool abort, BlockCompletionFunc *cb,
+ void *opaque)
+{
+ IO_CODE();
+ return blk_aio_pr_out(blk, cr_key, pr_key, false, type, false, abort,
+ blk_aio_pr_preempt_entry, cb, opaque);
+}
+
/* To be called between exactly one pair of blk_inc/dec_in_flight() */
static int coroutine_fn
blk_co_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes)
diff --git a/block/io.c b/block/io.c
index 7217cf811b..105161930e 100644
--- a/block/io.c
+++ b/block/io.c
@@ -146,6 +146,7 @@ static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src)
src->min_mem_alignment);
dst->max_iov = MIN_NON_ZERO(dst->max_iov, src->max_iov);
dst->max_hw_iov = MIN_NON_ZERO(dst->max_hw_iov, src->max_hw_iov);
+ dst->pr_cap |= src->pr_cap;
}
typedef struct BdrvRefreshLimitsState {
@@ -3220,6 +3221,169 @@ out:
return co.ret;
}
+int coroutine_fn bdrv_co_pr_read_keys(BlockDriverState *bs,
+ uint32_t *generation, uint32_t num_keys,
+ uint64_t *keys)
+{
+ BlockDriver *drv = bs->drv;
+ CoroutineIOCompletion co = {
+ .coroutine = qemu_coroutine_self(),
+ };
+
+ IO_CODE();
+ assert_bdrv_graph_readable();
+
+ bdrv_inc_in_flight(bs);
+ if (!drv || !drv->bdrv_co_pr_read_keys) {
+ co.ret = -ENOTSUP;
+ goto out;
+ }
+
+ co.ret = drv->bdrv_co_pr_read_keys(bs, generation, num_keys, keys);
+out:
+ bdrv_dec_in_flight(bs);
+ return co.ret;
+}
+
+int coroutine_fn bdrv_co_pr_read_reservation(BlockDriverState *bs,
+ uint32_t *generation, uint64_t *key, BlockPrType *type)
+{
+ BlockDriver *drv = bs->drv;
+ CoroutineIOCompletion co = {
+ .coroutine = qemu_coroutine_self(),
+ };
+
+ IO_CODE();
+ assert_bdrv_graph_readable();
+
+ bdrv_inc_in_flight(bs);
+ if (!drv || !drv->bdrv_co_pr_read_reservation) {
+ co.ret = -ENOTSUP;
+ goto out;
+ }
+
+ co.ret = drv->bdrv_co_pr_read_reservation(bs, generation, key, type);
+out:
+ bdrv_dec_in_flight(bs);
+ return co.ret;
+}
+
+int coroutine_fn bdrv_co_pr_register(BlockDriverState *bs, uint64_t old_key,
+ uint64_t new_key, BlockPrType type, bool ptpl,
+ bool ignore_key)
+{
+ BlockDriver *drv = bs->drv;
+ CoroutineIOCompletion co = {
+ .coroutine = qemu_coroutine_self(),
+ };
+
+ IO_CODE();
+ assert_bdrv_graph_readable();
+
+ bdrv_inc_in_flight(bs);
+ if (!drv || !drv->bdrv_co_pr_register) {
+ co.ret = -ENOTSUP;
+ goto out;
+ }
+
+ co.ret = drv->bdrv_co_pr_register(bs, old_key, new_key, type,
+ ptpl, ignore_key);
+out:
+ bdrv_dec_in_flight(bs);
+ return co.ret;
+}
+
+int coroutine_fn bdrv_co_pr_reserve(BlockDriverState *bs, uint64_t key,
+ BlockPrType type)
+{
+ BlockDriver *drv = bs->drv;
+ CoroutineIOCompletion co = {
+ .coroutine = qemu_coroutine_self(),
+ };
+
+ IO_CODE();
+ assert_bdrv_graph_readable();
+
+ bdrv_inc_in_flight(bs);
+ if (!drv || !drv->bdrv_co_pr_reserve) {
+ co.ret = -ENOTSUP;
+ goto out;
+ }
+
+ co.ret = drv->bdrv_co_pr_reserve(bs, key, type);
+out:
+ bdrv_dec_in_flight(bs);
+ return co.ret;
+}
+
+int coroutine_fn bdrv_co_pr_release(BlockDriverState *bs, uint64_t key,
+ BlockPrType type)
+{
+ BlockDriver *drv = bs->drv;
+ CoroutineIOCompletion co = {
+ .coroutine = qemu_coroutine_self(),
+ };
+
+ IO_CODE();
+ assert_bdrv_graph_readable();
+
+ bdrv_inc_in_flight(bs);
+ if (!drv || !drv->bdrv_co_pr_release) {
+ co.ret = -ENOTSUP;
+ goto out;
+ }
+
+ co.ret = drv->bdrv_co_pr_release(bs, key, type);
+out:
+ bdrv_dec_in_flight(bs);
+ return co.ret;
+}
+
+int coroutine_fn bdrv_co_pr_clear(BlockDriverState *bs, uint64_t key)
+{
+ BlockDriver *drv = bs->drv;
+ CoroutineIOCompletion co = {
+ .coroutine = qemu_coroutine_self(),
+ };
+
+ IO_CODE();
+ assert_bdrv_graph_readable();
+
+ bdrv_inc_in_flight(bs);
+ if (!drv || !drv->bdrv_co_pr_clear) {
+ co.ret = -ENOTSUP;
+ goto out;
+ }
+
+ co.ret = drv->bdrv_co_pr_clear(bs, key);
+out:
+ bdrv_dec_in_flight(bs);
+ return co.ret;
+}
+
+int coroutine_fn bdrv_co_pr_preempt(BlockDriverState *bs, uint64_t cr_key,
+ uint64_t pr_key, BlockPrType type, bool abort)
+{
+ BlockDriver *drv = bs->drv;
+ CoroutineIOCompletion co = {
+ .coroutine = qemu_coroutine_self(),
+ };
+
+ IO_CODE();
+ assert_bdrv_graph_readable();
+
+ bdrv_inc_in_flight(bs);
+ if (!drv || !drv->bdrv_co_pr_preempt) {
+ co.ret = -ENOTSUP;
+ goto out;
+ }
+
+ co.ret = drv->bdrv_co_pr_preempt(bs, cr_key, pr_key, type, abort);
+out:
+ bdrv_dec_in_flight(bs);
+ return co.ret;
+}
+
int coroutine_fn bdrv_co_zone_report(BlockDriverState *bs, int64_t offset,
unsigned int *nr_zones,
BlockZoneDescriptor *zones)
diff --git a/include/block/block-common.h b/include/block/block-common.h
index a846023a09..7ca4e2328f 100644
--- a/include/block/block-common.h
+++ b/include/block/block-common.h
@@ -524,6 +524,46 @@ typedef enum {
BDRV_FIX_ERRORS = 2,
} BdrvCheckMode;
+/**
+ * According SCSI protocol(chapter 5.9 of SCSI Primary Commands - 4)
+ * and NVMe protocol(chapter 7.2 of NVMe Base Specification 2.0),
+ * the persistent reservation types and persistent capabilities of
+ * the public layer block are abstracted.
+ */
+typedef enum {
+ BLK_PR_WRITE_EXCLUSIVE = 0x1,
+ BLK_PR_EXCLUSIVE_ACCESS = 0x2,
+ BLK_PR_WRITE_EXCLUSIVE_REGS_ONLY = 0x3,
+ BLK_PR_EXCLUSIVE_ACCESS_REGS_ONLY = 0x4,
+ BLK_PR_WRITE_EXCLUSIVE_ALL_REGS = 0x5,
+ BLK_PR_EXCLUSIVE_ACCESS_ALL_REGS = 0x6,
+} BlockPrType;
+
+typedef enum BLKPrCap {
+ /* Persist Through Power Loss */
+ BLK_PR_CAP_PTPL = 1 << 0,
+ /* Write Exclusive reservation type */
+ BLK_PR_CAP_WR_EX = 1 << 1,
+ /* Exclusive Access reservation type */
+ BLK_PR_CAP_EX_AC = 1 << 2,
+ /* Write Exclusive Registrants Only reservation type */
+ BLK_PR_CAP_WR_EX_RO = 1 << 3,
+ /* Exclusive Access Registrants Only reservation type */
+ BLK_PR_CAP_EX_AC_RO = 1 << 4,
+ /* Write Exclusive All Registrants reservation type */
+ BLK_PR_CAP_WR_EX_AR = 1 << 5,
+ /* Exclusive Access All Registrants reservation type */
+ BLK_PR_CAP_EX_AC_AR = 1 << 6,
+
+ BLK_PR_CAP_ALL = (BLK_PR_CAP_PTPL |
+ BLK_PR_CAP_WR_EX |
+ BLK_PR_CAP_EX_AC |
+ BLK_PR_CAP_WR_EX_RO |
+ BLK_PR_CAP_EX_AC_RO |
+ BLK_PR_CAP_WR_EX_AR |
+ BLK_PR_CAP_EX_AC_AR),
+} BLKPrCap;
+
typedef struct BlockSizes {
uint32_t phys;
uint32_t log;
diff --git a/include/block/block-io.h b/include/block/block-io.h
index b49e0537dd..908361862b 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -106,6 +106,26 @@ void bdrv_aio_cancel_async(BlockAIOCB *acb);
int coroutine_fn GRAPH_RDLOCK
bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf);
+int coroutine_fn GRAPH_RDLOCK
+bdrv_co_pr_read_keys(BlockDriverState *bs, uint32_t *generation,
+ uint32_t num_keys, uint64_t *keys);
+int coroutine_fn GRAPH_RDLOCK
+bdrv_co_pr_read_reservation(BlockDriverState *bs, uint32_t *generation,
+ uint64_t *key, BlockPrType *type);
+int coroutine_fn GRAPH_RDLOCK
+bdrv_co_pr_register(BlockDriverState *bs, uint64_t old_key,
+ uint64_t new_key, BlockPrType type,
+ bool ptpl, bool ignore_key);
+int coroutine_fn GRAPH_RDLOCK
+bdrv_co_pr_reserve(BlockDriverState *bs, uint64_t key, BlockPrType type);
+int coroutine_fn GRAPH_RDLOCK
+bdrv_co_pr_release(BlockDriverState *bs, uint64_t key, BlockPrType type);
+int coroutine_fn GRAPH_RDLOCK
+bdrv_co_pr_clear(BlockDriverState *bs, uint64_t key);
+int coroutine_fn GRAPH_RDLOCK
+bdrv_co_pr_preempt(BlockDriverState *bs, uint64_t cr_key, uint64_t pr_key,
+ BlockPrType type, bool abort);
+
/* Ensure contents are flushed to disk. */
int coroutine_fn GRAPH_RDLOCK bdrv_co_flush(BlockDriverState *bs);
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index 761276127e..6e628069e9 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -766,6 +766,87 @@ struct BlockDriver {
int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_ioctl)(
BlockDriverState *bs, unsigned long int req, void *buf);
+ /*
+ * Persistent reservation series api.
+ * Please refer to chapter 5.9 of SCSI Primary Commands - 4 or
+ * chapter 7 of NVMe Base Specification 2.0.
+ *
+ * The block layer driver should implement all the following APIs
+ * or none at all, including: bdrv_co_pr_read_keys,
+ * bdrv_co_pr_read_reservation, bdrv_co_pr_register,
+ * bdrv_co_pr_reserve, bdrv_co_pr_release,
+ * bdrv_co_pr_clear and bdrv_co_pr_preempt.
+ *
+ * Read the registered keys and return them in the @keys.
+ * @generation: The generation of the reservation key.
+ * @num_keys: The maximum number of keys that can be transmitted.
+ * @keys: Registered keys array.
+ *
+ * On success, store generation in @generation and store keys @keys
+ * and return the number of @keys.
+ * On failure return -errno.
+ */
+ int coroutine_fn GRAPH_RDLOCK_PTR(*bdrv_co_pr_read_keys)(
+ BlockDriverState *bs, uint32_t *generation,
+ uint32_t num_keys, uint64_t *keys);
+ /*
+ * Read the reservation key and store it in the @key.
+ * @generation: The generation of the reservation key.
+ * @key: The reservation key.
+ * @type: Type of the reservation key.
+ *
+ * On success, store generation in @generation, store the
+ * reservation key in @key and return the number of @key
+ * which used to determine whether the reservation key exists.
+ * On failure return -errno.
+ */
+ int coroutine_fn GRAPH_RDLOCK_PTR(*bdrv_co_pr_read_reservation)(
+ BlockDriverState *bs, uint32_t *generation,
+ uint64_t *key, BlockPrType *type);
+ /*
+ * Register, unregister, or replace a reservation key.
+ * @old_key: The current reservation key associated with the host.
+ * @new_key: The new reservation Key.
+ * @type: Type of the reservation key.
+ * @ignore_key: Ignore or not @old_key.
+ * @ptpl: Whether to support Persist Through Power Loss(PTPL).
+ */
+ int coroutine_fn GRAPH_RDLOCK_PTR(*bdrv_co_pr_register)(
+ BlockDriverState *bs, uint64_t old_key,
+ uint64_t new_key, BlockPrType type,
+ bool ptpl, bool ignore_key);
+ /*
+ * Acquire a reservation on a host.
+ * @key: The current reservation key associated with the host.
+ * @type: Type of the reservation key.
+ */
+ int coroutine_fn GRAPH_RDLOCK_PTR(*bdrv_co_pr_reserve)(
+ BlockDriverState *bs, uint64_t key, BlockPrType type);
+ /*
+ * Release a reservation on a host.
+ * @key: The current reservation key associated with the host.
+ * @type: Type of the reservation key.
+ */
+ int coroutine_fn GRAPH_RDLOCK_PTR(*bdrv_co_pr_release)(
+ BlockDriverState *bs, uint64_t key, BlockPrType type);
+ /**
+ * Clear reservations on a host.
+ * @key: The current reservation key associated with the host.
+ */
+ int coroutine_fn GRAPH_RDLOCK_PTR(*bdrv_co_pr_clear)(
+ BlockDriverState *bs, uint64_t key);
+ /*
+ * Preempt a reservation held on a host.
+ * @cr_key: The current reservation key associated with the host.
+ * @pr_key: The preempt reservation Key which to be
+ * unregistered from the namespace.
+ * @type: Type of the reservation key.
+ * @abort: Whether to abort a reservation held on a host.
+ */
+ int coroutine_fn GRAPH_RDLOCK_PTR(*bdrv_co_pr_preempt)(
+ BlockDriverState *bs, uint64_t cr_key,
+ uint64_t pr_key, BlockPrType type, bool abort);
+
/*
* Returns 0 for completed check, -errno for internal errors.
* The check results are stored in result.
@@ -899,6 +980,9 @@ typedef struct BlockLimits {
uint32_t max_active_zones;
uint32_t write_granularity;
+
+ /* Persistent reservation capacities. */
+ uint8_t pr_cap;
} BlockLimits;
typedef struct BdrvOpBlocker BdrvOpBlocker;
diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backend-io.h
index d174275a5c..b3d49a3c6f 100644
--- a/include/sysemu/block-backend-io.h
+++ b/include/sysemu/block-backend-io.h
@@ -62,6 +62,30 @@ void blk_aio_cancel_async(BlockAIOCB *acb);
BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned long int req, void *buf,
BlockCompletionFunc *cb, void *opaque);
+BlockAIOCB *blk_aio_pr_read_keys(BlockBackend *blk, uint32_t *generation,
+ uint32_t num_keys, uint64_t *keys,
+ BlockCompletionFunc *cb, void *opaque);
+BlockAIOCB *blk_aio_pr_read_reservation(BlockBackend *blk, uint32_t *generation,
+ uint64_t *key, BlockPrType *type,
+ BlockCompletionFunc *cb, void *opaque);
+BlockAIOCB *blk_aio_pr_register(BlockBackend *blk, uint64_t old_key,
+ uint64_t new_key, BlockPrType type,
+ bool ptpl, bool ignore_key,
+ BlockCompletionFunc *cb,
+ void *opaque);
+BlockAIOCB *blk_aio_pr_reserve(BlockBackend *blk, uint64_t key,
+ BlockPrType type,
+ BlockCompletionFunc *cb,
+ void *opaque);
+BlockAIOCB *blk_aio_pr_release(BlockBackend *blk, uint64_t key,
+ BlockPrType type, BlockCompletionFunc *cb,
+ void *opaque);
+BlockAIOCB *blk_aio_pr_clear(BlockBackend *blk, uint64_t key,
+ BlockCompletionFunc *cb, void *opaque);
+BlockAIOCB *blk_aio_pr_preempt(BlockBackend *blk, uint64_t cr_key,
+ uint64_t pr_key, BlockPrType type, bool abort,
+ BlockCompletionFunc *cb, void *opaque);
+
void blk_inc_in_flight(BlockBackend *blk);
void blk_dec_in_flight(BlockBackend *blk);
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v9 02/10] block/raw: add persistent reservation in/out driver
2024-07-12 2:36 [PATCH v9 00/10] Support persistent reservation operations Changqi Lu
2024-07-12 2:36 ` [PATCH v9 01/10] block: add persistent reservation in/out api Changqi Lu
@ 2024-07-12 2:36 ` Changqi Lu
2024-07-12 2:36 ` [PATCH v9 03/10] scsi/constant: add persistent reservation in/out protocol constants Changqi Lu
` (7 subsequent siblings)
9 siblings, 0 replies; 24+ messages in thread
From: Changqi Lu @ 2024-07-12 2:36 UTC (permalink / raw)
To: qemu-block, qemu-devel
Cc: kwolf, hreitz, stefanha, fam, ronniesahlberg, pbonzini, pl,
kbusch, its, foss, philmd, pizhenwei, Changqi Lu
Add persistent reservation in/out operations for raw driver.
The following methods are implemented: bdrv_co_pr_read_keys,
bdrv_co_pr_read_reservation, bdrv_co_pr_register, bdrv_co_pr_reserve,
bdrv_co_pr_release, bdrv_co_pr_clear and bdrv_co_pr_preempt.
Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/raw-format.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/block/raw-format.c b/block/raw-format.c
index ac7e8495f6..3746bc1bd3 100644
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -454,6 +454,55 @@ raw_co_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
return bdrv_co_ioctl(bs->file->bs, req, buf);
}
+static int coroutine_fn GRAPH_RDLOCK
+raw_co_pr_read_keys(BlockDriverState *bs, uint32_t *generation,
+ uint32_t num_keys, uint64_t *keys)
+{
+
+ return bdrv_co_pr_read_keys(bs->file->bs, generation, num_keys, keys);
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+raw_co_pr_read_reservation(BlockDriverState *bs, uint32_t *generation,
+ uint64_t *key, BlockPrType *type)
+{
+ return bdrv_co_pr_read_reservation(bs->file->bs, generation, key, type);
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+raw_co_pr_register(BlockDriverState *bs, uint64_t old_key,
+ uint64_t new_key, BlockPrType type,
+ bool ptpl, bool ignore_key)
+{
+ return bdrv_co_pr_register(bs->file->bs, old_key, new_key,
+ type, ptpl, ignore_key);
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+raw_co_pr_reserve(BlockDriverState *bs, uint64_t key, BlockPrType type)
+{
+ return bdrv_co_pr_reserve(bs->file->bs, key, type);
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+raw_co_pr_release(BlockDriverState *bs, uint64_t key, BlockPrType type)
+{
+ return bdrv_co_pr_release(bs->file->bs, key, type);
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+raw_co_pr_clear(BlockDriverState *bs, uint64_t key)
+{
+ return bdrv_co_pr_clear(bs->file->bs, key);
+}
+
+static int coroutine_fn GRAPH_RDLOCK
+raw_co_pr_preempt(BlockDriverState *bs, uint64_t old_key,
+ uint64_t new_key, BlockPrType type, bool abort)
+{
+ return bdrv_co_pr_preempt(bs->file->bs, old_key, new_key, type, abort);
+}
+
static int GRAPH_RDLOCK raw_has_zero_init(BlockDriverState *bs)
{
return bdrv_has_zero_init(bs->file->bs);
@@ -672,6 +721,13 @@ BlockDriver bdrv_raw = {
.strong_runtime_opts = raw_strong_runtime_opts,
.mutable_opts = mutable_opts,
.bdrv_cancel_in_flight = raw_cancel_in_flight,
+ .bdrv_co_pr_read_keys = raw_co_pr_read_keys,
+ .bdrv_co_pr_read_reservation = raw_co_pr_read_reservation,
+ .bdrv_co_pr_register = raw_co_pr_register,
+ .bdrv_co_pr_reserve = raw_co_pr_reserve,
+ .bdrv_co_pr_release = raw_co_pr_release,
+ .bdrv_co_pr_clear = raw_co_pr_clear,
+ .bdrv_co_pr_preempt = raw_co_pr_preempt,
};
static void bdrv_raw_init(void)
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v9 03/10] scsi/constant: add persistent reservation in/out protocol constants
2024-07-12 2:36 [PATCH v9 00/10] Support persistent reservation operations Changqi Lu
2024-07-12 2:36 ` [PATCH v9 01/10] block: add persistent reservation in/out api Changqi Lu
2024-07-12 2:36 ` [PATCH v9 02/10] block/raw: add persistent reservation in/out driver Changqi Lu
@ 2024-07-12 2:36 ` Changqi Lu
2024-07-12 2:36 ` [PATCH v9 04/10] scsi/util: add helper functions for persistent reservation types conversion Changqi Lu
` (6 subsequent siblings)
9 siblings, 0 replies; 24+ messages in thread
From: Changqi Lu @ 2024-07-12 2:36 UTC (permalink / raw)
To: qemu-block, qemu-devel
Cc: kwolf, hreitz, stefanha, fam, ronniesahlberg, pbonzini, pl,
kbusch, its, foss, philmd, pizhenwei, Changqi Lu
Add constants for the persistent reservation in/out protocol
in the scsi/constant module. The constants include the persistent
reservation command, type, and scope values defined in sections
6.13 and 6.14 of the SCSI Primary Commands-4 (SPC-4) specification.
Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
include/scsi/constants.h | 52 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/include/scsi/constants.h b/include/scsi/constants.h
index 9b98451912..922a314535 100644
--- a/include/scsi/constants.h
+++ b/include/scsi/constants.h
@@ -319,4 +319,56 @@
#define IDENT_DESCR_TGT_DESCR_SIZE 32
#define XCOPY_BLK2BLK_SEG_DESC_SIZE 28
+typedef enum {
+ SCSI_PR_WRITE_EXCLUSIVE = 0x01,
+ SCSI_PR_EXCLUSIVE_ACCESS = 0x03,
+ SCSI_PR_WRITE_EXCLUSIVE_REGS_ONLY = 0x05,
+ SCSI_PR_EXCLUSIVE_ACCESS_REGS_ONLY = 0x06,
+ SCSI_PR_WRITE_EXCLUSIVE_ALL_REGS = 0x07,
+ SCSI_PR_EXCLUSIVE_ACCESS_ALL_REGS = 0x08,
+} SCSIPrType;
+
+typedef enum {
+ SCSI_PR_LU_SCOPE = 0x00,
+} SCSIPrScope;
+
+typedef enum {
+ SCSI_PR_OUT_REGISTER = 0x0,
+ SCSI_PR_OUT_RESERVE = 0x1,
+ SCSI_PR_OUT_RELEASE = 0x2,
+ SCSI_PR_OUT_CLEAR = 0x3,
+ SCSI_PR_OUT_PREEMPT = 0x4,
+ SCSI_PR_OUT_PREEMPT_AND_ABORT = 0x5,
+ SCSI_PR_OUT_REG_AND_IGNORE_KEY = 0x6,
+ SCSI_PR_OUT_REG_AND_MOVE = 0x7,
+} SCSIPrOutAction;
+
+typedef enum {
+ SCSI_PR_IN_READ_KEYS = 0x0,
+ SCSI_PR_IN_READ_RESERVATION = 0x1,
+ SCSI_PR_IN_REPORT_CAPABILITIES = 0x2,
+} SCSIPrInAction;
+
+typedef enum {
+ /* Exclusive Access All Registrants reservation type */
+ SCSI_PR_CAP_EX_AC_AR = 1 << 0,
+ /* Write Exclusive reservation type */
+ SCSI_PR_CAP_WR_EX = 1 << 9,
+ /* Exclusive Access reservation type */
+ SCSI_PR_CAP_EX_AC = 1 << 11,
+ /* Write Exclusive Registrants Only reservation type */
+ SCSI_PR_CAP_WR_EX_RO = 1 << 13,
+ /* Exclusive Access Registrants Only reservation type */
+ SCSI_PR_CAP_EX_AC_RO = 1 << 14,
+ /* Write Exclusive All Registrants reservation type */
+ SCSI_PR_CAP_WR_EX_AR = 1 << 15,
+
+ SCSI_PR_CAP_ALL = (SCSI_PR_CAP_EX_AC_AR |
+ SCSI_PR_CAP_WR_EX |
+ SCSI_PR_CAP_EX_AC |
+ SCSI_PR_CAP_WR_EX_RO |
+ SCSI_PR_CAP_EX_AC_RO |
+ SCSI_PR_CAP_WR_EX_AR),
+} SCSIPrCap;
+
#endif
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v9 04/10] scsi/util: add helper functions for persistent reservation types conversion
2024-07-12 2:36 [PATCH v9 00/10] Support persistent reservation operations Changqi Lu
` (2 preceding siblings ...)
2024-07-12 2:36 ` [PATCH v9 03/10] scsi/constant: add persistent reservation in/out protocol constants Changqi Lu
@ 2024-07-12 2:36 ` Changqi Lu
2024-07-12 2:36 ` [PATCH v9 05/10] hw/scsi: add persistent reservation in/out api for scsi device Changqi Lu
` (5 subsequent siblings)
9 siblings, 0 replies; 24+ messages in thread
From: Changqi Lu @ 2024-07-12 2:36 UTC (permalink / raw)
To: qemu-block, qemu-devel
Cc: kwolf, hreitz, stefanha, fam, ronniesahlberg, pbonzini, pl,
kbusch, its, foss, philmd, pizhenwei, Changqi Lu
This commit introduces two helper functions
that facilitate the conversion between the
persistent reservation types used in the SCSI
protocol and those used in the block layer.
Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
include/scsi/utils.h | 8 +++++
scsi/utils.c | 81 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git a/include/scsi/utils.h b/include/scsi/utils.h
index d5c8efa16e..89a0b082fb 100644
--- a/include/scsi/utils.h
+++ b/include/scsi/utils.h
@@ -1,6 +1,8 @@
#ifndef SCSI_UTILS_H
#define SCSI_UTILS_H
+#include "block/block-common.h"
+#include "scsi/constants.h"
#ifdef CONFIG_LINUX
#include <scsi/sg.h>
#endif
@@ -135,6 +137,12 @@ uint32_t scsi_data_cdb_xfer(uint8_t *buf);
uint32_t scsi_cdb_xfer(uint8_t *buf);
int scsi_cdb_length(uint8_t *buf);
+BlockPrType scsi_pr_type_to_block(SCSIPrType type);
+SCSIPrType block_pr_type_to_scsi(BlockPrType type);
+
+uint8_t scsi_pr_cap_to_block(uint16_t scsi_pr_cap);
+uint16_t block_pr_cap_to_scsi(uint8_t block_pr_cap);
+
/* Linux SG_IO interface. */
#ifdef CONFIG_LINUX
#define SG_ERR_DRIVER_TIMEOUT 0x06
diff --git a/scsi/utils.c b/scsi/utils.c
index 357b036671..0dfdeb499d 100644
--- a/scsi/utils.c
+++ b/scsi/utils.c
@@ -658,3 +658,84 @@ int scsi_sense_from_host_status(uint8_t host_status,
}
return GOOD;
}
+
+BlockPrType scsi_pr_type_to_block(SCSIPrType type)
+{
+ switch (type) {
+ case SCSI_PR_WRITE_EXCLUSIVE:
+ return BLK_PR_WRITE_EXCLUSIVE;
+ case SCSI_PR_EXCLUSIVE_ACCESS:
+ return BLK_PR_EXCLUSIVE_ACCESS;
+ case SCSI_PR_WRITE_EXCLUSIVE_REGS_ONLY:
+ return BLK_PR_WRITE_EXCLUSIVE_REGS_ONLY;
+ case SCSI_PR_EXCLUSIVE_ACCESS_REGS_ONLY:
+ return BLK_PR_EXCLUSIVE_ACCESS_REGS_ONLY;
+ case SCSI_PR_WRITE_EXCLUSIVE_ALL_REGS:
+ return BLK_PR_WRITE_EXCLUSIVE_ALL_REGS;
+ case SCSI_PR_EXCLUSIVE_ACCESS_ALL_REGS:
+ return BLK_PR_EXCLUSIVE_ACCESS_ALL_REGS;
+ }
+
+ return 0;
+}
+
+SCSIPrType block_pr_type_to_scsi(BlockPrType type)
+{
+ switch (type) {
+ case BLK_PR_WRITE_EXCLUSIVE:
+ return SCSI_PR_WRITE_EXCLUSIVE;
+ case BLK_PR_EXCLUSIVE_ACCESS:
+ return SCSI_PR_EXCLUSIVE_ACCESS;
+ case BLK_PR_WRITE_EXCLUSIVE_REGS_ONLY:
+ return SCSI_PR_WRITE_EXCLUSIVE_REGS_ONLY;
+ case BLK_PR_EXCLUSIVE_ACCESS_REGS_ONLY:
+ return SCSI_PR_EXCLUSIVE_ACCESS_REGS_ONLY;
+ case BLK_PR_WRITE_EXCLUSIVE_ALL_REGS:
+ return SCSI_PR_WRITE_EXCLUSIVE_ALL_REGS;
+ case BLK_PR_EXCLUSIVE_ACCESS_ALL_REGS:
+ return SCSI_PR_EXCLUSIVE_ACCESS_ALL_REGS;
+ }
+
+ return 0;
+}
+
+
+uint8_t scsi_pr_cap_to_block(uint16_t scsi_pr_cap)
+{
+ uint8_t res = 0;
+
+ res |= (scsi_pr_cap & SCSI_PR_CAP_WR_EX) ?
+ BLK_PR_CAP_WR_EX : 0;
+ res |= (scsi_pr_cap & SCSI_PR_CAP_EX_AC) ?
+ BLK_PR_CAP_EX_AC : 0;
+ res |= (scsi_pr_cap & SCSI_PR_CAP_WR_EX_RO) ?
+ BLK_PR_CAP_WR_EX_RO : 0;
+ res |= (scsi_pr_cap & SCSI_PR_CAP_EX_AC_RO) ?
+ BLK_PR_CAP_EX_AC_RO : 0;
+ res |= (scsi_pr_cap & SCSI_PR_CAP_WR_EX_AR) ?
+ BLK_PR_CAP_WR_EX_AR : 0;
+ res |= (scsi_pr_cap & SCSI_PR_CAP_EX_AC_AR) ?
+ BLK_PR_CAP_EX_AC_AR : 0;
+
+ return res;
+}
+
+uint16_t block_pr_cap_to_scsi(uint8_t block_pr_cap)
+{
+ uint16_t res = 0;
+
+ res |= (block_pr_cap & BLK_PR_CAP_WR_EX) ?
+ SCSI_PR_CAP_WR_EX : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_EX_AC) ?
+ SCSI_PR_CAP_EX_AC : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_WR_EX_RO) ?
+ SCSI_PR_CAP_WR_EX_RO : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_EX_AC_RO) ?
+ SCSI_PR_CAP_EX_AC_RO : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_WR_EX_AR) ?
+ SCSI_PR_CAP_WR_EX_AR : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_EX_AC_AR) ?
+ SCSI_PR_CAP_EX_AC_AR : 0;
+
+ return res;
+}
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v9 05/10] hw/scsi: add persistent reservation in/out api for scsi device
2024-07-12 2:36 [PATCH v9 00/10] Support persistent reservation operations Changqi Lu
` (3 preceding siblings ...)
2024-07-12 2:36 ` [PATCH v9 04/10] scsi/util: add helper functions for persistent reservation types conversion Changqi Lu
@ 2024-07-12 2:36 ` Changqi Lu
2024-07-12 2:36 ` [PATCH v9 06/10] block/nvme: add reservation command protocol constants Changqi Lu
` (4 subsequent siblings)
9 siblings, 0 replies; 24+ messages in thread
From: Changqi Lu @ 2024-07-12 2:36 UTC (permalink / raw)
To: qemu-block, qemu-devel
Cc: kwolf, hreitz, stefanha, fam, ronniesahlberg, pbonzini, pl,
kbusch, its, foss, philmd, pizhenwei, Changqi Lu
Add persistent reservation in/out operations in the
SCSI device layer. By introducing the persistent
reservation in/out api, this enables the SCSI device
to perform reservation-related tasks, including querying
keys, querying reservation status, registering reservation
keys, initiating and releasing reservations, as well as
clearing and preempting reservations held by other keys.
These operations are crucial for management and control of
shared storage resources in a persistent manner.
Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
hw/scsi/scsi-disk.c | 368 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 368 insertions(+)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 4bd7af9d0c..09c12fafe3 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -32,6 +32,7 @@
#include "migration/vmstate.h"
#include "hw/scsi/emulation.h"
#include "scsi/constants.h"
+#include "scsi/utils.h"
#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
@@ -42,6 +43,7 @@
#include "qemu/cutils.h"
#include "trace.h"
#include "qom/object.h"
+#include "block/block_int.h"
#ifdef __linux
#include <scsi/sg.h>
@@ -1474,6 +1476,362 @@ static void scsi_disk_emulate_read_data(SCSIRequest *req)
scsi_req_complete(&r->req, GOOD);
}
+typedef struct SCSIPrReadKeys {
+ uint32_t generation;
+ uint32_t num_keys;
+ uint64_t *keys;
+ SCSIDiskReq *req;
+} SCSIPrReadKeys;
+
+typedef struct SCSIPrReadReservation {
+ uint32_t generation;
+ uint64_t key;
+ BlockPrType type;
+ SCSIDiskReq *req;
+} SCSIPrReadReservation;
+
+static void scsi_pr_read_keys_complete(void *opaque, int ret)
+{
+ int num_keys;
+ uint8_t *buf;
+ SCSIPrReadKeys *blk_keys = (SCSIPrReadKeys *)opaque;
+ SCSIDiskReq *r = blk_keys->req;
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
+
+ assert(blk_get_aio_context(s->qdev.conf.blk) ==
+ qemu_get_current_aio_context());
+
+ assert(r->req.aiocb != NULL);
+ r->req.aiocb = NULL;
+
+ if (scsi_disk_req_check_error(r, ret, true)) {
+ goto done;
+ }
+
+ buf = scsi_req_get_buf(&r->req);
+ num_keys = MIN(blk_keys->num_keys, ret > 0 ? ret : 0);
+ blk_keys->generation = cpu_to_be32(blk_keys->generation);
+ memcpy(&buf[0], &blk_keys->generation, 4);
+ for (int i = 0; i < num_keys; i++) {
+ blk_keys->keys[i] = cpu_to_be64(blk_keys->keys[i]);
+ memcpy(&buf[8 + i * 8], &blk_keys->keys[i], 8);
+ }
+ num_keys = cpu_to_be32(num_keys * 8);
+ memcpy(&buf[4], &num_keys, 4);
+
+ scsi_req_data(&r->req, r->buflen);
+done:
+ scsi_req_unref(&r->req);
+ g_free(blk_keys->keys);
+ g_free(blk_keys);
+}
+
+static void scsi_disk_emulate_pr_read_keys(SCSIRequest *req)
+{
+ SCSIPrReadKeys *blk_keys;
+ SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
+ int buflen = MIN(r->req.cmd.xfer, r->buflen);
+ int num_keys = (buflen - sizeof(uint32_t) * 2) / sizeof(uint64_t);
+
+ if (num_keys <= 0) {
+ scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
+ return;
+ }
+
+ blk_keys = g_new0(SCSIPrReadKeys, 1);
+ blk_keys->generation = 0;
+ /* num_keys is the maximum number of keys that can be transmitted */
+ blk_keys->num_keys = num_keys;
+ blk_keys->keys = g_malloc(sizeof(uint64_t) * num_keys);
+ blk_keys->req = r;
+
+ /* The request is used as the AIO opaque value, so add a ref. */
+ scsi_req_ref(&r->req);
+ r->req.aiocb = blk_aio_pr_read_keys(s->qdev.conf.blk, &blk_keys->generation,
+ blk_keys->num_keys, blk_keys->keys,
+ scsi_pr_read_keys_complete, blk_keys);
+ return;
+}
+
+static void scsi_pr_read_reservation_complete(void *opaque, int ret)
+{
+ uint8_t *buf;
+ uint32_t additional_len = 0;
+ SCSIPrReadReservation *blk_rsv = (SCSIPrReadReservation *)opaque;
+ SCSIDiskReq *r = blk_rsv->req;
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
+
+ assert(blk_get_aio_context(s->qdev.conf.blk) ==
+ qemu_get_current_aio_context());
+
+ assert(r->req.aiocb != NULL);
+ r->req.aiocb = NULL;
+
+ if (scsi_disk_req_check_error(r, ret, true)) {
+ goto done;
+ }
+
+ buf = scsi_req_get_buf(&r->req);
+ blk_rsv->generation = cpu_to_be32(blk_rsv->generation);
+ memcpy(&buf[0], &blk_rsv->generation, 4);
+ if (ret) {
+ additional_len = cpu_to_be32(16);
+ blk_rsv->key = cpu_to_be64(blk_rsv->key);
+ memcpy(&buf[8], &blk_rsv->key, 8);
+ buf[21] = block_pr_type_to_scsi(blk_rsv->type) & 0xf;
+ } else {
+ additional_len = cpu_to_be32(0);
+ }
+
+ memcpy(&buf[4], &additional_len, 4);
+ scsi_req_data(&r->req, r->buflen);
+
+done:
+ scsi_req_unref(&r->req);
+ g_free(blk_rsv);
+}
+
+static void scsi_disk_emulate_pr_read_reservation(SCSIRequest *req)
+{
+ SCSIPrReadReservation *blk_rsv;
+ SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
+ int buflen = MIN(r->req.cmd.xfer, r->buflen);
+ int count = sizeof(uint32_t) * 2 + sizeof(uint64_t) +
+ sizeof(uint32_t) + sizeof(uint8_t) * 2;
+
+ if (buflen < count) {
+ scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
+ return;
+ }
+
+ blk_rsv = g_malloc(sizeof(*blk_rsv));
+ blk_rsv->generation = 0;
+ blk_rsv->key = 0;
+ blk_rsv->type = 0;
+ blk_rsv->req = r;
+
+ /* The request is used as the AIO opaque value, so add a ref. */
+ scsi_req_ref(&r->req);
+ r->req.aiocb = blk_aio_pr_read_reservation(s->qdev.conf.blk,
+ &blk_rsv->generation, &blk_rsv->key, &blk_rsv->type,
+ scsi_pr_read_reservation_complete, blk_rsv);
+ return;
+}
+
+static void scsi_disk_emulate_pr_report_capabilities(SCSIRequest *req)
+{
+ SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
+ BlockDriverState *bs = blk_bs(s->qdev.conf.blk);
+ uint8_t blk_pr_cap = bs->bl.pr_cap;
+ uint8_t *buf = scsi_req_get_buf(req);
+ uint16_t pr_cap;
+ /*
+ * according to response of report_capabilities
+ * command of chapter 6.13 of spc4
+ */
+ int len = sizeof(uint16_t) * 2 + sizeof(uint8_t) * 4;
+
+ if (len > r->buflen) {
+ scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
+ return;
+ }
+
+ len = cpu_to_be16(len);
+ memcpy(&buf[0], &len, 2);
+ /* enable PTPL_C */
+ buf[2] = 1;
+ buf[3] = (blk_pr_cap & BLK_PR_CAP_PTPL) ? 1 : 0;
+ /* enable TMV */
+ buf[3] |= 1 << 7;
+
+ /* enable persistent reservation type */
+ pr_cap = block_pr_cap_to_scsi(blk_pr_cap);
+ buf[4] = pr_cap >> 8 & 0xff;
+ buf[5] = pr_cap & 0xff;
+
+ scsi_req_data(&r->req, len);
+ return;
+}
+
+static void scsi_aio_pr_complete(void *opaque, int ret)
+{
+ SCSIDiskReq *r = (SCSIDiskReq *)opaque;
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
+
+ /* The request must only run in the BlockBackend's AioContext */
+ assert(blk_get_aio_context(s->qdev.conf.blk) ==
+ qemu_get_current_aio_context());
+
+ assert(r->req.aiocb != NULL);
+ r->req.aiocb = NULL;
+
+ if (scsi_disk_req_check_error(r, ret, true)) {
+ goto done;
+ }
+
+ scsi_req_complete(&r->req, GOOD);
+
+done:
+ scsi_req_unref(&r->req);
+}
+
+static void scsi_disk_emulate_pr_register(SCSIDiskReq *r, uint64_t r_key,
+ uint64_t sa_key, SCSIPrType type,
+ uint8_t aptpl, bool ignore_key)
+{
+ SCSIRequest *req = &r->req;
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
+
+ /* The request is used as the AIO opaque value, so add a ref. */
+ scsi_req_ref(&r->req);
+ r->req.aiocb = blk_aio_pr_register(s->qdev.conf.blk, r_key, sa_key,
+ scsi_pr_type_to_block(type),
+ aptpl ? true : false,
+ ignore_key, scsi_aio_pr_complete, r);
+
+ return;
+}
+
+static void scsi_disk_emulate_pr_reserve(SCSIDiskReq *r, uint64_t r_key,
+ SCSIPrType type)
+{
+ SCSIRequest *req = &r->req;
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
+
+ /* The request is used as the AIO opaque value, so add a ref. */
+ scsi_req_ref(&r->req);
+ r->req.aiocb = blk_aio_pr_reserve(s->qdev.conf.blk, r_key,
+ scsi_pr_type_to_block(type),
+ scsi_aio_pr_complete, r);
+
+ return;
+}
+
+static void scsi_disk_emulate_pr_release(SCSIDiskReq *r, uint64_t r_key,
+ SCSIPrType type)
+{
+ SCSIRequest *req = &r->req;
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
+
+ /* The request is used as the AIO opaque value, so add a ref. */
+ scsi_req_ref(&r->req);
+ r->req.aiocb = blk_aio_pr_release(s->qdev.conf.blk, r_key,
+ scsi_pr_type_to_block(type),
+ scsi_aio_pr_complete, r);
+
+ return;
+}
+
+static void scsi_disk_emulate_pr_clear(SCSIDiskReq *r, uint64_t r_key)
+{
+ SCSIRequest *req = &r->req;
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
+
+ /* The request is used as the AIO opaque value, so add a ref. */
+ scsi_req_ref(&r->req);
+ r->req.aiocb = blk_aio_pr_clear(s->qdev.conf.blk, r_key,
+ scsi_aio_pr_complete, r);
+
+ return;
+}
+
+static void scsi_disk_emulate_pr_preempt(SCSIDiskReq *r, uint64_t r_key,
+ uint64_t sa_key, SCSIPrType type,
+ bool abort)
+{
+ SCSIRequest *req = &r->req;
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
+
+ /* The request is used as the AIO opaque value, so add a ref. */
+ scsi_req_ref(&r->req);
+ r->req.aiocb = blk_aio_pr_preempt(s->qdev.conf.blk, r_key, sa_key,
+ scsi_pr_type_to_block(type), abort,
+ scsi_aio_pr_complete, r);
+
+ return;
+}
+
+static void scsi_disk_emulate_pr_in(SCSIRequest *req)
+{
+ SCSIPrInAction action = req->cmd.buf[1] & 0x1f;
+ SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
+
+ switch (action) {
+ case SCSI_PR_IN_READ_KEYS:
+ scsi_disk_emulate_pr_read_keys(req);
+ break;
+ case SCSI_PR_IN_READ_RESERVATION:
+ scsi_disk_emulate_pr_read_reservation(req);
+ break;
+ case SCSI_PR_IN_REPORT_CAPABILITIES:
+ scsi_disk_emulate_pr_report_capabilities(req);
+ break;
+ default:
+ scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));
+ return;
+ }
+
+ return;
+}
+
+static void scsi_disk_emulate_pr_out(SCSIDiskReq *r, uint8_t *inbuf)
+{
+ uint8_t aptpl;
+ uint64_t r_key, sa_key;
+ SCSIPrOutAction action;
+ SCSIPrScope scope;
+ SCSIPrType type;
+ SCSIRequest *req = &r->req;
+
+ memcpy(&r_key, &inbuf[0], 8);
+ r_key = be64_to_cpu(r_key);
+ memcpy(&sa_key, &inbuf[8], 8);
+ sa_key = be64_to_cpu(sa_key);
+ memcpy(&aptpl, &inbuf[20], 1);
+ aptpl = aptpl & 0x01;
+ action = req->cmd.buf[1] & 0x1f;
+ scope = (req->cmd.buf[2] >> 4) & 0x0f;
+ type = req->cmd.buf[2] & 0x0f;
+
+ if (scope != SCSI_PR_LU_SCOPE) {
+ scsi_req_complete(&r->req, TASK_ABORTED);
+ return;
+ }
+
+ switch (action) {
+ case SCSI_PR_OUT_REGISTER:
+ scsi_disk_emulate_pr_register(r, r_key, sa_key, type,
+ aptpl, false);
+ break;
+ case SCSI_PR_OUT_REG_AND_IGNORE_KEY:
+ scsi_disk_emulate_pr_register(r, r_key, sa_key, type, aptpl, true);
+ break;
+ case SCSI_PR_OUT_RESERVE:
+ scsi_disk_emulate_pr_reserve(r, r_key, type);
+ break;
+ case SCSI_PR_OUT_RELEASE:
+ scsi_disk_emulate_pr_release(r, r_key, type);
+ break;
+ case SCSI_PR_OUT_CLEAR:
+ scsi_disk_emulate_pr_clear(r, r_key);
+ break;
+ case SCSI_PR_OUT_PREEMPT:
+ scsi_disk_emulate_pr_preempt(r, r_key, sa_key, type, false);
+ break;
+ case SCSI_PR_OUT_PREEMPT_AND_ABORT:
+ scsi_disk_emulate_pr_preempt(r, r_key, sa_key, type, true);
+ break;
+ default:
+ scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));
+ return;
+ }
+
+ return;
+}
+
static int scsi_disk_check_mode_select(SCSIDiskState *s, int page,
uint8_t *inbuf, int inlen)
{
@@ -1957,6 +2315,9 @@ static void scsi_disk_emulate_write_data(SCSIRequest *req)
scsi_req_complete(&r->req, GOOD);
break;
+ case PERSISTENT_RESERVE_OUT:
+ scsi_disk_emulate_pr_out(r, r->iov.iov_base);
+ break;
default:
abort();
}
@@ -2213,6 +2574,11 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf)
case FORMAT_UNIT:
trace_scsi_disk_emulate_command_FORMAT_UNIT(r->req.cmd.xfer);
break;
+ case PERSISTENT_RESERVE_OUT:
+ break;
+ case PERSISTENT_RESERVE_IN:
+ scsi_disk_emulate_pr_in(req);
+ return 0;
default:
trace_scsi_disk_emulate_command_UNKNOWN(buf[0],
scsi_command_name(buf[0]));
@@ -2632,6 +2998,8 @@ static const SCSIReqOps *const scsi_disk_reqops_dispatch[256] = {
[VERIFY_12] = &scsi_disk_emulate_reqops,
[VERIFY_16] = &scsi_disk_emulate_reqops,
[FORMAT_UNIT] = &scsi_disk_emulate_reqops,
+ [PERSISTENT_RESERVE_IN] = &scsi_disk_emulate_reqops,
+ [PERSISTENT_RESERVE_OUT] = &scsi_disk_emulate_reqops,
[READ_6] = &scsi_disk_dma_reqops,
[READ_10] = &scsi_disk_dma_reqops,
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v9 06/10] block/nvme: add reservation command protocol constants
2024-07-12 2:36 [PATCH v9 00/10] Support persistent reservation operations Changqi Lu
` (4 preceding siblings ...)
2024-07-12 2:36 ` [PATCH v9 05/10] hw/scsi: add persistent reservation in/out api for scsi device Changqi Lu
@ 2024-07-12 2:36 ` Changqi Lu
2024-07-12 2:36 ` [PATCH v9 07/10] hw/nvme: add helper functions for converting reservation types Changqi Lu
` (3 subsequent siblings)
9 siblings, 0 replies; 24+ messages in thread
From: Changqi Lu @ 2024-07-12 2:36 UTC (permalink / raw)
To: qemu-block, qemu-devel
Cc: kwolf, hreitz, stefanha, fam, ronniesahlberg, pbonzini, pl,
kbusch, its, foss, philmd, pizhenwei, Changqi Lu
Add constants for the NVMe persistent command protocol.
The constants include the reservation command opcode and
reservation type values defined in section 7 of the NVMe
2.0 specification.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
---
include/block/nvme.h | 61 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/include/block/nvme.h b/include/block/nvme.h
index bb231d0b9a..8b125f7769 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -633,7 +633,11 @@ enum NvmeIoCommands {
NVME_CMD_WRITE_ZEROES = 0x08,
NVME_CMD_DSM = 0x09,
NVME_CMD_VERIFY = 0x0c,
+ NVME_CMD_RESV_REGISTER = 0x0d,
+ NVME_CMD_RESV_REPORT = 0x0e,
+ NVME_CMD_RESV_ACQUIRE = 0x11,
NVME_CMD_IO_MGMT_RECV = 0x12,
+ NVME_CMD_RESV_RELEASE = 0x15,
NVME_CMD_COPY = 0x19,
NVME_CMD_IO_MGMT_SEND = 0x1d,
NVME_CMD_ZONE_MGMT_SEND = 0x79,
@@ -641,6 +645,63 @@ enum NvmeIoCommands {
NVME_CMD_ZONE_APPEND = 0x7d,
};
+typedef enum {
+ NVME_RESV_REGISTER_ACTION_REGISTER = 0x00,
+ NVME_RESV_REGISTER_ACTION_UNREGISTER = 0x01,
+ NVME_RESV_REGISTER_ACTION_REPLACE = 0x02,
+} NvmeReservationRegisterAction;
+
+typedef enum {
+ NVME_RESV_RELEASE_ACTION_RELEASE = 0x00,
+ NVME_RESV_RELEASE_ACTION_CLEAR = 0x01,
+} NvmeReservationReleaseAction;
+
+typedef enum {
+ NVME_RESV_ACQUIRE_ACTION_ACQUIRE = 0x00,
+ NVME_RESV_ACQUIRE_ACTION_PREEMPT = 0x01,
+ NVME_RESV_ACQUIRE_ACTION_PREEMPT_AND_ABORT = 0x02,
+} NvmeReservationAcquireAction;
+
+typedef enum {
+ NVME_RESV_WRITE_EXCLUSIVE = 0x01,
+ NVME_RESV_EXCLUSIVE_ACCESS = 0x02,
+ NVME_RESV_WRITE_EXCLUSIVE_REGS_ONLY = 0x03,
+ NVME_RESV_EXCLUSIVE_ACCESS_REGS_ONLY = 0x04,
+ NVME_RESV_WRITE_EXCLUSIVE_ALL_REGS = 0x05,
+ NVME_RESV_EXCLUSIVE_ACCESS_ALL_REGS = 0x06,
+} NvmeResvType;
+
+typedef enum {
+ NVME_RESV_PTPL_NO_CHANGE = 0x00,
+ NVME_RESV_PTPL_DISABLE = 0x02,
+ NVME_RESV_PTPL_ENABLE = 0x03,
+} NvmeResvPTPL;
+
+typedef enum NVMEPrCap {
+ /* Persist Through Power Loss */
+ NVME_PR_CAP_PTPL = 1 << 0,
+ /* Write Exclusive reservation type */
+ NVME_PR_CAP_WR_EX = 1 << 1,
+ /* Exclusive Access reservation type */
+ NVME_PR_CAP_EX_AC = 1 << 2,
+ /* Write Exclusive Registrants Only reservation type */
+ NVME_PR_CAP_WR_EX_RO = 1 << 3,
+ /* Exclusive Access Registrants Only reservation type */
+ NVME_PR_CAP_EX_AC_RO = 1 << 4,
+ /* Write Exclusive All Registrants reservation type */
+ NVME_PR_CAP_WR_EX_AR = 1 << 5,
+ /* Exclusive Access All Registrants reservation type */
+ NVME_PR_CAP_EX_AC_AR = 1 << 6,
+
+ NVME_PR_CAP_ALL = (NVME_PR_CAP_PTPL |
+ NVME_PR_CAP_WR_EX |
+ NVME_PR_CAP_EX_AC |
+ NVME_PR_CAP_WR_EX_RO |
+ NVME_PR_CAP_EX_AC_RO |
+ NVME_PR_CAP_WR_EX_AR |
+ NVME_PR_CAP_EX_AC_AR),
+} NvmePrCap;
+
typedef struct QEMU_PACKED NvmeDeleteQ {
uint8_t opcode;
uint8_t flags;
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v9 07/10] hw/nvme: add helper functions for converting reservation types
2024-07-12 2:36 [PATCH v9 00/10] Support persistent reservation operations Changqi Lu
` (5 preceding siblings ...)
2024-07-12 2:36 ` [PATCH v9 06/10] block/nvme: add reservation command protocol constants Changqi Lu
@ 2024-07-12 2:36 ` Changqi Lu
2024-07-12 2:36 ` [PATCH v9 08/10] hw/nvme: enable ONCS and rescap function Changqi Lu
` (2 subsequent siblings)
9 siblings, 0 replies; 24+ messages in thread
From: Changqi Lu @ 2024-07-12 2:36 UTC (permalink / raw)
To: qemu-block, qemu-devel
Cc: kwolf, hreitz, stefanha, fam, ronniesahlberg, pbonzini, pl,
kbusch, its, foss, philmd, pizhenwei, Changqi Lu, Klaus Jensen
This commit introduces two helper functions
that facilitate the conversion between the
reservation types used in the NVME protocol
and those used in the block layer.
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
---
hw/nvme/nvme.h | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h
index bed8191bd5..6d0e456348 100644
--- a/hw/nvme/nvme.h
+++ b/hw/nvme/nvme.h
@@ -474,6 +474,90 @@ static inline const char *nvme_io_opc_str(uint8_t opc)
}
}
+static inline NvmeResvType block_pr_type_to_nvme(BlockPrType type)
+{
+ switch (type) {
+ case BLK_PR_WRITE_EXCLUSIVE:
+ return NVME_RESV_WRITE_EXCLUSIVE;
+ case BLK_PR_EXCLUSIVE_ACCESS:
+ return NVME_RESV_EXCLUSIVE_ACCESS;
+ case BLK_PR_WRITE_EXCLUSIVE_REGS_ONLY:
+ return NVME_RESV_WRITE_EXCLUSIVE_REGS_ONLY;
+ case BLK_PR_EXCLUSIVE_ACCESS_REGS_ONLY:
+ return NVME_RESV_EXCLUSIVE_ACCESS_REGS_ONLY;
+ case BLK_PR_WRITE_EXCLUSIVE_ALL_REGS:
+ return NVME_RESV_WRITE_EXCLUSIVE_ALL_REGS;
+ case BLK_PR_EXCLUSIVE_ACCESS_ALL_REGS:
+ return NVME_RESV_EXCLUSIVE_ACCESS_ALL_REGS;
+ }
+
+ return 0;
+}
+
+static inline BlockPrType nvme_pr_type_to_block(NvmeResvType type)
+{
+ switch (type) {
+ case NVME_RESV_WRITE_EXCLUSIVE:
+ return BLK_PR_WRITE_EXCLUSIVE;
+ case NVME_RESV_EXCLUSIVE_ACCESS:
+ return BLK_PR_EXCLUSIVE_ACCESS;
+ case NVME_RESV_WRITE_EXCLUSIVE_REGS_ONLY:
+ return BLK_PR_WRITE_EXCLUSIVE_REGS_ONLY;
+ case NVME_RESV_EXCLUSIVE_ACCESS_REGS_ONLY:
+ return BLK_PR_EXCLUSIVE_ACCESS_REGS_ONLY;
+ case NVME_RESV_WRITE_EXCLUSIVE_ALL_REGS:
+ return BLK_PR_WRITE_EXCLUSIVE_ALL_REGS;
+ case NVME_RESV_EXCLUSIVE_ACCESS_ALL_REGS:
+ return BLK_PR_EXCLUSIVE_ACCESS_ALL_REGS;
+ }
+
+ return 0;
+}
+
+static inline uint8_t nvme_pr_cap_to_block(uint16_t nvme_pr_cap)
+{
+ uint8_t res = 0;
+
+ res |= (nvme_pr_cap & NVME_PR_CAP_PTPL) ?
+ NVME_PR_CAP_PTPL : 0;
+ res |= (nvme_pr_cap & NVME_PR_CAP_WR_EX) ?
+ BLK_PR_CAP_WR_EX : 0;
+ res |= (nvme_pr_cap & NVME_PR_CAP_EX_AC) ?
+ BLK_PR_CAP_EX_AC : 0;
+ res |= (nvme_pr_cap & NVME_PR_CAP_WR_EX_RO) ?
+ BLK_PR_CAP_WR_EX_RO : 0;
+ res |= (nvme_pr_cap & NVME_PR_CAP_EX_AC_RO) ?
+ BLK_PR_CAP_EX_AC_RO : 0;
+ res |= (nvme_pr_cap & NVME_PR_CAP_WR_EX_AR) ?
+ BLK_PR_CAP_WR_EX_AR : 0;
+ res |= (nvme_pr_cap & NVME_PR_CAP_EX_AC_AR) ?
+ BLK_PR_CAP_EX_AC_AR : 0;
+
+ return res;
+}
+
+static inline uint8_t block_pr_cap_to_nvme(uint8_t block_pr_cap)
+{
+ uint16_t res = 0;
+
+ res |= (block_pr_cap & BLK_PR_CAP_PTPL) ?
+ NVME_PR_CAP_PTPL : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_WR_EX) ?
+ NVME_PR_CAP_WR_EX : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_EX_AC) ?
+ NVME_PR_CAP_EX_AC : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_WR_EX_RO) ?
+ NVME_PR_CAP_WR_EX_RO : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_EX_AC_RO) ?
+ NVME_PR_CAP_EX_AC_RO : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_WR_EX_AR) ?
+ NVME_PR_CAP_WR_EX_AR : 0;
+ res |= (block_pr_cap & BLK_PR_CAP_EX_AC_AR) ?
+ NVME_PR_CAP_EX_AC_AR : 0;
+
+ return res;
+}
+
typedef struct NvmeSQueue {
struct NvmeCtrl *ctrl;
uint16_t sqid;
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v9 08/10] hw/nvme: enable ONCS and rescap function
2024-07-12 2:36 [PATCH v9 00/10] Support persistent reservation operations Changqi Lu
` (6 preceding siblings ...)
2024-07-12 2:36 ` [PATCH v9 07/10] hw/nvme: add helper functions for converting reservation types Changqi Lu
@ 2024-07-12 2:36 ` Changqi Lu
2024-07-12 2:36 ` [PATCH v9 09/10] hw/nvme: add reservation protocal command Changqi Lu
2024-07-12 2:36 ` [PATCH v9 10/10] block/iscsi: add persistent reservation in/out driver Changqi Lu
9 siblings, 0 replies; 24+ messages in thread
From: Changqi Lu @ 2024-07-12 2:36 UTC (permalink / raw)
To: qemu-block, qemu-devel
Cc: kwolf, hreitz, stefanha, fam, ronniesahlberg, pbonzini, pl,
kbusch, its, foss, philmd, pizhenwei, Changqi Lu, Klaus Jensen
This commit enables ONCS to support the reservation
function at the controller level. Also enables rescap
function in the namespace by detecting the supported reservation
function in the backend driver.
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
hw/nvme/ctrl.c | 3 ++-
hw/nvme/ns.c | 5 +++++
include/block/nvme.h | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 127c3d2383..ad212de723 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -8248,7 +8248,8 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)
id->nn = cpu_to_le32(NVME_MAX_NAMESPACES);
id->oncs = cpu_to_le16(NVME_ONCS_WRITE_ZEROES | NVME_ONCS_TIMESTAMP |
NVME_ONCS_FEATURES | NVME_ONCS_DSM |
- NVME_ONCS_COMPARE | NVME_ONCS_COPY);
+ NVME_ONCS_COMPARE | NVME_ONCS_COPY |
+ NVME_ONCS_RESERVATIONS);
/*
* NOTE: If this device ever supports a command set that does NOT use 0x0
diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c
index ea8db175db..a5c903d727 100644
--- a/hw/nvme/ns.c
+++ b/hw/nvme/ns.c
@@ -20,6 +20,7 @@
#include "qemu/bitops.h"
#include "sysemu/sysemu.h"
#include "sysemu/block-backend.h"
+#include "block/block_int.h"
#include "nvme.h"
#include "trace.h"
@@ -33,6 +34,7 @@ void nvme_ns_init_format(NvmeNamespace *ns)
BlockDriverInfo bdi;
int npdg, ret;
int64_t nlbas;
+ uint8_t blk_pr_cap;
ns->lbaf = id_ns->lbaf[NVME_ID_NS_FLBAS_INDEX(id_ns->flbas)];
ns->lbasz = 1 << ns->lbaf.ds;
@@ -55,6 +57,9 @@ void nvme_ns_init_format(NvmeNamespace *ns)
}
id_ns->npda = id_ns->npdg = npdg - 1;
+
+ blk_pr_cap = blk_bs(ns->blkconf.blk)->bl.pr_cap;
+ id_ns->rescap = block_pr_cap_to_nvme(blk_pr_cap);
}
static int nvme_ns_init(NvmeNamespace *ns, Error **errp)
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 8b125f7769..9b9eaeb3a7 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -1251,7 +1251,7 @@ enum NvmeIdCtrlOncs {
NVME_ONCS_DSM = 1 << 2,
NVME_ONCS_WRITE_ZEROES = 1 << 3,
NVME_ONCS_FEATURES = 1 << 4,
- NVME_ONCS_RESRVATIONS = 1 << 5,
+ NVME_ONCS_RESERVATIONS = 1 << 5,
NVME_ONCS_TIMESTAMP = 1 << 6,
NVME_ONCS_VERIFY = 1 << 7,
NVME_ONCS_COPY = 1 << 8,
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-07-12 2:36 [PATCH v9 00/10] Support persistent reservation operations Changqi Lu
` (7 preceding siblings ...)
2024-07-12 2:36 ` [PATCH v9 08/10] hw/nvme: enable ONCS and rescap function Changqi Lu
@ 2024-07-12 2:36 ` Changqi Lu
2024-07-15 10:09 ` Klaus Jensen
` (2 more replies)
2024-07-12 2:36 ` [PATCH v9 10/10] block/iscsi: add persistent reservation in/out driver Changqi Lu
9 siblings, 3 replies; 24+ messages in thread
From: Changqi Lu @ 2024-07-12 2:36 UTC (permalink / raw)
To: qemu-block, qemu-devel
Cc: kwolf, hreitz, stefanha, fam, ronniesahlberg, pbonzini, pl,
kbusch, its, foss, philmd, pizhenwei, Changqi Lu, Klaus Jensen
Add reservation acquire, reservation register,
reservation release and reservation report commands
in the nvme device layer.
By introducing these commands, this enables the nvme
device to perform reservation-related tasks, including
querying keys, querying reservation status, registering
reservation keys, initiating and releasing reservations,
as well as clearing and preempting reservations held by
other keys.
These commands are crucial for management and control of
shared storage resources in a persistent manner.
Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Acked-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/nvme/ctrl.c | 318 +++++++++++++++++++++++++++++++++++++++++++
hw/nvme/nvme.h | 4 +
include/block/nvme.h | 37 +++++
3 files changed, 359 insertions(+)
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index ad212de723..b6e8deb40d 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -294,6 +294,10 @@ static const uint32_t nvme_cse_iocs_nvm[256] = {
[NVME_CMD_COMPARE] = NVME_CMD_EFF_CSUPP,
[NVME_CMD_IO_MGMT_RECV] = NVME_CMD_EFF_CSUPP,
[NVME_CMD_IO_MGMT_SEND] = NVME_CMD_EFF_CSUPP | NVME_CMD_EFF_LBCC,
+ [NVME_CMD_RESV_REGISTER] = NVME_CMD_EFF_CSUPP,
+ [NVME_CMD_RESV_REPORT] = NVME_CMD_EFF_CSUPP,
+ [NVME_CMD_RESV_ACQUIRE] = NVME_CMD_EFF_CSUPP,
+ [NVME_CMD_RESV_RELEASE] = NVME_CMD_EFF_CSUPP,
};
static const uint32_t nvme_cse_iocs_zoned[256] = {
@@ -308,6 +312,10 @@ static const uint32_t nvme_cse_iocs_zoned[256] = {
[NVME_CMD_ZONE_APPEND] = NVME_CMD_EFF_CSUPP | NVME_CMD_EFF_LBCC,
[NVME_CMD_ZONE_MGMT_SEND] = NVME_CMD_EFF_CSUPP | NVME_CMD_EFF_LBCC,
[NVME_CMD_ZONE_MGMT_RECV] = NVME_CMD_EFF_CSUPP,
+ [NVME_CMD_RESV_REGISTER] = NVME_CMD_EFF_CSUPP,
+ [NVME_CMD_RESV_REPORT] = NVME_CMD_EFF_CSUPP,
+ [NVME_CMD_RESV_ACQUIRE] = NVME_CMD_EFF_CSUPP,
+ [NVME_CMD_RESV_RELEASE] = NVME_CMD_EFF_CSUPP,
};
static void nvme_process_sq(void *opaque);
@@ -1745,6 +1753,7 @@ static void nvme_aio_err(NvmeRequest *req, int ret)
switch (req->cmd.opcode) {
case NVME_CMD_READ:
+ case NVME_CMD_RESV_REPORT:
status = NVME_UNRECOVERED_READ;
break;
case NVME_CMD_FLUSH:
@@ -1752,6 +1761,9 @@ static void nvme_aio_err(NvmeRequest *req, int ret)
case NVME_CMD_WRITE_ZEROES:
case NVME_CMD_ZONE_APPEND:
case NVME_CMD_COPY:
+ case NVME_CMD_RESV_REGISTER:
+ case NVME_CMD_RESV_ACQUIRE:
+ case NVME_CMD_RESV_RELEASE:
status = NVME_WRITE_FAULT;
break;
default:
@@ -2692,6 +2704,304 @@ static uint16_t nvme_verify(NvmeCtrl *n, NvmeRequest *req)
return NVME_NO_COMPLETE;
}
+typedef struct NvmeKeyInfo {
+ uint64_t cr_key;
+ uint64_t nr_key;
+} NvmeKeyInfo;
+
+static uint16_t nvme_resv_register(NvmeCtrl *n, NvmeRequest *req)
+{
+ int ret;
+ NvmeKeyInfo key_info;
+ NvmeNamespace *ns = req->ns;
+ uint32_t cdw10 = le32_to_cpu(req->cmd.cdw10);
+ bool ignore_key = cdw10 >> 3 & 0x1;
+ uint8_t action = cdw10 & 0x7;
+ uint8_t ptpl = cdw10 >> 30 & 0x3;
+ bool aptpl;
+
+ switch (ptpl) {
+ case NVME_RESV_PTPL_NO_CHANGE:
+ aptpl = (ns->id_ns.rescap & NVME_PR_CAP_PTPL) ? true : false;
+ break;
+ case NVME_RESV_PTPL_DISABLE:
+ aptpl = false;
+ break;
+ case NVME_RESV_PTPL_ENABLE:
+ aptpl = true;
+ break;
+ default:
+ return NVME_INVALID_FIELD;
+ }
+
+ ret = nvme_h2c(n, (uint8_t *)&key_info, sizeof(NvmeKeyInfo), req);
+ if (ret) {
+ return ret;
+ }
+
+ switch (action) {
+ case NVME_RESV_REGISTER_ACTION_REGISTER:
+ req->aiocb = blk_aio_pr_register(ns->blkconf.blk, 0,
+ key_info.nr_key, 0, aptpl,
+ ignore_key, nvme_misc_cb,
+ req);
+ break;
+ case NVME_RESV_REGISTER_ACTION_UNREGISTER:
+ req->aiocb = blk_aio_pr_register(ns->blkconf.blk, key_info.cr_key, 0,
+ 0, aptpl, ignore_key,
+ nvme_misc_cb, req);
+ break;
+ case NVME_RESV_REGISTER_ACTION_REPLACE:
+ req->aiocb = blk_aio_pr_register(ns->blkconf.blk, key_info.cr_key,
+ key_info.nr_key, 0, aptpl, ignore_key,
+ nvme_misc_cb, req);
+ break;
+ default:
+ return NVME_INVALID_FIELD;
+ }
+
+ return NVME_NO_COMPLETE;
+}
+
+static uint16_t nvme_resv_release(NvmeCtrl *n, NvmeRequest *req)
+{
+ int ret;
+ uint64_t cr_key;
+ NvmeNamespace *ns = req->ns;
+ uint32_t cdw10 = le32_to_cpu(req->cmd.cdw10);
+ uint8_t action = cdw10 & 0x7;
+ NvmeResvType type = cdw10 >> 8 & 0xff;
+
+ ret = nvme_h2c(n, (uint8_t *)&cr_key, sizeof(cr_key), req);
+ if (ret) {
+ return ret;
+ }
+
+ switch (action) {
+ case NVME_RESV_RELEASE_ACTION_RELEASE:
+ req->aiocb = blk_aio_pr_release(ns->blkconf.blk, cr_key,
+ nvme_pr_type_to_block(type),
+ nvme_misc_cb, req);
+ break;
+ case NVME_RESV_RELEASE_ACTION_CLEAR:
+ req->aiocb = blk_aio_pr_clear(ns->blkconf.blk, cr_key,
+ nvme_misc_cb, req);
+ break;
+ default:
+ return NVME_INVALID_FIELD;
+ }
+
+ return NVME_NO_COMPLETE;
+}
+
+static uint16_t nvme_resv_acquire(NvmeCtrl *n, NvmeRequest *req)
+{
+ int ret;
+ NvmeKeyInfo key_info;
+ NvmeNamespace *ns = req->ns;
+ uint32_t cdw10 = le32_to_cpu(req->cmd.cdw10);
+ uint8_t action = cdw10 & 0x7;
+ NvmeResvType type = cdw10 >> 8 & 0xff;
+
+ ret = nvme_h2c(n, (uint8_t *)&key_info, sizeof(NvmeKeyInfo), req);
+ if (ret) {
+ return ret;
+ }
+
+ switch (action) {
+ case NVME_RESV_ACQUIRE_ACTION_ACQUIRE:
+ req->aiocb = blk_aio_pr_reserve(ns->blkconf.blk, key_info.cr_key,
+ nvme_pr_type_to_block(type),
+ nvme_misc_cb, req);
+ break;
+ case NVME_RESV_ACQUIRE_ACTION_PREEMPT:
+ req->aiocb = blk_aio_pr_preempt(ns->blkconf.blk,
+ key_info.cr_key, key_info.nr_key,
+ nvme_pr_type_to_block(type),
+ false, nvme_misc_cb, req);
+ break;
+ case NVME_RESV_ACQUIRE_ACTION_PREEMPT_AND_ABORT:
+ req->aiocb = blk_aio_pr_preempt(ns->blkconf.blk, key_info.cr_key,
+ key_info.nr_key, type, true,
+ nvme_misc_cb, req);
+ break;
+ default:
+ return NVME_INVALID_FIELD;
+ }
+
+ return NVME_NO_COMPLETE;
+}
+
+typedef struct NvmeResvKeys {
+ uint32_t generation;
+ uint32_t num_keys;
+ uint64_t *keys;
+ NvmeRequest *req;
+} NvmeResvKeys;
+
+typedef struct NvmeReadReservation {
+ uint32_t generation;
+ uint64_t key;
+ BlockPrType type;
+ NvmeRequest *req;
+ NvmeResvKeys *keys_info;
+} NvmeReadReservation;
+
+static int nvme_read_reservation_cb(NvmeReadReservation *reservation)
+{
+ int rc;
+ NvmeReservationStatus *nvme_status;
+ NvmeRequest *req = reservation->req;
+ NvmeCtrl *n = req->sq->ctrl;
+ NvmeResvKeys *keys_info = reservation->keys_info;
+ int len = sizeof(NvmeReservationStatusHeader) +
+ sizeof(NvmeRegisteredCtrl) * keys_info->num_keys;
+
+ nvme_status = g_malloc(len);
+ nvme_status->header.gen = reservation->generation;
+ nvme_status->header.rtype = block_pr_type_to_nvme(reservation->type);
+ nvme_status->header.regctl = keys_info->num_keys;
+ for (int i = 0; i < keys_info->num_keys; i++) {
+ nvme_status->regctl_ds[i].cntlid = nvme_ctrl(req)->cntlid;
+ nvme_status->regctl_ds[i].rkey = keys_info->keys[i];
+ nvme_status->regctl_ds[i].rcsts = keys_info->keys[i] ==
+ reservation->key ? 1 : 0;
+ /* hostid is not supported currently */
+ memset(&nvme_status->regctl_ds[i].hostid, 0, 8);
+ }
+
+ rc = nvme_c2h(n, (uint8_t *)nvme_status, len, req);
+ g_free(nvme_status);
+ return rc;
+}
+
+static int nvme_read_reservation_ext_cb(NvmeReadReservation *reservation)
+{
+ int rc;
+ NvmeReservationStatusExt *nvme_status_ext;
+ NvmeRequest *req = reservation->req;
+ NvmeCtrl *n = req->sq->ctrl;
+ NvmeResvKeys *keys_info = reservation->keys_info;
+ int len = sizeof(NvmeReservationStatusHeader) +
+ sizeof(uint8_t) * 40 +
+ sizeof(NvmeRegisteredCtrlExt) * keys_info->num_keys;
+
+ nvme_status_ext = g_malloc(len);
+ nvme_status_ext->header.gen = cpu_to_be32(reservation->generation);
+ nvme_status_ext->header.rtype = block_pr_type_to_nvme(reservation->type);
+ nvme_status_ext->header.regctl = cpu_to_be16(keys_info->num_keys);
+
+ for (int i = 0; i < keys_info->num_keys; i++) {
+ uint16_t ctnlid = nvme_ctrl(req)->cntlid;
+ nvme_status_ext->regctl_eds[i].cntlid = cpu_to_be16(ctnlid);
+ nvme_status_ext->regctl_eds[i].rkey = cpu_to_be64(keys_info->keys[i]);
+ nvme_status_ext->regctl_eds[i].rcsts = keys_info->keys[i] ==
+ reservation->key ? 1 : 0;
+ /* hostid is not supported currently */
+ memset(&nvme_status_ext->regctl_eds[i].hostid, 0, 16);
+ }
+
+ rc = nvme_c2h(n, (uint8_t *)nvme_status_ext, len, req);
+ g_free(nvme_status_ext);
+ return rc;
+}
+
+static void nvme_resv_read_reservation_cb(void *opaque, int ret)
+{
+ NvmeReadReservation *reservation = opaque;
+ NvmeRequest *req = reservation->req;
+ bool eds = req->cmd.cdw11 & 0x1;
+ NvmeResvKeys *keys_info = reservation->keys_info;
+
+ if (ret < 0) {
+ goto out;
+ }
+
+ if (eds) {
+ ret = nvme_read_reservation_ext_cb(reservation);
+ } else {
+ ret = nvme_read_reservation_cb(reservation);
+ }
+
+out:
+ g_free(keys_info->keys);
+ g_free(keys_info);
+ g_free(reservation);
+ nvme_misc_cb(req, ret);
+}
+
+static void nvme_resv_read_keys_cb(void *opaque, int ret)
+{
+ NvmeResvKeys *keys_info = opaque;
+ NvmeRequest *req = keys_info->req;
+ NvmeNamespace *ns = req->ns;
+ NvmeReadReservation *reservation;
+
+ if (ret < 0) {
+ goto out;
+ }
+
+ keys_info->num_keys = MIN(ret, keys_info->num_keys);
+ reservation = g_new0(NvmeReadReservation, 1);
+ memset(reservation, 0, sizeof(*reservation));
+ reservation->req = req;
+ reservation->keys_info = keys_info;
+
+ req->aiocb = blk_aio_pr_read_reservation(ns->blkconf.blk,
+ &reservation->generation, &reservation->key,
+ &reservation->type, nvme_resv_read_reservation_cb,
+ reservation);
+ return;
+
+out:
+ g_free(keys_info->keys);
+ g_free(keys_info);
+ nvme_misc_cb(req, ret);
+}
+
+
+static uint16_t nvme_resv_report(NvmeCtrl *n, NvmeRequest *req)
+{
+ int num_keys;
+ uint32_t cdw10 = req->cmd.cdw10;
+ uint32_t cdw11 = req->cmd.cdw11;
+ int buflen = (cdw10 + 1) * sizeof(uint32_t);
+ bool eds = cdw11 & 0x1;
+ NvmeNamespace *ns = req->ns;
+ NvmeResvKeys *keys_info;
+
+ if (eds) {
+ if (buflen < sizeof(NvmeReservationStatusHeader) +
+ sizeof(uint8_t) * 40) {
+ return NVME_INVALID_FIELD;
+ }
+
+ num_keys = (buflen - sizeof(NvmeReservationStatusHeader) -
+ sizeof(uint8_t) * 40) /
+ sizeof(struct NvmeRegisteredCtrlExt);
+ } else {
+ if (buflen < sizeof(NvmeReservationStatusHeader)) {
+ return NVME_INVALID_FIELD;
+ }
+
+ num_keys = (buflen - sizeof(NvmeReservationStatusHeader)) /
+ sizeof(struct NvmeRegisteredCtrl);
+ }
+
+ keys_info = g_new0(NvmeResvKeys, 1);
+ keys_info->generation = 0;
+ /* num_keys is the maximum number of keys that can be transmitted */
+ keys_info->num_keys = num_keys;
+ keys_info->keys = g_malloc(sizeof(uint64_t) * num_keys);
+ keys_info->req = req;
+
+ req->aiocb = blk_aio_pr_read_keys(ns->blkconf.blk, &keys_info->generation,
+ keys_info->num_keys, keys_info->keys,
+ nvme_resv_read_keys_cb, keys_info);
+
+ return NVME_NO_COMPLETE;
+}
+
typedef struct NvmeCopyAIOCB {
BlockAIOCB common;
BlockAIOCB *aiocb;
@@ -4469,6 +4779,14 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest *req)
return nvme_dsm(n, req);
case NVME_CMD_VERIFY:
return nvme_verify(n, req);
+ case NVME_CMD_RESV_REGISTER:
+ return nvme_resv_register(n, req);
+ case NVME_CMD_RESV_REPORT:
+ return nvme_resv_report(n, req);
+ case NVME_CMD_RESV_ACQUIRE:
+ return nvme_resv_acquire(n, req);
+ case NVME_CMD_RESV_RELEASE:
+ return nvme_resv_release(n, req);
case NVME_CMD_COPY:
return nvme_copy(n, req);
case NVME_CMD_ZONE_MGMT_SEND:
diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h
index 6d0e456348..fdd919c2b1 100644
--- a/hw/nvme/nvme.h
+++ b/hw/nvme/nvme.h
@@ -470,6 +470,10 @@ static inline const char *nvme_io_opc_str(uint8_t opc)
case NVME_CMD_ZONE_MGMT_SEND: return "NVME_ZONED_CMD_MGMT_SEND";
case NVME_CMD_ZONE_MGMT_RECV: return "NVME_ZONED_CMD_MGMT_RECV";
case NVME_CMD_ZONE_APPEND: return "NVME_ZONED_CMD_ZONE_APPEND";
+ case NVME_CMD_RESV_REGISTER: return "NVME_CMD_RESV_REGISTER";
+ case NVME_CMD_RESV_REPORT: return "NVME_CMD_RESV_REPORT";
+ case NVME_CMD_RESV_ACQUIRE: return "NVME_CMD_RESV_ACQUIRE";
+ case NVME_CMD_RESV_RELEASE: return "NVME_CMD_RESV_RELEASE";
default: return "NVME_NVM_CMD_UNKNOWN";
}
}
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 9b9eaeb3a7..2f24570d4a 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -702,6 +702,43 @@ typedef enum NVMEPrCap {
NVME_PR_CAP_EX_AC_AR),
} NvmePrCap;
+typedef struct QEMU_PACKED NvmeRegisteredCtrl {
+ uint16_t cntlid;
+ uint8_t rcsts;
+ uint8_t rsvd3[5];
+ uint8_t hostid[8];
+ uint64_t rkey;
+} NvmeRegisteredCtrl;
+
+typedef struct QEMU_PACKED NvmeRegisteredCtrlExt {
+ uint16_t cntlid;
+ uint8_t rcsts;
+ uint8_t rsvd3[5];
+ uint64_t rkey;
+ uint8_t hostid[16];
+ uint8_t rsvd32[32];
+} NvmeRegisteredCtrlExt;
+
+typedef struct QEMU_PACKED NvmeReservationStatusHeader {
+ uint32_t gen;
+ uint8_t rtype;
+ uint16_t regctl;
+ uint16_t resv5;
+ uint8_t ptpls;
+ uint8_t resv10[14];
+} NvmeReservationStatusHeader;
+
+typedef struct QEMU_PACKED NvmeReservationStatus {
+ struct NvmeReservationStatusHeader header;
+ struct NvmeRegisteredCtrl regctl_ds[];
+} NvmeReservationStatus;
+
+typedef struct QEMU_PACKED NvmeReservationStatusExt {
+ struct NvmeReservationStatusHeader header;
+ uint8_t rsvd24[40];
+ struct NvmeRegisteredCtrlExt regctl_eds[];
+} NvmeReservationStatusExt;
+
typedef struct QEMU_PACKED NvmeDeleteQ {
uint8_t opcode;
uint8_t flags;
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-07-12 2:36 ` [PATCH v9 09/10] hw/nvme: add reservation protocal command Changqi Lu
@ 2024-07-15 10:09 ` Klaus Jensen
2024-07-17 9:04 ` 卢长奇
[not found] ` <58383d65-83df-4527-81e4-b4d12c409b22@bytedance.com>
2024-08-28 6:10 ` Klaus Jensen
2024-08-28 6:51 ` Klaus Jensen
2 siblings, 2 replies; 24+ messages in thread
From: Klaus Jensen @ 2024-07-15 10:09 UTC (permalink / raw)
To: Changqi Lu
Cc: qemu-block, qemu-devel, kwolf, hreitz, stefanha, fam,
ronniesahlberg, pbonzini, pl, kbusch, foss, philmd, pizhenwei,
Klaus Jensen
[-- Attachment #1: Type: text/plain, Size: 1628 bytes --]
On Jul 12 10:36, Changqi Lu wrote:
> Add reservation acquire, reservation register,
> reservation release and reservation report commands
> in the nvme device layer.
>
> By introducing these commands, this enables the nvme
> device to perform reservation-related tasks, including
> querying keys, querying reservation status, registering
> reservation keys, initiating and releasing reservations,
> as well as clearing and preempting reservations held by
> other keys.
>
> These commands are crucial for management and control of
> shared storage resources in a persistent manner.
> Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
> Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
> Acked-by: Klaus Jensen <k.jensen@samsung.com>
> ---
> hw/nvme/ctrl.c | 318 +++++++++++++++++++++++++++++++++++++++++++
> hw/nvme/nvme.h | 4 +
> include/block/nvme.h | 37 +++++
> 3 files changed, 359 insertions(+)
>
This looks good to me, but two comments.
1. Do you have a small guide on how to get a simple test environment
up for this?
2. Can you touch on the justification for not supporting the remaining
mandatory features required when indicating Reservation support?
hw/nvme *does* compromise on mandatory features from time to time
when it makes sense, so I'm not saying that not having the log
pages, notifications and so on is a deal breaker, I'm just
interested in the justification and/or motivation.
For instance, I think the SPDK reserve test will fail on this due
to lack of Host Identifier Feature support.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-07-15 10:09 ` Klaus Jensen
@ 2024-07-17 9:04 ` 卢长奇
[not found] ` <58383d65-83df-4527-81e4-b4d12c409b22@bytedance.com>
1 sibling, 0 replies; 24+ messages in thread
From: 卢长奇 @ 2024-07-17 9:04 UTC (permalink / raw)
To: Klaus Jensen
Cc: qemu-block, qemu-devel, kwolf, hreitz, stefanha, fam,
ronniesahlberg, pbonzini, pl, kbusch, foss, philmd, pizhenwei,
Klaus Jensen
[-- Attachment #1: Type: text/plain, Size: 1862 bytes --]
Hi,
Thank you for your support.
1. I will add a guide on how to get a simple test at next patch.
2. I think hostid is stored locally like cntlid, but I can't
find a way to get the host ID. Is it correct to get it through
qmp_query_uuid() method?
Using spdk as target will not fail, but it will show 0 at hostid
at present.
On 2024/7/15 18:09, Klaus Jensen wrote:
> On Jul 12 10:36, Changqi Lu wrote:
>> Add reservation acquire, reservation register,
>> reservation release and reservation report commands
>> in the nvme device layer.
>>
>> By introducing these commands, this enables the nvme
>> device to perform reservation-related tasks, including
>> querying keys, querying reservation status, registering
>> reservation keys, initiating and releasing reservations,
>> as well as clearing and preempting reservations held by
>> other keys.
>>
>> These commands are crucial for management and control of
>> shared storage resources in a persistent manner.
>> Signed-off-by: Changqi Lu
>> Signed-off-by: zhenwei pi
>> Acked-by: Klaus Jensen
>> ---
>> hw/nvme/ctrl.c | 318 +++++++++++++++++++++++++++++++++++++++++++
>> hw/nvme/nvme.h | 4 +
>> include/block/nvme.h | 37 +++++
>> 3 files changed, 359 insertions(+)
>>
>
> This looks good to me, but two comments.
>
> 1. Do you have a small guide on how to get a simple test environment
> up for this?
>
> 2. Can you touch on the justification for not supporting the remaining
> mandatory features required when indicating Reservation support?
>
> hw/nvme *does* compromise on mandatory features from time to time
> when it makes sense, so I'm not saying that not having the log
> pages, notifications and so on is a deal breaker, I'm just
> interested in the justification and/or motivation.
>
> For instance, I think the SPDK reserve test will fail on this due
> to lack of Host Identifier Feature support.
[-- Attachment #2: Type: text/html, Size: 2404 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread[parent not found: <58383d65-83df-4527-81e4-b4d12c409b22@bytedance.com>]
* Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
[not found] ` <58383d65-83df-4527-81e4-b4d12c409b22@bytedance.com>
@ 2024-07-26 2:42 ` 卢长奇
2024-07-26 6:25 ` Klaus Jensen
0 siblings, 1 reply; 24+ messages in thread
From: 卢长奇 @ 2024-07-26 2:42 UTC (permalink / raw)
To: Klaus Jensen, Klaus Jensen
Cc: qemu-block, qemu-devel, kwolf, hreitz, stefanha, fam,
ronniesahlberg, pbonzini, pl, kbusch, foss, philmd, pizhenwei
[-- Attachment #1: Type: text/plain, Size: 2960 bytes --]
Hi,
```
2685 nvme_status->regctl_ds[i].cntlid = nvme_ctrl(req)->cntlid;
2686 nvme_status->regctl_ds[i].rkey = keys_info->keys[i];
2687 nvme_status->regctl_ds[i].rcsts = keys_info->keys[i] ==
2688 reservation->key ? 1 : 0;
2689 /* hostid is not supported currently */
2670 memset(&nvme_status->regctl_ds[i].hostid, 0, 8);
```
Klaus, I think hostid(2685) is stored locally like cntlid, i
can get cntlid by nvme_ctrl(req)->cntlid, but I can't
find a good way to get the host ID(2670). So I add a comment
"/* hostid is not supported currently */". Could you give me
some advices?
And using spdk as target will not fail, but it will show 0 at hostid
at present. The relevant tests in qemu are as follows，
```
root@node1:~# nvme resv-report /dev/nvme0n1
NVME Reservation Report success
NVME Reservation status:
gen : 1
regctl : 1
rtype : 0
ptpls : 0
regctl[0] :
cntlid : 0
rcsts : 0
hostid : 0
rkey : 6
```
On 2024/7/17 17:03, 卢长奇 wrote:
> Hi,
>
>
> Thank you for your support.
> 1. I will add a guide on how to get a simple test at next patch.
> 2. I think hostid is stored locally like cntlid, but I can't
> find a way to get the host ID. Is it correct to get it through
> qmp_query_uuid() method?
>
> Using spdk as target will not fail, but it will show 0 at hostid
> at present.
>
> On 2024/7/15 18:09, Klaus Jensen wrote:
>> On Jul 12 10:36, Changqi Lu wrote:
>>> Add reservation acquire, reservation register,
>>> reservation release and reservation report commands
>>> in the nvme device layer.
>>>
>>> By introducing these commands, this enables the nvme
>>> device to perform reservation-related tasks, including
>>> querying keys, querying reservation status, registering
>>> reservation keys, initiating and releasing reservations,
>>> as well as clearing and preempting reservations held by
>>> other keys.
>>>
>>> These commands are crucial for management and control of
>>> shared storage resources in a persistent manner.
>>> Signed-off-by: Changqi Lu
>>> Signed-off-by: zhenwei pi
>>> Acked-by: Klaus Jensen
>>> ---
>>> hw/nvme/ctrl.c | 318 +++++++++++++++++++++++++++++++++++++++++++
>>> hw/nvme/nvme.h | 4 +
>>> include/block/nvme.h | 37 +++++
>>> 3 files changed, 359 insertions(+)
>>>
>>
>> This looks good to me, but two comments.
>>
>> 1. Do you have a small guide on how to get a simple test environment
>> up for this?
>>
>> 2. Can you touch on the justification for not supporting the remaining
>> mandatory features required when indicating Reservation support?
>>
>> hw/nvme *does* compromise on mandatory features from time to time
>> when it makes sense, so I'm not saying that not having the log
>> pages, notifications and so on is a deal breaker, I'm just
>> interested in the justification and/or motivation.
>>
>> For instance, I think the SPDK reserve test will fail on this due
>> to lack of Host Identifier Feature support.
[-- Attachment #2: Type: text/html, Size: 3850 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-07-26 2:42 ` 卢长奇
@ 2024-07-26 6:25 ` Klaus Jensen
2024-07-26 9:54 ` [External] " 卢长奇
[not found] ` <3a799eb6-3350-4b35-8e75-68d9020443cb@bytedance.com>
0 siblings, 2 replies; 24+ messages in thread
From: Klaus Jensen @ 2024-07-26 6:25 UTC (permalink / raw)
To: 卢长奇
Cc: Klaus Jensen, qemu-block, qemu-devel, kwolf, hreitz, stefanha,
fam, ronniesahlberg, pbonzini, pl, kbusch, foss, philmd,
pizhenwei
[-- Attachment #1: Type: text/plain, Size: 1761 bytes --]
On Jul 25 19:42, 卢长奇 wrote:
> Hi,
>
> ```
> 2685 nvme_status->regctl_ds[i].cntlid = nvme_ctrl(req)->cntlid;
> 2686 nvme_status->regctl_ds[i].rkey = keys_info->keys[i];
> 2687 nvme_status->regctl_ds[i].rcsts = keys_info->keys[i] ==
> 2688 reservation->key ? 1 : 0;
> 2689 /* hostid is not supported currently */
> 2670 memset(&nvme_status->regctl_ds[i].hostid, 0, 8);
> ```
>
> Klaus, I think hostid(2685) is stored locally like cntlid, i
> can get cntlid by nvme_ctrl(req)->cntlid, but I can't
> find a good way to get the host ID(2670). So I add a comment
> "/* hostid is not supported currently */". Could you give me
> some advices?
>
The Host Identifier is just a 64 or 128 bit value that the host can set
with Set Feature. So, it is fine (and normal) that the value is
initially zero, but the host should be able to set it on controllers
with Set Feature to indicate if a controller belongs to the same host or
not.
> And using spdk as target will not fail, but it will show 0 at hostid
> at present.
Host Identifier 0 is a valid value when used with reservations; 0
indicates that the host associated with the controller is not associated
with any other controllers in the subsystem. So if two controllers have
Host Identifier set to 0, that implicitly mean they are associated with
two different hosts.
> The relevant tests in qemu are as follows，
>
> ```
> root@node1:~# nvme resv-report /dev/nvme0n1
> NVME Reservation Report success
>
> NVME Reservation status:
>
> gen : 1
> regctl : 1
> rtype : 0
> ptpls : 0
> regctl[0] :
> cntlid : 0
> rcsts : 0
> hostid : 0
> rkey : 6
> ```
I was hoping for an example on how to setup some simple iscsi stuff so I
could test the feature.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [External] Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-07-26 6:25 ` Klaus Jensen
@ 2024-07-26 9:54 ` 卢长奇
2024-08-28 6:05 ` Klaus Jensen
[not found] ` <3a799eb6-3350-4b35-8e75-68d9020443cb@bytedance.com>
1 sibling, 1 reply; 24+ messages in thread
From: 卢长奇 @ 2024-07-26 9:54 UTC (permalink / raw)
To: Klaus Jensen
Cc: Klaus Jensen, qemu-block, qemu-devel, kwolf, hreitz, stefanha,
fam, ronniesahlberg, pbonzini, pl, kbusch, foss, philmd,
pizhenwei
[-- Attachment #1: Type: text/plain, Size: 2920 bytes --]
Hi;
You can test it in spdk.
First start spdk and execute the following command.
```
dd if=/dev/zero of=test.img bs=1G count=10
RPC=/root/source/spdk/spdk/scripts/rpc.py
FILE=/root/test.img
$RPC bdev_aio_create $FILE aio0 512
$RPC iscsi_create_portal_group 1 127.0.0.1:3260
$RPC iscsi_create_initiator_group 2 ANY ANY
$RPC iscsi_create_target_node target0 target0_alias aio0:0 1:2 64 -d
```
Then start qemu and mount an nvme disk.
Execute the following test command.
```
#reporter
nvme resv-report /dev/nvme0n1
#register
nvme resv-register /dev/nvme0n1 --nrkey 3 --rrega 0
#unregister
nvme resv-register /dev/nvme0n1 --crkey 3 --rrega 1
# register replace
nvme resv-register /dev/nvme0n1 --crkey 3 --nrkey 5 --rrega 2
#release
nvme resv-release /dev/nvme0n1 --crkey 5 --rtype 1 --rrela 0
#clear
nvme resv-release /dev/nvme0n1 --crkey 5 --rtype 1 --rrela 1
#reserve
nvme resv-acquire /dev/nvme0n1 --crkey 3 --rtype 1 --racqa 0
#premmpt
nvme resv-acquire /dev/nvme0n1 --crkey 6 --prkey 3 --rtype 1 --racqa 1
```
On 2024/7/26 14:25, Klaus Jensen wrote:
> On Jul 25 19:42, 卢长奇 wrote:
>> Hi,
>>
>> ```
>> 2685 nvme_status->regctl_ds[i].cntlid = nvme_ctrl(req)->cntlid;
>> 2686 nvme_status->regctl_ds[i].rkey = keys_info->keys[i];
>> 2687 nvme_status->regctl_ds[i].rcsts = keys_info->keys[i] ==
>> 2688 reservation->key ? 1 : 0;
>> 2689 /* hostid is not supported currently */
>> 2670 memset(&nvme_status->regctl_ds[i].hostid, 0, 8);
>> ```
>>
>> Klaus, I think hostid(2685) is stored locally like cntlid, i
>> can get cntlid by nvme_ctrl(req)->cntlid, but I can't
>> find a good way to get the host ID(2670). So I add a comment
>> "/* hostid is not supported currently */". Could you give me
>> some advices?
>>
>
> The Host Identifier is just a 64 or 128 bit value that the host can set
> with Set Feature. So, it is fine (and normal) that the value is
> initially zero, but the host should be able to set it on controllers
> with Set Feature to indicate if a controller belongs to the same host or
> not.
>
>> And using spdk as target will not fail, but it will show 0 at hostid
>> at present.
>
> Host Identifier 0 is a valid value when used with reservations; 0
> indicates that the host associated with the controller is not associated
> with any other controllers in the subsystem. So if two controllers have
> Host Identifier set to 0, that implicitly mean they are associated with
> two different hosts.
>
>> The relevant tests in qemu are as follows，
>>
>> ```
>> root@node1:~# nvme resv-report /dev/nvme0n1
>> NVME Reservation Report success
>>
>> NVME Reservation status:
>>
>> gen : 1
>> regctl : 1
>> rtype : 0
>> ptpls : 0
>> regctl[0] :
>> cntlid : 0
>> rcsts : 0
>> hostid : 0
>> rkey : 6
>> ```
>
> I was hoping for an example on how to setup some simple iscsi stuff so I
> could test the feature.
[-- Attachment #2: Type: text/html, Size: 3667 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [External] Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-07-26 9:54 ` [External] " 卢长奇
@ 2024-08-28 6:05 ` Klaus Jensen
0 siblings, 0 replies; 24+ messages in thread
From: Klaus Jensen @ 2024-08-28 6:05 UTC (permalink / raw)
To: 卢长奇
Cc: Klaus Jensen, qemu-block, qemu-devel, kwolf, hreitz, stefanha,
fam, ronniesahlberg, pbonzini, pl, kbusch, foss, philmd,
pizhenwei
[-- Attachment #1: Type: text/plain, Size: 3563 bytes --]
On Jul 26 05:54, 卢长奇 wrote:
> Hi;
>
> You can test it in spdk.
> First start spdk and execute the following command.
>
> ```
> dd if=/dev/zero of=test.img bs=1G count=10
> RPC=/root/source/spdk/spdk/scripts/rpc.py
> FILE=/root/test.img
>
> $RPC bdev_aio_create $FILE aio0 512
> $RPC iscsi_create_portal_group 1 127.0.0.1:3260
> $RPC iscsi_create_initiator_group 2 ANY ANY
> $RPC iscsi_create_target_node target0 target0_alias aio0:0 1:2 64 -d
> ```
>
> Then start qemu and mount an nvme disk.
Forgive my ignorance when it comes to iSCSI, but can you enlighten me as
to what the name of the target is? I tried a bunch of combinations.
I configured QEMU with
-drive id=target0,file=iscsi://127.0.0.1/target0/0
-device nvme,serial=deadbeef,drive=target0
But on the spdk side (iscsi_tgt) I'm getting "target0 not found".
> Execute the following test command.
> ```
> #reporter
> nvme resv-report /dev/nvme0n1
> #register
> nvme resv-register /dev/nvme0n1 --nrkey 3 --rrega 0
> #unregister
> nvme resv-register /dev/nvme0n1 --crkey 3 --rrega 1
> # register replace
> nvme resv-register /dev/nvme0n1 --crkey 3 --nrkey 5 --rrega 2
> #release
> nvme resv-release /dev/nvme0n1 --crkey 5 --rtype 1 --rrela 0
> #clear
> nvme resv-release /dev/nvme0n1 --crkey 5 --rtype 1 --rrela 1
> #reserve
> nvme resv-acquire /dev/nvme0n1 --crkey 3 --rtype 1 --racqa 0
> #premmpt
> nvme resv-acquire /dev/nvme0n1 --crkey 6 --prkey 3 --rtype 1 --racqa 1
> ```
>
>
>
> On 2024/7/26 14:25, Klaus Jensen wrote:
> > On Jul 25 19:42, 卢长奇 wrote:
> >> Hi,
> >>
> >> ```
> >> 2685 nvme_status->regctl_ds[i].cntlid = nvme_ctrl(req)->cntlid;
> >> 2686 nvme_status->regctl_ds[i].rkey = keys_info->keys[i];
> >> 2687 nvme_status->regctl_ds[i].rcsts = keys_info->keys[i] ==
> >> 2688 reservation->key ? 1 : 0;
> >> 2689 /* hostid is not supported currently */
> >> 2670 memset(&nvme_status->regctl_ds[i].hostid, 0, 8);
> >> ```
> >>
> >> Klaus, I think hostid(2685) is stored locally like cntlid, i
> >> can get cntlid by nvme_ctrl(req)->cntlid, but I can't
> >> find a good way to get the host ID(2670). So I add a comment
> >> "/* hostid is not supported currently */". Could you give me
> >> some advices?
> >>
> >
> > The Host Identifier is just a 64 or 128 bit value that the host can set
> > with Set Feature. So, it is fine (and normal) that the value is
> > initially zero, but the host should be able to set it on controllers
> > with Set Feature to indicate if a controller belongs to the same host or
> > not.
> >
> >> And using spdk as target will not fail, but it will show 0 at hostid
> >> at present.
> >
> > Host Identifier 0 is a valid value when used with reservations; 0
> > indicates that the host associated with the controller is not associated
> > with any other controllers in the subsystem. So if two controllers have
> > Host Identifier set to 0, that implicitly mean they are associated with
> > two different hosts.
> >
> >> The relevant tests in qemu are as follows，
> >>
> >> ```
> >> root@node1:~# nvme resv-report /dev/nvme0n1
> >> NVME Reservation Report success
> >>
> >> NVME Reservation status:
> >>
> >> gen : 1
> >> regctl : 1
> >> rtype : 0
> >> ptpls : 0
> >> regctl[0] :
> >> cntlid : 0
> >> rcsts : 0
> >> hostid : 0
> >> rkey : 6
> >> ```
> >
> > I was hoping for an example on how to setup some simple iscsi stuff so I
> > could test the feature.
--
One of us - No more doubt, silence or taboo about mental illness.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
[parent not found: <3a799eb6-3350-4b35-8e75-68d9020443cb@bytedance.com>]
* Ping: Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
[not found] ` <3a799eb6-3350-4b35-8e75-68d9020443cb@bytedance.com>
@ 2024-08-06 2:56 ` 卢长奇
2024-08-18 16:57 ` Klaus Jensen
0 siblings, 1 reply; 24+ messages in thread
From: 卢长奇 @ 2024-08-06 2:56 UTC (permalink / raw)
To: Klaus Jensen, Klaus Jensen
Cc: qemu-block, qemu-devel, kwolf, hreitz, stefanha, fam,
ronniesahlberg, pbonzini, pl, kbusch, foss, philmd, pizhenwei
[-- Attachment #1: Type: text/plain, Size: 3158 bytes --]
Hi;
Klaus, Does the test method in the above email work properly?
On 2024/7/26 17:53, 卢长奇 wrote:
> Hi;
>
> You can test it in spdk.
> First start spdk and execute the following command.
>
> ```
> dd if=/dev/zero of=test.img bs=1G count=10
> RPC=/root/source/spdk/spdk/scripts/rpc.py
> FILE=/root/test.img
>
> $RPC bdev_aio_create $FILE aio0 512
> $RPC iscsi_create_portal_group 1 127.0.0.1:3260
> $RPC iscsi_create_initiator_group 2 ANY ANY
> $RPC iscsi_create_target_node target0 target0_alias aio0:0 1:2 64 -d
> ```
>
> Then start qemu and mount an nvme disk.
> Execute the following test command.
> ```
> #reporter
> nvme resv-report /dev/nvme0n1
> #register
> nvme resv-register /dev/nvme0n1 --nrkey 3 --rrega 0
> #unregister
> nvme resv-register /dev/nvme0n1 --crkey 3 --rrega 1
> # register replace
> nvme resv-register /dev/nvme0n1 --crkey 3 --nrkey 5 --rrega 2
> #release
> nvme resv-release /dev/nvme0n1 --crkey 5 --rtype 1 --rrela 0
> #clear
> nvme resv-release /dev/nvme0n1 --crkey 5 --rtype 1 --rrela 1
> #reserve
> nvme resv-acquire /dev/nvme0n1 --crkey 3 --rtype 1 --racqa 0
> #premmpt
> nvme resv-acquire /dev/nvme0n1 --crkey 6 --prkey 3 --rtype 1 --racqa 1
> ```
>
>
>
> On 2024/7/26 14:25, Klaus Jensen wrote:
>> On Jul 25 19:42, 卢长奇 wrote:
>>> Hi,
>>>
>>> ```
>>> 2685 nvme_status->regctl_ds[i].cntlid = nvme_ctrl(req)->cntlid;
>>> 2686 nvme_status->regctl_ds[i].rkey = keys_info->keys[i];
>>> 2687 nvme_status->regctl_ds[i].rcsts = keys_info->keys[i] ==
>>> 2688 reservation->key ? 1 : 0;
>>> 2689 /* hostid is not supported currently */
>>> 2670 memset(&nvme_status->regctl_ds[i].hostid, 0, 8);
>>> ```
>>>
>>> Klaus, I think hostid(2685) is stored locally like cntlid, i
>>> can get cntlid by nvme_ctrl(req)->cntlid, but I can't
>>> find a good way to get the host ID(2670). So I add a comment
>>> "/* hostid is not supported currently */". Could you give me
>>> some advices?
>>>
>>
>> The Host Identifier is just a 64 or 128 bit value that the host can set
>> with Set Feature. So, it is fine (and normal) that the value is
>> initially zero, but the host should be able to set it on controllers
>> with Set Feature to indicate if a controller belongs to the same host or
>> not.
>>
>>> And using spdk as target will not fail, but it will show 0 at hostid
>>> at present.
>>
>> Host Identifier 0 is a valid value when used with reservations; 0
>> indicates that the host associated with the controller is not associated
>> with any other controllers in the subsystem. So if two controllers have
>> Host Identifier set to 0, that implicitly mean they are associated with
>> two different hosts.
>>
>>> The relevant tests in qemu are as follows，
>>>
>>> ```
>>> root@node1:~# nvme resv-report /dev/nvme0n1
>>> NVME Reservation Report success
>>>
>>> NVME Reservation status:
>>>
>>> gen : 1
>>> regctl : 1
>>> rtype : 0
>>> ptpls : 0
>>> regctl[0] :
>>> cntlid : 0
>>> rcsts : 0
>>> hostid : 0
>>> rkey : 6
>>> ```
>>
>> I was hoping for an example on how to setup some simple iscsi stuff so I
>> could test the feature.
[-- Attachment #2: Type: text/html, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Ping: Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-08-06 2:56 ` Ping: " 卢长奇
@ 2024-08-18 16:57 ` Klaus Jensen
0 siblings, 0 replies; 24+ messages in thread
From: Klaus Jensen @ 2024-08-18 16:57 UTC (permalink / raw)
To: 卢长奇
Cc: Klaus Jensen, qemu-block, qemu-devel, kwolf, hreitz, stefanha,
fam, ronniesahlberg, pbonzini, pl, kbusch, foss, philmd,
pizhenwei
[-- Attachment #1: Type: text/plain, Size: 3588 bytes --]
On Aug 6 04:56, 卢长奇 wrote:
> Hi;
>
> Klaus, Does the test method in the above email work properly?
>
I assume it will; I was on conference and was catching up all of last
week.
I'll take action on this this week.
> On 2024/7/26 17:53, 卢长奇 wrote:
> > Hi;
> >
> > You can test it in spdk.
> > First start spdk and execute the following command.
> >
> > ```
> > dd if=/dev/zero of=test.img bs=1G count=10
> > RPC=/root/source/spdk/spdk/scripts/rpc.py
> > FILE=/root/test.img
> >
> > $RPC bdev_aio_create $FILE aio0 512
> > $RPC iscsi_create_portal_group 1 127.0.0.1:3260
> > $RPC iscsi_create_initiator_group 2 ANY ANY
> > $RPC iscsi_create_target_node target0 target0_alias aio0:0 1:2 64 -d
> > ```
> >
> > Then start qemu and mount an nvme disk.
> > Execute the following test command.
> > ```
> > #reporter
> > nvme resv-report /dev/nvme0n1
> > #register
> > nvme resv-register /dev/nvme0n1 --nrkey 3 --rrega 0
> > #unregister
> > nvme resv-register /dev/nvme0n1 --crkey 3 --rrega 1
> > # register replace
> > nvme resv-register /dev/nvme0n1 --crkey 3 --nrkey 5 --rrega 2
> > #release
> > nvme resv-release /dev/nvme0n1 --crkey 5 --rtype 1 --rrela 0
> > #clear
> > nvme resv-release /dev/nvme0n1 --crkey 5 --rtype 1 --rrela 1
> > #reserve
> > nvme resv-acquire /dev/nvme0n1 --crkey 3 --rtype 1 --racqa 0
> > #premmpt
> > nvme resv-acquire /dev/nvme0n1 --crkey 6 --prkey 3 --rtype 1 --racqa 1
> > ```
> >
> >
> >
> > On 2024/7/26 14:25, Klaus Jensen wrote:
> >> On Jul 25 19:42, 卢长奇 wrote:
> >>> Hi,
> >>>
> >>> ```
> >>> 2685 nvme_status->regctl_ds[i].cntlid = nvme_ctrl(req)->cntlid;
> >>> 2686 nvme_status->regctl_ds[i].rkey = keys_info->keys[i];
> >>> 2687 nvme_status->regctl_ds[i].rcsts = keys_info->keys[i] ==
> >>> 2688 reservation->key ? 1 : 0;
> >>> 2689 /* hostid is not supported currently */
> >>> 2670 memset(&nvme_status->regctl_ds[i].hostid, 0, 8);
> >>> ```
> >>>
> >>> Klaus, I think hostid(2685) is stored locally like cntlid, i
> >>> can get cntlid by nvme_ctrl(req)->cntlid, but I can't
> >>> find a good way to get the host ID(2670). So I add a comment
> >>> "/* hostid is not supported currently */". Could you give me
> >>> some advices?
> >>>
> >>
> >> The Host Identifier is just a 64 or 128 bit value that the host can set
> >> with Set Feature. So, it is fine (and normal) that the value is
> >> initially zero, but the host should be able to set it on controllers
> >> with Set Feature to indicate if a controller belongs to the same host or
> >> not.
> >>
> >>> And using spdk as target will not fail, but it will show 0 at hostid
> >>> at present.
> >>
> >> Host Identifier 0 is a valid value when used with reservations; 0
> >> indicates that the host associated with the controller is not associated
> >> with any other controllers in the subsystem. So if two controllers have
> >> Host Identifier set to 0, that implicitly mean they are associated with
> >> two different hosts.
> >>
> >>> The relevant tests in qemu are as follows，
> >>>
> >>> ```
> >>> root@node1:~# nvme resv-report /dev/nvme0n1
> >>> NVME Reservation Report success
> >>>
> >>> NVME Reservation status:
> >>>
> >>> gen : 1
> >>> regctl : 1
> >>> rtype : 0
> >>> ptpls : 0
> >>> regctl[0] :
> >>> cntlid : 0
> >>> rcsts : 0
> >>> hostid : 0
> >>> rkey : 6
> >>> ```
> >>
> >> I was hoping for an example on how to setup some simple iscsi stuff so I
> >> could test the feature.
--
One of us - No more doubt, silence or taboo about mental illness.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-07-12 2:36 ` [PATCH v9 09/10] hw/nvme: add reservation protocal command Changqi Lu
2024-07-15 10:09 ` Klaus Jensen
@ 2024-08-28 6:10 ` Klaus Jensen
2024-08-28 6:27 ` [External] " 卢长奇
2024-08-28 6:51 ` Klaus Jensen
2 siblings, 1 reply; 24+ messages in thread
From: Klaus Jensen @ 2024-08-28 6:10 UTC (permalink / raw)
To: Changqi Lu
Cc: qemu-block, qemu-devel, kwolf, hreitz, stefanha, fam,
ronniesahlberg, pbonzini, pl, kbusch, foss, philmd, pizhenwei,
Klaus Jensen
[-- Attachment #1: Type: text/plain, Size: 3798 bytes --]
On Jul 12 10:36, Changqi Lu wrote:
> Add reservation acquire, reservation register,
> reservation release and reservation report commands
> in the nvme device layer.
>
> By introducing these commands, this enables the nvme
> device to perform reservation-related tasks, including
> querying keys, querying reservation status, registering
> reservation keys, initiating and releasing reservations,
> as well as clearing and preempting reservations held by
> other keys.
>
> These commands are crucial for management and control of
> shared storage resources in a persistent manner.
> Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
> Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
> Acked-by: Klaus Jensen <k.jensen@samsung.com>
> ---
> hw/nvme/ctrl.c | 318 +++++++++++++++++++++++++++++++++++++++++++
> hw/nvme/nvme.h | 4 +
> include/block/nvme.h | 37 +++++
> 3 files changed, 359 insertions(+)
>
> +static int nvme_read_reservation_cb(NvmeReadReservation *reservation)
> +{
> + int rc;
> + NvmeReservationStatus *nvme_status;
> + NvmeRequest *req = reservation->req;
> + NvmeCtrl *n = req->sq->ctrl;
> + NvmeResvKeys *keys_info = reservation->keys_info;
> + int len = sizeof(NvmeReservationStatusHeader) +
> + sizeof(NvmeRegisteredCtrl) * keys_info->num_keys;
> +
> + nvme_status = g_malloc(len);
> + nvme_status->header.gen = reservation->generation;
> + nvme_status->header.rtype = block_pr_type_to_nvme(reservation->type);
> + nvme_status->header.regctl = keys_info->num_keys;
> + for (int i = 0; i < keys_info->num_keys; i++) {
> + nvme_status->regctl_ds[i].cntlid = nvme_ctrl(req)->cntlid;
> + nvme_status->regctl_ds[i].rkey = keys_info->keys[i];
> + nvme_status->regctl_ds[i].rcsts = keys_info->keys[i] ==
> + reservation->key ? 1 : 0;
> + /* hostid is not supported currently */
> + memset(&nvme_status->regctl_ds[i].hostid, 0, 8);
> + }
> +
> + rc = nvme_c2h(n, (uint8_t *)nvme_status, len, req);
> + g_free(nvme_status);
> + return rc;
> +}
> +
> +static int nvme_read_reservation_ext_cb(NvmeReadReservation *reservation)
> +{
> + int rc;
> + NvmeReservationStatusExt *nvme_status_ext;
> + NvmeRequest *req = reservation->req;
> + NvmeCtrl *n = req->sq->ctrl;
> + NvmeResvKeys *keys_info = reservation->keys_info;
> + int len = sizeof(NvmeReservationStatusHeader) +
> + sizeof(uint8_t) * 40 +
> + sizeof(NvmeRegisteredCtrlExt) * keys_info->num_keys;
> +
> + nvme_status_ext = g_malloc(len);
This leaks heap memory due to uninitialized reserved fields in
NvmeReservationStatusExt. Prefer g_malloc0.
The one above in nvme_read_reservation_cb looks safe, but prefer
g_malloc0 there anyway.
> + nvme_status_ext->header.gen = cpu_to_be32(reservation->generation);
> + nvme_status_ext->header.rtype = block_pr_type_to_nvme(reservation->type);
> + nvme_status_ext->header.regctl = cpu_to_be16(keys_info->num_keys);
> +
> + for (int i = 0; i < keys_info->num_keys; i++) {
> + uint16_t ctnlid = nvme_ctrl(req)->cntlid;
> + nvme_status_ext->regctl_eds[i].cntlid = cpu_to_be16(ctnlid);
> + nvme_status_ext->regctl_eds[i].rkey = cpu_to_be64(keys_info->keys[i]);
> + nvme_status_ext->regctl_eds[i].rcsts = keys_info->keys[i] ==
> + reservation->key ? 1 : 0;
> + /* hostid is not supported currently */
> + memset(&nvme_status_ext->regctl_eds[i].hostid, 0, 16);
> + }
> +
> + rc = nvme_c2h(n, (uint8_t *)nvme_status_ext, len, req);
> + g_free(nvme_status_ext);
> + return rc;
> +}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [External] Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-08-28 6:10 ` Klaus Jensen
@ 2024-08-28 6:27 ` 卢长奇
0 siblings, 0 replies; 24+ messages in thread
From: 卢长奇 @ 2024-08-28 6:27 UTC (permalink / raw)
To: Klaus Jensen
Cc: qemu-block, qemu-devel, kwolf, hreitz, stefanha, fam,
ronniesahlberg, pbonzini, pl, kbusch, foss, philmd, pizhenwei,
Klaus Jensen
[-- Attachment #1: Type: text/plain, Size: 3825 bytes --]
Hi,
Thanks for your advice.
Previously, g_malloc0 was used, but a segmentation
fault occurred during testing. Later, debugging
revealed that a field in struct NvmeReservationStatusExt,
struct NvmeRegisteredCtrlExt regctl_eds[], was a
variable-length array. Therefore, g_malloc was used
to apply after the array length was determined.
Therefore, g_malloc0 was not used here.
On 2024/8/28 14:10, Klaus Jensen wrote:
> On Jul 12 10:36, Changqi Lu wrote:
>> Add reservation acquire, reservation register,
>> reservation release and reservation report commands
>> in the nvme device layer.
>>
>> By introducing these commands, this enables the nvme
>> device to perform reservation-related tasks, including
>> querying keys, querying reservation status, registering
>> reservation keys, initiating and releasing reservations,
>> as well as clearing and preempting reservations held by
>> other keys.
>>
>> These commands are crucial for management and control of
>> shared storage resources in a persistent manner.
>> Signed-off-by: Changqi Lu
>> Signed-off-by: zhenwei pi
>> Acked-by: Klaus Jensen
>> ---
>> hw/nvme/ctrl.c | 318 +++++++++++++++++++++++++++++++++++++++++++
>> hw/nvme/nvme.h | 4 +
>> include/block/nvme.h | 37 +++++
>> 3 files changed, 359 insertions(+)
>>
>
>> +static int nvme_read_reservation_cb(NvmeReadReservation *reservation)
>> +{
>> + int rc;
>> + NvmeReservationStatus *nvme_status;
>> + NvmeRequest *req = reservation->req;
>> + NvmeCtrl *n = req->sq->ctrl;
>> + NvmeResvKeys *keys_info = reservation->keys_info;
>> + int len = sizeof(NvmeReservationStatusHeader) +
>> + sizeof(NvmeRegisteredCtrl) * keys_info->num_keys;
>> +
>> + nvme_status = g_malloc(len);
>> + nvme_status->header.gen = reservation->generation;
>> + nvme_status->header.rtype = block_pr_type_to_nvme(reservation->type);
>> + nvme_status->header.regctl = keys_info->num_keys;
>> + for (int i = 0; i < keys_info->num_keys; i++) {
>> + nvme_status->regctl_ds[i].cntlid = nvme_ctrl(req)->cntlid;
>> + nvme_status->regctl_ds[i].rkey = keys_info->keys[i];
>> + nvme_status->regctl_ds[i].rcsts = keys_info->keys[i] ==
>> + reservation->key ? 1 : 0;
>> + /* hostid is not supported currently */
>> + memset(&nvme_status->regctl_ds[i].hostid, 0, 8);
>> + }
>> +
>> + rc = nvme_c2h(n, (uint8_t *)nvme_status, len, req);
>> + g_free(nvme_status);
>> + return rc;
>> +}
>> +
>> +static int nvme_read_reservation_ext_cb(NvmeReadReservation
*reservation)
>> +{
>> + int rc;
>> + NvmeReservationStatusExt *nvme_status_ext;
>> + NvmeRequest *req = reservation->req;
>> + NvmeCtrl *n = req->sq->ctrl;
>> + NvmeResvKeys *keys_info = reservation->keys_info;
>> + int len = sizeof(NvmeReservationStatusHeader) +
>> + sizeof(uint8_t) * 40 +
>> + sizeof(NvmeRegisteredCtrlExt) * keys_info->num_keys;
>> +
>> + nvme_status_ext = g_malloc(len);
>
> This leaks heap memory due to uninitialized reserved fields in
> NvmeReservationStatusExt. Prefer g_malloc0.
>
> The one above in nvme_read_reservation_cb looks safe, but prefer
> g_malloc0 there anyway.
>
>> + nvme_status_ext->header.gen = cpu_to_be32(reservation->generation);
>> + nvme_status_ext->header.rtype =
block_pr_type_to_nvme(reservation->type);
>> + nvme_status_ext->header.regctl = cpu_to_be16(keys_info->num_keys);
>> +
>> + for (int i = 0; i < keys_info->num_keys; i++) {
>> + uint16_t ctnlid = nvme_ctrl(req)->cntlid;
>> + nvme_status_ext->regctl_eds[i].cntlid = cpu_to_be16(ctnlid);
>> + nvme_status_ext->regctl_eds[i].rkey = cpu_to_be64(keys_info->keys[i]);
>> + nvme_status_ext->regctl_eds[i].rcsts = keys_info->keys[i] ==
>> + reservation->key ? 1 : 0;
>> + /* hostid is not supported currently */
>> + memset(&nvme_status_ext->regctl_eds[i].hostid, 0, 16);
>> + }
>> +
>> + rc = nvme_c2h(n, (uint8_t *)nvme_status_ext, len, req);
>> + g_free(nvme_status_ext);
>> + return rc;
>> +}
[-- Attachment #2: Type: text/html, Size: 5192 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-07-12 2:36 ` [PATCH v9 09/10] hw/nvme: add reservation protocal command Changqi Lu
2024-07-15 10:09 ` Klaus Jensen
2024-08-28 6:10 ` Klaus Jensen
@ 2024-08-28 6:51 ` Klaus Jensen
2024-08-28 7:20 ` [External] " 卢长奇
2 siblings, 1 reply; 24+ messages in thread
From: Klaus Jensen @ 2024-08-28 6:51 UTC (permalink / raw)
To: Changqi Lu
Cc: qemu-block, qemu-devel, kwolf, hreitz, stefanha, fam,
ronniesahlberg, pbonzini, pl, kbusch, foss, philmd, pizhenwei,
Klaus Jensen
[-- Attachment #1: Type: text/plain, Size: 3066 bytes --]
On Jul 12 10:36, Changqi Lu wrote:
> Add reservation acquire, reservation register,
> reservation release and reservation report commands
> in the nvme device layer.
>
> By introducing these commands, this enables the nvme
> device to perform reservation-related tasks, including
> querying keys, querying reservation status, registering
> reservation keys, initiating and releasing reservations,
> as well as clearing and preempting reservations held by
> other keys.
>
> These commands are crucial for management and control of
> shared storage resources in a persistent manner.
> Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
> Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
> Acked-by: Klaus Jensen <k.jensen@samsung.com>
> ---
> hw/nvme/ctrl.c | 318 +++++++++++++++++++++++++++++++++++++++++++
> hw/nvme/nvme.h | 4 +
> include/block/nvme.h | 37 +++++
> 3 files changed, 359 insertions(+)
>
> +static uint16_t nvme_resv_register(NvmeCtrl *n, NvmeRequest *req)
> +{
> + int ret;
> + NvmeKeyInfo key_info;
> + NvmeNamespace *ns = req->ns;
> + uint32_t cdw10 = le32_to_cpu(req->cmd.cdw10);
> + bool ignore_key = cdw10 >> 3 & 0x1;
> + uint8_t action = cdw10 & 0x7;
> + uint8_t ptpl = cdw10 >> 30 & 0x3;
> + bool aptpl;
> +
> + switch (ptpl) {
> + case NVME_RESV_PTPL_NO_CHANGE:
> + aptpl = (ns->id_ns.rescap & NVME_PR_CAP_PTPL) ? true : false;
> + break;
> + case NVME_RESV_PTPL_DISABLE:
> + aptpl = false;
> + break;
> + case NVME_RESV_PTPL_ENABLE:
> + aptpl = true;
> + break;
> + default:
> + return NVME_INVALID_FIELD;
> + }
> +
> + ret = nvme_h2c(n, (uint8_t *)&key_info, sizeof(NvmeKeyInfo), req);
> + if (ret) {
> + return ret;
> + }
> +
> + switch (action) {
> + case NVME_RESV_REGISTER_ACTION_REGISTER:
> + req->aiocb = blk_aio_pr_register(ns->blkconf.blk, 0,
> + key_info.nr_key, 0, aptpl,
> + ignore_key, nvme_misc_cb,
> + req);
> + break;
> + case NVME_RESV_REGISTER_ACTION_UNREGISTER:
> + req->aiocb = blk_aio_pr_register(ns->blkconf.blk, key_info.cr_key, 0,
> + 0, aptpl, ignore_key,
> + nvme_misc_cb, req);
> + break;
> + case NVME_RESV_REGISTER_ACTION_REPLACE:
> + req->aiocb = blk_aio_pr_register(ns->blkconf.blk, key_info.cr_key,
> + key_info.nr_key, 0, aptpl, ignore_key,
> + nvme_misc_cb, req);
> + break;
There should be some check on rescap I think. On a setup without
reservation support from the block layer, these functions ends up
returning ENOTSUP which causes hw/nvme to end up returning a Write Fault
(which is a little wonky).
Should they return invalid field, invalid opcode?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [External] Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-08-28 6:51 ` Klaus Jensen
@ 2024-08-28 7:20 ` 卢长奇
2024-08-28 7:27 ` Klaus Jensen
0 siblings, 1 reply; 24+ messages in thread
From: 卢长奇 @ 2024-08-28 7:20 UTC (permalink / raw)
To: Klaus Jensen
Cc: qemu-block, qemu-devel, kwolf, hreitz, stefanha, fam,
ronniesahlberg, pbonzini, pl, kbusch, foss, philmd, pizhenwei,
Klaus Jensen
[-- Attachment #1: Type: text/plain, Size: 3672 bytes --]
Hi,
I want to know if I understand it correctly.
```
static void nvme_aio_err(NvmeRequest *req, int ret)
{
uint16_t status = NVME_SUCCESS;
Error *local_err = NULL;
switch (req->cmd.opcode) {
case NVME_CMD_READ:
case NVME_CMD_RESV_REPORT:
status = NVME_UNRECOVERED_READ;
break;
case NVME_CMD_FLUSH:
case NVME_CMD_WRITE:
case NVME_CMD_WRITE_ZEROES:
case NVME_CMD_ZONE_APPEND:
case NVME_CMD_COPY:
case NVME_CMD_RESV_REGISTER:
case NVME_CMD_RESV_ACQUIRE:
case NVME_CMD_RESV_RELEASE:
status = NVME_WRITE_FAULT;
break;
default:
status = NVME_INTERNAL_DEV_ERROR;
break;
}
trace_pci_nvme_err_aio(nvme_cid(req), strerror(-ret), status);
error_setg_errno(&local_err, -ret, "aio failed");
error_report_err(local_err);
/*
* Set the command status code to the first encountered error but
allow a
* subsequent Internal Device Error to trump it.
*/
if (req->status && status != NVME_INTERNAL_DEV_ERROR) {
return;
}
req->status = status;
}
```
In the above use case, if it is a pr-related command and the error code
is not supported, the invalid error code should be returned instead of
the Fault error code.
On 2024/8/28 14:51, Klaus Jensen wrote:
> On Jul 12 10:36, Changqi Lu wrote:
>> Add reservation acquire, reservation register,
>> reservation release and reservation report commands
>> in the nvme device layer.
>>
>> By introducing these commands, this enables the nvme
>> device to perform reservation-related tasks, including
>> querying keys, querying reservation status, registering
>> reservation keys, initiating and releasing reservations,
>> as well as clearing and preempting reservations held by
>> other keys.
>>
>> These commands are crucial for management and control of
>> shared storage resources in a persistent manner.
>> Signed-off-by: Changqi Lu
>> Signed-off-by: zhenwei pi
>> Acked-by: Klaus Jensen
>> ---
>> hw/nvme/ctrl.c | 318 +++++++++++++++++++++++++++++++++++++++++++
>> hw/nvme/nvme.h | 4 +
>> include/block/nvme.h | 37 +++++
>> 3 files changed, 359 insertions(+)
>>
>
>> +static uint16_t nvme_resv_register(NvmeCtrl *n, NvmeRequest *req)
>> +{
>> + int ret;
>> + NvmeKeyInfo key_info;
>> + NvmeNamespace *ns = req->ns;
>> + uint32_t cdw10 = le32_to_cpu(req->cmd.cdw10);
>> + bool ignore_key = cdw10 >> 3 & 0x1;
>> + uint8_t action = cdw10 & 0x7;
>> + uint8_t ptpl = cdw10 >> 30 & 0x3;
>> + bool aptpl;
>> +
>> + switch (ptpl) {
>> + case NVME_RESV_PTPL_NO_CHANGE:
>> + aptpl = (ns->id_ns.rescap & NVME_PR_CAP_PTPL) ? true : false;
>> + break;
>> + case NVME_RESV_PTPL_DISABLE:
>> + aptpl = false;
>> + break;
>> + case NVME_RESV_PTPL_ENABLE:
>> + aptpl = true;
>> + break;
>> + default:
>> + return NVME_INVALID_FIELD;
>> + }
>> +
>> + ret = nvme_h2c(n, (uint8_t *)&key_info, sizeof(NvmeKeyInfo), req);
>> + if (ret) {
>> + return ret;
>> + }
>> +
>> + switch (action) {
>> + case NVME_RESV_REGISTER_ACTION_REGISTER:
>> + req->aiocb = blk_aio_pr_register(ns->blkconf.blk, 0,
>> + key_info.nr_key, 0, aptpl,
>> + ignore_key, nvme_misc_cb,
>> + req);
>> + break;
>> + case NVME_RESV_REGISTER_ACTION_UNREGISTER:
>> + req->aiocb = blk_aio_pr_register(ns->blkconf.blk, key_info.cr_key, 0,
>> + 0, aptpl, ignore_key,
>> + nvme_misc_cb, req);
>> + break;
>> + case NVME_RESV_REGISTER_ACTION_REPLACE:
>> + req->aiocb = blk_aio_pr_register(ns->blkconf.blk, key_info.cr_key,
>> + key_info.nr_key, 0, aptpl, ignore_key,
>> + nvme_misc_cb, req);
>> + break;
>
> There should be some check on rescap I think. On a setup without
> reservation support from the block layer, these functions ends up
> returning ENOTSUP which causes hw/nvme to end up returning a Write Fault
> (which is a little wonky).
>
> Should they return invalid field, invalid opcode?
[-- Attachment #2: Type: text/html, Size: 5355 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [External] Re: [PATCH v9 09/10] hw/nvme: add reservation protocal command
2024-08-28 7:20 ` [External] " 卢长奇
@ 2024-08-28 7:27 ` Klaus Jensen
0 siblings, 0 replies; 24+ messages in thread
From: Klaus Jensen @ 2024-08-28 7:27 UTC (permalink / raw)
To: 卢长奇
Cc: qemu-block, qemu-devel, kwolf, hreitz, stefanha, fam,
ronniesahlberg, pbonzini, pl, kbusch, foss, philmd, pizhenwei,
Klaus Jensen
[-- Attachment #1: Type: text/plain, Size: 1510 bytes --]
On Aug 28 00:20, 卢长奇 wrote:
> Hi,
>
> I want to know if I understand it correctly.
>
> ```
> static void nvme_aio_err(NvmeRequest *req, int ret)
> {
> uint16_t status = NVME_SUCCESS;
> Error *local_err = NULL;
>
> switch (req->cmd.opcode) {
> case NVME_CMD_READ:
> case NVME_CMD_RESV_REPORT:
> status = NVME_UNRECOVERED_READ;
> break;
> case NVME_CMD_FLUSH:
> case NVME_CMD_WRITE:
> case NVME_CMD_WRITE_ZEROES:
> case NVME_CMD_ZONE_APPEND:
> case NVME_CMD_COPY:
> case NVME_CMD_RESV_REGISTER:
> case NVME_CMD_RESV_ACQUIRE:
> case NVME_CMD_RESV_RELEASE:
> status = NVME_WRITE_FAULT;
> break;
> default:
> status = NVME_INTERNAL_DEV_ERROR;
> break;
> }
>
> trace_pci_nvme_err_aio(nvme_cid(req), strerror(-ret), status);
>
> error_setg_errno(&local_err, -ret, "aio failed");
> error_report_err(local_err);
>
> /*
> * Set the command status code to the first encountered error but
> allow a
> * subsequent Internal Device Error to trump it.
> */
> if (req->status && status != NVME_INTERNAL_DEV_ERROR) {
> return;
> }
>
> req->status = status;
> }
> ```
> In the above use case, if it is a pr-related command and the error code
> is not supported, the invalid error code should be returned instead of
> the Fault error code.
>
Yes, as far as I can tell from the spec, if a Reservations related
command is issued on a controller/namespace that does not BOTH support
Reservations (i.e., in ONCS and RESCAP), then return Invalid Command
Opcode.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v9 10/10] block/iscsi: add persistent reservation in/out driver
2024-07-12 2:36 [PATCH v9 00/10] Support persistent reservation operations Changqi Lu
` (8 preceding siblings ...)
2024-07-12 2:36 ` [PATCH v9 09/10] hw/nvme: add reservation protocal command Changqi Lu
@ 2024-07-12 2:36 ` Changqi Lu
9 siblings, 0 replies; 24+ messages in thread
From: Changqi Lu @ 2024-07-12 2:36 UTC (permalink / raw)
To: qemu-block, qemu-devel
Cc: kwolf, hreitz, stefanha, fam, ronniesahlberg, pbonzini, pl,
kbusch, its, foss, philmd, pizhenwei, Changqi Lu
Add persistent reservation in/out operations for iscsi driver.
The following methods are implemented: bdrv_co_pr_read_keys,
bdrv_co_pr_read_reservation, bdrv_co_pr_register, bdrv_co_pr_reserve,
bdrv_co_pr_release, bdrv_co_pr_clear and bdrv_co_pr_preempt.
Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/iscsi.c | 423 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 423 insertions(+)
diff --git a/block/iscsi.c b/block/iscsi.c
index 2ff14b7472..7a12fd59eb 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -96,6 +96,7 @@ typedef struct IscsiLun {
unsigned long *allocmap_valid;
long allocmap_size;
int cluster_size;
+ uint8_t pr_cap;
bool use_16_for_rw;
bool write_protected;
bool lbpme;
@@ -280,6 +281,10 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
iTask->err_code = -error;
iTask->err_str = g_strdup(iscsi_get_error(iscsi));
}
+ } else if (status == SCSI_STATUS_RESERVATION_CONFLICT) {
+ iTask->err_code = -EBADE;
+ error_report("iSCSI Persistent Reservation Conflict: %s",
+ iscsi_get_error(iscsi));
}
}
}
@@ -1792,6 +1797,50 @@ static void iscsi_save_designator(IscsiLun *lun,
}
}
+/*
+ * Ensure iscsi_open() must succeed, weather or not the target
+ * implement SCSI_PR_IN_REPORT_CAPABILITIES.
+ */
+static void iscsi_get_pr_cap_sync(IscsiLun *iscsilun)
+{
+ struct scsi_task *task = NULL;
+ struct scsi_persistent_reserve_in_report_capabilities *rc = NULL;
+ int retries = ISCSI_CMD_RETRIES;
+ int xferlen = sizeof(struct scsi_persistent_reserve_in_report_capabilities);
+
+ do {
+ if (task != NULL) {
+ scsi_free_scsi_task(task);
+ task = NULL;
+ }
+
+ task = iscsi_persistent_reserve_in_sync(iscsilun->iscsi,
+ iscsilun->lun, SCSI_PR_IN_REPORT_CAPABILITIES, xferlen);
+ if (task != NULL && task->status == SCSI_STATUS_GOOD) {
+ rc = scsi_datain_unmarshall(task);
+ if (rc == NULL) {
+ error_report("iSCSI: Failed to unmarshall "
+ "report capabilities data.");
+ } else {
+ iscsilun->pr_cap =
+ scsi_pr_cap_to_block(rc->persistent_reservation_type_mask);
+ iscsilun->pr_cap |= (rc->ptpl_a) ? BLK_PR_CAP_PTPL : 0;
+ }
+ break;
+ }
+ } while (task != NULL && task->status == SCSI_STATUS_CHECK_CONDITION
+ && task->sense.key == SCSI_SENSE_UNIT_ATTENTION
+ && retries-- > 0);
+
+ if (task == NULL || task->status != SCSI_STATUS_GOOD) {
+ error_report("iSCSI: failed to send report capabilities command.");
+ }
+
+ if (task) {
+ scsi_free_scsi_task(task);
+ }
+}
+
static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp)
{
@@ -2024,6 +2073,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
bs->supported_zero_flags = BDRV_REQ_MAY_UNMAP;
}
+ iscsi_get_pr_cap_sync(iscsilun);
out:
qemu_opts_del(opts);
g_free(initiator_name);
@@ -2110,6 +2160,8 @@ static void iscsi_refresh_limits(BlockDriverState *bs, Error **errp)
bs->bl.opt_transfer = pow2floor(iscsilun->bl.opt_xfer_len *
iscsilun->block_size);
}
+
+ bs->bl.pr_cap = iscsilun->pr_cap;
}
/* Note that this will not re-establish a connection with an iSCSI target - it
@@ -2408,6 +2460,369 @@ out_unlock:
return r;
}
+static int coroutine_fn
+iscsi_co_pr_read_keys(BlockDriverState *bs, uint32_t *generation,
+ uint32_t num_keys, uint64_t *keys)
+{
+ IscsiLun *iscsilun = bs->opaque;
+ QEMUIOVector qiov;
+ struct IscsiTask iTask;
+ int xferlen = sizeof(struct scsi_persistent_reserve_in_read_keys) +
+ sizeof(uint64_t) * num_keys;
+ g_autofree uint8_t *buf = g_malloc0(xferlen);
+ int32_t num_collect_keys = 0;
+ int r = 0;
+
+ qemu_iovec_init_buf(&qiov, buf, xferlen);
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+ qemu_mutex_lock(&iscsilun->mutex);
+retry:
+ iTask.task = iscsi_persistent_reserve_in_task(iscsilun->iscsi,
+ iscsilun->lun, SCSI_PR_IN_READ_KEYS, xferlen,
+ iscsi_co_generic_cb, &iTask);
+
+ if (iTask.task == NULL) {
+ qemu_mutex_unlock(&iscsilun->mutex);
+ return -ENOMEM;
+ }
+
+ scsi_task_set_iov_in(iTask.task, (struct scsi_iovec *)qiov.iov, qiov.niov);
+ iscsi_co_wait_for_task(&iTask, iscsilun);
+
+ if (iTask.task != NULL) {
+ scsi_free_scsi_task(iTask.task);
+ iTask.task = NULL;
+ }
+
+ if (iTask.do_retry) {
+ iTask.complete = 0;
+ goto retry;
+ }
+
+ if (iTask.status != SCSI_STATUS_GOOD) {
+ error_report("iSCSI PERSISTENT_RESERVE_IN failed: %s", iTask.err_str);
+ r = iTask.err_code;
+ goto out;
+ }
+
+ memcpy(generation, &buf[0], 4);
+ *generation = be32_to_cpu(*generation);
+ memcpy(&num_collect_keys, &buf[4], 4);
+ num_collect_keys = be32_to_cpu(num_collect_keys) / sizeof(uint64_t);
+ if (num_collect_keys > num_keys) {
+ r = -EINVAL;
+ goto out;
+ }
+
+ for (int i = 0; i < num_collect_keys; i++) {
+ memcpy(&keys[i], &buf[8 + i * 8], 8);
+ keys[i] = be64_to_cpu(keys[i]);
+ }
+ r = num_collect_keys;
+
+out:
+ qemu_mutex_unlock(&iscsilun->mutex);
+ g_free(iTask.err_str);
+ return r;
+}
+
+static int coroutine_fn
+iscsi_co_pr_read_reservation(BlockDriverState *bs, uint32_t *generation,
+ uint64_t *key, BlockPrType *type)
+{
+ IscsiLun *iscsilun = bs->opaque;
+ QEMUIOVector qiov;
+ struct IscsiTask iTask;
+ int xferlen = sizeof(struct scsi_persistent_reserve_in_read_reservation);
+ g_autofree uint8_t *buf = g_malloc0(xferlen);
+ uint8_t scope_type = 0;
+ int32_t num_collect_keys = 0;
+ int r = 0;
+
+ qemu_iovec_init_buf(&qiov, buf, xferlen);
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+ qemu_mutex_lock(&iscsilun->mutex);
+retry:
+ iTask.task = iscsi_persistent_reserve_in_task(iscsilun->iscsi,
+ iscsilun->lun, SCSI_PR_IN_READ_RESERVATION,
+ xferlen, iscsi_co_generic_cb, &iTask);
+
+ if (iTask.task == NULL) {
+ qemu_mutex_unlock(&iscsilun->mutex);
+ return -ENOMEM;
+ }
+
+ scsi_task_set_iov_in(iTask.task, (struct scsi_iovec *)qiov.iov, qiov.niov);
+ iscsi_co_wait_for_task(&iTask, iscsilun);
+
+ if (iTask.task != NULL) {
+ scsi_free_scsi_task(iTask.task);
+ iTask.task = NULL;
+ }
+
+ if (iTask.do_retry) {
+ iTask.complete = 0;
+ goto retry;
+ }
+
+ if (iTask.status != SCSI_STATUS_GOOD) {
+ error_report("iSCSI PERSISTENT_RESERVE_IN failed: %s", iTask.err_str);
+ r = iTask.err_code;
+ goto out;
+ }
+
+ memcpy(generation, &buf[0], 4);
+ *generation = be32_to_cpu(*generation);
+ memcpy(key, &buf[8], 8);
+ *key = be64_to_cpu(*key);
+ memcpy(&scope_type, &buf[21], 1);
+ *type = scsi_pr_type_to_block(scope_type & 0xf);
+ memcpy(&num_collect_keys, &buf[4], 4);
+ r = be32_to_cpu(num_collect_keys) / sizeof(uint64_t);
+out:
+ qemu_mutex_unlock(&iscsilun->mutex);
+ g_free(iTask.err_str);
+ return r;
+}
+
+static int coroutine_fn
+iscsi_co_pr_register(BlockDriverState *bs, uint64_t old_key,
+ uint64_t new_key, BlockPrType type,
+ bool ptpl, bool ignore_key)
+{
+ IscsiLun *iscsilun = bs->opaque;
+ struct IscsiTask iTask;
+ struct scsi_persistent_reserve_out_basic basic;
+ SCSIPrOutAction action = ignore_key ? SCSI_PR_OUT_REG_AND_IGNORE_KEY :
+ SCSI_PR_OUT_REGISTER;
+ int r = 0;
+
+ basic.reservation_key = old_key;
+ basic.service_action_reservation_key = new_key;
+ basic.aptpl = ptpl ? 1 : 0;
+
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+ qemu_mutex_lock(&iscsilun->mutex);
+retry:
+ iTask.task = iscsi_persistent_reserve_out_task(iscsilun->iscsi,
+ iscsilun->lun, action, 0, block_pr_type_to_scsi(type),
+ &basic, iscsi_co_generic_cb, &iTask);
+
+ if (iTask.task == NULL) {
+ qemu_mutex_unlock(&iscsilun->mutex);
+ return -ENOMEM;
+ }
+
+ iscsi_co_wait_for_task(&iTask, iscsilun);
+
+ if (iTask.task != NULL) {
+ scsi_free_scsi_task(iTask.task);
+ iTask.task = NULL;
+ }
+
+ if (iTask.do_retry) {
+ iTask.complete = 0;
+ goto retry;
+ }
+
+ if (iTask.status != SCSI_STATUS_GOOD) {
+ error_report("iSCSI PERSISTENT_RESERVE_OUT failed: %s", iTask.err_str);
+ r = iTask.err_code;
+ }
+
+ qemu_mutex_unlock(&iscsilun->mutex);
+
+ g_free(iTask.err_str);
+ return r;
+}
+
+static int coroutine_fn
+iscsi_co_pr_reserve(BlockDriverState *bs, uint64_t key, BlockPrType type)
+{
+ IscsiLun *iscsilun = bs->opaque;
+ struct IscsiTask iTask;
+ struct scsi_persistent_reserve_out_basic basic;
+ int r = 0;
+
+ basic.reservation_key = key;
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+ qemu_mutex_lock(&iscsilun->mutex);
+retry:
+ iTask.task = iscsi_persistent_reserve_out_task(iscsilun->iscsi,
+ iscsilun->lun, SCSI_PR_OUT_RESERVE, 0,
+ block_pr_type_to_scsi(type), &basic,
+ iscsi_co_generic_cb, &iTask);
+
+ if (iTask.task == NULL) {
+ qemu_mutex_unlock(&iscsilun->mutex);
+ return -ENOMEM;
+ }
+
+
+ iscsi_co_wait_for_task(&iTask, iscsilun);
+
+ if (iTask.task != NULL) {
+ scsi_free_scsi_task(iTask.task);
+ iTask.task = NULL;
+ }
+
+ if (iTask.do_retry) {
+ iTask.complete = 0;
+ goto retry;
+ }
+
+ if (iTask.status != SCSI_STATUS_GOOD) {
+ error_report("iSCSI PERSISTENT_RESERVE_OUT failed: %s", iTask.err_str);
+ r = iTask.err_code;
+ }
+
+ qemu_mutex_unlock(&iscsilun->mutex);
+
+ g_free(iTask.err_str);
+ return r;
+}
+
+static int coroutine_fn
+iscsi_co_pr_release(BlockDriverState *bs, uint64_t key, BlockPrType type)
+{
+ IscsiLun *iscsilun = bs->opaque;
+ struct IscsiTask iTask;
+ struct scsi_persistent_reserve_out_basic basic;
+ int r = 0;
+
+ basic.reservation_key = key;
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+ qemu_mutex_lock(&iscsilun->mutex);
+retry:
+ iTask.task = iscsi_persistent_reserve_out_task(iscsilun->iscsi,
+ iscsilun->lun, SCSI_PR_OUT_RELEASE, 0,
+ block_pr_type_to_scsi(type), &basic,
+ iscsi_co_generic_cb, &iTask);
+
+ if (iTask.task == NULL) {
+ qemu_mutex_unlock(&iscsilun->mutex);
+ return -ENOMEM;
+ }
+
+
+ iscsi_co_wait_for_task(&iTask, iscsilun);
+
+ if (iTask.task != NULL) {
+ scsi_free_scsi_task(iTask.task);
+ iTask.task = NULL;
+ }
+
+ if (iTask.do_retry) {
+ iTask.complete = 0;
+ goto retry;
+ }
+
+ if (iTask.status != SCSI_STATUS_GOOD) {
+ error_report("iSCSI PERSISTENT_RESERVE_OUT failed: %s", iTask.err_str);
+ r = iTask.err_code;
+ }
+
+ qemu_mutex_unlock(&iscsilun->mutex);
+
+ g_free(iTask.err_str);
+ return r;
+}
+
+static int coroutine_fn
+iscsi_co_pr_clear(BlockDriverState *bs, uint64_t key)
+{
+ IscsiLun *iscsilun = bs->opaque;
+ struct IscsiTask iTask;
+ struct scsi_persistent_reserve_out_basic basic;
+ int r = 0;
+
+ basic.reservation_key = key;
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+ qemu_mutex_lock(&iscsilun->mutex);
+retry:
+ iTask.task = iscsi_persistent_reserve_out_task(iscsilun->iscsi,
+ iscsilun->lun, SCSI_PR_OUT_CLEAR, 0, 0, &basic,
+ iscsi_co_generic_cb, &iTask);
+
+ if (iTask.task == NULL) {
+ qemu_mutex_unlock(&iscsilun->mutex);
+ return -ENOMEM;
+ }
+
+
+ iscsi_co_wait_for_task(&iTask, iscsilun);
+
+ if (iTask.task != NULL) {
+ scsi_free_scsi_task(iTask.task);
+ iTask.task = NULL;
+ }
+
+ if (iTask.do_retry) {
+ iTask.complete = 0;
+ goto retry;
+ }
+
+ if (iTask.status != SCSI_STATUS_GOOD) {
+ error_report("iSCSI PERSISTENT_RESERVE_OUT failed: %s", iTask.err_str);
+ r = iTask.err_code;
+ }
+
+ qemu_mutex_unlock(&iscsilun->mutex);
+
+ g_free(iTask.err_str);
+ return r;
+}
+
+static int coroutine_fn
+iscsi_co_pr_preempt(BlockDriverState *bs, uint64_t old_key,
+ uint64_t new_key, BlockPrType type, bool abort)
+{
+ IscsiLun *iscsilun = bs->opaque;
+ struct IscsiTask iTask;
+ struct scsi_persistent_reserve_out_basic basic;
+ SCSIPrOutAction action = abort ? SCSI_PR_OUT_PREEMPT_AND_ABORT :
+ SCSI_PR_OUT_PREEMPT;
+ int r = 0;
+
+ basic.reservation_key = old_key;
+ basic.service_action_reservation_key = new_key;
+
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+ qemu_mutex_lock(&iscsilun->mutex);
+retry:
+ iTask.task = iscsi_persistent_reserve_out_task(iscsilun->iscsi,
+ iscsilun->lun, action, 0, block_pr_type_to_scsi(type),
+ &basic, iscsi_co_generic_cb, &iTask);
+
+ if (iTask.task == NULL) {
+ qemu_mutex_unlock(&iscsilun->mutex);
+ return -ENOMEM;
+ }
+
+
+ iscsi_co_wait_for_task(&iTask, iscsilun);
+
+ if (iTask.task != NULL) {
+ scsi_free_scsi_task(iTask.task);
+ iTask.task = NULL;
+ }
+
+ if (iTask.do_retry) {
+ iTask.complete = 0;
+ goto retry;
+ }
+
+ if (iTask.status != SCSI_STATUS_GOOD) {
+ error_report("iSCSI PERSISTENT_RESERVE_OUT failed: %s", iTask.err_str);
+ r = iTask.err_code;
+ }
+
+ qemu_mutex_unlock(&iscsilun->mutex);
+
+ g_free(iTask.err_str);
+ return r;
+}
+
static const char *const iscsi_strong_runtime_opts[] = {
"transport",
@@ -2451,6 +2866,14 @@ static BlockDriver bdrv_iscsi = {
.bdrv_co_writev = iscsi_co_writev,
.bdrv_co_flush_to_disk = iscsi_co_flush,
+ .bdrv_co_pr_read_keys = iscsi_co_pr_read_keys,
+ .bdrv_co_pr_read_reservation = iscsi_co_pr_read_reservation,
+ .bdrv_co_pr_register = iscsi_co_pr_register,
+ .bdrv_co_pr_reserve = iscsi_co_pr_reserve,
+ .bdrv_co_pr_release = iscsi_co_pr_release,
+ .bdrv_co_pr_clear = iscsi_co_pr_clear,
+ .bdrv_co_pr_preempt = iscsi_co_pr_preempt,
+
#ifdef __linux__
.bdrv_aio_ioctl = iscsi_aio_ioctl,
#endif
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread