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 6D6C92EC08F for ; Tue, 16 Sep 2025 23:50:38 +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=1758066640; cv=none; b=o8040FogcR7C4Q58pehl3VSV9qF6XlznjWNrSbo+vrFCD9DpoR+jA6G2b9ZHgHxTK0vqci5FN3COsiWMFMnf2+HDvRJENNsy8bD0SvlcWR5xW1lJmztssTDqdFlsxyLVEJkgQIO/9cp5KtcREjWfmmVcOHViKhIOhj/aazKRx20= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758066640; c=relaxed/simple; bh=eIOFnuBbEEhNrCRJgPMN/EYiLsFJzBzjn8Hty6/2sSg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GDkFeu8Pxmk6ci+x61N62sFKT4PQaCKtibBsQCSxQzCHLFW+a6bKAnpedJU7YzPWkDu7iZAsDx6H5MuSxxn2QZ/cawUZngqtwjqMDXUiJ3MD31qp4gWogOKNnuw+X1whfSDyEJRkhsasxSoaxVzKGBL20Z8ehU4rHWuBYJ7cXDA= 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=bzxHvt25; 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="bzxHvt25" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7761b392d50so5402932b3a.0 for ; Tue, 16 Sep 2025 16:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758066638; x=1758671438; 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=yTOBSsCSO8daJuxMquSbd6R0XZgS18qgaXRjlxCtvSo=; b=bzxHvt25GSYTgODOFss1tC6Clyeti7GP4iIcle4aIwjSFBvbmvcMgBstuNl9n446VT EUgvApW4dC90mbgT5/swXD58lB+ClOiaCzbEMaKeeERP6ZquhIJPYuu5huOgHTMySiDA Cq/ulDpCdo4Eafh2ufz+KlTh7MgRelK4SLryGOvHXQyhJXd/kqGYKc8iZas8S/EgUqEv ItROCONN7QS/y0qd7ltkH42zPV+ps63cnjAbitcysd+tvOKXjZ8CejyLrjvu4evPinfE 6zvts9DTt1zsVjCgJM1I0J1wtNPeL2mufOdZcySXTCLplRvdgACJxtoL/c7bfxIpMFS6 u0dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758066638; x=1758671438; 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=yTOBSsCSO8daJuxMquSbd6R0XZgS18qgaXRjlxCtvSo=; b=SdjBrUL4xCA4tvEvtHKTvh5dvMVVQpfmlrnwnraOq9rW7US9DDgk5UVwoxo/9tnmuF 32hY74U8Hcnh+RBZJgTItAbBmR1hBFQSMkQVULFud7kaQQDAcWxKNCtbZUjEhEGc2PRe Q12leRW3Sh6jeNb4VQscwjhuac0Tnbxxrzp9UF3l+6VyJBOlR5nSvohazUxxc0JTUv2V Koeqr4WrdoFHDm5Ii1Tyz76JVZ7t5duDX+TC6hSQwa0+wVPEr5dCKF1Tm9t/pP9Io9ep kW4Knsm/DXU7xVqJ8IKqxGPb5XU458IeImoM/k65g+wWl4+xgezrAFt7aAPkl7cEsifa kByA== X-Forwarded-Encrypted: i=1; AJvYcCWtNZalvdpKE1jyo/Jb4heHR5oyL7pEmJrCGjZU4bxjGsyaBDs7U+0T7o66V3lyC3zkeRVmTbCS6w8=@vger.kernel.org X-Gm-Message-State: AOJu0YzwD3jpZFZmgoEfZqj/IaIzNbpkUpshrck66yHMF/0Hsegwhs7N bOqaaNrro9z4Im2J9ImOUJgTUBlup3Mq9muuWc4GP0d0gIgEdVsOHnhCHBrxnw== X-Gm-Gg: ASbGnctQTerv2nyoN0Pubk0Hs+H6W5jK5Knn0GUrMYei0amG6l4vJ06dqJVo8HhEmhj KMwfNnEzFD+7j9lFHF7KjTW4845BMvy40X1D7Fuv6NlR53YR5cu127Xg4pdN4ZNFhA0S9xLcvQz pAUkHeiJ1D8zBApCHlqfLJjNUEhP5RQ+KBLsqGBRY0Yhr+461cs5ngeoV3Wd1ZXD2SFM54MS38r OHW03kyZkoUEb2hdXBYpX4/0Or/kMfmBXxlJG3L0r3JQnKLNCTCP6LZ3GVXurXLFRXScYcu7ENJ vny7SixMe3j3xblPh+TFTp53gimcFBqhknJuBOZjSSHb4VO1CZiPONlbf3UXJx40bfl729mUCa9 htqJQSqBttrHpEbd8Db4yDwvpyeSc6CLk4KFBpzY1RWeAkJ4SRA== X-Google-Smtp-Source: AGHT+IECDExDzeNFXpW8LF+8Eh4/U2VcB9ARfSR+udYUrCEyTsOh9fUUukMEN4AkshjPHgZP49IV8g== X-Received: by 2002:a05:6a20:244d:b0:262:4378:9dd5 with SMTP id adf61e73a8af0-27aaf1ce777mr50260637.34.1758066637658; Tue, 16 Sep 2025 16:50:37 -0700 (PDT) Received: from localhost ([2a03:2880:ff:42::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b54b5568a82sm11608169a12.34.2025.09.16.16.50.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 16:50:37 -0700 (PDT) From: Joanne Koong To: brauner@kernel.org, miklos@szeredi.hu Cc: hch@infradead.org, djwong@kernel.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 v3 07/15] iomap: track read/readahead folio ownership internally Date: Tue, 16 Sep 2025 16:44:17 -0700 Message-ID: <20250916234425.1274735-8-joannelkoong@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250916234425.1274735-1-joannelkoong@gmail.com> References: <20250916234425.1274735-1-joannelkoong@gmail.com> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The purpose of "struct iomap_read_folio_ctx->cur_folio_in_bio" is to track folio ownership to know who is responsible for unlocking it. Rename "cur_folio_in_bio" to "cur_folio_owned" to better reflect this purpose and so that this can be generically used later on by filesystems that are not block-based. Since "struct iomap_read_folio_ctx" will be made a public interface later on when read/readahead takes in caller-provided callbacks, track the folio ownership state internally instead of exposing it in "struct iomap_read_folio_ctx" to make the interface simpler for end users. Signed-off-by: Joanne Koong --- fs/iomap/buffered-io.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 6c5a631848b7..587bbdbd24bc 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -352,7 +352,6 @@ static void iomap_read_end_io(struct bio *bio) struct iomap_read_folio_ctx { struct folio *cur_folio; - bool cur_folio_in_bio; void *read_ctx; struct readahead_control *rac; }; @@ -376,7 +375,6 @@ static void iomap_bio_read_folio_range(const struct iomap_iter *iter, sector_t sector; struct bio *bio = ctx->read_ctx; - ctx->cur_folio_in_bio = true; if (ifs) { spin_lock_irq(&ifs->state_lock); ifs->read_bytes_pending += plen; @@ -413,7 +411,7 @@ static void iomap_bio_read_folio_range(const struct iomap_iter *iter, } static int iomap_read_folio_iter(struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx) + struct iomap_read_folio_ctx *ctx, bool *cur_folio_owned) { const struct iomap *iomap = &iter->iomap; loff_t pos = iter->pos; @@ -450,6 +448,7 @@ static int iomap_read_folio_iter(struct iomap_iter *iter, folio_zero_range(folio, poff, plen); iomap_set_range_uptodate(folio, poff, plen); } else { + *cur_folio_owned = true; iomap_bio_read_folio_range(iter, ctx, pos, plen); } @@ -472,16 +471,22 @@ int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops) struct iomap_read_folio_ctx ctx = { .cur_folio = folio, }; + /* + * If an external IO helper takes ownership of the folio, it is + * responsible for unlocking it when the read completes. + */ + bool cur_folio_owned = false; int ret; trace_iomap_readpage(iter.inode, 1); while ((ret = iomap_iter(&iter, ops)) > 0) - iter.status = iomap_read_folio_iter(&iter, &ctx); + iter.status = iomap_read_folio_iter(&iter, &ctx, + &cur_folio_owned); iomap_bio_submit_read(&ctx); - if (!ctx.cur_folio_in_bio) + if (!cur_folio_owned) folio_unlock(folio); /* @@ -494,12 +499,13 @@ int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops) EXPORT_SYMBOL_GPL(iomap_read_folio); static int iomap_readahead_iter(struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx) + struct iomap_read_folio_ctx *ctx, + bool *cur_folio_owned) { int ret; while (iomap_length(iter)) { - if (ctx->cur_folio && !ctx->cur_folio_in_bio) + if (ctx->cur_folio && !*cur_folio_owned) folio_unlock(ctx->cur_folio); ctx->cur_folio = readahead_folio(ctx->rac); /* @@ -508,8 +514,8 @@ static int iomap_readahead_iter(struct iomap_iter *iter, */ if (WARN_ON_ONCE(!ctx->cur_folio)) return -EINVAL; - ctx->cur_folio_in_bio = false; - ret = iomap_read_folio_iter(iter, ctx); + *cur_folio_owned = false; + ret = iomap_read_folio_iter(iter, ctx, cur_folio_owned); if (ret) return ret; } @@ -542,15 +548,21 @@ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops) struct iomap_read_folio_ctx ctx = { .rac = rac, }; + /* + * If an external IO helper takes ownership of the folio, it is + * responsible for unlocking it when the read completes. + */ + bool cur_folio_owned = false; trace_iomap_readahead(rac->mapping->host, readahead_count(rac)); while (iomap_iter(&iter, ops) > 0) - iter.status = iomap_readahead_iter(&iter, &ctx); + iter.status = iomap_readahead_iter(&iter, &ctx, + &cur_folio_owned); iomap_bio_submit_read(&ctx); - if (ctx.cur_folio && !ctx.cur_folio_in_bio) + if (ctx.cur_folio && !cur_folio_owned) folio_unlock(ctx.cur_folio); } EXPORT_SYMBOL_GPL(iomap_readahead); -- 2.47.3