From patchwork Wed Mar 8 16:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13166171 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 8A918C6FD1E for ; Wed, 8 Mar 2023 16:53:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C783280008; Wed, 8 Mar 2023 11:53:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 618936B0082; Wed, 8 Mar 2023 11:53:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3CCC1280008; Wed, 8 Mar 2023 11:53:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 278F56B0081 for ; Wed, 8 Mar 2023 11:53:49 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 594C01A024B for ; Wed, 8 Mar 2023 16:53:48 +0000 (UTC) X-FDA: 80546327736.12.6FDF456 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 9A510180025 for ; Wed, 8 Mar 2023 16:53:46 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZOBLq2Fz; spf=pass (imf06.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=1678294426; 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=HEPrb4kIqMqW7eebyDDmobfSBttcdx5+yTOr0krGf5g=; b=PiS69IPr/qwnQSAvxWiuRDEyLzFSgrr/aI6LyYri3H322tKAznVkElw7rrPjsQKgwjx5V2 QAJfQjpAnVAa0Vf+JSzKl1b0SZ3W5G97UNw8MazY23q2LxE2B5IPIZVN+e6NjYQZmkcO+Z 666txmiWWN01/XXf+Zb+9KL/ji8b75A= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZOBLq2Fz; spf=pass (imf06.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=1678294426; a=rsa-sha256; cv=none; b=R1J0mPVtF832DujeGY3+nmDuYghtAW046auYg5YJ6mgc9ydj4TzDHtqqPdZBeyf4xe8ytV VLrwAJInvYUnZ8q9sNSCtc6/ldDZpwylSPatjoC3xxEgASMSaiNb4qeWSp3hWr9DlDECNn 0USY6116vs84V2QgpdPZJE9idyzde+8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678294426; 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=HEPrb4kIqMqW7eebyDDmobfSBttcdx5+yTOr0krGf5g=; b=ZOBLq2FzJP55pDzVYqU4jwCmk+0lAPMZh7qjadxj34/rYUrypTMZ5A5jifzpHJwFqlJnjs f++1St9VZXKupgqIDITXamRYbIatfJaNHK1omg2YWGWGfgjao5f4RKLtheN3Ow8O5oiwOS sLcAa/3yRxeRAIkyGETtylf7YIwvLC0= 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-297-lMpGSRQOMG6okmNVI3BTqA-1; Wed, 08 Mar 2023 11:53:41 -0500 X-MC-Unique: lMpGSRQOMG6okmNVI3BTqA-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 83C6418A650A; Wed, 8 Mar 2023 16:53:32 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81ADA492C3E; Wed, 8 Mar 2023 16:53:30 +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 , Linus Torvalds , 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 v17 12/14] block: Add BIO_PAGE_PINNED and associated infrastructure Date: Wed, 8 Mar 2023 16:52:49 +0000 Message-Id: <20230308165251.2078898-13-dhowells@redhat.com> In-Reply-To: <20230308165251.2078898-1-dhowells@redhat.com> References: <20230308165251.2078898-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 9A510180025 X-Stat-Signature: zrqehowi45nk5r5b8cb95p4gsofb9ztc X-HE-Tag: 1678294426-199152 X-HE-Meta: U2FsdGVkX1+VdWQgloaavxeD9CV+3SOUosk2+6j6Ko2xiuuDutavQxuY9AfM+D11csWRznDLJGBfmPrN3j1TeSq6ouFFyDyec5fLWP6FUM/bI4/hQuFYOL2q09bcud31GmYPh23ji68Z/S57DvzNpOv8cmesQnnPeHwVuhJvnucjAMSqb288HZAMStwHfAyP9aKNVyC/woh7OSZYtPCQy37aXKcP/r7MP7HUMgS/G/8MtxEXNRUNxqkyFvcBNoh7LvmZFYOTZPu7ZGGJg6pTgevY41YWz/mq/gBgwY0LH+i6jBxcQnST4huYxjHCnybIIfmACgtSDqKTXApbd2v/AuRywMfyMWkVPGV/MfnZaLTJ6VJ6eobelz69pRQYjjvjJ/U0l4FxYvFsrBdlj6CLQhWpIiditee3CRkaGx3se+I4kIdz3cjq8Nk2YRWYnKiDebZomcZ9/9+GN3GQLNZ17apkvfxR/yrJi1onjGR+QnA+rtsxafhe0wSvoP4z1c7nP9BSGtkzVzxEPRvFv393KVBPSYutD6H0wPWykQymcELVUqcNvo+8nOgGC1rwr7snhlLmWN3qR186EnVGdyTkzg9vqZUzXJ/xfi7CABxTQljoQWGzzBoIVUY/eU2idVqaYmyheRBf7vdQJzK9RNTQz3ojxeme6GTNriiN3R11hl6K8RroyYXmpTNkGW3NA34YwSUveu4QHijuDhrmJ6RINY6VQTg54C8m15P/HmvJ901lr26BMTugKFOS+hX7P73oWOr21J0raeKXVJUwjFr3X93xGAuu43gd8HAP4X0Af/tExtyoqVByxsSi9OBTPV7ZT/iEng4KlXLb+JQ0lgOf7qfxA9yMZPhrPSJZjtdB743awcLMPnuyowcNK8OWHWori/2/w6FFs0NhO2x99ghveUo4EKugY8wLfdAAhPZ3NIGMoQ/QogqMW8qX3GoAL2FkaWHnzM9NZptOvdXbRxc d2rZitt+ ggh1nmKzn7hmupFY49ALvD0mJIcRrcQBvE8KDooh85ysHpFIUViTngSCFsS6uiL/Ykb5whW+gYiLEItf9USTXTFcKHMcE4CNmBkITJDDMx3nUm228V153Nkhcb7ohQgywcS6WZuH3o/7NhYl6t6EPlOPiUDhn1Sxq1k55G2yUFZCSGgNNZ+QkLQLxvMu+gtQhEZvalRJlPFJhaeDEFGMhh8aX3PmggMgQjm4Jgrb658U+WrVVxQ4en1wwPjviQ2irziGI7OfH5TpUnql10Fdgs0pzrYvSq/gyCABOCZ1Ek0TBRCaZ6QHJaseArhYEeMsrLKmk9PkbTQ3/x7WhqON2Y0+1cVy7T+0dxEP3LUQ1N0YAVhVJ4xy9sNRob57i9djlfOi7beeggAZVDa/jenlLDZUi6oDoaUvo+nROtigRVZHPM72mpoY3ExaWk02xTB/vifaPr5RyDcIlbjYI7ekj62E9665wX//pUlOMJ8qulOK3M3IGRkb0fDGTDQ== 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 4ff96a0e4091..51ae957cc4b6 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1168,7 +1168,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); @@ -1488,8 +1488,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 cc4e8873dfde..d65d96994a94 100644 --- a/block/blk.h +++ b/block/blk.h @@ -432,6 +432,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); diff --git a/include/linux/bio.h b/include/linux/bio.h index b537d03377f0..d8c30c791a9a 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -488,7 +488,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 */