From patchwork Thu Feb 9 10:29: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: 13134347 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 06D79C636D4 for ; Thu, 9 Feb 2023 10:30:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A20F6B0080; Thu, 9 Feb 2023 05:30:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D9116B0083; Thu, 9 Feb 2023 05:30:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC4CC6B0085; Thu, 9 Feb 2023 05:30:30 -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 CAC926B0080 for ; Thu, 9 Feb 2023 05:30:30 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 719DA1C6163 for ; Thu, 9 Feb 2023 10:30:30 +0000 (UTC) X-FDA: 80447384220.12.CBABBC3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 9180AC0023 for ; Thu, 9 Feb 2023 10:30:28 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CjQlF4so; spf=pass (imf10.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=1675938628; 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=leeLWVVFTqe00swCzmx1td9K71Qyl9yzlFiLT4sTu5iYoAQF4YSriJdGeL0QxvjqlqI8rQ T+O/v2Jm1vviAgKolQCcsqEXBuNsB1F5HOVbcJEE/goFUKzEUe9g5cVABFsvvBJftyILuG 7JLEvXU6vXID2XzaNlkTfuXmCTM4HDk= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CjQlF4so; spf=pass (imf10.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=1675938628; a=rsa-sha256; cv=none; b=oh8wd4T6eZHE7hkD/xQU/+HYJDmieTQWDZelVAlFXfXBzvUxOz62LJGU/jnLmlutXVbjXf rLvcXp3CjAfLR6S3eX2XPFEAESrV0O4JHneBsQG1d30yx858TNjEU/DG2cLT41VM0yNAQE Sd6mq3HzRJFEEErvD3UG/RVc1tsseFQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675938627; 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=CjQlF4sov46r+KmquqXpNlLXjlWhy+yflkxB9hkz4pvhr3iC8k7ovxSH3lhth2JSxLzYLl b66J7XO1ljvvm8lRi/1aGJRSfKTjZjdT/PuDRH+j9VLYA+GzcoC4KLgR4XllNf3d4YYN5b Y1blDeky/7uaSUhXrAdY68Y5JO+Ees0= 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-286-2Kg3XRHMMZGGmZ87YUpyow-1; Thu, 09 Feb 2023 05:30:25 -0500 X-MC-Unique: 2Kg3XRHMMZGGmZ87YUpyow-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B451F800DA6; Thu, 9 Feb 2023 10:30:22 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2EA8492C3F; Thu, 9 Feb 2023 10:30:20 +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 v13 09/12] block: Replace BIO_NO_PAGE_REF with BIO_PAGE_REFFED with inverted logic Date: Thu, 9 Feb 2023 10:29:51 +0000 Message-Id: <20230209102954.528942-10-dhowells@redhat.com> In-Reply-To: <20230209102954.528942-1-dhowells@redhat.com> References: <20230209102954.528942-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 9180AC0023 X-Rspam-User: X-Stat-Signature: 8pscrck7dtmx9zcqskyq58np76sj91rj X-HE-Tag: 1675938628-449242 X-HE-Meta: U2FsdGVkX18Z2ssbsJoG2c6RiCuI5uMln2End24ZdXFNgVyujKk86icRTNYSufHon3m5gGcoE0wXOciXN1Ussik/Atk21fCZrnGzoBxmMVXDmSme+n/WjkI34tBirsRffOK2t/ZE7UumZgko7X/i/ZgncOAvE+aOuPOxznC+d/GFiNFMcmeO2RSOplLlwZBqDyDKKvXsnrvmZpvcl0+3Y/nuB4oQnRQzBjC4hncRrnIuENCjHYTgCtgEjDrQvo2Mc+xyls8lD5nyhJL4UsMTEJ6p44TJH+yhMWWbX0cSNUkhgT1T9k4pJQOPtIS0v5YZXKyT68sgjdDHwk+2FTo5lgjG85D9eK8Bn1ALv8olE5OKaDQPU6/kwRn4nlNRTJsP5FsjdBJkq5A9O/egAdMDVDVnI+cJkQ5nxyspTRfEj6zCOlYKz4s3znXyQjBeBJpoOn69Me1T47tN8Zgyo7tTP6m2BTKs1rRszcYiwT+zEOAX+ZQbmdTCv6QadXqQjkl3yCYxwtYs2dfvr7AoE/duX31ky9EPkoUKAxEvghIXZo8XEk5chxFhdG0Hs3/vWv+ZpT02pv32ksRBTKmhb+HVEXjqJS1XaQBShY1gwxF74BvX32U2+OyN00HaXaGKtiiEQMeJIY36Rr59UKBDuziRXkjGY+hQa6dSLk/56HFdPD3eMY2RWvCtVEoIbdr9oa7YrfeMSx9KzR0N5X3RPklVG5VCrjTcLaSTFLN+iZpA4DKMqtYoUTbLfP2eJvsiDMFMl2DbEdlI3fnduuCGgJol+3AEqnyrbr3auYzIks50sZzWA571fTz98zV+CTdC79ADLT3YtIKzgHHdmzceJSqjfQGHGlrDve04icrvSEURtrQYFwRuthk86J0h7sKCgUYMgbxjkiUzvBzPXyo9lNkuih2KvEztqWkmtanac0pY/MV16mIFLItTfEhvpsGTRMRwohAZ0GThDA9TSWPeyzp fgEdCdvL ZRJOnXKhsgHIgbMqiHWVvw2TgfL8sdkxXGZyjBVjfMRYxP9NYhYIJQe+QLJ7CwhpQ3fbpnQDIvSMXRxHW8Db9610MwC+aKrjelFjOAY2ssStE95lOSyivFl1tb7jt6gj+ikjQRDs7kVV0bcialLIQwz/BklhKFZ52iG0cpTD5k6TwdRrATseVRWd6iF0rWsH0lV4fD5TCDl0wWaB+aFRA1tmqvvzPyxBTaT9ZFmMtNhmvQkVXAWXE6T2YfuI0FUN/omteIEkdyHE+Rr93G4LkFv2NgHxnR0v+Y66EayutNdriYGBTergmxEPq67St1zPQ4QCMNE46ktee2W6n00IXSDEuMz6TyT87T22mExkHOZaCk4ivUl/HfLdHiASYyOUPjNYkyTUWV7QVP/ZgTWXdRlR1nIuCR5YfmFxMU5NTarAWnxjmq/h8jDPKo2VV3BiDF0MOMb7vORthcKuF4LyC+uHYMXuAAXJ/P1BixDqcRAlQ7nhQGZa644/m4g== 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 */