From patchwork Wed Mar 15 16:35:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13176344 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 F2C2FC7618D for ; Wed, 15 Mar 2023 16:36:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 796BA6B0088; Wed, 15 Mar 2023 12:36:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 71F9A6B0089; Wed, 15 Mar 2023 12:36:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C1216B008A; Wed, 15 Mar 2023 12:36:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4204E6B0088 for ; Wed, 15 Mar 2023 12:36:40 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id EEA25C0FA3 for ; Wed, 15 Mar 2023 16:36:39 +0000 (UTC) X-FDA: 80571686118.21.302ED8B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf08.hostedemail.com (Postfix) with ESMTP id EAD2A16001F for ; Wed, 15 Mar 2023 16:36:37 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SeTNWLHu; spf=pass (imf08.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=1678898198; 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=liEcgau4p8t+mwUGuoaRedgxlmnzEgbJS9Vz3WDlJV3dVI6X1IfqyaxWRCo4Bsm9dZ9Q0r hCqPWfUvXP/oRKMJ0tgNQGt1EVAcp8ZU0eNUcjiESnRjlwifJ1wNxSQKUzUw1HcK/OK5ua GIqdQAZuRBcqNQdshoN5/4qayghjD00= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SeTNWLHu; spf=pass (imf08.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=1678898198; a=rsa-sha256; cv=none; b=V97d6ppYN/Hu1UWq2joI4QJPmgC3snSiAqez1iBOJxHC0cC0FYcQrAdjIbHLClrWjH08aa TJX27IPrSJXPZR76hcadJKyEVUHsHU0AJ1Fv3AFTpN1rre/HcWvjomZbevgygYyMmFaXEG r9p+1KZHLn01koRWhHA5Lv0SYd6m8eA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678898197; 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=SeTNWLHuXb3U+4tuTrMT4SqtNLRGP1zcVVGe7k9cfjERkphU1RJz7IK2ZDu+AE9h270v3Z 6dhQa4xVs1fPDOgHE09zbY1L22Y8I/tCu+iQf+u09XWkwqfo1i4etFcbUy6M55/RkoPlb8 adOCYBEld02KEQM5HC1k/eRg3My9nyM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-493-vcA44ovXN1e4qlJZz1bDQA-1; Wed, 15 Mar 2023 12:36:33 -0400 X-MC-Unique: vcA44ovXN1e4qlJZz1bDQA-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 6ED473814594; Wed, 15 Mar 2023 16:36:32 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 54816400F4F; Wed, 15 Mar 2023 16:36: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 , Christian Brauner , 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 v19 13/15] block: Add BIO_PAGE_PINNED and associated infrastructure Date: Wed, 15 Mar 2023 16:35:47 +0000 Message-Id: <20230315163549.295454-14-dhowells@redhat.com> In-Reply-To: <20230315163549.295454-1-dhowells@redhat.com> References: <20230315163549.295454-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspamd-Queue-Id: EAD2A16001F X-Stat-Signature: urudky8zejb3uej3r4wny5h5su6m1ig8 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1678898197-492326 X-HE-Meta: U2FsdGVkX193BuErVpJrlnTkzTF6+QIeByew9gfCW+r8irIptvpwkRHw7YoKcOXO31VRUR3LqBU1Rf8yhY5agt1/zZhbWNmiydEJghpqJ3xg+xJ1I5N7gY5dKNenYm5kKKOU/S8+kOOsMz5SheALbjb+BivwsAnbLUBBdogsyywsV7y5xx2yzJ8npUvfNNcSY9McpQKl1DSOYdYWL2ZPh4vjf6UrGAxmj11Xgjz2vEllIDzrjjrmgzb82bWoXfJfq7l7wjWOSdH/aidsL6bidr8e49KpGacgQKkvi3/1HsMesJJA2h+05GDFAyX4Hb9MLRrZQpfKYJmU0JMc8jIF1atZq03ofoDar3qzv/nXBmUcLRWY6rNuDb7haBQ8faNK1nXkYq7vcONkHqbR3N3ZRQeY6M70H3ZtbQW6ZCuj/dyFmkor8pVfWRgqyLJNraHNuU86VoTUuhJxgX0gpxAH1/eC8b/cueuEPd3qdePZximEirxnOvAbYkRqmMePirInkjl0CxaNpqtNjnEHCfS+8Cg3yyoj0CBil7pefta2ei7JYW0UouLpYaGlTXud2WDnm7MPjZXWxPPCoTWAU/JRMWXphxc6RWFFTzvKkH0VNJOqj2NklqX49x9aj7CtCR+H4cqSnT92G3ceWfZSkb1gRGViSnjsY2FEHfRwDWzlkJya6YFH6ehPF6fUtcTuP3culjBetmFLdxGQP44pvZ/elydQ8/73TYeu7yEkCkJepn0lUO752R9vW8VDRwoYfNSTe6jELjjP5x8IPSbto9fY2DC2EPi4NsTbvWH5ipAitY8Tj/sC+1WH2eURiIptpW5Vrfkp6OiAHrtk/BG6Yi29KVvYACWviuiYIPvE9QPqAieZElyTPdJr5yyX9d1vJdKIZeWOOartHMC/lr1ajFXOV6APeBsf3tgOtv+SOeNwld8vJmTQ7zTpRTXPBtGuCprOE6Kw1m+qNr3QFJZHHGb Yn6SYVLA gFKiMrXaRdlF7bZVajVDLwHQIYHIf1f6mqO25m6GhA1zFU6DcrLiSmaMUJ+sVubDPiMPswfd4DZxX3UVUX78abPOb840KkVch063/r1DJA/WNV9a86uBdLBgr3S5s92jBRiy1EFQWbxICjbAvT/kC9pUvK449cDDO1LgNxv+drWkWX4+/1JWF1juHVJ90Cv9kJ81D1Yawf7SKkopBEfN+eJa/BxgIa7pwqFo1/P7pNa7dbVzi2lUVhn0kolGt79To2CzePa8g/swZaz1T5mcsN066jLoEp4vM/NNiusvqAOxPZ5xh52XR47x5CXDyl4wRb3j7eF+O6fKHwYTrfex4QF9oNUwnavizV1kr/SE5J5xaHt1dnI+skRojnK5lg1ccZ5e8rPXaauG3ct6ivGLq2Ipw6fgegrXVRsrWYst3w5tjkoXvrEU1CqMxpwQ2pMnMJmutTWrWi1ALPe0zlEd4dhatxtZVwkBoMxNirFuNDWPcqthzpW/16lSEBA== 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 */