From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 866A3170A11 for ; Fri, 26 Sep 2025 00:29:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758846572; cv=none; b=SYljIHq95eJjBylL4jxutEANtJ+PPUY9TYDKPSjn58bxiUu9aZule8i6zKUWctQmwPUkDvAyVExOj2Ocp1v/c6OBf6Fu32HN0ZjEqBHh9e1uxTQr2Wq/RTSVuZ1M+eQcIrg5ndD1dNw7oE8HxzvagPmmtJpDkjcs6jrXmjXJqAw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758846572; c=relaxed/simple; bh=Bb9XHeMlSIhgxocJi7zMkwUhCzQElY81IHbj2qnvjQw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VznpwLl3HLccSwceZftaQDpsdtQy5jS6v4I+ea6V65Ntb5zojXVb2PHIxO2iJenlyIIgpeNXF4gjyZ5XMhc8j+qp/OmMnSBWUkv2Va3emGfHrvVa7g4qsq9LXDricbtraGknjNkOM/IoCaUgplaXxh+otUFLV2JRxPIvxcAHtd0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JowmS6C5; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JowmS6C5" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-77f41086c11so1518454b3a.0 for ; Thu, 25 Sep 2025 17:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758846570; x=1759451370; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UcpVeAYougECMqYDjv+WTibeO0LuSWTiGkan9JcZFA0=; b=JowmS6C5sJeV7x1nuWLKQjz429cgr5E6E1AzzJP90/HH8cxprzlGGz2TzfTIfHM1RY u9w3kHBq38XVd53SxIwLvVfi05ZZRzWLoidRerOAbfB6kguBl+zztPSvhOGlB3AhAffG xq83/HqRLmiMtVwXxL+KSOQmjmXKZCBygeXB+W6uuhUw2JDESZWsxBrG4Dj3Isshko9x /V5nDWp71/Ue27CirP0chHKMjYPUExwYk8x8yAQIzwMmUgjSGZ+zNgxcq1SsHmCufxcn ahfyh2cVCvi46336XUSJNZhhcqtHLjpEgEB+RMyAlDDMBQm320yN5L9VGarFXVhi0b3F qBew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758846570; x=1759451370; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UcpVeAYougECMqYDjv+WTibeO0LuSWTiGkan9JcZFA0=; b=QfnQQ6VDLeYqKMTvCAVtQGhE4wv9HCZpkz1S/P9tj9WdatObuEaLLnW1Wv1c4Jlw/Q 2FkAuDemkmg0Rg6zRFjjtuISvN1e79Xuc7BbDj2u6ap5eUfZuaZ02Rg4qX04X9qwYMqF HfW9U+UwFyjM1Mtb0esXEe7I8nG9BFBKtcneznC3/9fYyNhJieiFUzhOH1Hxhy6VClA5 4+OQpff+mVYvhB7Jovr2ZRXS7NQGe9lI4u6BxVqE1tF6Se1eI4U8H2zTjRNqn61GNvm2 l7zoBoRBA9apDGmvxCug/3j/4LrQYHgxH5smM6bTw3Fj64WIWWoDV8qJqT6dYpCLzCch OVSQ== X-Forwarded-Encrypted: i=1; AJvYcCUANnrOVMDNMgw5u+0MPzpKQDypEGLnvYoR6ZXbx4YrIktDEV3R2eAVBij7/TbxQD8t/KMH@lists.linux.dev X-Gm-Message-State: AOJu0Ywt9vI0im4dfWNdHOf9v02YLkazUXKuf4VLzgo6DiQTWtwKCMgi 1QcK6rezhB6JrcW1fKyU10ttzuzeHv3RxHNAmESilsC4yZNR+I7L4dRC X-Gm-Gg: ASbGncvhNiws6QLXydVh9SdPCBNvSQAb2Z0lb2C+jZ1EN6nar5us/eoCXNHcRVpGMp7 6aA7DPQ9Oj27AU5RLxg/Sy8ZckNgN6jbKXsecrUOxBzX04j4+OCBwCXt2nums85qjIRbzKX/rOY kQz4XBDLW41J/RrUxz2L/uJyOM1+RpawzUpsHeH646klRtUg6EQ3kLuTAxi3WpRTMYOc7u86QG7 sjVk/UCUXoIViBd0GjlkL5ii9knKTTb1rM7xfZM/cQPyS1btT6oh3mKkt+K+X8bZhApDsy3O7dK wuqnbd4Y6mRrzzJd3QKdvVSYOpVonbSDwb5jSTK/MYysOzdLqFBdjnsaRIk5ynIUspNLgDLYRiE ErKftHlZECvpJeaanA2zFJW2JLXZYdW/erLwLUBxiFYW+ZWBCbQ== X-Google-Smtp-Source: AGHT+IE91xeIbJoMIgNgyO/VNwoiIUYpZQSjScYdCH6vsO7wqyXKLToHX1mNo7t9dJIby0AcE/ZZqg== X-Received: by 2002:a05:6a20:5604:b0:2f2:f7d6:4803 with SMTP id adf61e73a8af0-2f2f7d648a4mr1387026637.16.1758846569813; Thu, 25 Sep 2025 17:29:29 -0700 (PDT) Received: from localhost ([2a03:2880:ff:7e::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3343621d2e3sm1807110a91.5.2025.09.25.17.29.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 17:29:29 -0700 (PDT) From: Joanne Koong To: brauner@kernel.org, miklos@szeredi.hu Cc: djwong@kernel.org, hch@infradead.org, hsiangkao@linux.alibaba.com, linux-block@vger.kernel.org, gfs2@lists.linux.dev, linux-fsdevel@vger.kernel.org, kernel-team@meta.com, linux-xfs@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v5 03/14] iomap: store read/readahead bio generically Date: Thu, 25 Sep 2025 17:25:58 -0700 Message-ID: <20250926002609.1302233-4-joannelkoong@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250926002609.1302233-1-joannelkoong@gmail.com> References: <20250926002609.1302233-1-joannelkoong@gmail.com> Precedence: bulk X-Mailing-List: gfs2@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Store the iomap_readpage_ctx bio generically as a "void *read_ctx". This makes the read/readahead interface more generic, which allows it to be used by filesystems that may not be block-based and may not have CONFIG_BLOCK set. Signed-off-by: Joanne Koong Reviewed-by: "Darrick J. Wong" --- fs/iomap/buffered-io.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index f8b985bb5a6b..b06b532033ad 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -363,13 +363,13 @@ static void iomap_read_end_io(struct bio *bio) struct iomap_readpage_ctx { struct folio *cur_folio; bool cur_folio_in_bio; - struct bio *bio; + void *read_ctx; struct readahead_control *rac; }; static void iomap_bio_submit_read(struct iomap_readpage_ctx *ctx) { - struct bio *bio = ctx->bio; + struct bio *bio = ctx->read_ctx; if (bio) submit_bio(bio); @@ -384,6 +384,7 @@ static void iomap_bio_read_folio_range(const struct iomap_iter *iter, size_t poff = offset_in_folio(folio, pos); loff_t length = iomap_length(iter); sector_t sector; + struct bio *bio = ctx->read_ctx; ctx->cur_folio_in_bio = true; if (ifs) { @@ -393,9 +394,8 @@ static void iomap_bio_read_folio_range(const struct iomap_iter *iter, } sector = iomap_sector(iomap, pos); - if (!ctx->bio || - bio_end_sector(ctx->bio) != sector || - !bio_add_folio(ctx->bio, folio, plen, poff)) { + if (!bio || bio_end_sector(bio) != sector || + !bio_add_folio(bio, folio, plen, poff)) { gfp_t gfp = mapping_gfp_constraint(folio->mapping, GFP_KERNEL); gfp_t orig_gfp = gfp; unsigned int nr_vecs = DIV_ROUND_UP(length, PAGE_SIZE); @@ -404,22 +404,21 @@ static void iomap_bio_read_folio_range(const struct iomap_iter *iter, if (ctx->rac) /* same as readahead_gfp_mask */ gfp |= __GFP_NORETRY | __GFP_NOWARN; - ctx->bio = bio_alloc(iomap->bdev, bio_max_segs(nr_vecs), - REQ_OP_READ, gfp); + bio = bio_alloc(iomap->bdev, bio_max_segs(nr_vecs), REQ_OP_READ, + gfp); /* * If the bio_alloc fails, try it again for a single page to * avoid having to deal with partial page reads. This emulates * what do_mpage_read_folio does. */ - if (!ctx->bio) { - ctx->bio = bio_alloc(iomap->bdev, 1, REQ_OP_READ, - orig_gfp); - } + if (!bio) + bio = bio_alloc(iomap->bdev, 1, REQ_OP_READ, orig_gfp); if (ctx->rac) - ctx->bio->bi_opf |= REQ_RAHEAD; - ctx->bio->bi_iter.bi_sector = sector; - ctx->bio->bi_end_io = iomap_read_end_io; - bio_add_folio_nofail(ctx->bio, folio, plen, poff); + bio->bi_opf |= REQ_RAHEAD; + bio->bi_iter.bi_sector = sector; + bio->bi_end_io = iomap_read_end_io; + bio_add_folio_nofail(bio, folio, plen, poff); + ctx->read_ctx = bio; } } -- 2.47.3