From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 B93D71EBFF7 for ; Tue, 23 Sep 2025 00:34:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758587646; cv=none; b=XkakNNyqHTiLrV5hBWiZW6PJsjObZm6t+1r5bQNUStrJEQXUSRHuARBl76acS4EZFiP0Mzy2KgjhOKqFTwwSFmkScRXhJk6eMVGz3j5r84RAWDuV1fF5SOcqZEboads9kYOBvUGLhu5xuxZHnHVOfnQKyrdU7SekFOW8qCabt1A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758587646; c=relaxed/simple; bh=wL9lZimimYPepUkw6uokO76yAdo/rrFpXRGxdT20nX8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GOYUTn39e3Wl1OKOsZcjiaiJQUJ9iznA/ZyAhrkfs1uKojAu4oL+fmQ4ySNrf+yYKxAVa0KNNpcHCR1owLpqsYMoSs9ZBWWk+/gSf0m3Tvaw4aScwCImnl24k2UPswIYkf2VceNvq5LhMPj8rK92qka9rWLGLPRxrtZfBKZTw8g= 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=aCcGPBPf; arc=none smtp.client-ip=209.85.215.176 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="aCcGPBPf" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-b551b040930so2189826a12.2 for ; Mon, 22 Sep 2025 17:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758587644; x=1759192444; 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=K5LoytNdOZjWYJW/+eSct1yfmQv94J0ZLKj78CJDynY=; b=aCcGPBPfMr2uG6WKESyUGdPsgiiIahPLQgBbCQOS7q9zHQsyIDd9McjV8lgKSENFq/ 7OdYCJglsYyXBIjxndB+wk/mlX7PBguZB7P5WmklHea0OB1rdk+nVb+Dgw6AaEIS6esh 7g/COTeCpOdU8UeGgYtRj43Kl5PDdaGtyzJ91fTVbxLdBhyJmE7H9/Ah5+j9O5n/hNDY I8L93nQieGJ+FacpgRM0pbgPFkthIQGUSeRljqtautCI++B4VAZPNPSKTagylzjAsZOs WPPqnZUKSYsl/p7cbFPuEKXoAfJtqtemmYkwpm805L8Ajk0S9ycxEWnhWnePtM8eSSMP KpYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758587644; x=1759192444; 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=K5LoytNdOZjWYJW/+eSct1yfmQv94J0ZLKj78CJDynY=; b=g/dmMOYi2VkRJUnLgXdEWdrl2BG+1sRBApBVntSGI3xWj9bzhJoOtHdjUa6usGv+Fv aDy24po9mWe4+ro+mA+IIYzgfe2SSnzOlYKENWa4xVh/9/nfDX9EcYGZXkYfHUX0DRt8 GsuGGscrWCftU4MpCJ3zUuU6R8osJxqiFJtv9sJ0t7Hzpg0BEBurIxDyrHJUbNP4DF1c yvRJ+t/kvWHqbetmQiZyW6cBs88B/NRQEz3t1aon1GUo7cN/KURTxeRpdFn1KZlLVlhC yiXUD/YktiWI5OB9SY6fUBnl7Yv4hufoFlNnfd9dtnLs+lFg64t4gpCoe9bJHL3ccbu9 cXDQ== X-Forwarded-Encrypted: i=1; AJvYcCU+TJjVzeX8m3zo2gKFQ5mlu88SfUXMtLity9BXP3aF7U3xdUsS7ZDWmVKmubqN5vmOaiPBUbwdfLin1Q==@vger.kernel.org X-Gm-Message-State: AOJu0YzBRZcqk06TtFEhZr4nW1YR/AL52+UgRhMqSd81qkE1vyWRO8PJ QP7d7p/cAUA27eg4rAoDYXNLp7X7fJWx8vNNsqc5bwueqmhTHLTUyRcC X-Gm-Gg: ASbGnct+83qde7Pxd68Mq0IZYfcUFJVlXzvaRwbHqk2skEmyEU69stOsORfIe5RpTn+ pEjC2UNm63K0G95wNEoqqDclk4kkbOd+drTmQxTE6hkuBoYAsPc0xva4F7PI8u8gB0ny1juar9p l5xpWkcigEW0GcGmTPtodB/xkXh2HnH2FlB36b7mvsSetRQ8VOpmEwZNUJDtyuTUX+ujPlCTGKA 0rE0a1RlLegZBj/Yl7Cw7fKjIft/8P4euIGIEF5ULoiS8AcYjWCPUphpe5Jv8/LvErsWvgD8Oob tb3sVmOUXi7G8jUGeu1Ui5u45UT2eWC1QGPbBbfj72CH1U4jY3nYnjNA61hilA00le/XKZuU794 QxLm5GArx+CDbwLZYz5QifEq1McYsu6zXYibYKy0XFGZlsO5wNg== X-Google-Smtp-Source: AGHT+IE2rDd9Yyv5lah4zvV6w6qJu6a1A3PLSQl9h6wVx4RGpLkLw8rukfKuDkaefPlT+C3jXqTA3w== X-Received: by 2002:a17:903:2ac5:b0:264:ee2:c3f5 with SMTP id d9443c01a7336-27cc22efd33mr7650465ad.19.1758587643804; Mon, 22 Sep 2025 17:34:03 -0700 (PDT) Received: from localhost ([2a03:2880:ff:41::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2698030ee20sm145121615ad.109.2025.09.22.17.34.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Sep 2025 17:34:03 -0700 (PDT) From: Joanne Koong To: brauner@kernel.org, miklos@szeredi.hu Cc: djwong@kernel.org, hch@infradead.org, linux-block@vger.kernel.org, gfs2@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-doc@vger.kernel.org, hsiangkao@linux.alibaba.com, kernel-team@meta.com, Christoph Hellwig Subject: [PATCH v4 08/15] iomap: add public start/finish folio read helpers Date: Mon, 22 Sep 2025 17:23:46 -0700 Message-ID: <20250923002353.2961514-9-joannelkoong@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250923002353.2961514-1-joannelkoong@gmail.com> References: <20250923002353.2961514-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 Move ifs read_bytes_pending increment logic into a separate helper, iomap_start_folio_read(), which will be needed later on by caller-provided read callbacks (added in a later commit) for read/readahead. This is the counterpart to the currently existing iomap_finish_folio_read(). Make iomap_start_folio_read() and iomap_finish_folio_read() publicly accessible. These need to be accessible in order for caller-provided read callbacks to use. Signed-off-by: Joanne Koong Reviewed-by: "Darrick J. Wong" Reviewed-by: Christoph Hellwig --- fs/iomap/buffered-io.c | 26 +++++++++++++++++--------- include/linux/iomap.h | 3 +++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 34df1cddf65c..469079524208 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -327,9 +327,20 @@ static int iomap_read_inline_data(const struct iomap_iter *iter, return 0; } -#ifdef CONFIG_BLOCK -static void iomap_finish_folio_read(struct folio *folio, size_t off, - size_t len, int error) +void iomap_start_folio_read(struct folio *folio, size_t len) +{ + struct iomap_folio_state *ifs = folio->private; + + if (ifs) { + spin_lock_irq(&ifs->state_lock); + ifs->read_bytes_pending += len; + spin_unlock_irq(&ifs->state_lock); + } +} +EXPORT_SYMBOL_GPL(iomap_start_folio_read); + +void iomap_finish_folio_read(struct folio *folio, size_t off, size_t len, + int error) { struct iomap_folio_state *ifs = folio->private; bool uptodate = !error; @@ -349,7 +360,9 @@ static void iomap_finish_folio_read(struct folio *folio, size_t off, if (finished) folio_end_read(folio, uptodate); } +EXPORT_SYMBOL_GPL(iomap_finish_folio_read); +#ifdef CONFIG_BLOCK static void iomap_read_end_io(struct bio *bio) { int error = blk_status_to_errno(bio->bi_status); @@ -379,17 +392,12 @@ static void iomap_bio_read_folio_range(const struct iomap_iter *iter, { struct folio *folio = ctx->cur_folio; const struct iomap *iomap = &iter->iomap; - struct iomap_folio_state *ifs = folio->private; size_t poff = offset_in_folio(folio, pos); loff_t length = iomap_length(iter); sector_t sector; struct bio *bio = ctx->read_ctx; - if (ifs) { - spin_lock_irq(&ifs->state_lock); - ifs->read_bytes_pending += plen; - spin_unlock_irq(&ifs->state_lock); - } + iomap_start_folio_read(folio, plen); sector = iomap_sector(iomap, pos); if (!bio || bio_end_sector(bio) != sector || diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 4469b2318b08..edc7b3682903 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -465,6 +465,9 @@ ssize_t iomap_add_to_ioend(struct iomap_writepage_ctx *wpc, struct folio *folio, loff_t pos, loff_t end_pos, unsigned int dirty_len); int iomap_ioend_writeback_submit(struct iomap_writepage_ctx *wpc, int error); +void iomap_start_folio_read(struct folio *folio, size_t len); +void iomap_finish_folio_read(struct folio *folio, size_t off, size_t len, + int error); void iomap_start_folio_write(struct inode *inode, struct folio *folio, size_t len); void iomap_finish_folio_write(struct inode *inode, struct folio *folio, -- 2.47.3