linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xie Yongji <xieyongji@bytedance.com>
To: mst@redhat.com, jasowang@redhat.com, stefanha@redhat.com
Cc: amit@kernel.org, arei.gonglei@huawei.com, airlied@linux.ie,
	kraxel@redhat.com, jean-philippe@linaro.org, ohad@wizery.com,
	bjorn.andersson@linaro.org, david@redhat.com, vgoyal@redhat.com,
	miklos@szeredi.hu, lucho@ionkov.net, asmadeus@codewreck.org,
	virtualization@lists.linux-foundation.org,
	linux-kernel@vger.kernel.org
Subject: [RFC PATCH 15/15] 9p/trans_virtio: Handle virtio_device_ready() failure
Date: Mon, 17 May 2021 17:34:28 +0800	[thread overview]
Message-ID: <20210517093428.670-16-xieyongji@bytedance.com> (raw)
In-Reply-To: <20210517093428.670-1-xieyongji@bytedance.com>

Now virtio_device_ready() will return error if we get
invalid status. Let's handle this case on probe.

Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
 net/9p/trans_virtio.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 0960ed1ad7ac..6013d3761b76 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -617,7 +617,9 @@ static int p9_virtio_probe(struct virtio_device *vdev)
 	/* Ceiling limit to avoid denial of service attacks */
 	chan->p9_max_pages = nr_free_buffer_pages()/4;
 
-	virtio_device_ready(vdev);
+	err = virtio_device_ready(vdev);
+	if (err)
+		goto out_free_vc_wq;
 
 	mutex_lock(&virtio_9p_lock);
 	list_add_tail(&chan->chan_list, &virtio_chan_list);
@@ -628,6 +630,8 @@ static int p9_virtio_probe(struct virtio_device *vdev)
 
 	return 0;
 
+out_free_vc_wq:
+	kfree(chan->vc_wq);
 out_remove_file:
 	sysfs_remove_file(&(vdev->dev.kobj), &dev_attr_mount_tag.attr);
 out_free_tag:
-- 
2.11.0


  parent reply	other threads:[~2021-05-17  9:37 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-17  9:34 [RFC PATCH 00/15] Handle virtio_device_ready() failure Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 01/15] virtio_config: Add return value to virtio_device_ready() Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 02/15] virtio-blk: Handle virtio_device_ready() failure Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 03/15] virtio_console: " Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 04/15] virtio_crypto: " Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 05/15] drm/virtio: " Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 06/15] virtio-iommu: " Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 07/15] virtio-net: " Xie Yongji
2021-05-17  9:34 ` Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 08/15] rpmsg: virtio: " Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 10/15] " Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 11/15] virtio-balloon: " Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 12/15] virtio-input: " Xie Yongji
2021-05-17  9:34 ` [RFC PATCH 13/15] virtio-mem: " Xie Yongji
2021-05-17  9:48   ` David Hildenbrand
2021-05-17 10:08     ` Yongji Xie
2021-05-17  9:34 ` [RFC PATCH 14/15] virtiofs: " Xie Yongji
2021-05-17  9:34 ` Xie Yongji [this message]
2021-05-17  9:53   ` [RFC PATCH 15/15] 9p/trans_virtio: " asmadeus

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=20210517093428.670-16-xieyongji@bytedance.com \
    --to=xieyongji@bytedance.com \
    --cc=airlied@linux.ie \
    --cc=amit@kernel.org \
    --cc=arei.gonglei@huawei.com \
    --cc=asmadeus@codewreck.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=david@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=jean-philippe@linaro.org \
    --cc=kraxel@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lucho@ionkov.net \
    --cc=miklos@szeredi.hu \
    --cc=mst@redhat.com \
    --cc=ohad@wizery.com \
    --cc=stefanha@redhat.com \
    --cc=vgoyal@redhat.com \
    --cc=virtualization@lists.linux-foundation.org \
    /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).