[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/56] hw/block/nvme: pull aio error handling
From: |
Klaus Jensen |
Subject: |
[PULL 02/56] hw/block/nvme: pull aio error handling |
Date: |
Tue, 9 Feb 2021 08:30:07 +0100 |
From: Klaus Jensen <k.jensen@samsung.com>
Add a new function, nvme_aio_err, to handle errors resulting from AIOs
and use this from the callbacks.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme.c | 61 +++++++++++++++++++++++++++++--------------------
1 file changed, 36 insertions(+), 25 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index b0816d19eff4..a245ff8ceb2c 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -878,6 +878,41 @@ static inline uint16_t nvme_check_bounds(NvmeNamespace
*ns, uint64_t slba,
return NVME_SUCCESS;
}
+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:
+ status = NVME_UNRECOVERED_READ;
+ break;
+ case NVME_CMD_FLUSH:
+ case NVME_CMD_WRITE:
+ case NVME_CMD_WRITE_ZEROES:
+ 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;
+}
+
static void nvme_rw_cb(void *opaque, int ret)
{
NvmeRequest *req = opaque;
@@ -887,37 +922,13 @@ static void nvme_rw_cb(void *opaque, int ret)
BlockAcctCookie *acct = &req->acct;
BlockAcctStats *stats = blk_get_stats(blk);
- Error *local_err = NULL;
-
trace_pci_nvme_rw_cb(nvme_cid(req), blk_name(blk));
if (!ret) {
block_acct_done(stats, acct);
} else {
- uint16_t status;
-
block_acct_failed(stats, acct);
-
- switch (req->cmd.opcode) {
- case NVME_CMD_READ:
- status = NVME_UNRECOVERED_READ;
- break;
- case NVME_CMD_FLUSH:
- case NVME_CMD_WRITE:
- case NVME_CMD_WRITE_ZEROES:
- 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);
-
- req->status = status;
+ nvme_aio_err(req, ret);
}
nvme_enqueue_req_completion(nvme_cq(req), req);
--
2.30.0
- [PULL 00/56] emulated nvme patches, Klaus Jensen, 2021/02/09
- [PULL 01/56] hw/block/nvme: remove superfluous NvmeCtrl parameter, Klaus Jensen, 2021/02/09
- [PULL 02/56] hw/block/nvme: pull aio error handling,
Klaus Jensen <=
- [PULL 03/56] hw/block/nvme: add dulbe support, Klaus Jensen, 2021/02/09
- [PULL 05/56] hw/block/nvme: add the dataset management command, Klaus Jensen, 2021/02/09
- [PULL 04/56] nvme: add namespace I/O optimization fields to shared header, Klaus Jensen, 2021/02/09
- [PULL 06/56] hw/block/nvme: add compare command, Klaus Jensen, 2021/02/09
- [PULL 08/56] hw/block/nvme: Process controller reset and shutdown differently, Klaus Jensen, 2021/02/09
- [PULL 09/56] hw/block/nvme: Generate namespace UUIDs, Klaus Jensen, 2021/02/09
- [PULL 10/56] hw/block/nvme: Separate read and write handlers, Klaus Jensen, 2021/02/09
- [PULL 11/56] hw/block/nvme: Combine nvme_write_zeroes() and nvme_write(), Klaus Jensen, 2021/02/09
- [PULL 12/56] hw/block/nvme: Add Commands Supported and Effects log, Klaus Jensen, 2021/02/09
- [PULL 07/56] hw/block/nvme: fix bad clearing of CAP, Klaus Jensen, 2021/02/09