From patchwork Wed Mar 8 14:37:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13165959 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 5F553C6FD1E for ; Wed, 8 Mar 2023 14:38:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 016136B0074; Wed, 8 Mar 2023 09:38:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F08736B0078; Wed, 8 Mar 2023 09:38:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D5BFE280001; Wed, 8 Mar 2023 09:38:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C6DE06B0074 for ; Wed, 8 Mar 2023 09:38:40 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5E6931A0F57 for ; Wed, 8 Mar 2023 14:38:40 +0000 (UTC) X-FDA: 80545987200.06.45D4BF5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf03.hostedemail.com (Postfix) with ESMTP id A014E2001D for ; Wed, 8 Mar 2023 14:38:38 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dcOQosEl; spf=pass (imf03.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=1678286318; 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=cRZ6zwkATo5WH/jIVyGNX8/GaSvHJQOFy9f4tGJFuL8=; b=MPWpE3utg09TxpNWXcKgN78yEzYsaXvaNdrQRwseCS3ac/m3tE0ZlrLW6q8b9Vh3V9rmSO nySmhtGvMtP19SijPocUkG+gjUspUuQeuQqnisGUtNYNSfa2KsvWb0rrD8Dg8ry6BlDGKP M8HOPDMZ+M2zTJGsiYlPbHxnjYQbpP8= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dcOQosEl; spf=pass (imf03.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=1678286318; a=rsa-sha256; cv=none; b=yqSf+vjHkfHqAgaPlPGngvKi65XVezILEuk/Id0RMyv16jGXqyNJdxQfoPb1cj4Vz5+DZH 32RoeampY0Vfn0O8Fb02EOnAeBXtJdIwaN0KEL3WTzJqRQtKVfZg2jzpBOAP+tDdZEK1Uf VispuoLSp0jHHLm7ZSwMsf8oWbv0xcs= 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=cRZ6zwkATo5WH/jIVyGNX8/GaSvHJQOFy9f4tGJFuL8=; b=dcOQosElHrvaV6bYRKUfDxvRqeiOE0/RwWdS7ieU3TfwOEKh5FYcYk5DZxpgfTtZhQrMXO iv7ixpF5ajJULgxZLLo0/RrKXD7GM2jHhEna2XXglTmBb8Xl2Nsheq/YRo1JHs15FhLNSq DUH2WU4SAFJbKDjJlxL4jEuzURvdtW8= 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-377-hIiZUSLuPjqJrRjMvg_wpg-1; Wed, 08 Mar 2023 09:38:35 -0500 X-MC-Unique: hIiZUSLuPjqJrRjMvg_wpg-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 AC064823DF1; Wed, 8 Mar 2023 14:38:27 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A710D492B00; Wed, 8 Mar 2023 14:38:25 +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 10/13] block: Replace BIO_NO_PAGE_REF with BIO_PAGE_REFFED with inverted logic Date: Wed, 8 Mar 2023 14:37:51 +0000 Message-Id: <20230308143754.1976726-11-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.10 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A014E2001D X-Stat-Signature: ysdxoozzjpxr4cpmixj14i1p9k1oqfj7 X-HE-Tag: 1678286318-660471 X-HE-Meta: U2FsdGVkX1/XlfFpymntjXhq2eIWTUzb4wQwH3unrGtuO1N7GJZs6Qu9vxGdy3edMqm/fD8GIIscNf7H6X4BKj/XKl78Hr/xuP9WoeusEwUImLCbsqNSou6srOeMaTlZysJ3yhwvQ6ZgwXkcomO9UBZn7PPP7bN5iSDllgEyl3nGKiuO7X//Qb+5kUm5yC42nu1xRnHCmphTHM/2cp47+r7sq4rPfYYk6uwIQPagOm66Gt/CPLFOCeZLvZYvJ1+5QgdWOuBbhclFxECFDQ/OB9bBEzpS07k1NKCiv7fITl1GtoU7NMqw1oekW5Vm43btkc1vuBJK3XC5+qmwvbT9X55Nd0mQL7tOoP1F7jSZRtMohAeIJAQ+Iu6BfVRrLyiU8bBRAenTf09ikp7S+zIgImW9ktBsat7TUuwK6iN5HXZgMYBoXyaqnoGhpZi/L8x8ODSVzCxONQY2tDeVewGU1nm/SCc4DoorD5wr0t9eL3JVzv7YHQ6PYeHsiFuWeGx12AaByNMQUy674aqCXBJ/ns7P1ZjFkN9P0Ij5lhUQZlXUGIu6OhWr+SuSH7nUCDxbjrWRBJbWZyqdJuyPRU5a4wghy40utD+/Gpc+ZmmBzT/TZwESIYLgfMmT2B8CQwdnTy0hJHyrjwX15dcrpqAmaCcn7wMJRD523B0f7iG0iVAMPD0NPhpn2tHFAwYGTlWB2noLGecZTfp3Qo2TjTFijYOvm9xjnLf+BsOd3L/WfkBGnvJ/WNydxB67joAXDVTU7kztS8hjwkuaGgJ8S4qmLrd5KIPhDYZPZAC2YZBtZR2wHlp/TsvpX1ZenD1SyArQEXTVohWVy8dJewIXdBncaepY9SM84Xqz0MK4lW65j4VTP/LcleJLREdUhgyCZ1GG79KvmC5DVVREgZRcl3rA49QvofrcS5t3uMqXWUmUiUM2M1KTEatHzCA//B6GOJLnl70Tl3LNFylJ5Qj4VyV lgwmiYLM oWWiGPc4vPLUZMOHCOqxBgOJXZG325vJycNfCgka0vJf5NOFbX9WkkNcjhCUZfeGaIfAboCjZerYmN2VfAB+KJmgTCq35TptECqBw3ESKyGhEFW8Ru5SkQ23NPdCKI9SmDDaM8Irvx6gCxodgTN2Z++QSTa/JEMAHxr95NfUfj6gGfSPTBvIOyF3dpZ3/D4/60+Eyqq3Z3VsUymB1K+geyxc3sLoc4TG/B3pqN6JzYTOp2NT+qJJt9iSYq5XxvzU+bfMVa2CGk7h6Oe/umc0GEGvdb/eKBlx8s+s35gQKWVv0/QxNADyK0mDuGjDz7ecyTgfS9YQEp4GysfrejAYKxO43w1EcqPg7ka1FpkFkj3syzCDszR5oagyCC2O52RNz1jKv0gRzPRss+YOe/axowvOkG/qVTPJ82MT36mPkokpeVOhmdEfNnkhOyaSHw2FJt4aZmwexQFyUiaj4NdToHm7FlCaLDFTIB3exmBkozcZ3OEobT6RnCsu6qQ== 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: From: Christoph Hellwig Replace BIO_NO_PAGE_REF with a BIO_PAGE_REFFED flag that has the inverted meaning is only set when a page reference has been acquired that needs to be released by bio_release_pages(). Signed-off-by: Christoph Hellwig Signed-off-by: David Howells 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 #8) - Split out from another patch [hch]. - Don't default to BIO_PAGE_REFFED [hch]. ver #5) - Split from patch that uses iov_iter_extract_pages(). block/bio.c | 2 +- block/blk-map.c | 1 + fs/direct-io.c | 2 ++ fs/iomap/direct-io.c | 1 - include/linux/bio.h | 2 +- include/linux/blk_types.h | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/block/bio.c b/block/bio.c index fd11614bba4d..4ff96a0e4091 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1190,7 +1190,6 @@ void bio_iov_bvec_set(struct bio *bio, struct iov_iter *iter) bio->bi_io_vec = (struct bio_vec *)iter->bvec; bio->bi_iter.bi_bvec_done = iter->iov_offset; bio->bi_iter.bi_size = size; - bio_set_flag(bio, BIO_NO_PAGE_REF); bio_set_flag(bio, BIO_CLONED); } @@ -1335,6 +1334,7 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) return 0; } + bio_set_flag(bio, BIO_PAGE_REFFED); do { ret = __bio_iov_iter_get_pages(bio, iter); } while (!ret && iov_iter_count(iter) && !bio_full(bio, 0)); diff --git a/block/blk-map.c b/block/blk-map.c index 9137d16cecdc..c77fdb1fbda7 100644 --- a/block/blk-map.c +++ b/block/blk-map.c @@ -281,6 +281,7 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter, if (blk_queue_pci_p2pdma(rq->q)) extraction_flags |= ITER_ALLOW_P2PDMA; + bio_set_flag(bio, BIO_PAGE_REFFED); while (iov_iter_count(iter)) { struct page **pages, *stack_pages[UIO_FASTIOV]; ssize_t bytes; diff --git a/fs/direct-io.c b/fs/direct-io.c index ab0d7ea89813..47b90c68b369 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -403,6 +403,8 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio, bio->bi_end_io = dio_bio_end_aio; else bio->bi_end_io = dio_bio_end_io; + /* for now require references for all pages */ + bio_set_flag(bio, BIO_PAGE_REFFED); sdio->bio = bio; sdio->logical_offset_in_bio = sdio->cur_page_fs_offset; } diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index 850fb9870c2f..ceeb0a183cea 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -202,7 +202,6 @@ static void iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio, bio->bi_private = dio; bio->bi_end_io = iomap_dio_bio_end_io; - bio_set_flag(bio, BIO_NO_PAGE_REF); __bio_add_page(bio, page, len, 0); iomap_dio_submit_bio(iter, dio, bio, pos); } diff --git a/include/linux/bio.h b/include/linux/bio.h index d9d6df62ea57..b537d03377f0 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -488,7 +488,7 @@ void zero_fill_bio(struct bio *bio); static inline void bio_release_pages(struct bio *bio, bool mark_dirty) { - if (!bio_flagged(bio, BIO_NO_PAGE_REF)) + if (bio_flagged(bio, BIO_PAGE_REFFED)) __bio_release_pages(bio, mark_dirty); } diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 99be590f952f..7daa261f4f98 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -318,7 +318,7 @@ struct bio { * bio flags */ enum { - BIO_NO_PAGE_REF, /* don't put release vec pages */ + BIO_PAGE_REFFED, /* put pages in bio_release_pages() */ BIO_CLONED, /* doesn't own data */ BIO_BOUNCED, /* bio is a bounce bio */ BIO_QUIET, /* Make BIO Quiet */