From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 8939912D1F1 for ; Fri, 26 Sep 2025 00:29:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758846573; cv=none; b=HHHsR1Czcx9Cwbs3APIDRHMrrwMrXXanHleM58Qie76yiNcYNcHZ1P2EsK096bDXmYoN7xCOFkyVElbJ1Ev6SfbHh1Jyvy0ROcmsX4Yciy6eLdF5VDT/e553IJ8ATfuUQkPgiM+Ee0czL4bz4L1vmeHPl3cEtot7vVc81V2flfg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758846573; c=relaxed/simple; bh=Bb9XHeMlSIhgxocJi7zMkwUhCzQElY81IHbj2qnvjQw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PnzElIv6HzuExJJNkcExddtQ4EiTWUXqAWio/kTIY/iFdJd8fXZtB/rjMbnelajlOXYCRREyZgv2CnN16V5eZbv2Oh/DKUptaMHIdFopPQjW2/+j3y3OIN6q8JvVd2lTQXVLky+FDb7SXipG7ewxsj4NvtknQGvqXY1yqG/d5eg= 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=CXobwTje; arc=none smtp.client-ip=209.85.210.180 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="CXobwTje" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-78100be28easo1162898b3a.1 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=vger.kernel.org; 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=CXobwTje4Nh3A3GHc56icn4lMotNIQDzp1vesdjfYBO+BCp1Yxo2urrSbdo0Ks35/h //9EE0DqZSfwptrgRCPgHZ+zrVcYdAbCGzA4A+PoZ8PcE9E4DxkGTIyRo1pRj5oeZr1C dVAhtBo16W6umn5ZaVxBgR39ZxE3ZLYHtw/8hDYT7nUfrmYz64DBPt8qTKrN1O4E7EZ6 lvsArN8EfyYA1YeCFNplS/gSFTsNQdn0BV0JYJnHUHno0R8Kt82Y6zbvNZY/7FfzzHQX KNZtHbuIMVSf1eHxptdlXocSus8SJYtiTHTHCBv0SbbKk+PxI/aZMITnSNRR4LSD+iN9 tD5A== 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=h/buP0TLHgwBrCXuV0ENRmyaUWaOOBluG+94ZheIZ5Dev+2edGr0OmD9aS0rUhvdh+ fBkwK8ak3Cj8fGlJBKRO5TIGrDQmwXQ7iJkIlKrxfJcCnAVH8mKSxLnX5xSFuNujnxry A3eVVBqB5XGn1AOGfg0kibdG7NKlz5qcCC+Bq+NYKKEZoAyRQOuX4KnIkWFEhCS/pF+w 31fZIcBcsE/xhp4T33FTMMG96rP2oJSl89Y4wqzXuhSm82iJbvdtxh/LAxpZSwTZkhk9 kd4skihKsduHv2C+IZl3TFRdC+CzL98XO75iTO8/J8Vs/QpNnkbazH1nnfCLuP6TrTLy 9PVQ== X-Forwarded-Encrypted: i=1; AJvYcCW1oSDr20wL3SAIYZsZAW6dZ85uwptUfLRxP+FBrZmL3jdrRsz6XJsdAw1RDrZpSP/1J1iwPiHR62WONA==@vger.kernel.org X-Gm-Message-State: AOJu0Yy89G+FpWicOy54lEQ1nzewwdo5fGMyo5dAvawuyWDydt+mn0kt k73yL0d2GxXw9KruzXPGb69vQEgFaEtOcQ64P1osiD1SDsYu4TFTUr2L X-Gm-Gg: ASbGncs2VkG0HRbaqO1wLuULRlFfzs1ydIYeE7gJJXxRAsjkGK3jMZ7mA+jCXNnHjx2 kFqEaKsMcdYU9EZ5E9ebBs75ylIG6niHlTWgR+1E5fTciM6925tIp8mOA8Cj5IZID6wvqXfqYKt h2DyZ4/hZ8vb2Y7KpU+MvZP8r9RQIuIIeKXYZxgqxmJ5GhYGepEZuKchrIW5htMGS4umcBXNbiS e6pZEXEagj/MzMeQJXc125wfIZeoBAPNO88tXj7kN7YOfUixe4x1mhgFvr4XNx6FE0OaylJ5od5 JjHVMqGf2hf7yEvFE9kEkxqJt6rf+EKI+cvaIYwlWBcpX7PuGu0nsv/T+gLk4n51roJwty5ucm9 M1Hkrq4+xZNTtijLxecGk0JyavVmAsPtI4PPN6zk0mZQVKHwqDA== 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: linux-block@vger.kernel.org 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