linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: David Hildenbrand <david@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, virtualization@lists.linux-foundation.org,
	David Hildenbrand <david@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Jason Wang <jasowang@redhat.com>, Wei Wang <wei.w.wang@intel.com>,
	Liang Li <liang.z.li@intel.com>
Subject: [PATCH v1 2/3] virtio_balloon: Fix memory leaks on errors in virtballoon_probe()
Date: Wed,  5 Feb 2020 17:34:01 +0100	[thread overview]
Message-ID: <20200205163402.42627-3-david@redhat.com> (raw)
In-Reply-To: <20200205163402.42627-1-david@redhat.com>

We forget to put the inode and unmount the kernfs used for compaction.

Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Liang Li <liang.z.li@intel.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
 drivers/virtio/virtio_balloon.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index abef2306c899..7e5d84caeb94 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -901,8 +901,7 @@ static int virtballoon_probe(struct virtio_device *vdev)
 	vb->vb_dev_info.inode = alloc_anon_inode(balloon_mnt->mnt_sb);
 	if (IS_ERR(vb->vb_dev_info.inode)) {
 		err = PTR_ERR(vb->vb_dev_info.inode);
-		kern_unmount(balloon_mnt);
-		goto out_del_vqs;
+		goto out_kern_unmount;
 	}
 	vb->vb_dev_info.inode->i_mapping->a_ops = &balloon_aops;
 #endif
@@ -913,13 +912,13 @@ static int virtballoon_probe(struct virtio_device *vdev)
 		 */
 		if (virtqueue_get_vring_size(vb->free_page_vq) < 2) {
 			err = -ENOSPC;
-			goto out_del_vqs;
+			goto out_iput;
 		}
 		vb->balloon_wq = alloc_workqueue("balloon-wq",
 					WQ_FREEZABLE | WQ_CPU_INTENSIVE, 0);
 		if (!vb->balloon_wq) {
 			err = -ENOMEM;
-			goto out_del_vqs;
+			goto out_iput;
 		}
 		INIT_WORK(&vb->report_free_page_work, report_free_page_func);
 		vb->cmd_id_received_cache = VIRTIO_BALLOON_CMD_ID_STOP;
@@ -953,6 +952,12 @@ static int virtballoon_probe(struct virtio_device *vdev)
 out_del_balloon_wq:
 	if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT))
 		destroy_workqueue(vb->balloon_wq);
+out_iput:
+#ifdef CONFIG_BALLOON_COMPACTION
+	iput(vb->vb_dev_info.inode);
+out_kern_unmount:
+	kern_unmount(balloon_mnt);
+#endif
 out_del_vqs:
 	vdev->config->del_vqs(vdev);
 out_free_vb:
-- 
2.24.1



  parent reply	other threads:[~2020-02-05 16:34 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-05 16:33 [PATCH v1 0/3] virtio-balloon: Fixes + switch back to OOM handler David Hildenbrand
2020-02-05 16:34 ` [PATCH v1 1/3] virtio-balloon: Fix memory leak when unloading while hinting is in progress David Hildenbrand
2020-02-06  8:36   ` Michael S. Tsirkin
2020-02-05 16:34 ` David Hildenbrand [this message]
2020-02-06  8:36   ` [PATCH v1 2/3] virtio_balloon: Fix memory leaks on errors in virtballoon_probe() Michael S. Tsirkin
2020-02-05 16:34 ` [PATCH v1 3/3] virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM David Hildenbrand
2020-02-05 22:37   ` Tyler Sanderson
2020-02-05 22:52     ` David Hildenbrand
2020-02-05 23:06       ` Tyler Sanderson
2020-02-06  7:40   ` Michael S. Tsirkin
2020-02-06  8:42     ` David Hildenbrand
2020-02-06  8:57       ` Michael S. Tsirkin
2020-02-06  9:05         ` David Hildenbrand
2020-02-06  9:09           ` Michael S. Tsirkin
2020-02-06  8:57   ` Wang, Wei W
2020-02-06  9:11   ` Michael S. Tsirkin
2020-02-06  9:12   ` Michael S. Tsirkin
2020-02-06  9:21     ` David Hildenbrand
2020-02-14  9:51   ` David Hildenbrand
2020-02-14 13:31     ` Wang, Wei W
2020-02-16  9:47     ` Michael S. Tsirkin
2020-02-21  3:29       ` Tyler Sanderson
2020-03-08  4:47         ` Tyler Sanderson
2020-03-09  9:03           ` David Hildenbrand
2020-03-09 10:14             ` Michael S. Tsirkin
2020-03-09 10:59               ` David Hildenbrand
2020-03-09 10:24           ` Michael S. Tsirkin
2020-02-14 14:06   ` Michal Hocko
2020-02-14 14:18     ` David Hildenbrand
2020-02-14 20:48       ` Tyler Sanderson
2020-02-14 21:17         ` David Hildenbrand
2020-02-16  9:46         ` Michael S. Tsirkin

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=20200205163402.42627-3-david@redhat.com \
    --to=david@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=liang.z.li@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mst@redhat.com \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=wei.w.wang@intel.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).