From patchwork Wed Mar 8 14:37:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13165960 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 8B6D0C678D5 for ; Wed, 8 Mar 2023 14:38:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 56E036B0078; Wed, 8 Mar 2023 09:38:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 51E50280001; Wed, 8 Mar 2023 09:38:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 397746B0085; Wed, 8 Mar 2023 09:38:41 -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 2B40E6B0078 for ; Wed, 8 Mar 2023 09:38:41 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id F0F771209EA for ; Wed, 8 Mar 2023 14:38:40 +0000 (UTC) X-FDA: 80545987200.01.844AFA0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf14.hostedemail.com (Postfix) with ESMTP id ECF80100011 for ; Wed, 8 Mar 2023 14:38:38 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hhf1F4Fw; spf=pass (imf14.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=1678286319; 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=AY4iQM6ohN8ZiPPChVafz2jyy2BJJZGyKjG/+Yi6AJigGTSozZpSjeFymyrc0E5siijH6k fXcnKNUS/T1QSUs1k0CxNXOQhbmkDK9/S7HLnLe77uGwDMbvYW76bgS/pyhhgKVKfegiSV Jy4eNenTbS0EOy1vYR9ueO6bVWkcG+k= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hhf1F4Fw; spf=pass (imf14.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=1678286319; a=rsa-sha256; cv=none; b=oUxKNmpxY6jomlMF02EQLA7+6Uu/6dH864dEJUmcAyieDWrTKQPKfB756zTTaG+K8V3XdK GLDd/5XLXc3PRV5emlypeRpJ0jBKR+V1Z89+/avWW1Ka/7qP/iCZbzFR1fRlcEvczhaEcN dV0eN2yDyZVpu09GR5iKnIrxZrSziso= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678286318; 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=hhf1F4FwBK83BofBkL+/xgu3nJbWZZeV8scTuJtBGDveXPRcI5ZPdUQwWJcNGYjElYTYny lCCNj0qvSbnTPWLIMzhhVx1Tm/oFtazu92lA/FJ53Qf30DQUimlJSyyaJOyJT1cphxMQ0R pbPHEcYUSbrorMQoYfbLG43ad0W+CBE= 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-647-K3nJiuC7OpWvo24vQi0Wfg-1; Wed, 08 Mar 2023 09:38:35 -0500 X-MC-Unique: K3nJiuC7OpWvo24vQi0Wfg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 49555382C991; Wed, 8 Mar 2023 14:38:30 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 482B31121330; Wed, 8 Mar 2023 14:38:28 +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 v16 11/13] block: Add BIO_PAGE_PINNED and associated infrastructure Date: Wed, 8 Mar 2023 14:37:52 +0000 Message-Id: <20230308143754.1976726-12-dhowells@redhat.com> In-Reply-To: <20230308143754.1976726-1-dhowells@redhat.com> References: <20230308143754.1976726-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: ECF80100011 X-Rspam-User: X-Stat-Signature: b33ab65r51erukomc696z5iux1oetxhh X-HE-Tag: 1678286318-598003 X-HE-Meta: U2FsdGVkX19wtqXfwFJPvx1QbVlOIr3pmyp/cLhxHc+c3kbAeGiP6epbLZ5SXLqNpmYGBirh+nL9LYIZfxj9HQBsJdXdUTZAYTYkqBUyrNul2o3PJa2dxF+A1EjwhcHTOrcHIOq+giAJrr1vCrAwSNUlmkUkgg9bceF3IwMzeCAWjOhiBNKwURIBWVh5B2Subml3XhdvQiWEi360seWu1m2/fkzAauRzpsDToIjWCfHDzMU0XQNRxSPqVlrsjaKc25+sZMdQYq4a8885rS23xusZC0PN5rBz4fTtl/K9n39Y5//kuR8fGcIswR576t6Q2jwFdUDibZmorxMHC6S/D/NX87dOC8/YR0W9uqlFXLBYn63F09dzgpZwODtgzDvqS+Dmonc9uRjf0PKu5GMFyNPvF/xSg4U3UT4Lbx1cvi9k8LXTpcQ2IiWNbww3apSnAvJZg6Sd7lbeSJjOhgsarXCAYo5Jz5vXPCf0yQRHfYwyaeLj3NTxPHwjHdTxt6dZbxlW0nwMnB0B5/s3pKdel4W3JWdvNW+nYbYPls0YnuNWgnDJOBasp8nGyvscNwxHtG4d6n4In3+Qabnak3Kfrj43EUTOs/vGuZjyxHqG+mKPRtwzSwCRcgJu80bh0A91243xFEejaVKEPXMBqVP5ieZx2w5fFBE2PeX1Zov2Ta+DacLmdjwepy5XbJ4xMs//PYJ0uVTuLjOcLLUGfq+uliI+l0csZhGuuOH8JHAMP/wex2CFyVvc6m45A691ODTudKHvXWHpQGoWVpj+rBbsGajTUePdkE26QbH1oWX8yzQv788fVhzUlq+4MapLCICTLhAVkJNSc4U9Zv3JscIGzmJ3SVM1Th6NF9CkmAD+Ca1KYslFx6eEddLKdQkVmWpBt4v9XmS6uGVxGqCs2pBJ9Iu7mi8lDhSovKetd78++a4boKINOHw9QeXGE4TvQyd0jEOka1K4Ba/LCidLFpY dkHSF+OK fQpiwgmtGC/RF5MZ8zz1+ZnzM//dgI4xVgG7lnCAtr0ofYfDou79vmnbAeOGLYCD54QTsrph778UHyXr+cvtek0A1UpxiJ5MrDm0ijAlNpY4sWLfv1GjO4Vj2D/ZvuqtpWZwYxhL2vpzzkuzj+LRH53ti9kBj4u5ZCG/KRLGG2BOrL2oUvrxieDOr05Dd8KjGWDjG28vJ3jkaIZm2jul609ngcdzm8uFoip/N7WjtWeSSs8ylSTUrh7upaXi5WFtfuVpaKk9dLVZ0vRvRZoD6TDNABfPchk0qa8brMLju22c4CgdQWezGPiL+/7yAxGc8j6U85SUDC0WQhD9jZpFAtASoTLCBe8hhztrRGdUSjolSoFpkuMuan+qqmNvuS8iqwvMUK3TtiklATJfvKKCxBptd6BYaP4y/WFs1PJkE70ZMrAi9D502Wf+cB8LXAz0ulMtu3b+V1UNl7DEbO/cvTMlH+b4QdkOVcH0mfST5bUr/quEEEGzwVmNqwg== 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 */