From nobody Mon Apr 6 18:27:14 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=1773826091; cv=none; d=zohomail.com; s=zohoarc; b=PbJlMSGX4w3xuq7KspN6elLTu+2sRc1IfZDRzQV+pZ6r3RBErDXOiAubTtghJ6X4D4NZvhOPdZhTDawdgkWrC1HHbWvyyuMN+cY1+2sm7kbAxUzh53z8kXt+TSJgLItqtF0hbD0qiKQbuhO4828vwnzwcxF5fmIRJAYJqtwISyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773826091; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=n+B+y2foUNRdG/7TFn2seka0zeg+wKm7i3VoPZFDAUA=; b=oJsM/ZJvcGfF/c7CyoqrMcY3hAlfPzckX/J092o9bk0qrDf5PslebmCyM9SJBQlwCA7tE329pEiaJkkRJknbg1Ayk8ondpfw3vdtk9uMY014RCL8gG4whNmAbfNuzBeVghsA5aTtf9CyYIXt5D2D4HBF9U6oIl3zfJVKTZQyvzY= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773826091625271.13177428508357; Wed, 18 Mar 2026 02:28:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2nBQ-0005bg-35; Wed, 18 Mar 2026 05:27:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2nBN-0005aa-Uu; Wed, 18 Mar 2026 05:27:17 -0400 Received: from fout-b1-smtp.messagingengine.com ([202.12.124.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2nBL-0000Fh-8q; Wed, 18 Mar 2026 05:27:17 -0400 Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfout.stl.internal (Postfix) with ESMTP id 38A661D00127; Wed, 18 Mar 2026 05:27:11 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Wed, 18 Mar 2026 05:27:11 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 18 Mar 2026 05:27:08 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=cc:cc:content-transfer-encoding:content-type:content-type :date:date:from:from:in-reply-to:message-id:mime-version :reply-to:subject:subject:to:to; s=fm3; t=1773826030; x= 1773912430; bh=n+B+y2foUNRdG/7TFn2seka0zeg+wKm7i3VoPZFDAUA=; b=S pCsqqKZboGbb4waqU/fdkCnumAIw7vlWOx4xFrFPPCTXvupPR3Gn0zsN1S52+HtL jjmFoyPmH3cQ5xmbcuhGIUBXXJvsihjbmlveWWjq5EOpaf3BKmajVa3AXTK9MT3T WZvCJbTPySjbhs+im1e2sFLXKufq+//O1GGMtGzMJjA9nPHaxA5s/FdI46yl2MfF Xq7YI8TipI7qJ9ecgcDrN1cR9nqBUN6OCRYULr0mox0YW0hxLmuXvNhmJn1C6HEO fvWwnSTKzZNxlF4Wv5ObPtxf9TA3R8/k4Bl5A8S4HxaehzENCtGMBP8/Zt8Cb+rS TiTAbM7E2kV/maqYcgBZw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1773826030; x=1773912430; bh=n+B+y2foUNRdG/7TFn2seka0zeg+ wKm7i3VoPZFDAUA=; b=O4IEzxJvzEZYmLGgyc39qst7ySAxs2cndnT6cTGLE5G3 6rG3xAhF2AYnlhqz5QQOT0NuWeJDaOy02MoK03IHT0ih0VyZjmUWpub+t8khAPE+ RT1vVBaptbc93pb0CPIHR6+Ac0iJmTSCBccz5wco2fXJffSbpkMLGMVRU21J1KBC BpaMkMUAd2JtFPAmQ5zuEV3dOvG/RYRbufEqabuhrNFj4uqTqHBwQXMl/zdW8OfA a8TLQ1M8IUTjQt+VCy/6TBgE2elEywKDscePsu9LdLQ8yZ00YekqZq+nnZtJxIJf 6A1xcSIn1KM1zeDfQ1FAqD5AvlaEbe8pu1YDv1TAig== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdeftdefjeejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephfffufggtgfgkffvvefosehtjeertdertdejnecuhfhrohhmpefmlhgruhhsucfl vghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtthgvrh hnpedtheevjeeihffggeeihfefheeuiefguefglefhtdffveehffekhfekgeetteffteen ucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehithhsse hirhhrvghlvghvrghnthdrughkpdhnsggprhgtphhtthhopeekpdhmohguvgepshhmthhp ohhuthdprhgtphhtthhopehfohhsshesuggvfhhmrggtrhhordhithdprhgtphhtthhope hithhssehirhhrvghlvghvrghnthdrughkpdhrtghpthhtohepqhgvmhhuqdgslhhotghk sehnohhnghhnuhdrohhrghdprhgtphhtthhopehksghushgthheskhgvrhhnvghlrdhorh hgpdhrtghpthhtohepqhgvmhhuqdhsthgrsghlvgesnhhonhhgnhhurdhorhhgpdhrtghp thhtohepqhgvmhhuqdguvghvvghlsehnohhnghhnuhdrohhrghdprhgtphhtthhopehkrd hjvghnshgvnhesshgrmhhsuhhnghdrtghomhdprhgtphhtthhopegrrdhhihhnuggsohhr ghesshgrmhhsuhhnghdrtghomh X-ME-Proxy: Feedback-ID: idc91472f:Fastmail From: Klaus Jensen Date: Wed, 18 Mar 2026 10:26:58 +0100 Subject: [PATCH] hw/nvme: fix admin cq msix setup MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260318-fix-adminq-msix-v1-1-404b7c27c378@samsung.com> X-B4-Tracking: v=1; b=H4sIAOFvumkC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIzMDY0ML3bTMCt3ElNzMvELd3GIgO9XC0tzSJMkkzTDRQAmoq6AoFagEbGJ 0bG0tAFpkUGRhAAAA X-Change-ID: 20260318-fix-adminq-msix-e89794b4f1a0 To: qemu-devel@nongnu.org, Keith Busch , Klaus Jensen , Jesper Devantier , qemu-block@nongnu.org Cc: Klaus Jensen , qemu-stable@nongnu.org, Andreas Hindborg X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1508; i=k.jensen@samsung.com; h=from:subject:message-id; bh=3kzkNNtu486PTttuL5Vcla/AHAvi6ouN4gxsgkP69MI=; b=LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tCgpvd0o0bkFGdEFaTCtrQTBEQUFvQlRlR3ZNV zFQRGVrQnl5WmlBR202Yit6YzIxUGFuV2I2aG02ZWt6cEtaREk5Ckh0VVJoS2ZvOUZTYkllUUJN Um1rZm9rQk13UUFBUW9BSFJZaEJGSW9NNnAxNHR6bW9rZG13RTNocnpGdFR3M3AKQlFKcHVtL3N BQW9KRUUzaHJ6RnRUdzNwZHBJSC9qVW9WRnR0SnQ1cXl1RDhtcFMwQ1g1WXExdExCSmY5cGlCaw puOWcxRXJwTHVsTElkeE9GMWZZYktnUmNKaUk4ZG83Q3Rnei95OTlxV1FLMm01d1ZBSDA1cUVxV UQxUmY0WjYxCllwbjRGdHBTb1RkYlZLRE9XSVg2RDNaZXlRMFp2VytXdHMwVHgyL05QZ1hPUUhu d0xHT2xMVnVVbHRENkJqR0EKS2NjT1JpT1N2UmVZY1BNRkw0cTN3YWZGY2JtSFFZemNBbkVrMU5 UZUlsQjh1bzBZTDlLdmc4cVdlWGxXaXRGMwpQeGZIMWptNDRLRW1EV2VqYXNOZ0tnQm9pcjJxWk s4VW1yM2Y0MVJBaGtpdlVYTll6NTJMZUd1U1JOU0pMQjQ0CnFJenRvSk5zdlpIaWprRGlVdXU3U zFESm14MFQ3aU0vZEs5YjdqeTVsbDRySk5jTzBLbHV6NmYxCj1lcW9jCi0tLS0tRU5EIFBHUCBN RVNTQUdFLS0tLS0K X-Developer-Key: i=k.jensen@samsung.com; a=openpgp; fpr=DDCA4D9C9EF931CC3468427263D56FC5E55DA838 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=lists.gnu.org; Received-SPF: pass client-ip=202.12.124.144; envelope-from=its@irrelevant.dk; helo=fout-b1-smtp.messagingengine.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 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, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1773826094436154100 From: Klaus Jensen If MSI-X is not enabled when the admin completion queue is created, msix_vector_use() is not called. But, if MSI-X is subsequently enabled, msix_notify() will fail to fire the interrupt because the use count for the vector remains at 0. msix_vector_use/unuse should be called if MSI-X is *present*, not *enabled*. Fix this. Cc: qemu-stable@nongnu.org Reported-by: Andreas Hindborg Signed-off-by: Klaus Jensen --- hw/nvme/ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index cc4593cd427a..7af4059c62e2 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -5517,7 +5517,7 @@ static void nvme_free_cq(NvmeCQueue *cq, NvmeCtrl *n) event_notifier_set_handler(&cq->notifier, NULL); event_notifier_cleanup(&cq->notifier); } - if (msix_enabled(pci) && cq->irq_enabled) { + if (msix_present(pci) && cq->irq_enabled) { msix_vector_unuse(pci, cq->vector); } if (cq->cqid) { @@ -5558,7 +5558,7 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n,= uint64_t dma_addr, { PCIDevice *pci =3D PCI_DEVICE(n); =20 - if (msix_enabled(pci) && irq_enabled) { + if (msix_present(pci) && irq_enabled) { msix_vector_use(pci, vector); } =20 --- base-commit: 559919ce54927d59b215a4665eda7ab6118a48aa change-id: 20260318-fix-adminq-msix-e89794b4f1a0 Best regards, --=20 Klaus Jensen