From patchwork Mon Jun 10 04:18:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10984073 Return-Path: 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 C1E11924 for ; Mon, 10 Jun 2019 04:18:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3248287AD for ; Mon, 10 Jun 2019 04:18:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A785A287C9; Mon, 10 Jun 2019 04:18:40 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 226BB287AD for ; Mon, 10 Jun 2019 04:18:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727440AbfFJESj (ORCPT ); Mon, 10 Jun 2019 00:18:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44350 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726070AbfFJESj (ORCPT ); Mon, 10 Jun 2019 00:18:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D7F273091783; Mon, 10 Jun 2019 04:18:38 +0000 (UTC) Received: from localhost (ovpn-8-23.pek2.redhat.com [10.72.8.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 345161972B; Mon, 10 Jun 2019 04:18:34 +0000 (UTC) From: Ming Lei To: Jens Axboe Cc: linux-block@vger.kernel.org, Ming Lei , "Darrick J. Wong" , linux-xfs@vger.kernel.org, Alexander Viro , Christoph Hellwig , David Gibson Subject: [PATCH V2 1/2] block: introduce 'enum bvec_merge_flags' for __bio_try_merge_page Date: Mon, 10 Jun 2019 12:18:18 +0800 Message-Id: <20190610041819.11575-2-ming.lei@redhat.com> In-Reply-To: <20190610041819.11575-1-ming.lei@redhat.com> References: <20190610041819.11575-1-ming.lei@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 10 Jun 2019 04:18:38 +0000 (UTC) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Introduce 'enum bvec_merge_flags' and pass it to __bio_try_merge_page, we have to deal with several cases related with page reference when merging same page to bio(bvec), such as: 1) only merge to same page without putting reference of the same page, such as iomap & xfs 2) merge to same page and put reference of the same page, such as __bio_iov_iter_get_pages() Cc: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org Cc: Alexander Viro Cc: Christoph Hellwig Cc: David Gibson Signed-off-by: Ming Lei --- block/bio.c | 20 ++++++++++++-------- fs/iomap.c | 3 ++- fs/xfs/xfs_aops.c | 3 ++- include/linux/bio.h | 8 +++++++- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/block/bio.c b/block/bio.c index 683cbb40f051..39e3b931dc3b 100644 --- a/block/bio.c +++ b/block/bio.c @@ -636,7 +636,7 @@ EXPORT_SYMBOL(bio_clone_fast); static inline bool page_is_mergeable(const struct bio_vec *bv, struct page *page, unsigned int len, unsigned int off, - bool same_page) + enum bvec_merge_flags flags) { phys_addr_t vec_end_addr = page_to_phys(bv->bv_page) + bv->bv_offset + bv->bv_len - 1; @@ -648,13 +648,14 @@ static inline bool page_is_mergeable(const struct bio_vec *bv, return false; if ((vec_end_addr & PAGE_MASK) != page_addr) { - if (same_page) + if (flags & BVEC_MERGE_TO_SAME_PAGE) return false; if (pfn_to_page(PFN_DOWN(vec_end_addr)) + 1 != page) return false; } - WARN_ON_ONCE(same_page && (len + off) > PAGE_SIZE); + WARN_ON_ONCE((flags & BVEC_MERGE_TO_SAME_PAGE) && + (len + off) > PAGE_SIZE); return true; } @@ -729,8 +730,9 @@ static int __bio_add_pc_page(struct request_queue *q, struct bio *bio, if (bvec_gap_to_prev(q, bvec, offset)) return 0; - if (page_is_mergeable(bvec, page, len, offset, false) && - can_add_page_to_seg(q, bvec, page, len, offset)) { + if (page_is_mergeable(bvec, page, len, offset, + BVEC_MERGE_DEFAULT) && can_add_page_to_seg(q, bvec, + page, len, offset)) { bvec->bv_len += len; goto done; } @@ -779,7 +781,8 @@ EXPORT_SYMBOL(bio_add_pc_page); * Return %true on success or %false on failure. */ bool __bio_try_merge_page(struct bio *bio, struct page *page, - unsigned int len, unsigned int off, bool same_page) + unsigned int len, unsigned int off, + enum bvec_merge_flags flags) { if (WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED))) return false; @@ -787,7 +790,7 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page, if (bio->bi_vcnt > 0) { struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1]; - if (page_is_mergeable(bv, page, len, off, same_page)) { + if (page_is_mergeable(bv, page, len, off, flags)) { bv->bv_len += len; bio->bi_iter.bi_size += len; return true; @@ -837,7 +840,8 @@ EXPORT_SYMBOL_GPL(__bio_add_page); int bio_add_page(struct bio *bio, struct page *page, unsigned int len, unsigned int offset) { - if (!__bio_try_merge_page(bio, page, len, offset, false)) { + if (!__bio_try_merge_page(bio, page, len, offset, + BVEC_MERGE_DEFAULT)) { if (bio_full(bio)) return 0; __bio_add_page(bio, page, len, offset); diff --git a/fs/iomap.c b/fs/iomap.c index 23ef63fd1669..e04652bbf92a 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -316,7 +316,8 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, */ sector = iomap_sector(iomap, pos); if (ctx->bio && bio_end_sector(ctx->bio) == sector) { - if (__bio_try_merge_page(ctx->bio, page, plen, poff, true)) + if (__bio_try_merge_page(ctx->bio, page, plen, poff, + BVEC_MERGE_TO_SAME_PAGE)) goto done; is_contig = true; } diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index a6f0f4761a37..7e7385bc3b9e 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -774,7 +774,8 @@ xfs_add_to_ioend( wpc->imap.br_state, offset, bdev, sector); } - if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, true)) { + if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, + BVEC_MERGE_TO_SAME_PAGE)) { if (iop) atomic_inc(&iop->write_count); if (bio_full(wpc->ioend->io_bio)) diff --git a/include/linux/bio.h b/include/linux/bio.h index 0f23b5682640..48a95bca1703 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -419,11 +419,17 @@ extern void bio_uninit(struct bio *); extern void bio_reset(struct bio *); void bio_chain(struct bio *, struct bio *); +enum bvec_merge_flags { + BVEC_MERGE_DEFAULT, + BVEC_MERGE_TO_SAME_PAGE = BIT(0), +}; + extern int bio_add_page(struct bio *, struct page *, unsigned int,unsigned int); extern int bio_add_pc_page(struct request_queue *, struct bio *, struct page *, unsigned int, unsigned int); bool __bio_try_merge_page(struct bio *bio, struct page *page, - unsigned int len, unsigned int off, bool same_page); + unsigned int len, unsigned int off, + enum bvec_merge_flags flags); void __bio_add_page(struct bio *bio, struct page *page, unsigned int len, unsigned int off); int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter); From patchwork Mon Jun 10 04:18:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10984077 Return-Path: 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 EF4BF924 for ; Mon, 10 Jun 2019 04:18:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEEAC287BD for ; Mon, 10 Jun 2019 04:18:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D2086287AD; Mon, 10 Jun 2019 04:18: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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 66ACC287AD for ; Mon, 10 Jun 2019 04:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728037AbfFJESr (ORCPT ); Mon, 10 Jun 2019 00:18:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39144 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726070AbfFJESq (ORCPT ); Mon, 10 Jun 2019 00:18:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 912D781DF5; Mon, 10 Jun 2019 04:18:46 +0000 (UTC) Received: from localhost (ovpn-8-23.pek2.redhat.com [10.72.8.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 631DB5B685; Mon, 10 Jun 2019 04:18:42 +0000 (UTC) From: Ming Lei To: Jens Axboe Cc: linux-block@vger.kernel.org, Ming Lei , David Gibson , "Darrick J. Wong" , linux-xfs@vger.kernel.org, Alexander Viro , Christoph Hellwig Subject: [PATCH V2 2/2] block: fix page leak in case of merging to same page Date: Mon, 10 Jun 2019 12:18:19 +0800 Message-Id: <20190610041819.11575-3-ming.lei@redhat.com> In-Reply-To: <20190610041819.11575-1-ming.lei@redhat.com> References: <20190610041819.11575-1-ming.lei@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 10 Jun 2019 04:18:46 +0000 (UTC) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Different iovec may use one same page, then 'pages' array filled by iov_iter_get_pages() may get reference of the same page several times. If some elements in 'pages' can be merged to same page in one bvec by bio_add_page(), bio_release_pages() only drops the page's reference once. This way causes page leak reported by David Gibson. This issue can be triggered since 576ed913 ("block: use bio_add_page in bio_iov_iter_get_pages"). Fixes the issue by putting the page's ref if it is merged to same page. Cc: David Gibson Cc: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org Cc: Alexander Viro Cc: Christoph Hellwig Link: https://lkml.org/lkml/2019/4/23/64 Fixes: 576ed913 ("block: use bio_add_page in bio_iov_iter_get_pages") Reported-by: David Gibson Signed-off-by: Ming Lei --- block/bio.c | 12 ++++++++++-- include/linux/bio.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/block/bio.c b/block/bio.c index 39e3b931dc3b..07a15abc3d11 100644 --- a/block/bio.c +++ b/block/bio.c @@ -652,6 +652,9 @@ static inline bool page_is_mergeable(const struct bio_vec *bv, return false; if (pfn_to_page(PFN_DOWN(vec_end_addr)) + 1 != page) return false; + /* drop page ref if the page has been added and user asks to do that */ + } else if (flags & BVEC_MERGE_PUT_SAME_PAGE) { + put_page(page); } WARN_ON_ONCE((flags & BVEC_MERGE_TO_SAME_PAGE) && @@ -924,8 +927,13 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) struct page *page = pages[i]; len = min_t(size_t, PAGE_SIZE - offset, left); - if (WARN_ON_ONCE(bio_add_page(bio, page, len, offset) != len)) - return -EINVAL; + + if (!__bio_try_merge_page(bio, page, len, offset, + BVEC_MERGE_PUT_SAME_PAGE)) { + if (WARN_ON_ONCE(bio_add_page(bio, page, len, offset) + != len)) + return -EINVAL; + } offset = 0; } diff --git a/include/linux/bio.h b/include/linux/bio.h index 48a95bca1703..dec6cf683d8e 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -422,6 +422,7 @@ void bio_chain(struct bio *, struct bio *); enum bvec_merge_flags { BVEC_MERGE_DEFAULT, BVEC_MERGE_TO_SAME_PAGE = BIT(0), + BVEC_MERGE_PUT_SAME_PAGE = BIT(1), }; extern int bio_add_page(struct bio *, struct page *, unsigned int,unsigned int);