53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From 5d4fdfc6639103d0ea5754537886921e59abb2fc Mon Sep 17 00:00:00 2001
|
|
From: wangmeiyang <wangmeiyang@xfusion.com>
|
|
Date: Fri, 26 May 2023 10:52:48 +0800
|
|
Subject: [PATCH] hw/nvme: fix missing DNR on compare failure
|
|
|
|
Even if the host is somehow using compare to do compare-and-write, the
|
|
host should be notified immediately about the compare failure and not
|
|
have to wait for the driver to potentially retry the command.
|
|
|
|
origin commit: https://gitlab.com/qemu-project/qemu/-/commit/ca2a091802872b265bc6007a2d36276d51d8e4b3
|
|
Signed-off-by: Meiyang Wang <wangmeiyang@xfusion.com>
|
|
Fixes: 0a384f923f51 ("hw/block/nvme: add compare command")
|
|
Reported-by: Jim Harris <james.r.harris@intel.com>
|
|
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
|
|
---
|
|
hw/nvme/ctrl.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
|
|
index 40fbda3b03..0b4df77e3c 100644
|
|
--- a/hw/nvme/ctrl.c
|
|
+++ b/hw/nvme/ctrl.c
|
|
@@ -2123,7 +2123,7 @@ static void nvme_compare_mdata_cb(void *opaque, int ret)
|
|
|
|
for (bufp = buf; mbufp < end; bufp += ns->lbaf.ms, mbufp += ns->lbaf.ms) {
|
|
if (memcmp(bufp + pil, mbufp + pil, ns->lbaf.ms - pil)) {
|
|
- req->status = NVME_CMP_FAILURE;
|
|
+ req->status = NVME_CMP_FAILURE | NVME_DNR;
|
|
goto out;
|
|
}
|
|
}
|
|
@@ -2132,7 +2132,7 @@ static void nvme_compare_mdata_cb(void *opaque, int ret)
|
|
}
|
|
|
|
if (memcmp(buf, ctx->mdata.bounce, ctx->mdata.iov.size)) {
|
|
- req->status = NVME_CMP_FAILURE;
|
|
+ req->status = NVME_CMP_FAILURE | NVME_DNR;
|
|
goto out;
|
|
}
|
|
|
|
@@ -2181,7 +2181,7 @@ static void nvme_compare_data_cb(void *opaque, int ret)
|
|
}
|
|
|
|
if (memcmp(buf, ctx->data.bounce, ctx->data.iov.size)) {
|
|
- req->status = NVME_CMP_FAILURE;
|
|
+ req->status = NVME_CMP_FAILURE | NVME_DNR;
|
|
goto out;
|
|
}
|
|
|
|
--
|
|
2.41.0.windows.1
|
|
|