Message ID | 1532075585-39067-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.web.codeaurora.org (Postfix) with ESMTP id 0E4F8603B5 for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 20 Jul 2018 09:00:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0599529147 for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 20 Jul 2018 09:00:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED6BB29158; Fri, 20 Jul 2018 09:00:47 +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 8864F29147 for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 20 Jul 2018 09:00:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 408AE6B026C; Fri, 20 Jul 2018 05:00:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3B83F6B026D; Fri, 20 Jul 2018 05:00:44 -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 2A8B96B026E; Fri, 20 Jul 2018 05:00:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id DFFF56B026C for <linux-mm@kvack.org>; Fri, 20 Jul 2018 05:00:43 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id x2-v6so6892488plv.0 for <linux-mm@kvack.org>; Fri, 20 Jul 2018 02:00:43 -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=kOLno4LKhk3T/XPSnPPliijl4UUViLWBO74lue5FG5o=; b=s8bbVUAgL27BF/C+OK+l7QWM/KAlcUZE+VwtYY00KsUkRS3ajgw8z6SBwM4GLBAIFB n74Hkkw9U5yMG4lCjQheSnkP66d88Hf5XbzOGK5gHrbPxnmUsTfHzqyc3LZozJmfItbI U1oAB7mwawptAbaCONHSiEYO6nmZSTfjX6fPwjNPfDkiAOxBbNfPyeyGFHzAJjuikD6g FvePDjZ9SGZ8crot3+to3ovtNItLm2tXLw40BjKGxjYw1gN/60hnxlDk2ThxYfE0k025 SdkGLHJWCzkkplZAhiLezRvpY3S3tCimeZP7C4ikVpn6lqcuMazS7hBHxC/DReCskylD dL5A== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.120 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: AOUpUlFwaLU73aYLKag7AJvBHn6/FZ54ps/ngYbl0QNlFwuGeM2N5UOV Rnedgo+TCzcQI/l7NSx1AanBW65E8jJUySDdqR7PLe0VoK0TC6m08cOGeK5ZYd9AMx23qrZesXl 8u05BnHem1Mt/HdDxqL/NBhe5X824RheN3pxbCtJlocq4JoHJCVoLnOefNaOYR1/pyA== X-Received: by 2002:a63:b349:: with SMTP id x9-v6mr1218079pgt.337.1532077243594; Fri, 20 Jul 2018 02:00:43 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf14a83nMt/H3kDZmY1QEftPtWOgaLwuoM5cJ0zbQrOTOOV7l/Aq2+dibSjFQUcHcjh5HLQ X-Received: by 2002:a63:b349:: with SMTP id x9-v6mr1217979pgt.337.1532077242306; Fri, 20 Jul 2018 02:00:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532077242; cv=none; d=google.com; s=arc-20160816; b=cUSmrjbETrmt0FpfhECV1NjrQAOLzVdjf40iywV4K77pqX/HTLhVcFCQlHh0KnNglY RHlCJP0Ow3EMx8WHsHnV45++/O53ciktxq+7o6tLGmfl1YLWofKaC5sbhRDnhIvL+v9e cOJ3BeHGcChb+LenTu0L64a5Mu4R3KxxA3lvxIB62VQQ6TrbBUGpUfxb1ECKg2sW8xxD 60LuMcausxHGJ9EvQJ31YCjEDyC0FGLM7CtU6MkDkDT9JCuR8H4fNtj1ibIx3wVgW0Tk NyfQn52Ibwqbb4YOzXkkaioeZ9zQZL1xRGLu5GpDfV/gph3qpJDLqtZDAODgcRq03aMr qO9w== 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=kOLno4LKhk3T/XPSnPPliijl4UUViLWBO74lue5FG5o=; b=t49VOsP2DjTtjx7NdGRb/xBIYBiYeZYf00dY5ailntEgJ2lbAa+mdSwi0b1uD7qZYH JEB+A7PCIf8BmZeTvySa6Jmfo6L4lHfrBiwUuAwfWSqvWeR53/8DjD8kY070cxFMoS4/ /t+gJBte7PNllUQ9TxRn6qVisqNpDD8kdOtxnn6mOxDp2h3le31ji2qfd4U3jtkcvV2R z7GSJuIxq3ykUpl7TiMj/QhDdxepbi+yGJWX637YddvsQA9+PNng6GveEswoZvlAnmZK 6arxMoQOATjlQC7E8FUQyd/Bq/Ed6uYrHMjoliiJMxxRibgDf2hQa+2IfHzltDc/+izk 5CFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id w15-v6si1381027pga.30.2018.07.20.02.00.42 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Jul 2018 02:00:42 -0700 (PDT) Received-SPF: pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.120 as permitted sender) client-ip=192.55.52.120; Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.120 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 fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jul 2018 02:00:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,378,1526367600"; d="scan'208";a="66141353" Received: from devel-ww.sh.intel.com ([10.239.48.110]) by FMSMGA003.fm.intel.com with ESMTP; 20 Jul 2018 02:00:22 -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, 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 Message-Id: <1532075585-39067-2-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532075585-39067-1-git-send-email-wei.w.wang@intel.com> References: <1532075585-39067-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 |
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;
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(-)