From patchwork Wed Jan 25 21:06:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13116175 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 B1460C27C76 for ; Wed, 25 Jan 2023 21:07:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47A2E6B007E; Wed, 25 Jan 2023 16:07:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4036B6B0080; Wed, 25 Jan 2023 16:07:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A3386B0081; Wed, 25 Jan 2023 16:07:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1CBC06B007E for ; Wed, 25 Jan 2023 16:07:24 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B043C1A0E6F for ; Wed, 25 Jan 2023 21:07:23 +0000 (UTC) X-FDA: 80394557166.30.DD45F48 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id E001410000E for ; Wed, 25 Jan 2023 21:07:21 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dWSPeEO6; spf=pass (imf05.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=1674680841; a=rsa-sha256; cv=none; b=BlqqoOADBm+JEMAxIdKpWDus5hI7i5HLGD0EfvRfLgxglvael3KHSRjBQjWV2+c3RBIoZY qzLIEJ9NCQTHRMEF59tsoSPM9R4Dc+P5jLKYPgVW2HtDC0+8O1w3i8xFney8LHEQ18pIVq ZADZ7/LxqAFeuCapE2tYDgeBwTjp0RU= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dWSPeEO6; spf=pass (imf05.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=1674680841; 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=NpRga8VxfxN6lE75EkYWgLaBl9tiTC43SRcsCFIIcl8=; b=1DCJYFuJXbAzNlnMVnQf8bfZfjmi1YV9oaTPd/NWaRhjMW2y+SpRNBYU28Upq9YR4nIMRd 4l9eNIeit9WAgLsQ+YRp4Z6Tii6njSlFAlS30XK5byHVSgEmQ9FyFmpTJwE/NaaXLqYnzM 0K3VdSgkrwTDwI4I9EFyXq1MH4rJVsg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674680841; 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=NpRga8VxfxN6lE75EkYWgLaBl9tiTC43SRcsCFIIcl8=; b=dWSPeEO6BWUi4bZUpbKDr3Eba1wjKKYrC07/V6HlVao1jjpFknGjjfUi4VZO7mte07K0GO E5aPd58N7Us/tO/f7NYELfhwgjvUtyGUORbnSgPzmttkqlxcNOZUj2WjyKztKbu63s/8Nn p5xvMIkcU2+lv5qe9P1SB3S16wBjDAU= 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-643-AkuViztfMFmk_DNAx--MGQ-1; Wed, 25 Jan 2023 16:07:18 -0500 X-MC-Unique: AkuViztfMFmk_DNAx--MGQ-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 29AE6858F09; Wed, 25 Jan 2023 21:07:17 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.33.36.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22ED4492B02; Wed, 25 Jan 2023 21:07:15 +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 v10 5/8] block: Replace BIO_NO_PAGE_REF with BIO_PAGE_REFFED with inverted logic Date: Wed, 25 Jan 2023 21:06:54 +0000 Message-Id: <20230125210657.2335748-6-dhowells@redhat.com> In-Reply-To: <20230125210657.2335748-1-dhowells@redhat.com> References: <20230125210657.2335748-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspam-User: X-Rspamd-Queue-Id: E001410000E X-Rspamd-Server: rspam01 X-Stat-Signature: nh9tbr7cgjgmyx84sg8sk9n7z5yqr63i X-HE-Tag: 1674680841-687856 X-HE-Meta: U2FsdGVkX18RoWrPfACiuezEaiSRu+vgXzi04NMKlsTGAuYfesXt/V6qRyl5gONpYVwOS2HNlbPQeseiUyXpbNxKqLoeePbPzWXqvtA7FFw2jbJ5QjVUzeNYBx1Q9RwIxq9Z8OhStq+pGuq3ORxTy0BA0iYbHwJq+eqZJvn8m37lSw4iIzw09fmSwidkcG4u4o05H9r737EydANoI6JsWvOyT+4Vp7ov5lP3ir2qJs9Ya9GRoULwiMPI1DcWWugmdkYCGsq480aqxj+xjaKcn0cexKZsik8RnEeLNU6qtbVGvIiH0lelJziD+nZw3MfQTsTCjcrq1luF294Ig3pQ1PKZYlLvzD8XlGfnf65ELUT6YA0p48mxhwT/BwCMJ84Nkq4+bHfWMZH+cU1Uwmn454YwN08vLF3i6brK/4jAgimgcsNIU9JSLuQ3yjz/Y6X91Gj+7yQxneWM0/c2XI39lPl058EXPwtK5oNO73TBD7iKO4RaiOZ4+INm93HUdU32SukVmfS4IpFo4NMnZh99iC2jrFSyonQKkRmb8GzxLApgHGdjA/8xW9vZGZTKpXt/n4tMgvzNOpzBN/53eSP6B8YSXjHbku66nzp+kXx+yOS8Hz2K4v9Wmdxe9yddhwRXm3D3+lPNAnb5mKseVECug4rvcckE80Ot1ZUkh3AE4DyKutxUx5Q5K0N4xnim9b9u+hv7+h8q05gRsLH/Df/yetgyrnEel2zE4kKP0tivhMF/hPgNFnXIXfc3YTdLknkqbbQUkSpwBIjF67CCle3OpO3jMM706fxKaUeFygpf7zvBE+XgNvqBC10AU5DXhiI5dgf0S8rM27NTwD8ZTct+QX7TPBd2Wmrj/CiaiBm84XygM0v6XmTQ3/6N+Uvzab4rMXRPOjtZj4dqzDn8CtVSAlBQkdiQ2vyhxi/1Q5UfB2o5BcOZDXxsBkrblSr5HZL3yqeEsPccw5MoFFwKyEF 7ZjQ7tcz L/c77XT0DHWY+gOTxrt/dxTaoqgNx1SzSUnyjCnstNBDXeulgLrTxwMmZJo0qDX3vUGayufKVDwbS04TL9zGrq/1R1C9c0PxkQ0/aMAtHiw1gkNOBCkKbUYP0DMc/xDNXpUJRbyf1+FbUZvcUS1TLHwMI782oP9o+kAXBSHMtD3X45jUBChDDGk0mebejIUa24nKX6FD6JYnTVdHKSAnRQx2T22qsfWRKnFWpn5VuUsi10qNJ1/3YSpnnRBHECN6eLjg2GxKb3paEKkkFgTkha95ze7m1ptpCR+kRRoNp8rOmMNQHsXsDGp4/+xeYUsPhT9AclMRWa+LUjetlO+JKMNOO2IlnNSxpvWFqfGcdPiQzxYQTLcX3xpEUneqoWzgYPx5wuOZHFBfoXc/Sh08yyq5jaK6J4A+gLhdxoSPdCCMAlrA5WU2XzgUrCrZBphLY+F1kR1Fy4FOmz8uMuf7cExFiq4HhZZqvn8HzvFJh8Z5MP8mh64pPgFQVVA== 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: 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 Reviewed-by: David Hildenbrand --- Notes: ver #8) - 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 683444e6b711..851c23641a0d 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 7db52ad5b2d0..0e2b0a861ba3 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 */