mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/nvme: Simplify nvme_cmd_sync()

Browse Source 
As all commands use the ADMIN queue, it is pointless to pass
it as argument each time. Remove the argument, and rename the
function as nvme_admin_cmd_sync() to make this new behavior
clearer.

Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20201029093306.1063879-17-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-10-29 10:32:57 +01:00 committed by Stefan Hajnoczi
parent 52b75ea8ec
commit 08d5406798
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
block/nvme.c
View File

@ -481,16 +481,17 @@ static void nvme_submit_command(NVMeQueuePair *q, NVMeRequest *req,
qemu_mutex_unlock(&q->lock); qemu_mutex_unlock(&q->lock);
} }
static void nvme_cmd_sync_cb(void *opaque, int ret) static void nvme_admin_cmd_sync_cb(void *opaque, int ret)
{ {
int *pret = opaque; int *pret = opaque;
*pret = ret; *pret = ret;
aio_wait_kick(); aio_wait_kick();
} }
static int nvme_cmd_sync(BlockDriverState *bs, NVMeQueuePair *q, static int nvme_admin_cmd_sync(BlockDriverState *bs, NvmeCmd *cmd)
NvmeCmd *cmd)
{ {
BDRVNVMeState *s = bs->opaque;
NVMeQueuePair *q = s->queues[INDEX_ADMIN];
AioContext *aio_context = bdrv_get_aio_context(bs); AioContext *aio_context = bdrv_get_aio_context(bs);
NVMeRequest *req; NVMeRequest *req;
int ret = -EINPROGRESS; int ret = -EINPROGRESS;
@ -498,7 +499,7 @@ static int nvme_cmd_sync(BlockDriverState *bs, NVMeQueuePair *q,
if (!req) { if (!req) {
return -EBUSY; return -EBUSY;
} }
nvme_submit_command(q, req, cmd, nvme_cmd_sync_cb, &ret); nvme_submit_command(q, req, cmd, nvme_admin_cmd_sync_cb, &ret);
AIO_WAIT_WHILE(aio_context, ret == -EINPROGRESS); AIO_WAIT_WHILE(aio_context, ret == -EINPROGRESS);
return ret; return ret;
@ -535,7 +536,7 @@ static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp)
memset(id, 0, sizeof(*id)); memset(id, 0, sizeof(*id));
cmd.dptr.prp1 = cpu_to_le64(iova); cmd.dptr.prp1 = cpu_to_le64(iova);
if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { if (nvme_admin_cmd_sync(bs, &cmd)) {
error_setg(errp, "Failed to identify controller"); error_setg(errp, "Failed to identify controller");
goto out; goto out;
} }
@ -558,7 +559,7 @@ static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp)
memset(id, 0, sizeof(*id)); memset(id, 0, sizeof(*id));
cmd.cdw10 = 0; cmd.cdw10 = 0;
cmd.nsid = cpu_to_le32(namespace); cmd.nsid = cpu_to_le32(namespace);
if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { if (nvme_admin_cmd_sync(bs, &cmd)) {
error_setg(errp, "Failed to identify namespace"); error_setg(errp, "Failed to identify namespace");
goto out; goto out;
} }
@ -664,7 +665,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp)
.cdw10 = cpu_to_le32(((queue_size - 1) << 16) | n), .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | n),
.cdw11 = cpu_to_le32(NVME_CQ_IEN | NVME_CQ_PC), .cdw11 = cpu_to_le32(NVME_CQ_IEN | NVME_CQ_PC),
}; };
if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { if (nvme_admin_cmd_sync(bs, &cmd)) {
error_setg(errp, "Failed to create CQ io queue [%u]", n); error_setg(errp, "Failed to create CQ io queue [%u]", n);
goto out_error; goto out_error;
} }
@ -674,7 +675,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp)
.cdw10 = cpu_to_le32(((queue_size - 1) << 16) | n), .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | n),
.cdw11 = cpu_to_le32(NVME_SQ_PC | (n << 16)), .cdw11 = cpu_to_le32(NVME_SQ_PC | (n << 16)),
}; };
if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { if (nvme_admin_cmd_sync(bs, &cmd)) {
error_setg(errp, "Failed to create SQ io queue [%u]", n); error_setg(errp, "Failed to create SQ io queue [%u]", n);
goto out_error; goto out_error;
} }
@ -887,7 +888,7 @@ static int nvme_enable_disable_write_cache(BlockDriverState *bs, bool enable,
.cdw11 = cpu_to_le32(enable ? 0x01 : 0x00), .cdw11 = cpu_to_le32(enable ? 0x01 : 0x00),
}; };
ret = nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd); ret = nvme_admin_cmd_sync(bs, &cmd);
if (ret) { if (ret) {
error_setg(errp, "Failed to configure NVMe write cache"); error_setg(errp, "Failed to configure NVMe write cache");
} }