From patchwork Wed Jun 14 16:12:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaohua Li X-Patchwork-Id: 9786851 Return-Path: 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 4303560325 for ; Wed, 14 Jun 2017 16:13:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33CF6285EB for ; Wed, 14 Jun 2017 16:13:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24D0A28604; Wed, 14 Jun 2017 16:13:10 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAD7B285EB for ; Wed, 14 Jun 2017 16:13:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753067AbdFNQMx (ORCPT ); Wed, 14 Jun 2017 12:12:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:47544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752445AbdFNQM1 (ORCPT ); Wed, 14 Jun 2017 12:12:27 -0400 Received: from shli-virt.localdomain (unknown [199.201.64.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CF21D214E2; Wed, 14 Jun 2017 16:12:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF21D214E2 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 From: Shaohua Li To: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org 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 Subject: [PATCH V2 10/12] block: call __bio_free in bio_endio Date: Wed, 14 Jun 2017 09:12:08 -0700 Message-Id: <6019e3e30918ea37c262d6dcdc89ee5edf2c84ed.1497455937.git.shli@fb.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Shaohua Li 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. This assumes ->bi_end_io() doesn't access cgroup/integrity info, which seems true in my audit. Otherwise, we probably must add a flag to distinguish if bio will be called by bio_put. Signed-off-by: Shaohua Li --- block/bio-integrity.c | 1 + block/bio.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/block/bio-integrity.c b/block/bio-integrity.c index b5009a8..869ac7a 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..9bfd8d4 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1823,6 +1823,8 @@ void bio_endio(struct bio *bio) } blk_throtl_bio_endio(bio); + /* release cgroup/integrity info */ + __bio_free(bio); if (bio->bi_end_io) bio->bi_end_io(bio); }