From: David Howells <dhowells@redhat.com>
To: Al Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@infradead.org>
Cc: David Howells <dhowells@redhat.com>,
Matthew Wilcox <willy@infradead.org>,
Jens Axboe <axboe@kernel.dk>, Jan Kara <jack@suse.cz>,
Jeff Layton <jlayton@kernel.org>,
Logan Gunthorpe <logang@deltatee.com>,
linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>
Subject: [PATCH v8 07/10] block: Switch to pinning pages.
Date: Mon, 23 Jan 2023 17:30:04 +0000 [thread overview]
Message-ID: <20230123173007.325544-8-dhowells@redhat.com> (raw)
In-Reply-To: <20230123173007.325544-1-dhowells@redhat.com>
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 <dhowells@redhat.com>
cc: Al Viro <viro@zeniv.linux.org.uk>
cc: Jens Axboe <axboe@kernel.dk>
cc: Jan Kara <jack@suse.cz>
cc: Christoph Hellwig <hch@lst.de>
cc: Matthew Wilcox <willy@infradead.org>
cc: Logan Gunthorpe <logang@deltatee.com>
cc: linux-block@vger.kernel.org
---
Notes:
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 | 7 ++++---
block/blk.h | 28 ++++++++++++++++++++++++++++
include/linux/bio.h | 3 ++-
include/linux/blk_types.h | 1 +
4 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/block/bio.c b/block/bio.c
index 40c2b01906da..6f98bcfc0c92 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1170,13 +1170,14 @@ bool bio_add_folio(struct bio *bio, struct folio *folio, size_t len,
void __bio_release_pages(struct bio *bio, bool mark_dirty)
{
+ unsigned int gup_flags = bio_to_gup_flags(bio);
struct bvec_iter_all iter_all;
struct bio_vec *bvec;
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);
+ page_put_unpin(bvec->bv_page, gup_flags);
}
}
EXPORT_SYMBOL_GPL(__bio_release_pages);
@@ -1496,8 +1497,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 run one page_put_unpin() against 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..294044d696e0 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -425,6 +425,34 @@ 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);
+/*
+ * Set the cleanup mode for a bio from an iterator and the extraction flags.
+ */
+static inline void bio_set_cleanup_mode(struct bio *bio, struct iov_iter *iter)
+{
+ unsigned int cleanup_mode = iov_iter_extract_mode(iter);
+
+ if (cleanup_mode & FOLL_GET)
+ bio_set_flag(bio, BIO_PAGE_REFFED);
+ if (cleanup_mode & FOLL_PIN)
+ bio_set_flag(bio, BIO_PAGE_PINNED);
+}
+
+static inline unsigned int bio_to_gup_flags(struct bio *bio)
+{
+ return (bio_flagged(bio, BIO_PAGE_REFFED) ? FOLL_GET : 0) |
+ (bio_flagged(bio, BIO_PAGE_PINNED) ? FOLL_PIN : 0);
+}
+
+/*
+ * 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)
+{
+ page_put_unpin(page, bio_to_gup_flags(bio));
+}
+
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 */
next prev parent reply other threads:[~2023-01-23 17:32 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-23 17:29 [PATCH v8 00/10] iov_iter: Improve page extraction (pin or just list) David Howells
2023-01-23 17:29 ` [PATCH v8 01/10] iov_iter: Define flags to qualify page extraction David Howells
2023-01-23 18:20 ` Christoph Hellwig
2023-01-24 2:12 ` John Hubbard
2023-01-23 17:29 ` [PATCH v8 02/10] iov_iter: Add a function to extract a page list from an iterator David Howells
2023-01-23 18:21 ` Christoph Hellwig
2023-01-24 14:27 ` David Hildenbrand
2023-01-24 14:35 ` David Howells
2023-01-24 14:37 ` David Hildenbrand
2023-01-24 14:45 ` David Howells
2023-01-24 14:52 ` David Hildenbrand
2023-01-23 17:30 ` [PATCH v8 03/10] mm: Provide a helper to drop a pin/ref on a page David Howells
2023-01-23 18:21 ` Christoph Hellwig
2023-01-24 3:03 ` John Hubbard
2023-01-24 14:28 ` David Hildenbrand
2023-01-24 14:41 ` David Howells
2023-01-24 14:52 ` Christoph Hellwig
2023-01-24 14:53 ` David Hildenbrand
2023-01-24 15:04 ` David Howells
2023-01-23 17:30 ` [PATCH v8 04/10] iomap: don't get an reference on ZERO_PAGE for direct I/O block zeroing David Howells
2023-01-23 18:22 ` Christoph Hellwig
2023-01-24 2:42 ` John Hubbard
2023-01-24 5:59 ` Christoph Hellwig
2023-01-24 7:03 ` John Hubbard
2023-01-24 14:29 ` David Hildenbrand
2023-01-23 17:30 ` [PATCH v8 05/10] block: Fix bio_flagged() so that gcc can better optimise it David Howells
2023-01-23 17:30 ` [PATCH v8 06/10] block: Rename BIO_NO_PAGE_REF to BIO_PAGE_REFFED and invert the meaning David Howells
2023-01-23 18:23 ` Christoph Hellwig
2023-01-23 17:30 ` David Howells [this message]
2023-01-23 18:23 ` [PATCH v8 07/10] block: Switch to pinning pages Christoph Hellwig
2023-01-24 14:32 ` David Hildenbrand
2023-01-24 14:47 ` David Howells
2023-01-24 14:53 ` Christoph Hellwig
2023-01-24 15:03 ` David Howells
2023-01-24 16:44 ` Christoph Hellwig
2023-01-24 16:46 ` David Hildenbrand
2023-01-24 16:59 ` Christoph Hellwig
2023-01-24 18:37 ` David Howells
2023-01-24 18:55 ` Christoph Hellwig
2023-01-24 18:38 ` David Howells
2023-01-23 17:30 ` [PATCH v8 08/10] block: Convert bio_iov_iter_get_pages to use iov_iter_extract_pages David Howells
2023-01-23 18:23 ` Christoph Hellwig
2023-01-23 17:30 ` [PATCH v8 09/10] block: convert bio_map_user_iov " David Howells
2023-01-23 18:24 ` Christoph Hellwig
2023-01-23 17:30 ` [PATCH v8 10/10] mm: Renumber FOLL_PIN and FOLL_GET down David Howells
2023-01-23 18:25 ` Christoph Hellwig
2023-01-24 3:08 ` John Hubbard
2023-01-24 3:11 ` John Hubbard
2023-01-24 13:13 ` Jason Gunthorpe
2023-01-24 13:18 ` Christoph Hellwig
2023-01-24 13:43 ` Jason Gunthorpe
2023-01-24 13:40 ` David Howells
2023-01-24 13:46 ` David Howells
2023-01-24 13:47 ` Jason Gunthorpe
2023-01-24 13:57 ` David Howells
2023-01-24 14:00 ` Jason Gunthorpe
2023-01-24 14:02 ` Christoph Hellwig
2023-01-24 14:11 ` David Howells
2023-01-24 14:14 ` Jason Gunthorpe
2023-01-24 14:27 ` David Howells
2023-01-24 14:31 ` Jason Gunthorpe
2023-01-24 14:59 ` David Howells
2023-01-24 15:06 ` Jason Gunthorpe
2023-01-24 15:12 ` David Howells
2023-01-24 14:12 ` David Howells
2023-01-24 14:13 ` Christoph Hellwig
2023-01-24 14:25 ` David Howells
2023-01-24 7:05 ` David Howells
2023-01-24 2:02 ` [PATCH v8 00/10] iov_iter: Improve page extraction (pin or just list) John Hubbard
2023-01-24 12:44 ` David Hildenbrand
2023-01-24 13:16 ` Christoph Hellwig
2023-01-24 13:22 ` David Hildenbrand
2023-01-24 13:32 ` Christoph Hellwig
2023-01-24 13:35 ` David Hildenbrand
2023-01-24 13:44 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230123173007.325544-8-dhowells@redhat.com \
--to=dhowells@redhat.com \
--cc=axboe@kernel.dk \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=jlayton@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).