From nobody Fri Oct 2 02:36:27 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 EC18144E65F; Fri, 7 Aug 2026 06:58:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786085897; cv=none; b=iW2eum/IRe7tId7xKo/fFjea2L9Mp4jP5s+azhwuxPRjglUDtq/aGbaVhrAoKs/ZYkglj8B7cmjkrXNFkQpRUXdBbyNaBVSb3/0a+XIEkozHmmYqH5T/bIjeWJabPKP6kgG7hvxtTy8by/JtDrlCLInaBcBUUyxbOaOuU5Q2eeY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786085897; c=relaxed/simple; bh=4m+EHl2XTR/0uEV/B4HePdgMiDwLkPiJHY5SCOXNQ5o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OMfi8wJ6yja5Yx4713DPQeolbHZB9VohVMyJhRxPIbk1OOsigYtq4sL/OVxR2L71YKqmg5KNtc5JkIxiWEmrKXMbSQPtTC5p5mAeVR6EI17WB6iIMzBkS4Ux1bbDVnE9DGO2BgKZf3RacnhU3txt/hYIP3HNs/u1/5WK20/pEu8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: 5a013936922d11f1aa26b74ffac11d73-20260807 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:7ed57725-55f1-4dc7-aaae-c7e5e56f3396,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:e7bac3a,CLOUDID:ae1ced206cde49520b779d84447a9a33,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|136|865|898,TC:nil,Content:0|1 5|50,EDM:-3|-100,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL: 0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 5a013936922d11f1aa26b74ffac11d73-20260807 X-User: liuxixin@kylinos.cn Received: from [127.0.1.1] [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 706926235; Fri, 07 Aug 2026 14:58:10 +0800 From: Xixin Liu To: linux-block@vger.kernel.org Cc: virtualization@lists.linux.dev, mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, axboe@kernel.dk, linux-kernel@vger.kernel.org, liuxixin@kylinos.cn Subject: [PATCH v3 1/2] virtio-pci: add error_detected and slot_reset for AER Date: Thu, 6 Aug 2026 09:15:00 +0800 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: patches/scripts/send-local.py Content-Type: text/plain; charset="utf-8" virtio-pci only registered reset_prepare/reset_done. Without .error_detected the recovery core votes NO_AER_DRIVER on the first broadcast, and report_perm_failure_detected skips the driver callback whenever overall status is not RECOVERED. That skip covers NO_AER_DRIVER even when subordinate reset succeeded. Virtio therefore misses the normal ERS path and pci_channel_io_perm_failure. AER's aer_root_reset() uses pci_bus_error_reset(), which does a bus or slot reset without pci_dev_save_and_disable(). The existing .reset_prepare and .reset_done therefore do not run on that path. Those hooks still serve FLR and pci_reset_function. Register error_detected and slot_reset: - frozen / unknown: virtio_device_reset_prepare() then NEED_RESET - after a successful PCI reset: restore config, virtio_device_reset_done() - perm_failure: virtio_break_device() and return DISCONNECT Assisted-by: DeepSeek:deepseek-v3 Signed-off-by: Xixin Liu --- drivers/virtio/virtio_pci_common.c | 53 ++++++++++++++++++++++++++++++++++= +++++ 1 file changed, 53 insertions(+) diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci= _common.c index 164f480b18a6..c0ffeed00004 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c @@ -828,7 +828,60 @@ static void virtio_pci_reset_done(struct pci_dev *pci_= dev) dev_warn(&pci_dev->dev, "Reset done failure: %d", ret); } =20 +static pci_ers_result_t virtio_pci_error_detected(struct pci_dev *pci_dev, + pci_channel_state_t state) +{ + struct virtio_pci_device *vp_dev =3D pci_get_drvdata(pci_dev); + + /* + * Quiesce on frozen/unknown before AER bus reset. That path does + * not call .reset_prepare. On permanent failure only break + * virtqueues. + */ + switch (state) { + case pci_channel_io_normal: + return PCI_ERS_RESULT_CAN_RECOVER; + case pci_channel_io_perm_failure: + dev_warn(&pci_dev->dev, + "permanent failure, disconnecting device\n"); + virtio_break_device(&vp_dev->vdev); + return PCI_ERS_RESULT_DISCONNECT; + case pci_channel_io_frozen: + default: + pci_info(pci_dev, "channel state %u, quiesce device\n", state); + if (virtio_device_reset_prepare(&vp_dev->vdev)) + dev_warn(&pci_dev->dev, "reset prepare failed\n"); + return PCI_ERS_RESULT_NEED_RESET; + } +} + +static pci_ers_result_t virtio_pci_slot_reset(struct pci_dev *pci_dev) +{ + struct virtio_pci_device *vp_dev =3D pci_get_drvdata(pci_dev); + int ret; + + if (pci_enable_device(pci_dev)) { + dev_err(&pci_dev->dev, + "Cannot re-enable PCI device after reset\n"); + return PCI_ERS_RESULT_DISCONNECT; + } + + pci_set_master(pci_dev); + pci_restore_state(pci_dev); + + ret =3D virtio_device_reset_done(&vp_dev->vdev); + if (ret && ret !=3D -EOPNOTSUPP) { + dev_warn(&pci_dev->dev, "slot reset restore failed: %d\n", + ret); + return PCI_ERS_RESULT_DISCONNECT; + } + + return PCI_ERS_RESULT_RECOVERED; +} + static const struct pci_error_handlers virtio_pci_err_handler =3D { + .error_detected =3D virtio_pci_error_detected, + .slot_reset =3D virtio_pci_slot_reset, .reset_prepare =3D virtio_pci_reset_prepare, .reset_done =3D virtio_pci_reset_done, }; --=20 2.43.0 From nobody Fri Oct 2 02:36:27 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 3DDF4455177; Fri, 7 Aug 2026 06:58:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786085900; cv=none; b=k/ZuFx7/sH1XbYM3q4igobt4mJvTmIs1CHhySAmZn/RgB4dnyWyqLz3U+9wz1Kzp1vSaQigKBMxQ95QRaZlzlev5VVWoP1BKg+uydBC0R9gLTHI8KnjRjOV57VkqVyT0uR5amlWEX1mMUFhsvn4Y4Zz4XfiCerBsPbpw6f6WO0c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786085900; c=relaxed/simple; bh=2k36wO5X9SZ8jPI9CAGiOvZvhLKcuvrAG34lp4AbnG0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CwnFRa0Avv0KQOU4044uWfrWLTvVo3YBgFJ8Z2OdqqWNcNd13ja7mwE1CymkJPzcz1NBXyqQAmxuPMcf8uRbhHiu7VtzDqrfUV1tB/ym5RmUmTMthdleVNgvY3MrL4IA4G+9o96QOi6DFWbkUgNZspRm9N7zks8ZmI7Nud2eEQ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: 5b5fcb62922d11f1aa26b74ffac11d73-20260807 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:a4cae2cd-ddbc-45f5-aefc-cd5e9715d49d,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:e7bac3a,CLOUDID:24a4393c6e3ab0dd0cda9751a340d239,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|136|865|898,TC:nil,Content:0|1 5|50,EDM:-3|-100,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL: 0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 5b5fcb62922d11f1aa26b74ffac11d73-20260807 X-User: liuxixin@kylinos.cn Received: from [127.0.1.1] [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 25166834; Fri, 07 Aug 2026 14:58:12 +0800 From: Xixin Liu To: linux-block@vger.kernel.org Cc: virtualization@lists.linux.dev, mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, axboe@kernel.dk, linux-kernel@vger.kernel.org, liuxixin@kylinos.cn Subject: [PATCH v3 2/2] virtio-blk: add shutdown and fail queue_rq after VQ teardown Date: Thu, 6 Aug 2026 09:20:00 +0800 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: patches/scripts/send-local.py Content-Type: text/plain; charset="utf-8" Register virtio_driver.shutdown for reboot and poweroff via virtio_dev_shutdown: freeze to reclaim in-flight requests, then break virtqueues and mark the disk dead. Also fail queue_rq early when vqs were removed during frozen reset_prepare and vqs is NULL. Assisted-by: DeepSeek:deepseek-v3 Signed-off-by: Xixin Liu --- drivers/block/virtio_blk.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 32bf3ba07a9d..bbbbbbbbbbbb 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -435,6 +435,12 @@ static blk_status_t virtio_queue_rq(struct blk_mq_hw_c= tx *hctx, blk_status_t status; int err; =20 + /* VQs may be gone after frozen reset_prepare; avoid NULL deref. */ + if (unlikely(!vblk->vqs || !vblk->vdev)) { + blk_mq_start_request(req); + return BLK_STS_IOERR; + } + status =3D virtblk_prep_rq(hctx, vblk, req, vbr); if (unlikely(status)) return status; @@ -1561,6 +1561,34 @@ static int virtblk_probe(struct virtio_device *vdev) return err; } =20 +/* System shutdown: reclaim in-flight requests, then break and mark dead. = */ +static void virtblk_shutdown(struct virtio_device *vdev) +{ + struct virtio_blk *vblk =3D vdev->priv; + struct request_queue *q; + unsigned int memflags; + + if (!vblk || !vblk->disk) + return; + + q =3D vblk->disk->queue; + /* + * Reclaim request memory before break: freeze waits until + * q_usage_counter is zero (PDU + chained sg freed in done path). + * After virtio_break_device(), completions no longer run. + */ + memflags =3D blk_mq_freeze_queue(q); + blk_mq_quiesce_queue_nowait(q); + + virtio_break_device(vdev); + flush_work(&vblk->config_work); + + blk_mark_disk_dead(vblk->disk); + + blk_mq_unquiesce_queue(q); + blk_mq_unfreeze_queue(q, memflags); +} + static void virtblk_remove(struct virtio_device *vdev) { struct virtio_blk *vblk =3D vdev->priv; @@ -1684,6 +1712,7 @@ static struct virtio_driver virtio_blk =3D { .probe =3D virtblk_probe, .remove =3D virtblk_remove, .config_changed =3D virtblk_config_changed, + .shutdown =3D virtblk_shutdown, #ifdef CONFIG_PM_SLEEP .freeze =3D virtblk_freeze, .restore =3D virtblk_restore, --=20 2.43.0