From nobody Wed Sep 23 09:33:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1785797161; cv=none; d=zohomail.com; s=zohoarc; b=EEcwImC9Sxa5nG9cIbHnEcd0/VN4ISRXIzAEZ/RoDeCadISQo8U2jT0tXTsjh7juN+IcP6XyVO+ojqvQBuy6LvqMaIyXsSPb8oDxK2x9wxF2+G4OeZzLKbrGvwgyF2c4+LHGpM3MvsuqY8f0iw5NlWAlwWtI08DP4blusD6sifg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785797161; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Fexyhnzj/u9gD63iqTRm7949vPST9u199nO6W6D81do=; b=Cr8sWE7WdwN1yRBM+N0hwK+6zPrZhFaDpJL3uKpL+GCl1F79lka/VWHgR7W1BLyQPVD1sNu3F+z3qF+8JXRZZ0GxXbuFjv+v2mX61FcZ830pNlggEay23xVFMAi4PLhMN7NqGkf6QzSlkdCVDEMAjGNIuOACVuGx0WtK2kWXlYc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785797160494834.9847452844812; Mon, 3 Aug 2026 15:46:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wr1P8-0005Ao-7v; Mon, 03 Aug 2026 18:45:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wr1P5-00058y-VD; Mon, 03 Aug 2026 18:45:04 -0400 Received: from fhigh-a7-smtp.messagingengine.com ([103.168.172.158]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wr1P4-00056n-Gr; Mon, 03 Aug 2026 18:45:03 -0400 Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfhigh.phl.internal (Postfix) with ESMTP id 604011400149; Mon, 3 Aug 2026 18:45:00 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Mon, 03 Aug 2026 18:45:00 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 3 Aug 2026 18:44:55 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1785797100; x= 1785883500; bh=Fexyhnzj/u9gD63iqTRm7949vPST9u199nO6W6D81do=; b=u ngDhISJpYXUzS2MPuKMV/ytFI+SsW8/k7PFz3XHcO+mqp0nlJGkhNX9b91MTzyNp BZxJjGGWuD6r3A57+fIlnAJjVBygleW/7TFblY1v6Awfs7AHCypQuh1W/sO+9fYu CDNBay64e0usKQEh+O86V+SgE9AZt+E1r/7XQiOP6RInteFEztl/gsWes2xJsnUO sdLcI+zJdMXJ1DcxjNx0wxPCgdzvvvR5/uCk2S/s4XDj25Q3KY6mmZlFyy10ZIWw y4nyydVzg63MOKtuxcd4is8aFh8ymEsa1r8G2SdiocUfJSmgjE8/7nlQY1NPpHX2 W7Uafr+m/k5Wf1jeRiPRg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1785797100; x=1785883500; bh=F exyhnzj/u9gD63iqTRm7949vPST9u199nO6W6D81do=; b=k7v0IiungaMZ7/rDS Ex/wkYUEcGXEjDeumBqTsz568lnDajcVxK1HSpiLzNddOkbslYbMIfRgFpQuCo2+ JCfsPOyjLbjGWXoTcZGHaX1W8vgFoeXcecwFQ2EqC49447qJNm+sxaDSK/8A7eqK uf96gLI8nMaV0xxAJeUDusxrAYwJ4IUFV57q9h5TxWtDBQfFMQc6fjZIQmV4aZeL joCF+Sd87eswRLG25pa61nDIUsqbPrsCWphWipQKnCm8ysWIBjIotEO8Yetw4Uyp FWhLIc5vlTRj2WJBaDv5h681ypVV/LpokXtPDgtjjeLmH3aX5esPu0J4jhs6VoPE TtBeQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTGBwBi/Yeu/peMq8Ngc1wQNqPR0owGT6TsXi5P//CvcIH3VpbZD6k72frfNrTPmJ1 HzAsw0Nek94AFz6/hyId/n2vFnSsULLz/dCExBxAVF7Wkns8SSKeussPL693jItbJPhw8W 9NppZ+VdrXsTJGGeIhQeFbTsRWyq6tXwlEwPv3OovYpL6WbYzUeIGapD881h3iwBuhQzBL yggvH+NPIaYLOPLKtGfICRUCi/Zgm1F30tHBJPANJnYoIv44XJEtXG1AV01WR8YvxuSn6v uVaspQ8TgNHfAnkT968W4FZr2dNYnNGf8Y/bmzegupv3TawcKvMGnuXBPLbFA9djhX2mAB g68EkAKlwOiCbPuEu7uQn9EIrPTBsSsHOdqLqddS4yczrdS3P79U2mjwSaqN+r6RgY1KYP sZ8fndK7W7CTCDw9mrN/sagsE8DHP41/Q0d7aLW0cMhtOF6Kbj04NhC3tzj/cbVHQ966R0 w1sau87+PQmY/hBLflMsZuT9EjNmYX1B/l08IulRHxkNKYhNImxSdvB+HjpnqBld2VrhE0 k4n2U66uOM+Irquz4tmDawTWBgi33JLwVEqtoKH0gc4WQ6I4vQHPFpOe5exssyTJwLY1H0 Wh7DLTNqU0lD3xPpjCEn/QCoI0ZjeewHfQwe0ULRnrc//eVAjCwZeCFRMCqA X-ME-Proxy: Feedback-ID: idc91472f:Fastmail From: Klaus Jensen To: qemu-devel@nongnu.org Cc: Peter Maydell , Minwoo Im , qemu-stable@nongnu.org, Minwoo Im , Klaus Jensen , Keith Busch , Klaus Jensen , Jesper Devantier , qemu-block@nongnu.org Subject: [PULL 2/4] hw/nvme: factor out nvme_sq_cancel_inflight() Date: Mon, 3 Aug 2026 15:44:33 -0700 Message-ID: <20260803224436.38768-3-its@irrelevant.dk> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260803224436.38768-1-its@irrelevant.dk> References: <20260803224436.38768-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=103.168.172.158; envelope-from=its@irrelevant.dk; helo=fhigh-a7-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @irrelevant.dk) X-ZM-MESSAGEID: 1785797162961158500 Content-Type: text/plain; charset="utf-8" From: Minwoo Im Factor the cancel-and-wait loop used by nvme_del_sq() into nvme_sq_cancel_inflight(), so it can be reused to drain queues on controller reset. Cc: qemu-stable@nongnu.org Signed-off-by: Minwoo Im Signed-off-by: Klaus Jensen --- hw/nvme/ctrl.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index e3eadf3d1dd0..e355c256a561 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -4826,6 +4826,26 @@ static int nvme_init_sq_ioeventfd(NvmeSQueue *sq) return 0; } =20 +/* + * A pending Async Event Request has no aiocb (nvme_aer() parks it without + * issuing any block I/O), so there is nothing to cancel; just drop it. + */ +static void nvme_sq_cancel_inflight(NvmeSQueue *sq, uint16_t status) +{ + NvmeRequest *r; + + while (!QTAILQ_EMPTY(&sq->out_req_list)) { + r =3D QTAILQ_FIRST(&sq->out_req_list); + r->status =3D status; + + if (r->aiocb) { + blk_aio_cancel(r->aiocb); + } else { + QTAILQ_REMOVE(&sq->out_req_list, r, entry); + } + } +} + static void nvme_free_sq(NvmeSQueue *sq, NvmeCtrl *n) { uint16_t offset =3D sq->sqid << 3; @@ -4860,16 +4880,7 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeRequest= *req) trace_pci_nvme_del_sq(qid); =20 sq =3D n->sq[qid]; - while (!QTAILQ_EMPTY(&sq->out_req_list)) { - r =3D QTAILQ_FIRST(&sq->out_req_list); - r->status =3D NVME_CMD_ABORT_SQ_DEL; - - if (r->aiocb) { - blk_aio_cancel(r->aiocb); - } else { - QTAILQ_REMOVE(&sq->out_req_list, r, entry); - } - } + nvme_sq_cancel_inflight(sq, NVME_CMD_ABORT_SQ_DEL); =20 if (!nvme_check_cqid(n, sq->cqid)) { cq =3D n->cq[sq->cqid]; --=20 2.53.0