Message ID | 1533285146-25212-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 356101708 for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 3 Aug 2018 09:00:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 254C92C33B for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 3 Aug 2018 09:00:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 232CD2C3AA; Fri, 3 Aug 2018 09:00:49 +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 C18982C33B for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 3 Aug 2018 09:00:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 31A636B0010; Fri, 3 Aug 2018 05:00:47 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2A2B46B0266; Fri, 3 Aug 2018 05:00:47 -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 0F7446B0269; Fri, 3 Aug 2018 05:00:47 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id B8D906B0010 for <linux-mm@kvack.org>; Fri, 3 Aug 2018 05:00:46 -0400 (EDT) Received: by mail-pf1-f198.google.com with SMTP id u8-v6so3268571pfn.18 for <linux-mm@kvack.org>; Fri, 03 Aug 2018 02:00:46 -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=tA2yDG0lpn3PQylNQdfQIVZI5H4lGQNNzDeTIiNV/XWlKjglwOVW4LcjFDM2Ki61Ho +Y3cFMNr4x17TEif/79ufuTcFLiB+aqDfIPLmBRzswmz1ikWe5H0gKH7iQ1//pe9zoOi bAnkTJLR4go25br1bZwNLyFLZ0jkLbF2CD3bgPmkvZ157nYdTyx/dPXZVm1B7mrCqTUF LhqhdpcDqxyvBzCAYCpNQ299CtCZLEMf4Dr0E2vSfidfKRJsTGH9UlZrcfYkMCsYFt8l h5SEVi+QEXTzsGhN3mn60tRa4EgVLHg221RDh8rvyN/ZmnkIpYCX3J8rBfX5fCJvXZs1 NBHA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.126 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: AOUpUlEcJJMKqT+oMmiEFA9V6MJMpSwLqBhb1YkW0nLJEzrSdwpS4jEE avzk5Vs8T7hLbsKLs3pEwO9D4aZ5aWSk1vtQbmOrBzQbyesFYxt1yK8B2Hae89FPDiY6/ViGoX8 hDnEW6HtAhXov4GcwgaM2yHIt1nxqJpid8TDKLqx1SJnsdk+mkxs+Ez0QqXv4Mf2eyw== X-Received: by 2002:a62:68c3:: with SMTP id d186-v6mr3474843pfc.70.1533286845379; Fri, 03 Aug 2018 02:00:45 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcB57KEszNI1vuCaFgZ3VD7X9wlvSnFERzJrOCbhzy0+jR1cThYwI73MXHuPFyzgzwgzzfo X-Received: by 2002:a62:68c3:: with SMTP id d186-v6mr3474679pfc.70.1533286843585; Fri, 03 Aug 2018 02:00:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533286843; cv=none; d=google.com; s=arc-20160816; b=bDnLltcs+0/9IsBjiZMOxmFceeroF+QrNILwAQjdzAMM+OxOYAlT/V8ChLBHAW/d3z +4FknLmzH5AnYqF9egVRh6xGQO7aDwyCzLlBbiEE5e/tD4KEEVVSjTDboPmX9TU0nw1T erzh88o7w+LKLmIfnpzmglsCN4JhdO6LiBWBNkWuVJ7oPw+m457inOXqd2Iz+MUNXOJx pyoAJyqZDmiCeqMh4KB3kKA9xHdilAehVqKPd+nFMwuSJvsQXbCM+cjZpe9wTgQ2IPcv v2OQx0tTvq7ApWikJwXha9HOyk62QH27BjK45k7EEO4Ob51JnAYS+12gvAJt3xi4yWcR vvaA== 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=b/Q99P3uBUfx4ZeDUekY83B1spGL0Y2bERT6SqO3pPM0cYbD/RJ5Id8SJa1aNDbCdX DFat4qW+PfAFh5o9Y+6TXEpTN8mB7x9xxYCW+jlqci3MSBhV28S88mbFP100R8Q549zL mFERpVAjgLt77CRwMtn0H465OEPZHzakgubDPMFd9B6jup4AtiLE+6aj+ZC/s1v0bZHW RxvQoGEp5aXCMCLSUHDRrTRJEnFYDLfWg86xI1PemtlMxGHN9+xIzsWIBxhpy35R8/jV m2VewgIGvVHkFFEKggYuvYsuVu7U6ahLePdQ7TM1zRGAN5NoylKRV1JaNNpw3h8XXn/B /W8g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga18.intel.com (mga18.intel.com. [134.134.136.126]) by mx.google.com with ESMTPS id h5-v6si4893081pfd.112.2018.08.03.02.00.43 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Aug 2018 02:00:43 -0700 (PDT) Received-SPF: pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.126 as permitted sender) client-ip=134.134.136.126; Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.126 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 fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Aug 2018 02:00:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,438,1526367600"; d="scan'208";a="60151749" Received: from devel-ww.sh.intel.com ([10.239.48.110]) by fmsmga008.fm.intel.com with ESMTP; 03 Aug 2018 02:00:41 -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 v3 1/2] virtio-balloon: remove BUG() in init_vqs Date: Fri, 3 Aug 2018 16:32:25 +0800 Message-Id: <1533285146-25212-2-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533285146-25212-1-git-send-email-wei.w.wang@intel.com> References: <1533285146-25212-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(-)