Message ID | 1534405858-27085-2-git-send-email-wei.w.wang@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 494F9913 for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 16 Aug 2018 08:19:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 363192A903 for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 16 Aug 2018 08:19:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A1B62A9F4; Thu, 16 Aug 2018 08:19:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF0242A903 for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 16 Aug 2018 08:19:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B64E16B0006; Thu, 16 Aug 2018 04:19:16 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B16E66B0008; Thu, 16 Aug 2018 04:19:16 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2D406B000A; Thu, 16 Aug 2018 04:19:16 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id 61F986B0006 for <linux-mm@kvack.org>; Thu, 16 Aug 2018 04:19:16 -0400 (EDT) Received: by mail-pg1-f197.google.com with SMTP id t5-v6so1718187pgp.17 for <linux-mm@kvack.org>; Thu, 16 Aug 2018 01:19:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=OoRrqMvtQOkcAAQCWiTy1rmqNcHIz22kqzFyQNCQfU4=; b=gAUf64ew+VX56zxPirZ53b5wHZMlfWeZ4WEoalXzPWkwk+gExSBzz3MdBVaMjWut3I /bWBoYqzZ2cEmNkl7xz1HwBJH2DnryDUBgiDyvyp7IcT1YJR3gI2bl83dXL82oYsBWiI wMTlpmVKjeSmSDaML1wqoAdZYsFqn2zbPaAdPzuJFuAmg8mgCpqggDui7SU8sM3Zmcp0 rrNqN0ZVGgMlHaTB5Nf1MxpJjTPvTE358agVj0leib7CdQ98zxDG2s31q+eSLMYEdlIl ATj0Qj+vt0p50BECHwuzagOuKKdgQB/YEzfztfY1fWyfd6gQrXipR/J3IAd2OWr9qyzH 8KJw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.100 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AOUpUlHpsoKkjkBdx/Rz3JhRzhwYw4JXB6kTZqCCOU+B5eR7YES+dcmk Je62l8x8Cfzv42fyrwGKjex1Yd5PntXb1NDUtS6+5elkeN3wyYa4YzkS0OzagSeNIkjARqoeT1W IJWevjWtFClS+ef65WcDksJV0XulKtmYlBHheRHGxKHXVLNjo8JXh+BUnwhrWRUl6Yg== X-Received: by 2002:a17:902:864b:: with SMTP id y11-v6mr28319074plt.335.1534407556067; Thu, 16 Aug 2018 01:19:16 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzuGfpwnYziVx0bQi2JcKeO8atsjgBXUg5LMeYSekfVkgvX6NBG+ygd+XDH7jSZo7rC1Av7 X-Received: by 2002:a17:902:864b:: with SMTP id y11-v6mr28319045plt.335.1534407555473; Thu, 16 Aug 2018 01:19:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534407555; cv=none; d=google.com; s=arc-20160816; b=aLnjme7fDIkxJrQrU5wZCWfioiS4fHTQOsxujRqQjF/mISU++xKLkTcfllLKKNA7hH +0GjuKP6ORrUik7WyMm/5J/G7tpyGbRQSl2lIzpylZvY4qCDDljIfVaZXVVV97+mvfUA YP5CyMDMImsqT92DM58U7XcqIe4kZCyW4T/f3kIGxGCW3gp8eJ1acpSkkFlK+tqalAdv Jp9fP2v42pFFr61ogHnTRf3aRg88a77fZdL4dP5JQ5Nv3KeSHrk8ZP7HILmXKuFg3TWG mvc9abqFN+R0GEhW0nw0On6Q2kTv7jbyTz61JHgd5qd/Bmq4t+j0pudoChYLUIO4VraL sTQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=OoRrqMvtQOkcAAQCWiTy1rmqNcHIz22kqzFyQNCQfU4=; b=xT8ObBmaGzoeDiOgcqEra/9sA5l1TYpYKIKkpq9OsnyZsRVcASodnS8ZfrSCfy/W+n UY4+GwRShUzuLDLKqHg52y0qNYZNJbx0vyESWk5dTAWcexQM5H12hOvR5rJ+w86nreI/ qbSOoZH32Gqge07CmfGcnhOV+wRfxk1f+taFUfjvpyT0Q3UrUkVZ6YpkpAogH8TbzzFx IewZXCDgA9yyNpfotPFnQ6SvUBM4vd/Znwxrddvk4cXqDwUWy9RAFOrFJCJLZte15TxA ANWM5fTuwwSf7kn7KTatWK+Z4v5DgRwCQjx18rREgQW+WsnSz0Nh7+O7byprnhS0kJ0a i+cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.100 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga07.intel.com (mga07.intel.com. [134.134.136.100]) by mx.google.com with ESMTPS id t7-v6si21504807pgp.18.2018.08.16.01.19.15 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 01:19:15 -0700 (PDT) Received-SPF: pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.100 as permitted sender) client-ip=134.134.136.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.100 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Aug 2018 01:19:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,246,1531810800"; d="scan'208";a="83781738" Received: from devel-ww.sh.intel.com ([10.239.48.110]) by orsmga002.jf.intel.com with ESMTP; 16 Aug 2018 01:19:13 -0700 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, linux-mm@kvack.org, mst@redhat.com, mhocko@kernel.org, akpm@linux-foundation.org, penguin-kernel@I-love.SAKURA.ne.jp Cc: wei.w.wang@intel.com Subject: [PATCH v4 1/3] virtio-balloon: remove BUG() in init_vqs Date: Thu, 16 Aug 2018 15:50:56 +0800 Message-Id: <1534405858-27085-2-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1534405858-27085-1-git-send-email-wei.w.wang@intel.com> References: <1534405858-27085-1-git-send-email-wei.w.wang@intel.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
virtio-balloon: some improvements
|
expand
|
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 3988c09..8100e77 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;
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(-)