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 Cc: torvalds@linux-foundation.org, 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 v35 2/5] virtio-balloon: remove BUG() in init_vqs Date: Tue, 10 Jul 2018 17:31:04 +0800 [thread overview] Message-ID: <1531215067-35472-3-git-send-email-wei.w.wang@intel.com> (raw) In-Reply-To: <1531215067-35472-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
WARNING: multiple messages have this Message-ID (diff)
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 Cc: torvalds@linux-foundation.org, 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: [virtio-dev] [PATCH v35 2/5] virtio-balloon: remove BUG() in init_vqs Date: Tue, 10 Jul 2018 17:31:04 +0800 [thread overview] Message-ID: <1531215067-35472-3-git-send-email-wei.w.wang@intel.com> (raw) In-Reply-To: <1531215067-35472-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 --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org
next prev parent reply other threads:[~2018-07-10 9:57 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-10 9:31 [PATCH v35 0/5] Virtio-balloon: support free page reporting Wei Wang 2018-07-10 9:31 ` [virtio-dev] " Wei Wang 2018-07-10 9:31 ` Wei Wang 2018-07-10 9:31 ` [PATCH v35 1/5] mm: support to get hints of free page blocks Wei Wang 2018-07-10 9:31 ` [virtio-dev] " Wei Wang 2018-07-10 10:16 ` Wang, Wei W 2018-07-10 10:16 ` [virtio-dev] " Wang, Wei W 2018-07-10 10:16 ` Wang, Wei W 2018-07-10 10:16 ` Wang, Wei W 2018-07-10 17:33 ` Linus Torvalds 2018-07-10 17:33 ` Linus Torvalds 2018-07-11 1:28 ` Wei Wang 2018-07-11 1:28 ` Wei Wang 2018-07-11 1:28 ` [virtio-dev] " Wei Wang 2018-07-11 1:44 ` Linus Torvalds 2018-07-11 9:21 ` Michal Hocko 2018-07-11 9:21 ` Michal Hocko 2018-07-11 10:52 ` Wei Wang 2018-07-11 10:52 ` [virtio-dev] " Wei Wang 2018-07-11 10:52 ` Wei Wang 2018-07-11 11:09 ` Michal Hocko 2018-07-11 11:09 ` Michal Hocko 2018-07-11 13:55 ` Wang, Wei W 2018-07-11 13:55 ` Wang, Wei W 2018-07-11 13:55 ` [virtio-dev] " Wang, Wei W 2018-07-11 14:38 ` Michal Hocko 2018-07-11 14:38 ` Michal Hocko 2018-07-11 19:36 ` Michael S. Tsirkin 2018-07-11 19:36 ` Michael S. Tsirkin 2018-07-11 19:36 ` [virtio-dev] " Michael S. Tsirkin 2018-07-11 16:23 ` Linus Torvalds 2018-07-11 16:23 ` Linus Torvalds 2018-07-12 2:21 ` Wei Wang 2018-07-12 2:21 ` [virtio-dev] " Wei Wang 2018-07-12 2:30 ` Linus Torvalds 2018-07-12 2:30 ` Linus Torvalds 2018-07-12 2:52 ` Wei Wang 2018-07-12 2:52 ` [virtio-dev] " Wei Wang 2018-07-12 2:52 ` Wei Wang 2018-07-12 8:13 ` Michal Hocko 2018-07-12 11:34 ` Wei Wang 2018-07-12 11:34 ` Wei Wang 2018-07-12 11:34 ` [virtio-dev] " Wei Wang 2018-07-12 11:49 ` Michal Hocko 2018-07-13 0:33 ` Wei Wang 2018-07-13 0:33 ` [virtio-dev] " Wei Wang 2018-07-13 0:33 ` Wei Wang 2018-07-12 11:49 ` Michal Hocko 2018-07-12 8:13 ` Michal Hocko 2018-07-12 2:21 ` Wei Wang 2018-07-12 13:12 ` Michal Hocko 2018-07-12 13:12 ` Michal Hocko 2018-07-11 1:44 ` Linus Torvalds 2018-07-11 4:00 ` Michael S. Tsirkin 2018-07-11 4:00 ` [virtio-dev] " Michael S. Tsirkin 2018-07-11 4:04 ` Michael S. Tsirkin 2018-07-11 4:04 ` Michael S. Tsirkin 2018-07-11 4:04 ` [virtio-dev] " Michael S. Tsirkin 2018-07-11 4:00 ` Michael S. Tsirkin 2018-07-10 9:31 ` Wei Wang 2018-07-10 9:31 ` Wei Wang [this message] 2018-07-10 9:31 ` [virtio-dev] [PATCH v35 2/5] virtio-balloon: remove BUG() in init_vqs Wei Wang 2018-07-10 9:31 ` Wei Wang 2018-07-10 9:31 ` [PATCH v35 3/5] virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT Wei Wang 2018-07-10 9:31 ` [virtio-dev] " Wei Wang 2018-07-10 9:31 ` Wei Wang 2018-07-10 9:31 ` [PATCH v35 4/5] mm/page_poison: expose page_poisoning_enabled to kernel modules Wei Wang 2018-07-10 9:31 ` [virtio-dev] " Wei Wang 2018-07-10 9:31 ` Wei Wang 2018-07-10 9:31 ` [PATCH v35 5/5] virtio-balloon: VIRTIO_BALLOON_F_PAGE_POISON Wei Wang 2018-07-10 9:31 ` [virtio-dev] " Wei Wang 2018-07-10 9:31 ` Wei Wang
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=1531215067-35472-3-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: 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.