From: Xie Yongji <xieyongji@bytedance.com> To: mst@redhat.com, jasowang@redhat.com, stefanha@redhat.com, sgarzare@redhat.com, parav@nvidia.com, hch@infradead.org, christian.brauner@canonical.com, rdunlap@infradead.org, willy@infradead.org, viro@zeniv.linux.org.uk, axboe@kernel.dk, bcrl@kvack.org, corbet@lwn.net, mika.penttila@nextfour.com, dan.carpenter@oracle.com, joro@8bytes.org, gregkh@linuxfoundation.org, zhe.he@windriver.com, xiaodong.liu@intel.com, joe@perches.com Cc: songmuchun@bytedance.com, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-fsdevel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v10 10/17] virtio: Handle device reset failure in register_virtio_device() Date: Thu, 29 Jul 2021 15:34:56 +0800 [thread overview] Message-ID: <20210729073503.187-11-xieyongji@bytedance.com> (raw) In-Reply-To: <20210729073503.187-1-xieyongji@bytedance.com> The device reset may fail in virtio-vdpa case now, so add checks to its return value and fail the register_virtio_device(). Signed-off-by: Xie Yongji <xieyongji@bytedance.com> --- drivers/virtio/virtio.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index a15beb6b593b..8df75425fb43 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -349,7 +349,9 @@ int register_virtio_device(struct virtio_device *dev) /* We always start by resetting the device, in case a previous * driver messed it up. This also tests that code path a little. */ - dev->config->reset(dev); + err = dev->config->reset(dev); + if (err) + goto err_reset; /* Acknowledge that we've seen the device. */ virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE); @@ -362,10 +364,13 @@ int register_virtio_device(struct virtio_device *dev) */ err = device_add(&dev->dev); if (err) - ida_simple_remove(&virtio_index_ida, dev->index); -out: - if (err) - virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED); + goto err_add; + + return 0; +err_add: + virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED); +err_reset: + ida_simple_remove(&virtio_index_ida, dev->index); return err; } EXPORT_SYMBOL_GPL(register_virtio_device); -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Xie Yongji <xieyongji@bytedance.com> To: mst@redhat.com, jasowang@redhat.com, stefanha@redhat.com, sgarzare@redhat.com, parav@nvidia.com, hch@infradead.org, christian.brauner@canonical.com, rdunlap@infradead.org, willy@infradead.org, viro@zeniv.linux.org.uk, axboe@kernel.dk, bcrl@kvack.org, corbet@lwn.net, mika.penttila@nextfour.com, dan.carpenter@oracle.com, joro@8bytes.org, gregkh@linuxfoundation.org, zhe.he@windriver.com, xiaodong.liu@intel.com, joe@perches.com Cc: kvm@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, iommu@lists.linux-foundation.org, songmuchun@bytedance.com, linux-fsdevel@vger.kernel.org Subject: [PATCH v10 10/17] virtio: Handle device reset failure in register_virtio_device() Date: Thu, 29 Jul 2021 15:34:56 +0800 [thread overview] Message-ID: <20210729073503.187-11-xieyongji@bytedance.com> (raw) In-Reply-To: <20210729073503.187-1-xieyongji@bytedance.com> The device reset may fail in virtio-vdpa case now, so add checks to its return value and fail the register_virtio_device(). Signed-off-by: Xie Yongji <xieyongji@bytedance.com> --- drivers/virtio/virtio.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index a15beb6b593b..8df75425fb43 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -349,7 +349,9 @@ int register_virtio_device(struct virtio_device *dev) /* We always start by resetting the device, in case a previous * driver messed it up. This also tests that code path a little. */ - dev->config->reset(dev); + err = dev->config->reset(dev); + if (err) + goto err_reset; /* Acknowledge that we've seen the device. */ virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE); @@ -362,10 +364,13 @@ int register_virtio_device(struct virtio_device *dev) */ err = device_add(&dev->dev); if (err) - ida_simple_remove(&virtio_index_ida, dev->index); -out: - if (err) - virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED); + goto err_add; + + return 0; +err_add: + virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED); +err_reset: + ida_simple_remove(&virtio_index_ida, dev->index); return err; } EXPORT_SYMBOL_GPL(register_virtio_device); -- 2.11.0 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2021-07-29 7:37 UTC|newest] Thread overview: 131+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-29 7:34 [PATCH v10 00/17] Introduce VDUSE - vDPA Device in Userspace Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-07-29 7:34 ` [PATCH v10 01/17] iova: Export alloc_iova_fast() and free_iova_fast() Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-08-03 7:41 ` Jason Wang 2021-08-03 7:41 ` Jason Wang 2021-08-03 7:41 ` Jason Wang 2021-08-03 7:41 ` Jason Wang 2021-08-03 7:41 ` Jason Wang 2021-08-03 7:41 ` Jason Wang 2021-08-03 8:54 ` Yongji Xie 2021-08-03 8:54 ` Yongji Xie 2021-08-03 10:53 ` Robin Murphy 2021-08-03 10:53 ` Robin Murphy 2021-08-03 10:53 ` Robin Murphy 2021-08-04 5:02 ` Yongji Xie 2021-08-04 5:02 ` Yongji Xie 2021-08-04 15:43 ` Robin Murphy 2021-08-04 15:43 ` Robin Murphy 2021-08-04 15:43 ` Robin Murphy 2021-08-05 12:34 ` Yongji Xie 2021-08-05 12:34 ` Yongji Xie 2021-08-05 13:31 ` Jason Wang 2021-08-05 13:31 ` Jason Wang 2021-08-05 13:31 ` Jason Wang 2021-08-09 5:56 ` Yongji Xie 2021-08-09 5:56 ` Yongji Xie 2021-08-10 3:02 ` Jason Wang 2021-08-10 3:02 ` Jason Wang 2021-08-10 3:02 ` Jason Wang 2021-08-10 7:43 ` Yongji Xie 2021-08-10 7:43 ` Yongji Xie 2021-07-29 7:34 ` [PATCH v10 02/17] file: Export receive_fd() to modules Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-08-03 7:45 ` Jason Wang 2021-08-03 7:45 ` Jason Wang 2021-08-03 7:45 ` Jason Wang 2021-08-03 9:01 ` Yongji Xie 2021-08-03 9:01 ` Yongji Xie 2021-08-04 8:27 ` Jason Wang 2021-08-04 8:27 ` Jason Wang 2021-08-04 8:27 ` Jason Wang 2021-07-29 7:34 ` [PATCH v10 03/17] vdpa: Fix code indentation Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-08-03 7:50 ` Jason Wang 2021-08-03 7:50 ` Jason Wang 2021-08-03 7:50 ` Jason Wang 2021-08-03 9:13 ` Yongji Xie 2021-08-03 9:13 ` Yongji Xie 2021-07-29 7:34 ` [PATCH v10 04/17] vdpa: Fail the vdpa_reset() if fail to set device status to zero Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-08-03 7:58 ` Jason Wang 2021-08-03 7:58 ` Jason Wang 2021-08-03 7:58 ` Jason Wang 2021-08-03 9:31 ` Yongji Xie 2021-08-03 9:31 ` Yongji Xie 2021-08-04 8:30 ` Jason Wang 2021-08-04 8:30 ` Jason Wang 2021-08-04 8:30 ` Jason Wang 2021-07-29 7:34 ` [PATCH v10 05/17] vhost-vdpa: Fail the vhost_vdpa_set_status() on reset failure Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-08-03 8:10 ` Jason Wang 2021-08-03 8:10 ` Jason Wang 2021-08-03 8:10 ` Jason Wang 2021-08-03 9:50 ` Yongji Xie 2021-08-03 9:50 ` Yongji Xie 2021-08-04 8:33 ` Jason Wang 2021-08-04 8:33 ` Jason Wang 2021-08-04 8:33 ` Jason Wang 2021-07-29 7:34 ` [PATCH v10 06/17] vhost-vdpa: Handle the failure of vdpa_reset() Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-07-29 7:34 ` [PATCH v10 07/17] virtio: Don't set FAILED status bit on device index allocation failure Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-08-03 8:02 ` Jason Wang 2021-08-03 8:02 ` Jason Wang 2021-08-03 8:02 ` Jason Wang 2021-08-03 9:17 ` Yongji Xie 2021-08-03 9:17 ` Yongji Xie 2021-07-29 7:34 ` [PATCH v10 08/17] virtio_config: Add a return value to reset function Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-07-29 7:34 ` [PATCH v10 09/17] virtio-vdpa: Handle the failure of vdpa_reset() Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-07-29 7:34 ` Xie Yongji [this message] 2021-07-29 7:34 ` [PATCH v10 10/17] virtio: Handle device reset failure in register_virtio_device() Xie Yongji 2021-08-03 8:09 ` Jason Wang 2021-08-03 8:09 ` Jason Wang 2021-08-03 8:09 ` Jason Wang 2021-08-03 9:38 ` Yongji Xie 2021-08-03 9:38 ` Yongji Xie 2021-08-04 8:32 ` Jason Wang 2021-08-04 8:32 ` Jason Wang 2021-08-04 8:32 ` Jason Wang 2021-08-04 8:50 ` Yongji Xie 2021-08-04 8:50 ` Yongji Xie 2021-08-04 8:54 ` Jason Wang 2021-08-04 8:54 ` Jason Wang 2021-08-04 8:54 ` Jason Wang 2021-08-04 9:07 ` Yongji Xie 2021-08-04 9:07 ` Yongji Xie 2021-08-05 7:12 ` Jason Wang 2021-08-05 7:12 ` Jason Wang 2021-08-05 7:12 ` Jason Wang 2021-07-29 7:34 ` [PATCH v10 11/17] vhost-iotlb: Add an opaque pointer for vhost IOTLB Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-07-29 7:34 ` [PATCH v10 12/17] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map() Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-07-29 7:34 ` [PATCH v10 13/17] vdpa: factor out vhost_vdpa_pa_map() and vhost_vdpa_pa_unmap() Xie Yongji 2021-07-29 7:34 ` Xie Yongji 2021-07-29 7:35 ` [PATCH v10 14/17] vdpa: Support transferring virtual addressing during DMA mapping Xie Yongji 2021-07-29 7:35 ` Xie Yongji 2021-07-29 7:35 ` [PATCH v10 15/17] vduse: Implement an MMU-based software IOTLB Xie Yongji 2021-07-29 7:35 ` Xie Yongji 2021-07-29 7:35 ` [PATCH v10 16/17] vduse: Introduce VDUSE - vDPA Device in Userspace Xie Yongji 2021-07-29 7:35 ` Xie Yongji 2021-07-29 9:00 ` Greg KH 2021-07-29 9:00 ` Greg KH 2021-07-29 9:00 ` Greg KH 2021-07-29 9:57 ` Yongji Xie 2021-07-29 9:57 ` Yongji Xie 2021-08-03 7:30 ` Jason Wang 2021-08-03 7:30 ` Jason Wang 2021-08-03 7:30 ` Jason Wang 2021-08-03 8:39 ` Yongji Xie 2021-08-03 8:39 ` Yongji Xie 2021-07-29 7:35 ` [PATCH v10 17/17] Documentation: Add documentation for VDUSE Xie Yongji 2021-07-29 7:35 ` Xie Yongji 2021-08-03 7:35 ` Jason Wang 2021-08-03 7:35 ` Jason Wang 2021-08-03 7:35 ` Jason Wang 2021-08-03 8:52 ` Yongji Xie 2021-08-03 8:52 ` Yongji Xie
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210729073503.187-11-xieyongji@bytedance.com \ --to=xieyongji@bytedance.com \ --cc=axboe@kernel.dk \ --cc=bcrl@kvack.org \ --cc=christian.brauner@canonical.com \ --cc=corbet@lwn.net \ --cc=dan.carpenter@oracle.com \ --cc=gregkh@linuxfoundation.org \ --cc=hch@infradead.org \ --cc=iommu@lists.linux-foundation.org \ --cc=jasowang@redhat.com \ --cc=joe@perches.com \ --cc=joro@8bytes.org \ --cc=kvm@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mika.penttila@nextfour.com \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=parav@nvidia.com \ --cc=rdunlap@infradead.org \ --cc=sgarzare@redhat.com \ --cc=songmuchun@bytedance.com \ --cc=stefanha@redhat.com \ --cc=viro@zeniv.linux.org.uk \ --cc=virtualization@lists.linux-foundation.org \ --cc=willy@infradead.org \ --cc=xiaodong.liu@intel.com \ --cc=zhe.he@windriver.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.