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, robin.murphy@arm.com,
will@kernel.org, john.garry@huawei.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 v13 06/13] vhost-vdpa: Handle the failure of vdpa_reset()
Date: Tue, 31 Aug 2021 18:36:27 +0800 [thread overview]
Message-ID: <20210831103634.33-7-xieyongji@bytedance.com> (raw)
In-Reply-To: <20210831103634.33-1-xieyongji@bytedance.com>
The vdpa_reset() may fail now. This adds check to its return
value and fail the vhost_vdpa_open().
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
---
drivers/vhost/vdpa.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
index ab7a24613982..ab39805ecff1 100644
--- a/drivers/vhost/vdpa.c
+++ b/drivers/vhost/vdpa.c
@@ -116,12 +116,13 @@ static void vhost_vdpa_unsetup_vq_irq(struct vhost_vdpa *v, u16 qid)
irq_bypass_unregister_producer(&vq->call_ctx.producer);
}
-static void vhost_vdpa_reset(struct vhost_vdpa *v)
+static int vhost_vdpa_reset(struct vhost_vdpa *v)
{
struct vdpa_device *vdpa = v->vdpa;
- vdpa_reset(vdpa);
v->in_batch = 0;
+
+ return vdpa_reset(vdpa);
}
static long vhost_vdpa_get_device_id(struct vhost_vdpa *v, u8 __user *argp)
@@ -865,7 +866,9 @@ static int vhost_vdpa_open(struct inode *inode, struct file *filep)
return -EBUSY;
nvqs = v->nvqs;
- vhost_vdpa_reset(v);
+ r = vhost_vdpa_reset(v);
+ if (r)
+ goto err;
vqs = kmalloc_array(nvqs, sizeof(*vqs), GFP_KERNEL);
if (!vqs) {
--
2.11.0
next prev parent reply other threads:[~2021-08-31 10:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 10:36 [PATCH v13 00/13] Introduce VDUSE - vDPA Device in Userspace Xie Yongji
2021-08-31 10:36 ` [PATCH v13 01/13] iova: Export alloc_iova_fast() and free_iova_fast() Xie Yongji
2021-08-31 10:36 ` [PATCH v13 02/13] eventfd: Export eventfd_wake_count to modules Xie Yongji
2021-09-01 2:50 ` Jason Wang
2021-08-31 10:36 ` [PATCH v13 03/13] file: Export receive_fd() " Xie Yongji
2021-09-05 15:57 ` Michael S. Tsirkin
2021-09-05 16:44 ` Al Viro
2021-08-31 10:36 ` [PATCH v13 04/13] vdpa: Fix some coding style issues Xie Yongji
2021-08-31 10:36 ` [PATCH v13 05/13] vdpa: Add reset callback in vdpa_config_ops Xie Yongji
2021-09-06 5:55 ` Michael S. Tsirkin
2021-09-06 6:09 ` Yongji Xie
2021-09-06 6:37 ` Michael S. Tsirkin
2021-09-06 7:06 ` Yongji Xie
2021-09-06 8:00 ` Michael S. Tsirkin
2021-09-06 8:45 ` Yongji Xie
2021-09-06 10:43 ` Michael S. Tsirkin
2021-09-06 12:13 ` Yongji Xie
2021-08-31 10:36 ` Xie Yongji [this message]
2021-08-31 10:36 ` [PATCH v13 07/13] vhost-iotlb: Add an opaque pointer for vhost IOTLB Xie Yongji
2021-08-31 10:36 ` [PATCH v13 08/13] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map() Xie Yongji
2021-08-31 10:36 ` [PATCH v13 09/13] vdpa: factor out vhost_vdpa_pa_map() and vhost_vdpa_pa_unmap() Xie Yongji
2021-08-31 10:36 ` [PATCH v13 10/13] vdpa: Support transferring virtual addressing during DMA mapping Xie Yongji
2021-08-31 10:36 ` [PATCH v13 11/13] vduse: Implement an MMU-based software IOTLB Xie Yongji
2021-08-31 10:36 ` [PATCH v13 12/13] vduse: Introduce VDUSE - vDPA Device in Userspace Xie Yongji
2021-08-31 10:36 ` [PATCH v13 13/13] Documentation: Add documentation for VDUSE Xie Yongji
2021-10-11 7:32 ` [PATCH v13 00/13] Introduce VDUSE - vDPA Device in Userspace Liuxiangdong
2021-10-11 8:31 ` Yongji Xie
2021-10-11 8:32 ` 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=20210831103634.33-7-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=john.garry@huawei.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=robin.murphy@arm.com \
--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=will@kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).