From patchwork Tue Feb 7 17:13:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13131886 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04820C636D3 for ; Tue, 7 Feb 2023 17:13:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8999D8E0001; Tue, 7 Feb 2023 12:13:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8484C900002; Tue, 7 Feb 2023 12:13:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6E84A8E0005; Tue, 7 Feb 2023 12:13:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 604D28E0001 for ; Tue, 7 Feb 2023 12:13:40 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 31C511C6036 for ; Tue, 7 Feb 2023 17:13:40 +0000 (UTC) X-FDA: 80441142600.21.F4A38EF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 4DA99C0023 for ; Tue, 7 Feb 2023 17:13:38 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AdSMsiMT; spf=pass (imf10.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675790018; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=GZNnQ4PFOAio/M36ha2lSqPmGocJT5Xn1bbdC3s23DY=; b=UZUzJTlGctt4PLFXFcWxu4c6O6GKynilyMJ1nOeMgtaJ+CjeCKsjtTivcbADN21E+ldWQb E6b6ed7ydaQxtQeSc1UBT+ks4GCR8lo/g9P48DyZfiv5g/qOL3XToGgJ+u5Y9xnMRwEuF0 8Ql/Kh8uo0umA9n0roPvuUhX8Mo8WYA= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AdSMsiMT; spf=pass (imf10.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675790018; a=rsa-sha256; cv=none; b=a4KqBtogQou5r6siKlAuLHJC2osw5+73Ppxb1s7uIcWWk/4rwLvMzSy+EQ91sSOh4GMy+P Rmzo0UKQNjinYYPiSMEVIGJaAY9ZjCFPk23IKF2HjU99Ny9hMC8p4wicFa415YDyUD3qYn B89FZm8eD4kB0ddOfIZ2jieCp91GQz0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675790017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GZNnQ4PFOAio/M36ha2lSqPmGocJT5Xn1bbdC3s23DY=; b=AdSMsiMT7VqgRyYQaigLkBxwXy9NeacXLx4RY0cj+VDnMvj4J3szfVcx1ATV75hW8MvWa7 +suHiWa8QvgUbnAO1xrU75Rxmvb1hpNZK3JvSdC+FES1wwlE/UtyTbQxTQvfGYQa360ljn XCdeOIPrf6bueTKPxUXjdSwkavIhofU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-453-aB6sR73-ONqhF5rsBSycRw-1; Tue, 07 Feb 2023 12:13:34 -0500 X-MC-Unique: aB6sR73-ONqhF5rsBSycRw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F6F887B2A5; Tue, 7 Feb 2023 17:13:33 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.33.36.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EBE6492B21; Tue, 7 Feb 2023 17:13:31 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , John Hubbard Subject: [PATCH v12 08/10] block: Add BIO_PAGE_PINNED and associated infrastructure Date: Tue, 7 Feb 2023 17:13:03 +0000 Message-Id: <20230207171305.3716974-9-dhowells@redhat.com> In-Reply-To: <20230207171305.3716974-1-dhowells@redhat.com> References: <20230207171305.3716974-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspamd-Queue-Id: 4DA99C0023 X-Stat-Signature: 9yh918dajahx5nbwbr5dq49sdo3yrrcy X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1675790018-927065 X-HE-Meta: U2FsdGVkX19xzu1frBn8mVQ+E4e4MYnLUjiw7YJHKgjju1WfctvVWaK75FVX/mmbPGQxt0CDiX8Vb5f5M90Nma76zBrNKEDs/MjF6XiN61lq2Hyurcxc+HC3w/Eyjkq5MwR6CBcyyfy5IzqeDp9xr3YmQC9l2Lso7EuZLhs/4rBEX2epIzTCE2nDAmiQ9hyr7R1uKsLftjmnIEWawxZceQFSE9e6ki1cpZ2AuQViHlOC4qo6Kchlm89QlYTufzTgvqHZy32bkLQEq6NmF5TgEU40o4cgYHHPTUq9KTqOeDSRQt6vTakBTU3jsQEHYJi2LmYYYqEu9yDwOgH6fgxI+AB2CTR4tS8R0KzgJAiYK/BcD3pqJafcmJqopPE1pTjDEEdfGZI3WA3vXyVocczgpuqJtaW1YdC+HYB2JmKaPT9Q3QmUWRKTXJk8orgPHUuZ+QDbbX6ILwB4qVyGl1YjZs3V97SyN8Oq8PHZsMzZseV4s6GY/W04ma4SWB+gfXIfMAFf/LYhoJdKPsDo+kkYluFqMPSJRslfg5fT1nMXF0bevEaFV1z7Cdrb1b0cV5hfn3NZVqt8jm6Zch+grQBWBakZa4DGhuJssLCbOMe16dHlSH0zWX8EDpeg4hMgw9w/T0NSQBBZsfGniRCVJIWTrV6mV6w4tT1ipf4NXctaI3aQbWnFnI8WDt9p1MHjaXMc+zQCmVjQxrobXh4ikafzxm6T6pZqfTSZKclOpezKr5s3vd3TH66k5tLcqlaTpa9ySvv5rWt7OkiFbZCQM2KBA1id6q6zGw+SCKsI2lvc9DdD52OyzD7JkTAzrBALojNu0gCVE6hSZ7aUID2zU/9ihz3tv1kC3YEue2uDEBVDz0R85/3AQenUg3T9AbC4QdACHDYCEMLDIWUjoFtX2kykoeTu19YwaWfMW7IW6hkQOOky5H+N/BM8a7JHGM4KvfVbuKcQJvHhs4cm/RHs6dG xX2YT3H+ nY/3Xp9rFNXJMKJvg3IxNIXn3hF3BlWKidlpGpeqH0zbFM8g3R6iWUHs9cdnFUCjXJzDEQcAwQvswLmQ361aWDu4b8LPgPuXKkR81eVp9r3eVc1rhWsFJzEhVmkEHie6+unfLDCvEOCupvq5UbKPe8e+RB9vY3LUlQuQ6usNnrMA4g9jK302LDpVBSIGY8flu9QzwXhqYsbvZ04SOrlpylNiPJQgDLVQutzJQVvkivjHJ3TAvu3Yjba66wXrM5f/g+N3rhXwcwMDTeMzzop0hkJ9GzZbivcCTaI5WrsqD5HjCnfq/iC6R7l3z64fn3BeYkOLBsoV7tGVS6nKcy7tCmADGEVhglmVp4ApEgc/cBzk+P52yHrlGqIxtRpP7ZSjSznhBejr48RELCv7Fb+WvosGzAxQ6KgLAEHUWfEu4FzY+Ku8UpZcBkOuD2UQyzstjVPHppmHr2hNjoCPdS1rUyeuVNWFpyJGih77inODf72HxyjKhW3cWs6i5fw== 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: Add BIO_PAGE_PINNED to indicate that the pages in a bio are pinned (FOLL_PIN) and that the pin will need removing. Signed-off-by: David Howells Reviewed-by: Christoph Hellwig Reviewed-by: John Hubbard cc: Al Viro cc: Jens Axboe cc: Jan Kara cc: Matthew Wilcox cc: Logan Gunthorpe cc: linux-block@vger.kernel.org --- Notes: ver #10) - Drop bio_set_cleanup_mode(), open coding it instead. ver #9) - Only consider pinning in bio_set_cleanup_mode(). Ref'ing pages in struct bio is going away. - page_put_unpin() is removed; call unpin_user_page() and put_page() directly. - Use bio_release_page() in __bio_release_pages(). - BIO_PAGE_PINNED and BIO_PAGE_REFFED can't both be set, so use if-else when testing both of them. ver #8) - Move the infrastructure to clean up pinned pages to this patch [hch]. - Put BIO_PAGE_PINNED before BIO_PAGE_REFFED as the latter should probably be removed at some point. FOLL_PIN can then be renumbered first. block/bio.c | 6 +++--- block/blk.h | 12 ++++++++++++ include/linux/bio.h | 3 ++- include/linux/blk_types.h | 1 + 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/block/bio.c b/block/bio.c index bf9bf53232be..547e38883934 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1176,7 +1176,7 @@ void __bio_release_pages(struct bio *bio, bool mark_dirty) bio_for_each_segment_all(bvec, bio, iter_all) { if (mark_dirty && !PageCompound(bvec->bv_page)) set_page_dirty_lock(bvec->bv_page); - put_page(bvec->bv_page); + bio_release_page(bio, bvec->bv_page); } } EXPORT_SYMBOL_GPL(__bio_release_pages); @@ -1496,8 +1496,8 @@ void bio_set_pages_dirty(struct bio *bio) * the BIO and re-dirty the pages in process context. * * It is expected that bio_check_pages_dirty() will wholly own the BIO from - * here on. It will run one put_page() against each page and will run one - * bio_put() against the BIO. + * here on. It will unpin each page and will run one bio_put() against the + * BIO. */ static void bio_dirty_fn(struct work_struct *work); diff --git a/block/blk.h b/block/blk.h index 4c3b3325219a..f02381405311 100644 --- a/block/blk.h +++ b/block/blk.h @@ -425,6 +425,18 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio, struct page *page, unsigned int len, unsigned int offset, unsigned int max_sectors, bool *same_page); +/* + * Clean up a page appropriately, where the page may be pinned, may have a + * ref taken on it or neither. + */ +static inline void bio_release_page(struct bio *bio, struct page *page) +{ + if (bio_flagged(bio, BIO_PAGE_PINNED)) + unpin_user_page(page); + else if (bio_flagged(bio, BIO_PAGE_REFFED)) + put_page(page); +} + struct request_queue *blk_alloc_queue(int node_id); int disk_scan_partitions(struct gendisk *disk, fmode_t mode, void *owner); diff --git a/include/linux/bio.h b/include/linux/bio.h index 805957c99147..b2c09997d79c 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -484,7 +484,8 @@ void zero_fill_bio(struct bio *bio); static inline void bio_release_pages(struct bio *bio, bool mark_dirty) { - if (bio_flagged(bio, BIO_PAGE_REFFED)) + if (bio_flagged(bio, BIO_PAGE_REFFED) || + bio_flagged(bio, BIO_PAGE_PINNED)) __bio_release_pages(bio, mark_dirty); } diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 7daa261f4f98..a0e339ff3d09 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -318,6 +318,7 @@ struct bio { * bio flags */ enum { + BIO_PAGE_PINNED, /* Unpin pages in bio_release_pages() */ BIO_PAGE_REFFED, /* put pages in bio_release_pages() */ BIO_CLONED, /* doesn't own data */ BIO_BOUNCED, /* bio is a bounce bio */