From patchwork Tue Feb 14 17:13:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13140638 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 DE6B7C64ED6 for ; Tue, 14 Feb 2023 17:14:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8238A6B007E; Tue, 14 Feb 2023 12:14:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7ACC56B0082; Tue, 14 Feb 2023 12:14:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FF8B6B0089; Tue, 14 Feb 2023 12:14:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4828B6B007E for ; Tue, 14 Feb 2023 12:14:31 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 223B91606AC for ; Tue, 14 Feb 2023 17:14:31 +0000 (UTC) X-FDA: 80466546342.28.B196E5F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 7115BC0016 for ; Tue, 14 Feb 2023 17:14:29 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LlnHaPK0; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676394869; 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=dqniJi1fcm9DuVb2jGUzwy7ATEE/wnT//KjRosSsKEA=; b=xNdVf0+RXwGwvaEWynga8qEhV+LKw7FFn/ulVgvC+CVStXMRMnBorGIjMPHHuY2PEyX0Wh lKKeAGljNPcRUt7nbxYiWYWDFfjLjNh9512RwFMHpoFkfQyEPltg2N4hJ7YY+IJ9rOatPU 7mCk01WeKqVWOmZCyRVBdP+JDiusosc= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LlnHaPK0; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676394869; a=rsa-sha256; cv=none; b=35XpmEyTduIb0tL8IfCTBZXn/2L7BdzChlmC3fTN6Y26RWMJxgVTTiNhzBC6HZyGI3/4XQ Hnd2JKULbFfdBBsPjrEy1xIry4+DcOkKtLDHqV9w3OU76ftmhs5l411VtLQj7syTKg48vX dwmpRxJjHHIfT8NWhv67otbSrh1Yu68= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676394868; 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=dqniJi1fcm9DuVb2jGUzwy7ATEE/wnT//KjRosSsKEA=; b=LlnHaPK0NvrQVvkv3Nv1y3lmLSlNb5eVRmfB+/SvEj+zIep3SM6WP+tT5TE1FCGQi0RVEW 4moWoM8qvSXjPtvhBeCEHTeCqSCgWSoET5rdBMDl+rXFdhE8QbkZ590M9ietY8M888RgKp 0RkoH6Hi/YhDjyRlMPncgtf+yf7mLYc= 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-376-CS34Hu8FOKSxyZVTcNhLCw-1; Tue, 14 Feb 2023 12:14:25 -0500 X-MC-Unique: CS34Hu8FOKSxyZVTcNhLCw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4250A85A588; Tue, 14 Feb 2023 17:14:24 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4367C2166B26; Tue, 14 Feb 2023 17:14:22 +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 , 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 v14 14/17] block: Replace BIO_NO_PAGE_REF with BIO_PAGE_REFFED with inverted logic Date: Tue, 14 Feb 2023 17:13:27 +0000 Message-Id: <20230214171330.2722188-15-dhowells@redhat.com> In-Reply-To: <20230214171330.2722188-1-dhowells@redhat.com> References: <20230214171330.2722188-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Rspamd-Queue-Id: 7115BC0016 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: rgbpxcfgjoy5e6cxdshrr7h87rwr4yqr X-HE-Tag: 1676394869-813365 X-HE-Meta: U2FsdGVkX1+Zy1MCEOudM2gkN50WQ/BJriTexQfErXcEbco3NO7Vj7zKXA/K7N6bjkvVpfHGOB0EyIVaI1pGGdJBGE09XF8Uh1rroSsL232bP5MCTXT7UrcUq+mgxFTTzbWXskh4+5b7Mh0AwGT+ZX76hqMqnnKHKiCvGgYfvAuuyytMe5HJckVOyN2VvsG1eVMnOvVU6+A43tCrUeHSVw+MTXKxupzIHaBcT3h88RQKwlL5d81BRQDj8Ctl6gPVdRi+ryJXaxcvpQdvVo2PFFmRk/LQwrrlFr2xIHTjVDlp/W3eomRs5fRYMvG2Yw5UfdQn3cjtFikcVTNxqJOjmJQ40x/9T8syYJRYi8sbHy9cZqFOfcbYYU36P5WPmDlpSdg2bawnii9zAkl7YNaPxaI+tC1rTBkuVZtefLAILry4Tpig++As3zNK2/oPhFkTrbfqwF3Y9h9heIvCu2w1qQuplP7UgrnCIPHqASfIGZHuxG5/6ifnzuzLoRw+LyQsxgylLIDvCQwCjkyR2Q1BFNCAcTshLJtIg978RxQ1tDpKkUhWGdPTqFbCA4RWqeynMI5tAImBc5g96jpi5lBAP3yaRqoL3bXDno8LDG8AUWWlgU8C82qrtdVVx2hlMLN+xXy77tnSwRLst8OhcZ0We/l7tCCyJq8Z10fGR6a5RW5cQRu8N5q1nKyhYMkI/wqOqCewO8TbwRwOlTxgajuKhngys1y26B8G6NTQN5+soxRwm9FWI9cbtqDTljy4dVFYhaecdVe6jQC/rYzoE5GCSfZP6IEFw6lRYHSTt4ZD9PZ8tUGwnd99wp65otmRuJHgrpPF3BSzZnYhNhV1gqof4tqsZxZFrH5BZhSsmmCU6+2i2y+4Fn3Vj9uBNhd6caYAZCKA+bt5tsB5gPK4RD2JDzhRtWmLXpayKgvmeG1v6ZPhWUulwA4uFZ2vXCn3tJ6SUh7HkMjDIk8gBxvuC/Z /EBdRe9M 287FCRIUj2MuUqh7v4Ia3U0MR9EYVnWFnZkF77zTDvqs+WBmCfItU9lYYla1pMN/f2F4Nia92ydPCpbo3YZZB5Q7+8QTMMUNk9NP4niB7EcKchmQK5dNCuTPOoiQl7y/NpUC7I8cZ0Lg1ZShgVDinFZLJ7SM1Cg1kofA/uqVutapNj97kI9I+S5+ti2iimqovBRjpFf15h1B+Uj5y6bD0RZHlmZi/3xWgmQNz3G9ieSBOGsa39iO7JJTWmxY9YpwDxoeoHjem28bbbKViZJrxSkEMjix6yXcSGk69Iy/9b4BWukPZXV/F55z1jykKIfkyMsLHeWUfoxwpUK+UYekCWU3lU5ilYP0qp5FC8YcdcZaAmlw3qO12VNlV9X6fHSu9YUPYXExbRQ3vYOhLi5VIUDMwr9L49P1Y9IiYXhgXmuJFfFEj3F6ywTniIzBqhaXUj33fAn52GP9iWk8a5LdxpDo32zflpHZ6fMKBDl3Ib4hpxDf631UAQh+uGw== 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 b97f3991c904..bf9bf53232be 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1198,7 +1198,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); } @@ -1343,6 +1342,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 080dd60485be..f1f70b50388d 100644 --- a/block/blk-map.c +++ b/block/blk-map.c @@ -282,6 +282,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 03d381377ae1..07810465fc9d 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 47db4ead1e74..c0e75900e754 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 10366b8bdb13..805957c99147 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -484,7 +484,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 */