[PATCH 09/11] block: call __bio_free in bio_endio

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Shaohua Li <shli@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH 09/11] block: call __bio_free in bio_endio
Date	Sat, 03 Jun 2017 00:00:01 +0200
Message-ID	<tO2LT-6Ey-19@gated-at.bofh.it> (permalink)
References	<tO2LT-6Ey-3@gated-at.bofh.it>
X-Original-To	linux-kernel@vger.kernel.org, linux-block@vger.kernel.org
Dmarc-Filter	OpenDMARC Filter v1.3.2 mail.kernel.org A8F90214EC
Authentication-Results	mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org
Authentication-Results	mail.kernel.org; spf=fail smtp.mailfrom=shli@fb.com
X-Mailer	git-send-email 2.11.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	41
Organization	linux.* mail to news gateway
X-Original-Cc	tj@kernel.org, gregkh@linuxfoundation.org, hch@lst.de, axboe@fb.com, rostedt@goodmis.org, lizefan@huawei.com, Kernel-team@fb.com, Shaohua Li <shli@fb.com>
X-Original-Date	Fri, 2 Jun 2017 14:54:02 -0700
X-Original-Message-ID	<3035a49cc29b237231fd77200e03c0dd93f2f780.1496432591.git.shli@fb.com>
X-Original-References	<cover.1496432591.git.shli@fb.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1656589

Show key headers only | View raw

From: Shaohua Li <shli@fb.com>

bio_free isn't a good place to free cgroup/integrity info. There are a
lot of cases bio is allocated in special way (for example, in stack) and
never gets called by bio_put hence bio_free, we are leaking memory. This
patch moves the free to bio endio, which should be called anyway. The
__bio_free call in bio_free is kept, in case the bio never gets called
bio endio.

Signed-off-by: Shaohua Li <shli@fb.com>
---
 block/bio-integrity.c | 1 +
 block/bio.c           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 5384713..c6c5aed 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -120,6 +120,7 @@ void bio_integrity_free(struct bio *bio)
 	}
 
 	bio->bi_integrity = NULL;
+	bio->bi_opf &= ~REQ_INTEGRITY;
 }
 EXPORT_SYMBOL(bio_integrity_free);
 
diff --git a/block/bio.c b/block/bio.c
index 888e780..02556b3 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1803,6 +1803,7 @@ void bio_endio(struct bio *bio)
 	if (!bio_remaining_done(bio))
 		return;
 
+	__bio_free(bio);
 	/*
 	 * Need to have a real endio function for chained bios, otherwise
 	 * various corner cases will break (like stacking block devices that
-- 
2.9.3

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 09/11] block: call __bio_free in bio_endio Shaohua Li <shli@kernel.org> - 2017-06-03 00:00 +0200

csiph-web