[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] hw/nvme: add missing return statement
From: |
Klaus Jensen |
Subject: |
[PULL 02/11] hw/nvme: add missing return statement |
Date: |
Fri, 3 Jun 2022 21:53:45 +0200 |
From: Dmitry Tikhov <d.tihov@yadro.com>
Since there is no return after nvme_dsm_cb invocation, metadata
associated with non-zero block range is currently zeroed. Also this
behaviour leads to segfault since we schedule iocb->bh two times.
First when entering nvme_dsm_cb with iocb->idx == iocb->nr and
second because of missing return on call stack unwinding by calling
blk_aio_pwrite_zeroes and subsequent nvme_dsm_cb callback.
Fixes: d7d1474fd85d ("hw/nvme: reimplement dsm to allow cancellation")
Signed-off-by: Dmitry Tikhov <d.tihov@yadro.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/nvme/ctrl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 03760ddeae8c..74540a03d518 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -2372,6 +2372,7 @@ static void nvme_dsm_md_cb(void *opaque, int ret)
}
nvme_dsm_cb(iocb, 0);
+ return;
}
iocb->aiocb = blk_aio_pwrite_zeroes(ns->blkconf.blk, nvme_moff(ns, slba),
--
2.36.1
- [PULL 00/11] hw/nvme updates, Klaus Jensen, 2022/06/03
- [PULL 01/11] hw/nvme: fix narrowing conversion, Klaus Jensen, 2022/06/03
- [PULL 02/11] hw/nvme: add missing return statement,
Klaus Jensen <=
- [PULL 03/11] hw/nvme: fix copy cmd for pi enabled namespaces, Klaus Jensen, 2022/06/03
- [PULL 04/11] hw/nvme: fix smart aen, Klaus Jensen, 2022/06/03
- [PULL 05/11] hw/nvme: enforce common serial per subsystem, Klaus Jensen, 2022/06/03
- [PULL 06/11] hw/nvme: do not auto-generate eui64, Klaus Jensen, 2022/06/03
- [PULL 07/11] hw/nvme: do not auto-generate uuid, Klaus Jensen, 2022/06/03
- [PULL 08/11] hw/nvme: do not report null uuid, Klaus Jensen, 2022/06/03
- [PULL 09/11] hw/nvme: bump firmware revision, Klaus Jensen, 2022/06/03
- [PULL 10/11] hw/nvme: deprecate the use-intel-id compatibility parameter, Klaus Jensen, 2022/06/03
- [PULL 11/11] hw/nvme: add new command abort case, Klaus Jensen, 2022/06/03