[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/23] Partially revert "hw/block/nvme: drain namespaces on sq del
From: |
Klaus Jensen |
Subject: |
[PULL 18/23] Partially revert "hw/block/nvme: drain namespaces on sq deletion" |
Date: |
Tue, 29 Jun 2021 20:47:38 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
This partially reverts commit 98f84f5a4eca5c03e32fff20f246d9b4b96d6422.
Since all "multi aio" commands are now reimplemented to properly track
the nested aiocbs, we can revert the "hack" that was introduced to make
sure all requests we're properly drained upon sq deletion.
The revert is partial since we keep the assert that no outstanding
requests remain on the submission queue after the explicit cancellation.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
---
hw/nvme/ctrl.c | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 3b8c542db6e7..6a0c2cc48422 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -3918,7 +3918,6 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeRequest *req)
NvmeSQueue *sq;
NvmeCQueue *cq;
uint16_t qid = le16_to_cpu(c->qid);
- uint32_t nsid;
if (unlikely(!qid || nvme_check_sqid(n, qid))) {
trace_pci_nvme_err_invalid_del_sq(qid);
@@ -3930,22 +3929,8 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeRequest
*req)
sq = n->sq[qid];
while (!QTAILQ_EMPTY(&sq->out_req_list)) {
r = QTAILQ_FIRST(&sq->out_req_list);
- if (r->aiocb) {
- blk_aio_cancel(r->aiocb);
- }
- }
-
- /*
- * Drain all namespaces if there are still outstanding requests that we
- * could not cancel explicitly.
- */
- if (!QTAILQ_EMPTY(&sq->out_req_list)) {
- for (nsid = 1; nsid <= NVME_MAX_NAMESPACES; nsid++) {
- NvmeNamespace *ns = nvme_ns(n, nsid);
- if (ns) {
- nvme_ns_drain(ns);
- }
- }
+ assert(r->aiocb);
+ blk_aio_cancel(r->aiocb);
}
assert(QTAILQ_EMPTY(&sq->out_req_list));
--
2.32.0
- [PULL 08/23] hw/nvme: reimplement flush to allow cancellation, (continued)
- [PULL 08/23] hw/nvme: reimplement flush to allow cancellation, Klaus Jensen, 2021/06/29
- [PULL 10/23] hw/nvme: reimplement dsm to allow cancellation, Klaus Jensen, 2021/06/29
- [PULL 09/23] hw/nvme: add nvme_block_status_all helper, Klaus Jensen, 2021/06/29
- [PULL 11/23] hw/nvme: save reftag when generating pi, Klaus Jensen, 2021/06/29
- [PULL 12/23] hw/nvme: remove assert from nvme_get_zone_by_slba, Klaus Jensen, 2021/06/29
- [PULL 13/23] hw/nvme: use prinfo directly in nvme_check_prinfo and nvme_dif_check, Klaus Jensen, 2021/06/29
- [PULL 14/23] hw/nvme: add dw0/1 to the req completion trace event, Klaus Jensen, 2021/06/29
- [PULL 15/23] hw/nvme: reimplement the copy command to allow aio cancellation, Klaus Jensen, 2021/06/29
- [PULL 16/23] hw/nvme: reimplement zone reset to allow cancellation, Klaus Jensen, 2021/06/29
- [PULL 17/23] hw/nvme: reimplement format nvm to allow cancellation, Klaus Jensen, 2021/06/29
- [PULL 18/23] Partially revert "hw/block/nvme: drain namespaces on sq deletion",
Klaus Jensen <=
- [PULL 19/23] hw/nvme: fix endianess conversion and add controller list, Klaus Jensen, 2021/06/29
- [PULL 20/23] hw/nvme: documentation fix, Klaus Jensen, 2021/06/29
- [PULL 23/23] hw/nvme: add 'zoned.zasl' to documentation, Klaus Jensen, 2021/06/29
- [PULL 21/23] hw/nvme: fix missing check for PMR capability, Klaus Jensen, 2021/06/29
- [PULL 22/23] hw/nvme: fix pin-based interrupt behavior (again), Klaus Jensen, 2021/06/29