From patchwork Thu Jan 26 14:16:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13117197 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 7ACC4C05027 for ; Thu, 26 Jan 2023 14:16:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14D106B007D; Thu, 26 Jan 2023 09:16:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D76F6B007E; Thu, 26 Jan 2023 09:16:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6B9C6B0080; Thu, 26 Jan 2023 09:16:57 -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 D79376B007D for ; Thu, 26 Jan 2023 09:16:57 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A1462C02E2 for ; Thu, 26 Jan 2023 14:16:57 +0000 (UTC) X-FDA: 80397151674.16.4DB14EC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf19.hostedemail.com (Postfix) with ESMTP id DB9141A001C for ; Thu, 26 Jan 2023 14:16:55 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MepWsr+p; spf=pass (imf19.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1674742615; 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=cDQB7KhIDyXSziSn/GI35cAKUCVQsG972STYDRbkBkFVcrOHqEwwuL/A8awpIl2bFqBDqW jdKfu2sW+Sv40X4Ej4mRF+aDm9/jUMWdLPJ16bXSY1Qc/PSYnWVmEYPC6Ny4ksvlrxQ61b C9wVPSrxEA+0uufkxD/oSCHCJHaVjMk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MepWsr+p; spf=pass (imf19.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1674742615; a=rsa-sha256; cv=none; b=3SkFAVPM2I3t5hJmv4DcEdmlrTX4NNnha+YkCMgrLb1kG/3AvJXMZEb03uvLzlsXEXr+oy 2bndU42OUAHDvAtwnMWhXlSe472OiDIglWqdmcdPG1aAw5hhYzBHlP7GQe+aJ4M7TD3shU iq9JDI76ZNtL+doIE8sc/ayuxUhfT1Q= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674742615; 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=MepWsr+pksZ++PfXyzByEi2+fYMP9mm2Twf+uxXL3FxbtteEK4h+zWMgTlBcZXrgc9Pfuu Ee18c2SeTLbkZnKqy5Gqvsz+HfuoT8xAagcmKzdCskgv6ryOgEXyVx5RtqxHSk5UFRmXc9 rw1R6rrWMTQla0/o74nOZeuiotx2RyE= 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-240-3eI7SoLlONeQMLaTsdqU5g-1; Thu, 26 Jan 2023 09:16:50 -0500 X-MC-Unique: 3eI7SoLlONeQMLaTsdqU5g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DEA25857D0D; Thu, 26 Jan 2023 14:16:49 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.33.36.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E20540C2064; Thu, 26 Jan 2023 14:16:47 +0000 (UTC) From: David Howells To: Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jens Axboe , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , 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 v11 6/8] block: Add BIO_PAGE_PINNED and associated infrastructure Date: Thu, 26 Jan 2023 14:16:24 +0000 Message-Id: <20230126141626.2809643-7-dhowells@redhat.com> In-Reply-To: <20230126141626.2809643-1-dhowells@redhat.com> References: <20230126141626.2809643-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: asq8x758jdqgfmfi5w5qa9rjbysfarc4 X-Rspamd-Queue-Id: DB9141A001C X-HE-Tag: 1674742615-94669 X-HE-Meta: U2FsdGVkX1/CP5eZVh2oo66pbwZ5JJ7/LHy/njc2xN1+tWGX3UwJKJEMV23F+EGpD0zgU5FPj4uNndTiRGYWhNXzv/6IA6GSEmANjVpTKkIiiGwdH1OrAsY3w11ciE1Y0C02P4YUNKC7S9lBLZ1kJXqu9OzOfeU5Frz8VCM5eQzbF3eb6wSswHeHKKm5/DP7thHwQbw2q7Ti8lqYiRKkKnkVkigi2Txr0wXcFVmr/49C7dVvrzhVfMZlBPRVaUNOtJ11tzVtiO3/etQ36ASgGnMXrHFyGm8cOPDnbj+v1Cj/En9un94s4RzpAi9t5Vh05RzOhdVIKMK/YDR2o1y7XKfEubL1djAzXOZ0Ukx9YTp95SP5QDqROU1PAA5a1+F4Ygn/ndyPV8GpySqT4K0Oz17zQtF50QIsFBx2qgoUmQ6m2JcyjLVjOGY2XtedUxVStPJnWC4Z9QSo/nccXv7RfyR7KLfiiAgm8yqRqa2RJ6giURFj7y+JGqDyg2c2UKTV5i1bLUAQRKVdd0jcHj5H1s8oOIPLD8TdZb1D9mKOJ4iIV9R8Zj4Bv9/lGr5Ny2p+5+U1UECX/yzH5I1Ii8RwOwogymr36FQroIOGQaeTDsYvCBQJUzeY6tA/kepU4B2axQiDZ82veZ2aTKTrAJKdDhBqgpwgqWjKiQA6MvYDIG06SJ5qvji0GJtmqe2Y0dAmkluHu5Q3afTXWgi7mJsDUnw50L7MHwQt2Vz1Y/YBeLdTtHXqKtFnculTPv54IlnxOciIaUSk6ecnhlFhvDL/u/6pR91sOohRnFH/8KYXD/wErY6GZZj48EPlVOsDo0zXc455eZVAP1AMlz9cbRYVfDbnm4xtz37NrNg+vyEWJXDfrESZGDwg13FmTfIzKTeKglv4pvuGxViQeZ7ClKv6O7FpQAUoRg198cT5i5b0o7cjSUT6Ea3swWyy5m810VCRA1XdYmdHJCwpqCXrv9L Nlcq/SlX KQ8j08yreKLnAz7X3I5Bzhu5OJ6oAjy7XnEUBwCe2YkRKZRsmSgztQVx6JIWfMUyufD63l4gvXPe6D5cwXx4Dmvu60WhIwSwcUe+5i8LqsKcegvvqafb/IUxgaXThmhPcf/6NZyQVCKL7PRjsl5kwDK8Wfe+zWQ7qf1Yi022wbXzcfA3GDCE2JDf4DyXa7rdPklW+k2Z5/xY+Sqb/d7CgP2+LR9Lt44jGHoNVBhc1p7AKjm7vDwyOdePWlejrOK1GJ0WJ9W7igu82t5wg0dO9ts2AJdwEhLOJkWrtQVjj8kZn9StiWVZVn68RY1sLuyteBfALWHgTj2cD8fl6sDvimoyBIi5TCoAUSi+T8j3SZILLV6r3eW2EoVJMwY482505Md1tDOJ8EIoQMS06WRKb66fZNIWw5cNsjllSQRcAd70r3/klXB1xwttltOr9ck7AY5y3yQHXeiGVHr5K4eY9XTbIOv7wjTxZlY4akolH/ecVD6p870+GeM9a5g== 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 */