From: Wei Wang <wei.w.wang@intel.com>
To: virtio-dev@lists.oasis-open.org, linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org, kvm@vger.kernel.org,
linux-mm@kvack.org, mst@redhat.com, mhocko@kernel.org,
akpm@linux-foundation.org, torvalds@linux-foundation.org
Cc: pbonzini@redhat.com, wei.w.wang@intel.com,
liliang.opensource@gmail.com, yang.zhang.wz@gmail.com,
quan.xu0@gmail.com, nilal@redhat.com, riel@redhat.com,
peterx@redhat.com
Subject: [PATCH v36 1/5] virtio-balloon: remove BUG() in init_vqs
Date: Fri, 20 Jul 2018 16:33:01 +0800 [thread overview]
Message-ID: <1532075585-39067-2-git-send-email-wei.w.wang@intel.com> (raw)
In-Reply-To: <1532075585-39067-1-git-send-email-wei.w.wang@intel.com>
It's a bit overkill to use BUG when failing to add an entry to the
stats_vq in init_vqs. So remove it and just return the error to the
caller to bail out nicely.
Signed-off-by: Wei Wang <wei.w.wang@intel.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
---
drivers/virtio/virtio_balloon.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 6b237e3..9356a1a 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -455,9 +455,13 @@ static int init_vqs(struct virtio_balloon *vb)
num_stats = update_balloon_stats(vb);
sg_init_one(&sg, vb->stats, sizeof(vb->stats[0]) * num_stats);
- if (virtqueue_add_outbuf(vb->stats_vq, &sg, 1, vb, GFP_KERNEL)
- < 0)
- BUG();
+ err = virtqueue_add_outbuf(vb->stats_vq, &sg, 1, vb,
+ GFP_KERNEL);
+ if (err) {
+ dev_warn(&vb->vdev->dev, "%s: add stat_vq failed\n",
+ __func__);
+ return err;
+ }
virtqueue_kick(vb->stats_vq);
}
return 0;
--
2.7.4
next prev parent reply other threads:[~2018-07-20 9:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-20 8:33 [PATCH v36 0/5] Virtio-balloon: support free page reporting Wei Wang
2018-07-20 8:33 ` Wei Wang [this message]
2018-07-20 8:33 ` [PATCH v36 2/5] virtio_balloon: replace oom notifier with shrinker Wei Wang
2018-07-22 14:48 ` Michael S. Tsirkin
2018-07-23 10:30 ` Wei Wang
2018-07-23 14:13 ` Michael S. Tsirkin
2018-07-24 1:49 ` Wei Wang
2018-07-20 8:33 ` [PATCH v36 3/5] virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT Wei Wang
2018-07-20 8:33 ` [PATCH v36 4/5] mm/page_poison: expose page_poisoning_enabled to kernel modules Wei Wang
2018-07-20 8:33 ` [PATCH v36 5/5] virtio-balloon: VIRTIO_BALLOON_F_PAGE_POISON Wei Wang
2018-07-20 12:51 ` [PATCH v36 0/5] Virtio-balloon: support free page reporting Michael S. Tsirkin
2018-07-22 11:11 ` Wang, Wei W
2018-07-23 14:07 ` Michael S. Tsirkin
2018-07-23 14:36 ` Dr. David Alan Gilbert
2018-07-24 8:12 ` Wei Wang
2018-09-06 12:18 ` Wei Wang
2018-09-07 12:29 ` Dr. David Alan Gilbert
2018-09-08 1:46 ` Wang, Wei W
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=1532075585-39067-2-git-send-email-wei.w.wang@intel.com \
--to=wei.w.wang@intel.com \
--cc=akpm@linux-foundation.org \
--cc=kvm@vger.kernel.org \
--cc=liliang.opensource@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=mst@redhat.com \
--cc=nilal@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=quan.xu0@gmail.com \
--cc=riel@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=virtio-dev@lists.oasis-open.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=yang.zhang.wz@gmail.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).