From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 E480D35CB7C for ; Sun, 2 Aug 2026 21:10:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785705046; cv=none; b=jFqtcQoPRe60vLdLqLs3gd/PHaYYfr3OebFz6N+dUsOrL5ZSykMGizyPLo9IRfU+Mvk3ovLN5me9AROMpLO7vMkyn+S8oAEOIdrh/6ZDkKgyFw/PYjaXrPicgKZNhEHkcFcmUoyqkDuSm2L56ogfvbiX2sDpjPSM+y48laERWmM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785705046; c=relaxed/simple; bh=8XHhBJSaOao1ra7Th8dCO+IUDowG1Hd6FxTnD1DgZPY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=QkSkEkUJo6cANN5UUTL8q3ynOrRUnl9dc8Cm9lbHMb6eUVtij+bhkD74fT5KF44ZtDBceOxvmJmDyLzv62NfM6Zl2x1LKPM9Peds8O86KLQgi/wXBnSo+EViBMb06VwD0gKZJfzWxgU0+V5oDIPivMQU9URJKVhBCJWiI6qfW6Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=U3xMSFHC; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=SRQ8HWjm; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U3xMSFHC"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="SRQ8HWjm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785705029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+Xqxsjy354sVq1muPTWLc7ZtrNPulk9p/RuRel+d6OA=; b=U3xMSFHC4onMvC4Q2YNcTdt+jzwIG+rleCVEFDSAWSirkg8QDW4gAoxAVlbcFGpmTJhu8L bSXKRBYKLbJvedEy6ywxVQmxRG5c9fjiuUaSSOypVd7vIfYX5lznwecEdOc5/YpVq4Lbq9 HjuTxhwywvNVPpMlfOcjuDkusEOLuFc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-327-lzWlxwLjNie8S5z0Vx74sw-1; Sun, 02 Aug 2026 17:10:27 -0400 X-MC-Unique: lzWlxwLjNie8S5z0Vx74sw-1 X-Mimecast-MFC-AGG-ID: lzWlxwLjNie8S5z0Vx74sw_1785705026 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-49545071724so14798575e9.0 for ; Sun, 02 Aug 2026 14:10:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1785705026; x=1786309826; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=+Xqxsjy354sVq1muPTWLc7ZtrNPulk9p/RuRel+d6OA=; b=SRQ8HWjmelDM09YhRw3HhQhpm5BmT2o6TdisHyJwFB41jbmNt5FAM2eNFdb890f9nu OFy9wNBPaI+fki74y4Isv4Q2F6L85agQgGYZaPggVT4qKVCMY1uSD2Ak7MVuFmGvC/sM PbUrwEoQRpS//ycmDe68LquND9DUWCP1Oqgf69Hy257pk3j2z1BfE9sWZGkQNPQmdvQc R0Kz5MVC5h9sJEUZf/ZCU4g8+XdaGPQo6ifS62lzru79BjOoOIZtfWS6+mCK98prnWak 6D8DSrKSiY/2NOvJqtrXFHw9R/AXOzEU688kTv1o/heFsEspnFd1P/SbwlUeQGKFYWN8 a8rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785705026; x=1786309826; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=+Xqxsjy354sVq1muPTWLc7ZtrNPulk9p/RuRel+d6OA=; b=NySQjLz+Fp3ZYrDe/zYIqOUK4hMUpobkzZkvwwb28sBzOd8hdokOD1DrWBpFlaaxJx uNPrBk7scvACuIy+uCUkU4hZvt0wBY7/LswDtJmOBKUDGukffRNzG6Z0pfqaPbR0uP4d MY3pJFrvdkr3cIpTrGr/f5QyL0qi3JZIJpaAGF3QP7da5FOKtiXe8HN9KtCC+wFAO0wt nPY+L56yQZS9uV+V7s2wp0IgmMmihspkJr+6L9vIegz9iutbYPxi9GqwtboI2KzaP4cX cTlEqNQv1F6lAj+CP5FqCzbZ95AqVcxCszG+s4hIxpC6aVu09uEeTWm0kD5F+izQzjjj w1gQ== X-Forwarded-Encrypted: i=1; AHgh+RphxJ+W7cmytoHv6O2NC7/vOdgbO4pP22jexpK1X0H8DJT9DVdk0QcPwApUG31IJm1RtC7zw8MXxu0iG7c=@vger.kernel.org X-Gm-Message-State: AOJu0YyLZQCPTWHi+VUuqLjJyFSj24eAJ0/TnawCiubwQGwXeJDUIgeY GwcOZpP1Uqu+AAldTDWzaxk940WyZ+UcEwWsRRtI6n+OYfTKIBuU49OltEs+CBkZIN1JI/QCcfW ZhS0C+ptj4TLQqMQJhYQ0bmNlMvix/FTeB1/6yIiczJnZXTez1LtBFmolA8woVbTYYU6XnlV/2w == X-Gm-Gg: AR+sD10IYAsROICCkymFMwXLwTJzoevZx3CBGE5m1GYF6KF/IwwYSi/8H9ZGsqLacag 6rsDr41Q1tfLlZItbBckktuNe4Hl6bU9G5hhTJerD9V+yobzecF/QZLUXMknV3QBunlKPIgmibT GlRnf8q7nKtFad5lC8VtLXVA3ue8iUqRrpDv4szvxzi3r+YNJr9VutCsyhKf+IfQoPWFFqVKpbT 2C9xJzkIrfcTYNDfVjYHZ/fodLpdq95eojf5CA2Qxh6T6UPMPj1FroL1iHnvxJg0pPI7Rdzkc+C NgE/8CWHNVCreMVy/5bu9HH9AJAdg+2zYNQH/EbHtKtnY+SNMMgS7CDRjAr2cawnfjG2pUJwtii ihK15Ti8M//eFDwwqlwSxig== X-Received: by 2002:a05:600c:19cf:b0:495:7a04:b006 with SMTP id 5b1f17b1804b1-4980c66b572mr144626065e9.8.1785705026077; Sun, 02 Aug 2026 14:10:26 -0700 (PDT) X-Received: by 2002:a05:600c:19cf:b0:495:7a04:b006 with SMTP id 5b1f17b1804b1-4980c66b572mr144625545e9.8.1785705025517; Sun, 02 Aug 2026 14:10:25 -0700 (PDT) Received: from redhat.com (IGLD-80-230-28-14.inter.net.il. [80.230.28.14]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4980878dbaesm284117615e9.12.2026.08.02.14.10.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Aug 2026 14:10:24 -0700 (PDT) Date: Sun, 2 Aug 2026 17:10:21 -0400 From: "Michael S. Tsirkin" To: Xixin Liu Cc: linux-block@vger.kernel.org, virtualization@lists.linux.dev, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, axboe@kernel.dk, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 1/2] virtio-pci: add error_detected for PCI AER recovery Message-ID: <20260802165915-mutt-send-email-mst@kernel.org> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Fri, Jul 31, 2026 at 11:17:00AM +0800, Xixin Liu wrote: > virtio-pci only registered reset_prepare/reset_done. The PCI error > recovery core treats devices without error_detected as NO_AER_DRIVER and > does not deliver pci_channel_io_perm_failure to the driver after a failed > recovery. Maybe it should? > Virtio devices therefore miss the normal ERS quiesce/teardown > sequence. > > Register error_detected: quiesce on frozen (reset_prepare) before bus > reset; on perm_failure break virtqueues and return DISCONNECT. Block-layer > cleanup for virtio-blk is handled in the follow-up patch. > > Assisted-by: DeepSeek:deepseek-v3 > Signed-off-by: Xixin Liu > --- > drivers/virtio/virtio_pci_common.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c > index 164f480b18a6..fff6b6e2d0c5 100644 > --- a/drivers/virtio/virtio_pci_common.c > +++ b/drivers/virtio/virtio_pci_common.c > @@ -828,7 +828,37 @@ static void virtio_pci_reset_done(struct pci_dev *pci_dev) > dev_warn(&pci_dev->dev, "Reset done failure: %d", ret); > } > > +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 = pci_get_drvdata(pci_dev); > + > + /* > + * PCI ERS error_detected: quiesce on frozen before bus reset; on > + * permanent failure break virtqueues (follow-up may call driver > + * .shutdown for block teardown). block specifically? this is common code. > + */ > + switch (state) { > + case pci_channel_io_normal: > + return PCI_ERS_RESULT_CAN_RECOVER; > + case pci_channel_io_frozen: > + pci_info(pci_dev, "frozen error detected, quiesce device\n"); > + if (virtio_device_reset_prepare(&vp_dev->vdev)) > + dev_warn(&pci_dev->dev, "frozen: reset prepare failed\n"); > + return PCI_ERS_RESULT_NEED_RESET; so I guess pci will do slot reset? but what will call driver reset later? confused. > + 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; > + default: > + break; > + } > + return PCI_ERS_RESULT_NEED_RESET; here, too, and we didn't virtio_device_reset_prepare either. > +} > + > static const struct pci_error_handlers virtio_pci_err_handler = { > + .error_detected = virtio_pci_error_detected, > .reset_prepare = virtio_pci_reset_prepare, > .reset_done = virtio_pci_reset_done, > }; > -- > 2.43.0