openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/block/nvme: add ns/cmd references in NvmeRequest 

Instead of passing around the NvmeNamespace and the NvmeCmd, add them as
members in the NvmeRequest structure.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
This commit is contained in:
Klaus Jensen 2020-07-20 12:44:01 +02:00
parent 69265150aa
commit 3143df3d56
2 changed files with 104 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
hw/block/nvme.c
View File

@ -226,6 +226,12 @@ static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq)
} }
} }
static void nvme_req_clear(NvmeRequest *req)
{
req->ns = NULL;
memset(&req->cqe, 0x0, sizeof(req->cqe));
}
static uint16_t nvme_map_addr_cmb(NvmeCtrl *n, QEMUIOVector *iov, hwaddr addr, static uint16_t nvme_map_addr_cmb(NvmeCtrl *n, QEMUIOVector *iov, hwaddr addr,
size_t len) size_t len)
{ {
@ -443,9 +449,9 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,
return status; return status;
} }
static uint16_t nvme_map_dptr(NvmeCtrl *n, NvmeCmd *cmd, size_t len, static uint16_t nvme_map_dptr(NvmeCtrl *n, size_t len, NvmeRequest *req)
NvmeRequest *req)
{ {
NvmeCmd *cmd = &req->cmd;
uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1);
uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2);
@ -621,8 +627,7 @@ static void nvme_rw_cb(void *opaque, int ret)
nvme_enqueue_req_completion(cq, req); nvme_enqueue_req_completion(cq, req);
} }
static uint16_t nvme_flush(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, static uint16_t nvme_flush(NvmeCtrl *n, NvmeRequest *req)
NvmeRequest *req)
{ {
block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0, block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0,
BLOCK_ACCT_FLUSH); BLOCK_ACCT_FLUSH);
@ -631,10 +636,10 @@ static uint16_t nvme_flush(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
return NVME_NO_COMPLETE; return NVME_NO_COMPLETE;
} }
static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRequest *req)
NvmeRequest *req)
{ {
NvmeRwCmd *rw = (NvmeRwCmd *)cmd; NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd;
NvmeNamespace *ns = req->ns;
const uint8_t lba_index = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); const uint8_t lba_index = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas);
const uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds; const uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds;
uint64_t slba = le64_to_cpu(rw->slba); uint64_t slba = le64_to_cpu(rw->slba);
@ -658,10 +663,10 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
return NVME_NO_COMPLETE; return NVME_NO_COMPLETE;
} }
static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req)
NvmeRequest *req)
{ {
NvmeRwCmd *rw = (NvmeRwCmd *)cmd; NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd;
NvmeNamespace *ns = req->ns;
uint32_t nlb = le32_to_cpu(rw->nlb) + 1; uint32_t nlb = le32_to_cpu(rw->nlb) + 1;
uint64_t slba = le64_to_cpu(rw->slba); uint64_t slba = le64_to_cpu(rw->slba);
@ -689,7 +694,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
return status; return status;
} }
if (nvme_map_dptr(n, cmd, data_size, req)) { if (nvme_map_dptr(n, data_size, req)) {
block_acct_invalid(blk_get_stats(n->conf.blk), acct); block_acct_invalid(blk_get_stats(n->conf.blk), acct);
return NVME_INVALID_FIELD | NVME_DNR; return NVME_INVALID_FIELD | NVME_DNR;
} }
@ -715,29 +720,29 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
return NVME_NO_COMPLETE; return NVME_NO_COMPLETE;
} }
static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeNamespace *ns; uint32_t nsid = le32_to_cpu(req->cmd.nsid);
uint32_t nsid = le32_to_cpu(cmd->nsid);
trace_pci_nvme_io_cmd(nvme_cid(req), nsid, nvme_sqid(req), cmd->opcode); trace_pci_nvme_io_cmd(nvme_cid(req), nsid, nvme_sqid(req),
req->cmd.opcode);
if (unlikely(nsid == 0 || nsid > n->num_namespaces)) { if (unlikely(nsid == 0 || nsid > n->num_namespaces)) {
trace_pci_nvme_err_invalid_ns(nsid, n->num_namespaces); trace_pci_nvme_err_invalid_ns(nsid, n->num_namespaces);
return NVME_INVALID_NSID | NVME_DNR; return NVME_INVALID_NSID | NVME_DNR;
} }
ns = &n->namespaces[nsid - 1]; req->ns = &n->namespaces[nsid - 1];
switch (cmd->opcode) { switch (req->cmd.opcode) {
case NVME_CMD_FLUSH: case NVME_CMD_FLUSH:
return nvme_flush(n, ns, cmd, req); return nvme_flush(n, req);
case NVME_CMD_WRITE_ZEROES: case NVME_CMD_WRITE_ZEROES:
return nvme_write_zeroes(n, ns, cmd, req); return nvme_write_zeroes(n, req);
case NVME_CMD_WRITE: case NVME_CMD_WRITE:
case NVME_CMD_READ: case NVME_CMD_READ:
return nvme_rw(n, ns, cmd, req); return nvme_rw(n, req);
default: default:
trace_pci_nvme_err_invalid_opc(cmd->opcode); trace_pci_nvme_err_invalid_opc(req->cmd.opcode);
return NVME_INVALID_OPCODE | NVME_DNR; return NVME_INVALID_OPCODE | NVME_DNR;
} }
} }
@ -753,10 +758,10 @@ static void nvme_free_sq(NvmeSQueue *sq, NvmeCtrl *n)
} }
} }
static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeCmd *cmd) static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeDeleteQ *c = (NvmeDeleteQ *)cmd; NvmeDeleteQ *c = (NvmeDeleteQ *)&req->cmd;
NvmeRequest *req, *next; NvmeRequest *r, *next;
NvmeSQueue *sq; NvmeSQueue *sq;
NvmeCQueue *cq; NvmeCQueue *cq;
uint16_t qid = le16_to_cpu(c->qid); uint16_t qid = le16_to_cpu(c->qid);
@ -770,19 +775,19 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeCmd *cmd)
sq = n->sq[qid]; sq = n->sq[qid];
while (!QTAILQ_EMPTY(&sq->out_req_list)) { while (!QTAILQ_EMPTY(&sq->out_req_list)) {
req = QTAILQ_FIRST(&sq->out_req_list); r = QTAILQ_FIRST(&sq->out_req_list);
assert(req->aiocb); assert(r->aiocb);
blk_aio_cancel(req->aiocb); blk_aio_cancel(r->aiocb);
} }
if (!nvme_check_cqid(n, sq->cqid)) { if (!nvme_check_cqid(n, sq->cqid)) {
cq = n->cq[sq->cqid]; cq = n->cq[sq->cqid];
QTAILQ_REMOVE(&cq->sq_list, sq, entry); QTAILQ_REMOVE(&cq->sq_list, sq, entry);
nvme_post_cqes(cq); nvme_post_cqes(cq);
QTAILQ_FOREACH_SAFE(req, &cq->req_list, entry, next) { QTAILQ_FOREACH_SAFE(r, &cq->req_list, entry, next) {
if (req->sq == sq) { if (r->sq == sq) {
QTAILQ_REMOVE(&cq->req_list, req, entry); QTAILQ_REMOVE(&cq->req_list, r, entry);
QTAILQ_INSERT_TAIL(&sq->req_list, req, entry); QTAILQ_INSERT_TAIL(&sq->req_list, r, entry);
} }
} }
} }
@ -819,10 +824,10 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr,
n->sq[sqid] = sq; n->sq[sqid] = sq;
} }
static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd) static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeSQueue *sq; NvmeSQueue *sq;
NvmeCreateSq *c = (NvmeCreateSq *)cmd; NvmeCreateSq *c = (NvmeCreateSq *)&req->cmd;
uint16_t cqid = le16_to_cpu(c->cqid); uint16_t cqid = le16_to_cpu(c->cqid);
uint16_t sqid = le16_to_cpu(c->sqid); uint16_t sqid = le16_to_cpu(c->sqid);
@ -857,10 +862,10 @@ static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd)
return NVME_SUCCESS; return NVME_SUCCESS;
} }
static uint16_t nvme_smart_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae, static uint16_t nvme_smart_info(NvmeCtrl *n, uint8_t rae, uint32_t buf_len,
uint32_t buf_len, uint64_t off, uint64_t off, NvmeRequest *req)
NvmeRequest *req)
{ {
NvmeCmd *cmd = &req->cmd;
uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1);
uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2);
uint32_t nsid = le32_to_cpu(cmd->nsid); uint32_t nsid = le32_to_cpu(cmd->nsid);
@ -916,10 +921,11 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae,
DMA_DIRECTION_FROM_DEVICE); DMA_DIRECTION_FROM_DEVICE);
} }
static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len, static uint16_t nvme_fw_log_info(NvmeCtrl *n, uint32_t buf_len, uint64_t off,
uint64_t off, NvmeRequest *req) NvmeRequest *req)
{ {
uint32_t trans_len; uint32_t trans_len;
NvmeCmd *cmd = &req->cmd;
uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1);
uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2);
NvmeFwSlotInfoLog fw_log = { NvmeFwSlotInfoLog fw_log = {
@ -938,11 +944,11 @@ static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len,
DMA_DIRECTION_FROM_DEVICE); DMA_DIRECTION_FROM_DEVICE);
} }
static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae, static uint16_t nvme_error_info(NvmeCtrl *n, uint8_t rae, uint32_t buf_len,
uint32_t buf_len, uint64_t off, uint64_t off, NvmeRequest *req)
NvmeRequest *req)
{ {
uint32_t trans_len; uint32_t trans_len;
NvmeCmd *cmd = &req->cmd;
uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1);
uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2);
NvmeErrorLog errlog; NvmeErrorLog errlog;
@ -963,8 +969,10 @@ static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae,
DMA_DIRECTION_FROM_DEVICE); DMA_DIRECTION_FROM_DEVICE);
} }
static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) static uint16_t nvme_get_log(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeCmd *cmd = &req->cmd;
uint32_t dw10 = le32_to_cpu(cmd->cdw10); uint32_t dw10 = le32_to_cpu(cmd->cdw10);
uint32_t dw11 = le32_to_cpu(cmd->cdw11); uint32_t dw11 = le32_to_cpu(cmd->cdw11);
uint32_t dw12 = le32_to_cpu(cmd->cdw12); uint32_t dw12 = le32_to_cpu(cmd->cdw12);
@ -999,11 +1007,11 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
switch (lid) { switch (lid) {
case NVME_LOG_ERROR_INFO: case NVME_LOG_ERROR_INFO:
return nvme_error_info(n, cmd, rae, len, off, req); return nvme_error_info(n, rae, len, off, req);
case NVME_LOG_SMART_INFO: case NVME_LOG_SMART_INFO:
return nvme_smart_info(n, cmd, rae, len, off, req); return nvme_smart_info(n, rae, len, off, req);
case NVME_LOG_FW_SLOT_INFO: case NVME_LOG_FW_SLOT_INFO:
return nvme_fw_log_info(n, cmd, len, off, req); return nvme_fw_log_info(n, len, off, req);
default: default:
trace_pci_nvme_err_invalid_log_page(nvme_cid(req), lid); trace_pci_nvme_err_invalid_log_page(nvme_cid(req), lid);
return NVME_INVALID_FIELD | NVME_DNR; return NVME_INVALID_FIELD | NVME_DNR;
@ -1021,9 +1029,9 @@ static void nvme_free_cq(NvmeCQueue *cq, NvmeCtrl *n)
} }
} }
static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeCmd *cmd) static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeDeleteQ *c = (NvmeDeleteQ *)cmd; NvmeDeleteQ *c = (NvmeDeleteQ *)&req->cmd;
NvmeCQueue *cq; NvmeCQueue *cq;
uint16_t qid = le16_to_cpu(c->qid); uint16_t qid = le16_to_cpu(c->qid);
@ -1064,10 +1072,10 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr,
cq->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, nvme_post_cqes, cq); cq->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, nvme_post_cqes, cq);
} }
static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeCQueue *cq; NvmeCQueue *cq;
NvmeCreateCq *c = (NvmeCreateCq *)cmd; NvmeCreateCq *c = (NvmeCreateCq *)&req->cmd;
uint16_t cqid = le16_to_cpu(c->cqid); uint16_t cqid = le16_to_cpu(c->cqid);
uint16_t vector = le16_to_cpu(c->irq_vector); uint16_t vector = le16_to_cpu(c->irq_vector);
uint16_t qsize = le16_to_cpu(c->qsize); uint16_t qsize = le16_to_cpu(c->qsize);
@ -1115,8 +1123,9 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)
return NVME_SUCCESS; return NVME_SUCCESS;
} }
static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeIdentify *c) static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeIdentify *c = (NvmeIdentify *)&req->cmd;
uint64_t prp1 = le64_to_cpu(c->prp1); uint64_t prp1 = le64_to_cpu(c->prp1);
uint64_t prp2 = le64_to_cpu(c->prp2); uint64_t prp2 = le64_to_cpu(c->prp2);
@ -1126,9 +1135,10 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeIdentify *c)
prp2, DMA_DIRECTION_FROM_DEVICE); prp2, DMA_DIRECTION_FROM_DEVICE);
} }
static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c) static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeNamespace *ns; NvmeNamespace *ns;
NvmeIdentify *c = (NvmeIdentify *)&req->cmd;
uint32_t nsid = le32_to_cpu(c->nsid); uint32_t nsid = le32_to_cpu(c->nsid);
uint64_t prp1 = le64_to_cpu(c->prp1); uint64_t prp1 = le64_to_cpu(c->prp1);
uint64_t prp2 = le64_to_cpu(c->prp2); uint64_t prp2 = le64_to_cpu(c->prp2);
@ -1146,8 +1156,9 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c)
prp2, DMA_DIRECTION_FROM_DEVICE); prp2, DMA_DIRECTION_FROM_DEVICE);
} }
static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c) static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeIdentify *c = (NvmeIdentify *)&req->cmd;
static const int data_len = NVME_IDENTIFY_DATA_SIZE; static const int data_len = NVME_IDENTIFY_DATA_SIZE;
uint32_t min_nsid = le32_to_cpu(c->nsid); uint32_t min_nsid = le32_to_cpu(c->nsid);
uint64_t prp1 = le64_to_cpu(c->prp1); uint64_t prp1 = le64_to_cpu(c->prp1);
@ -1184,8 +1195,9 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c)
return ret; return ret;
} }
static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeIdentify *c) static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeIdentify *c = (NvmeIdentify *)&req->cmd;
uint32_t nsid = le32_to_cpu(c->nsid); uint32_t nsid = le32_to_cpu(c->nsid);
uint64_t prp1 = le64_to_cpu(c->prp1); uint64_t prp1 = le64_to_cpu(c->prp1);
uint64_t prp2 = le64_to_cpu(c->prp2); uint64_t prp2 = le64_to_cpu(c->prp2);
@ -1224,28 +1236,28 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeIdentify *c)
DMA_DIRECTION_FROM_DEVICE); DMA_DIRECTION_FROM_DEVICE);
} }
static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd) static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeIdentify *c = (NvmeIdentify *)cmd; NvmeIdentify *c = (NvmeIdentify *)&req->cmd;
switch (le32_to_cpu(c->cns)) { switch (le32_to_cpu(c->cns)) {
case NVME_ID_CNS_NS: case NVME_ID_CNS_NS:
return nvme_identify_ns(n, c); return nvme_identify_ns(n, req);
case NVME_ID_CNS_CTRL: case NVME_ID_CNS_CTRL:
return nvme_identify_ctrl(n, c); return nvme_identify_ctrl(n, req);
case NVME_ID_CNS_NS_ACTIVE_LIST: case NVME_ID_CNS_NS_ACTIVE_LIST:
return nvme_identify_nslist(n, c); return nvme_identify_nslist(n, req);
case NVME_ID_CNS_NS_DESCR_LIST: case NVME_ID_CNS_NS_DESCR_LIST:
return nvme_identify_ns_descr_list(n, c); return nvme_identify_ns_descr_list(n, req);
default: default:
trace_pci_nvme_err_invalid_identify_cns(le32_to_cpu(c->cns)); trace_pci_nvme_err_invalid_identify_cns(le32_to_cpu(c->cns));
return NVME_INVALID_FIELD | NVME_DNR; return NVME_INVALID_FIELD | NVME_DNR;
} }
} }
static uint16_t nvme_abort(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) static uint16_t nvme_abort(NvmeCtrl *n, NvmeRequest *req)
{ {
uint16_t sqid = le32_to_cpu(cmd->cdw10) & 0xffff; uint16_t sqid = le32_to_cpu(req->cmd.cdw10) & 0xffff;
req->cqe.result = 1; req->cqe.result = 1;
if (nvme_check_sqid(n, sqid)) { if (nvme_check_sqid(n, sqid)) {
@ -1295,8 +1307,9 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n)
return cpu_to_le64(ts.all); return cpu_to_le64(ts.all);
} }
static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeCmd *cmd = &req->cmd;
uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1);
uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2);
@ -1306,8 +1319,9 @@ static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)
prp2, DMA_DIRECTION_FROM_DEVICE); prp2, DMA_DIRECTION_FROM_DEVICE);
} }
static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeCmd *cmd = &req->cmd;
uint32_t dw10 = le32_to_cpu(cmd->cdw10); uint32_t dw10 = le32_to_cpu(cmd->cdw10);
uint32_t dw11 = le32_to_cpu(cmd->cdw11); uint32_t dw11 = le32_to_cpu(cmd->cdw11);
uint32_t nsid = le32_to_cpu(cmd->nsid); uint32_t nsid = le32_to_cpu(cmd->nsid);
@ -1381,7 +1395,7 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
result = n->features.async_config; result = n->features.async_config;
goto out; goto out;
case NVME_TIMESTAMP: case NVME_TIMESTAMP:
return nvme_get_feature_timestamp(n, cmd); return nvme_get_feature_timestamp(n, req);
default: default:
break; break;
} }
@ -1427,10 +1441,11 @@ out:
return NVME_SUCCESS; return NVME_SUCCESS;
} }
static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeRequest *req)
{ {
uint16_t ret; uint16_t ret;
uint64_t timestamp; uint64_t timestamp;
NvmeCmd *cmd = &req->cmd;
uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1);
uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2);
@ -1445,8 +1460,9 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)
return NVME_SUCCESS; return NVME_SUCCESS;
} }
static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeRequest *req)
{ {
NvmeCmd *cmd = &req->cmd;
uint32_t dw10 = le32_to_cpu(cmd->cdw10); uint32_t dw10 = le32_to_cpu(cmd->cdw10);
uint32_t dw11 = le32_to_cpu(cmd->cdw11); uint32_t dw11 = le32_to_cpu(cmd->cdw11);
uint32_t nsid = le32_to_cpu(cmd->nsid); uint32_t nsid = le32_to_cpu(cmd->nsid);
@ -1537,14 +1553,14 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
n->features.async_config = dw11; n->features.async_config = dw11;
break; break;
case NVME_TIMESTAMP: case NVME_TIMESTAMP:
return nvme_set_feature_timestamp(n, cmd); return nvme_set_feature_timestamp(n, req);
default: default:
return NVME_FEAT_NOT_CHANGEABLE | NVME_DNR; return NVME_FEAT_NOT_CHANGEABLE | NVME_DNR;
} }
return NVME_SUCCESS; return NVME_SUCCESS;
} }
static uint16_t nvme_aer(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) static uint16_t nvme_aer(NvmeCtrl *n, NvmeRequest *req)
{ {
trace_pci_nvme_aer(nvme_cid(req)); trace_pci_nvme_aer(nvme_cid(req));
@ -1563,33 +1579,33 @@ static uint16_t nvme_aer(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
return NVME_NO_COMPLETE; return NVME_NO_COMPLETE;
} }
static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeRequest *req)
{ {
trace_pci_nvme_admin_cmd(nvme_cid(req), nvme_sqid(req), cmd->opcode); trace_pci_nvme_admin_cmd(nvme_cid(req), nvme_sqid(req), req->cmd.opcode);
switch (cmd->opcode) { switch (req->cmd.opcode) {
case NVME_ADM_CMD_DELETE_SQ: case NVME_ADM_CMD_DELETE_SQ:
return nvme_del_sq(n, cmd); return nvme_del_sq(n, req);
case NVME_ADM_CMD_CREATE_SQ: case NVME_ADM_CMD_CREATE_SQ:
return nvme_create_sq(n, cmd); return nvme_create_sq(n, req);
case NVME_ADM_CMD_GET_LOG_PAGE: case NVME_ADM_CMD_GET_LOG_PAGE:
return nvme_get_log(n, cmd, req); return nvme_get_log(n, req);
case NVME_ADM_CMD_DELETE_CQ: case NVME_ADM_CMD_DELETE_CQ:
return nvme_del_cq(n, cmd); return nvme_del_cq(n, req);
case NVME_ADM_CMD_CREATE_CQ: case NVME_ADM_CMD_CREATE_CQ:
return nvme_create_cq(n, cmd); return nvme_create_cq(n, req);
case NVME_ADM_CMD_IDENTIFY: case NVME_ADM_CMD_IDENTIFY:
return nvme_identify(n, cmd); return nvme_identify(n, req);
case NVME_ADM_CMD_ABORT: case NVME_ADM_CMD_ABORT:
return nvme_abort(n, cmd, req); return nvme_abort(n, req);
case NVME_ADM_CMD_SET_FEATURES: case NVME_ADM_CMD_SET_FEATURES:
return nvme_set_feature(n, cmd, req); return nvme_set_feature(n, req);
case NVME_ADM_CMD_GET_FEATURES: case NVME_ADM_CMD_GET_FEATURES:
return nvme_get_feature(n, cmd, req); return nvme_get_feature(n, req);
case NVME_ADM_CMD_ASYNC_EV_REQ: case NVME_ADM_CMD_ASYNC_EV_REQ:
return nvme_aer(n, cmd, req); return nvme_aer(n, req);
default: default:
trace_pci_nvme_err_invalid_admin_opc(cmd->opcode); trace_pci_nvme_err_invalid_admin_opc(req->cmd.opcode);
return NVME_INVALID_OPCODE | NVME_DNR; return NVME_INVALID_OPCODE | NVME_DNR;
} }
} }
@ -1613,11 +1629,12 @@ static void nvme_process_sq(void *opaque)
req = QTAILQ_FIRST(&sq->req_list); req = QTAILQ_FIRST(&sq->req_list);
QTAILQ_REMOVE(&sq->req_list, req, entry); QTAILQ_REMOVE(&sq->req_list, req, entry);
QTAILQ_INSERT_TAIL(&sq->out_req_list, req, entry); QTAILQ_INSERT_TAIL(&sq->out_req_list, req, entry);
memset(&req->cqe, 0, sizeof(req->cqe)); nvme_req_clear(req);
req->cqe.cid = cmd.cid; req->cqe.cid = cmd.cid;
memcpy(&req->cmd, &cmd, sizeof(NvmeCmd));
status = sq->sqid ? nvme_io_cmd(n, &cmd, req) : status = sq->sqid ? nvme_io_cmd(n, req) :
nvme_admin_cmd(n, &cmd, req); nvme_admin_cmd(n, req);
if (status != NVME_NO_COMPLETE) { if (status != NVME_NO_COMPLETE) {
req->status = status; req->status = status;
nvme_enqueue_req_completion(cq, req); nvme_enqueue_req_completion(cq, req);

2
hw/block/nvme.h
View File

@ -21,9 +21,11 @@ typedef struct NvmeAsyncEvent {
typedef struct NvmeRequest { typedef struct NvmeRequest {
struct NvmeSQueue *sq; struct NvmeSQueue *sq;
struct NvmeNamespace *ns;
BlockAIOCB *aiocb; BlockAIOCB *aiocb;
uint16_t status; uint16_t status;
NvmeCqe cqe; NvmeCqe cqe;
NvmeCmd cmd;
BlockAcctCookie acct; BlockAcctCookie acct;
QEMUSGList qsg; QEMUSGList qsg;
QEMUIOVector iov; QEMUIOVector iov;