From patchwork Wed May 23 14:43:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421457 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 BA5C660327 for ; Wed, 23 May 2018 14:44:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A949F26E82 for ; Wed, 23 May 2018 14:44:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DE0328733; Wed, 23 May 2018 14:44:11 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID 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 ECA2C26E82 for ; Wed, 23 May 2018 14:44:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BA5956B0006; Wed, 23 May 2018 10:44:09 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B7DFA6B0007; Wed, 23 May 2018 10:44:09 -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 A6CF46B000C; Wed, 23 May 2018 10:44:09 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f197.google.com (mail-pf0-f197.google.com [209.85.192.197]) by kanga.kvack.org (Postfix) with ESMTP id 6998B6B0006 for ; Wed, 23 May 2018 10:44:09 -0400 (EDT) Received: by mail-pf0-f197.google.com with SMTP id g1-v6so13282077pfh.19 for ; Wed, 23 May 2018 07:44:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=XPss1VTxz2qCVfFVSLoYvZ0EAp+GL7aQpaLeNpnEUZE=; b=cndzy0FQ2oeMzRNUSAwaD+t2/Z6oMG/We4eIMnMs2NBlWCRgyDqXXRAijCpLCzO97Y roc3R8WvEbcFiT9m3aGhhLuc34ll23JauWVIKQBUaUVmZIz+3yEfXVuHfYV0B9Dnxb7M 8s16AM/xITeAd0mLhktYZVzBXkm5/vtI33AGhk9addIkDF5qdad76xsq1dC5m84HRM1y voCILg6n7BmwneVzj0JiyPgPS4Q71wpNP4M7cY9WOyHjCsJjCx+qo7Auw8ZMaLtw5daQ +rCiBtoPUl4soba2cYqBrvsQeIzT3lwdB2HJoiN88hHjQQUvCrvjvLS2e1CgW9ITlaxy Mssw== X-Gm-Message-State: ALKqPwdDk2dWLMFnCoLdAwkDyy+Vm6r5SvH4dzWG6njJ3kV25CjzvVCy 7kpgu8pY8rNEPb4w8vYNJ1waodin2eXCHIWONw3oR6dztGP0HDnWcFKTImMrMZ6oZuomSq26Aie Rt6Adyf4xXzHSxCV6/qACoRJBsy8eg/w1XlADCCfp9dHJVFWXxti2rT42gVmi7wk= X-Received: by 2002:a17:902:284b:: with SMTP id e69-v6mr3194944plb.240.1527086649081; Wed, 23 May 2018 07:44:09 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrs6orXVbCMKVbEOaprhT1hkgMl1QmxAb5THHVFwIikIkI5sOqgpcgFI6veRBm8ehtSjpoh X-Received: by 2002:a17:902:284b:: with SMTP id e69-v6mr3194881plb.240.1527086647935; Wed, 23 May 2018 07:44:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086647; cv=none; d=google.com; s=arc-20160816; b=cTX11kpuiTjYJ2CSzfBV3Pw/YEvXVbS7bZbdtUNyujxDyb9rXNz6p2Bgi4p/4pn4JS wrtzzxG8f9jQ8pyGoGfjqvdrCpqG5/ev6hx8iJHQ1Vyf/GDejeGLEEbnkP8S7YVKJSbD 5cVETgGvseIafqSeZNjAZidRKXRAtPFHRemmiuQ17zzzYJFM++VJI3yaKlCByqUxL0+J jf7r8a24L23YYdmTUJRkc5/YULLPpv6Zr8xUq2PqvtU7F2ltv5bQcofUHl+c5bnwsYzo bDO1fWmhdqVkIYBj76idAJ9FdS2eVr+Gd5D28p7g3bmPWQwAN28cr3Nug6fulm+Y4nkk 3/xQ== 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 :dkim-signature:arc-authentication-results; bh=XPss1VTxz2qCVfFVSLoYvZ0EAp+GL7aQpaLeNpnEUZE=; b=cMPGVhqTTfM1ZnS2N8ZebfoePMRL+Xx8+WEhjJqSV35wTTGfPPpIpERWZFTc8u+7gI s+ZaLzkn8DrqGEz4NbikdkcSez1LcXMpVL0rRM+3Q2UvilHXXCVXnxy+WtplsSeA3Vhp k45kjBozhB/2em/LOG+cEQNX+iUXx/EpcEg959L5XRqbXh1SSATxqywySUXcJAVY366w 656bWxpTV67tIlD44U1p1fGPUvRwe/spKo5+dykDiiO4EUnu5dSSOwGvGyxGxGaVk5Ip 1F+RU22yCXYjz9auQNYNzANwNQF1FTH2xis08Uo0TyD6MxaQjr6tU2BqBNvg9N09buKL 604A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=U7t/NU6V; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id 1-v6si18757084ply.226.2018.05.23.07.44.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:44:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=U7t/NU6V; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=XPss1VTxz2qCVfFVSLoYvZ0EAp+GL7aQpaLeNpnEUZE=; b=U7t/NU6VN30Ad95gWvzAPA9ID x38g7nLVa8oEEklGE/jd2/FKWtY1cTKVOoB3ie5HaluV8JGRINTnEvj0ta3P+/MaWbc2ouqJ8UI7Q A0IDZ2J6zdCQQfWnldG/BQ7Of8wnScRg70N100kk0xlJItChOok/wYHuXBVH8WLzWEI4ZGUbFf3wR QBfd904MFMdNvLyuH30QTOhu+raLiSnbMRrlGeKuJk+AHlTcXC+IrB284Ny2rmmVa2446K6b27FlC P+S/zYC2wm2MYF+rw4CwDAYIbc+1WjzjXBMhr2DdK+JDG01szlODYFXPmyot040rlVeRQH+Hq1Pr2 xnsgHRlfQ==; Received: from 089144199016.atnat0008.highway.a1.net ([89.144.199.16] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLUzk-00005t-1J; Wed, 23 May 2018 14:44:04 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 01/34] block: add a lower-level bio_add_page interface Date: Wed, 23 May 2018 16:43:24 +0200 Message-Id: <20180523144357.18985-2-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523144357.18985-1-hch@lst.de> References: <20180523144357.18985-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 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: X-Virus-Scanned: ClamAV using ClamSMTP For the upcoming removal of buffer heads in XFS we need to keep track of the number of outstanding writeback requests per page. For this we need to know if bio_add_page merged a region with the previous bvec or not. Instead of adding additional arguments this refactors bio_add_page to be implemented using three lower level helpers which users like XFS can use directly if they care about the merge decisions. Signed-off-by: Christoph Hellwig Reviewed-by: Jens Axboe Reviewed-by: Darrick J. Wong --- block/bio.c | 96 +++++++++++++++++++++++++++++---------------- include/linux/bio.h | 9 +++++ 2 files changed, 72 insertions(+), 33 deletions(-) diff --git a/block/bio.c b/block/bio.c index 53e0f0a1ed94..fdf635d42bbd 100644 --- a/block/bio.c +++ b/block/bio.c @@ -773,7 +773,7 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page return 0; } - if (bio->bi_vcnt >= bio->bi_max_vecs) + if (bio_full(bio)) return 0; /* @@ -821,52 +821,82 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page EXPORT_SYMBOL(bio_add_pc_page); /** - * bio_add_page - attempt to add page to bio - * @bio: destination bio - * @page: page to add - * @len: vec entry length - * @offset: vec entry offset + * __bio_try_merge_page - try appending data to an existing bvec. + * @bio: destination bio + * @page: page to add + * @len: length of the data to add + * @off: offset of the data in @page * - * Attempt to add a page to the bio_vec maplist. This will only fail - * if either bio->bi_vcnt == bio->bi_max_vecs or it's a cloned bio. + * Try to add the data at @page + @off to the last bvec of @bio. This is a + * a useful optimisation for file systems with a block size smaller than the + * page size. + * + * Return %true on success or %false on failure. */ -int bio_add_page(struct bio *bio, struct page *page, - unsigned int len, unsigned int offset) +bool __bio_try_merge_page(struct bio *bio, struct page *page, + unsigned int len, unsigned int off) { - struct bio_vec *bv; - - /* - * cloned bio must not modify vec list - */ if (WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED))) - return 0; + return false; - /* - * For filesystems with a blocksize smaller than the pagesize - * we will often be called with the same page as last time and - * a consecutive offset. Optimize this special case. - */ if (bio->bi_vcnt > 0) { - bv = &bio->bi_io_vec[bio->bi_vcnt - 1]; + struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1]; - if (page == bv->bv_page && - offset == bv->bv_offset + bv->bv_len) { + if (page == bv->bv_page && off == bv->bv_offset + bv->bv_len) { bv->bv_len += len; - goto done; + bio->bi_iter.bi_size += len; + return true; } } + return false; +} +EXPORT_SYMBOL_GPL(__bio_try_merge_page); - if (bio->bi_vcnt >= bio->bi_max_vecs) - return 0; +/** + * __bio_add_page - add page to a bio in a new segment + * @bio: destination bio + * @page: page to add + * @len: length of the data to add + * @off: offset of the data in @page + * + * Add the data at @page + @off to @bio as a new bvec. The caller must ensure + * that @bio has space for another bvec. + */ +void __bio_add_page(struct bio *bio, struct page *page, + unsigned int len, unsigned int off) +{ + struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt]; - bv = &bio->bi_io_vec[bio->bi_vcnt]; - bv->bv_page = page; - bv->bv_len = len; - bv->bv_offset = offset; + WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)); + WARN_ON_ONCE(bio_full(bio)); + + bv->bv_page = page; + bv->bv_offset = off; + bv->bv_len = len; - bio->bi_vcnt++; -done: bio->bi_iter.bi_size += len; + bio->bi_vcnt++; +} +EXPORT_SYMBOL_GPL(__bio_add_page); + +/** + * bio_add_page - attempt to add page to bio + * @bio: destination bio + * @page: page to add + * @len: vec entry length + * @offset: vec entry offset + * + * Attempt to add a page to the bio_vec maplist. This will only fail + * if either bio->bi_vcnt == bio->bi_max_vecs or it's a cloned bio. + */ +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)) { + if (bio_full(bio)) + return 0; + __bio_add_page(bio, page, len, offset); + } return len; } EXPORT_SYMBOL(bio_add_page); diff --git a/include/linux/bio.h b/include/linux/bio.h index ce547a25e8ae..3e73c8bc25ea 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -123,6 +123,11 @@ static inline void *bio_data(struct bio *bio) return NULL; } +static inline bool bio_full(struct bio *bio) +{ + return bio->bi_vcnt >= bio->bi_max_vecs; +} + /* * will die */ @@ -470,6 +475,10 @@ void bio_chain(struct bio *, struct bio *); 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); +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); struct rq_map_data; extern struct bio *bio_map_user_iov(struct request_queue *,