Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81F333DD85E; Thu, 17 Sep 2026 18:44:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789670673; cv=none; b=JO/8KL4RbfuYSiMgWR8W4Ui/pGnnMUNT5XZR2efGoFaiAdxRmvySpGDBK3yHAl2oVLDQIu4Dmwxdt7vZtJ2DahkQoSvBFj90i95hCE34bIPRxg5NzTOhRqWInF7VfP7vL0oVynDavqwHfiafcfGg58rr4gdWajBr+wK2gOb5L6w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789670673; c=relaxed/simple; bh=k47MDmxIYieGo2oeL5LPp2U6sbeA+m3tq75xTb37h3Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IC/7p9EBY+/vt9Nxl8AFOVtY4QhhLnEgBtsXAJf+BLoMJnhIOjCdzR3k2EYGMK9qGSfwIbxuN/F/4N1Vs9FhkmRB8WAiH85LPpGo3lCJYvPUiwwMLhtprR/APOLpXIrNFv6+wp97DwcigIVxc51kMe2LeKLWoA+CvY8Meo1/81Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0Jiidksf; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0Jiidksf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2D881F000FF; Thu, 17 Sep 2026 18:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789670672; bh=Ft1klI+dWEv/tKoHLw98vLQ7RKItPGCoGVD8laHyklA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0Jiidksfpc3Qb7gKG2iSrLM/zNUefxinBp1rkcZycI+8LZu7P+GZsOsQpJPYckBj9 uJyAu6GOMHNotb9c6603mO6g2vMR9Z6bTffVA2NCFbxp+7Nsl48QJ/VUTMKANJzk0I Qpf0i35o76CymBRL4UyFG3D6Mo95ltj2SPWsZip8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Michael S. Tsirkin" , Andrew Stellman , Sasha Levin Subject: [PATCH 6.12 0718/1102] virtio-pci: return IRQ_HANDLED after non-zero ISR Date: Thu, 17 Sep 2026 16:11:01 +0100 Message-ID: <20260917151558.370137722@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151539.408551884@linuxfoundation.org> References: <20260917151539.408551884@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andrew Stellman [ Upstream commit 93fa09455fb1a9624b73d42ac1f83771f4818e80 ] vp_interrupt() reads the ISR before dispatching config-change and vring handling. Reading the ISR also clears it, so once the read returns non-zero the interrupt was from this device and has already been consumed. Currently vp_interrupt() returns the result of vp_vring_interrupt(). For a config-change interrupt with no vring work, that can return IRQ_NONE even though the ISR was non-zero and the interrupt was handled. Call vp_vring_interrupt() for any queue work, but once the ISR is non-zero return IRQ_HANDLED. Tested with QEMU virtio-blk-pci forced to INTx using vectors=0 and pci=nomsi. On an idle device, 200 config-change interrupts were generated using QMP block_resize. Before this change, irq_handler_exit reported ret=unhandled and /proc/irq/11/spurious increased from 0 to 200 unhandled interrupts. After this change, irq_handler_exit reported ret=handled and the unhandled count remained at 0. The issue was found during an LLM-assisted Quality Playbook review. Fixes: 77cf524654a8 ("virtio_pci: split up vp_interrupt") Suggested-by: Michael S. Tsirkin Assisted-by: LLM Signed-off-by: Andrew Stellman Message-ID: <20260904141318.30278-1-astellman@stellman-greene.com> Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- drivers/virtio/virtio_pci_common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index af31711f3861a..d88f62d0fb7a2 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c @@ -120,7 +120,9 @@ static irqreturn_t vp_interrupt(int irq, void *opaque) if (isr & VIRTIO_PCI_ISR_CONFIG) vp_config_changed(irq, opaque); - return vp_vring_interrupt(irq, opaque); + vp_vring_interrupt(irq, opaque); + + return IRQ_HANDLED; } static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors, -- 2.53.0