All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Chandan Babu R <chandan.babu@oracle.com>,
	"Darrick J. Wong" <djwong@kernel.org>,
	Hugh Dickins <hughd@google.com>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: Hui Su <sh_def@163.com>,
	linux-xfs@vger.kernel.org, linux-mm@kvack.org,
	Kent Overstreet <kent.overstreet@linux.dev>
Subject: [PATCH 18/22] xfs: add file_{get,put}_folio
Date: Mon, 19 Feb 2024 07:27:26 +0100	[thread overview]
Message-ID: <20240219062730.3031391-19-hch@lst.de> (raw)
In-Reply-To: <20240219062730.3031391-1-hch@lst.de>

From: "Darrick J. Wong" <djwong@kernel.org>

Add helper similar to file_{get,set}_page, but which deal with folios
and don't allocate new folio unless explicitly asked to, which map
to shmem_get_folio instead of calling into the aops.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Kent Overstreet <kent.overstreet@linux.dev>
---
 fs/xfs/scrub/trace.h |  2 ++
 fs/xfs/scrub/xfile.c | 74 ++++++++++++++++++++++++++++++++++++++++++++
 fs/xfs/scrub/xfile.h |  7 +++++
 3 files changed, 83 insertions(+)

diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h
index 0327cab606b070..c61fa7a95ef522 100644
--- a/fs/xfs/scrub/trace.h
+++ b/fs/xfs/scrub/trace.h
@@ -908,6 +908,8 @@ DEFINE_XFILE_EVENT(xfile_store);
 DEFINE_XFILE_EVENT(xfile_seek_data);
 DEFINE_XFILE_EVENT(xfile_get_page);
 DEFINE_XFILE_EVENT(xfile_put_page);
+DEFINE_XFILE_EVENT(xfile_get_folio);
+DEFINE_XFILE_EVENT(xfile_put_folio);
 
 TRACE_EVENT(xfarray_create,
 	TP_PROTO(struct xfarray *xfa, unsigned long long required_capacity),
diff --git a/fs/xfs/scrub/xfile.c b/fs/xfs/scrub/xfile.c
index 2229f0b7f9ca49..0cab9d529365bb 100644
--- a/fs/xfs/scrub/xfile.c
+++ b/fs/xfs/scrub/xfile.c
@@ -340,3 +340,77 @@ xfile_put_page(
 		return -EIO;
 	return 0;
 }
+
+/*
+ * Grab the (locked) folio for a memory object.  The object cannot span a folio
+ * boundary.  Returns the locked folio if successful, NULL if there was no
+ * folio or it didn't cover the range requested, or an ERR_PTR on failure.
+ */
+struct folio *
+xfile_get_folio(
+	struct xfile		*xf,
+	loff_t			pos,
+	size_t			len,
+	unsigned int		flags)
+{
+	struct inode		*inode = file_inode(xf->file);
+	struct folio		*folio = NULL;
+	unsigned int		pflags;
+	int			error;
+
+	if (inode->i_sb->s_maxbytes - pos < len)
+		return ERR_PTR(-ENOMEM);
+
+	trace_xfile_get_folio(xf, pos, len);
+
+	/*
+	 * Increase the file size first so that shmem_get_folio(..., SGP_CACHE),
+	 * actually allocates a folio instead of erroring out.
+	 */
+	if ((flags & XFILE_ALLOC) && pos + len > i_size_read(inode))
+		i_size_write(inode, pos + len);
+
+	pflags = memalloc_nofs_save();
+	error = shmem_get_folio(inode, pos >> PAGE_SHIFT, &folio,
+			(flags & XFILE_ALLOC) ? SGP_CACHE : SGP_READ);
+	memalloc_nofs_restore(pflags);
+	if (error)
+		return ERR_PTR(error);
+
+	if (!folio)
+		return NULL;
+
+	if (len > folio_size(folio) - offset_in_folio(folio, pos)) {
+		folio_unlock(folio);
+		folio_put(folio);
+		return NULL;
+	}
+
+	if (filemap_check_wb_err(inode->i_mapping, 0)) {
+		folio_unlock(folio);
+		folio_put(folio);
+		return ERR_PTR(-EIO);
+	}
+
+	/*
+	 * Mark the folio dirty so that it won't be reclaimed once we drop the
+	 * (potentially last) reference in xfile_put_folio.
+	 */
+	if (flags & XFILE_ALLOC)
+		folio_set_dirty(folio);
+	return folio;
+}
+
+/*
+ * Release the (locked) folio for a memory object.
+ */
+void
+xfile_put_folio(
+	struct xfile		*xf,
+	struct folio		*folio)
+{
+	trace_xfile_put_folio(xf, folio_pos(folio), folio_size(folio));
+
+	folio_unlock(folio);
+	folio_put(folio);
+}
diff --git a/fs/xfs/scrub/xfile.h b/fs/xfs/scrub/xfile.h
index 465b10f492b66d..afb75e9fbaf265 100644
--- a/fs/xfs/scrub/xfile.h
+++ b/fs/xfs/scrub/xfile.h
@@ -39,4 +39,11 @@ int xfile_get_page(struct xfile *xf, loff_t offset, unsigned int len,
 		struct xfile_page *xbuf);
 int xfile_put_page(struct xfile *xf, struct xfile_page *xbuf);
 
+#define XFILE_MAX_FOLIO_SIZE	(PAGE_SIZE << MAX_PAGECACHE_ORDER)
+
+#define XFILE_ALLOC		(1 << 0) /* allocate folio if not present */
+struct folio *xfile_get_folio(struct xfile *xf, loff_t offset, size_t len,
+		unsigned int flags);
+void xfile_put_folio(struct xfile *xf, struct folio *folio);
+
 #endif /* __XFS_SCRUB_XFILE_H__ */
-- 
2.39.2


  parent reply	other threads:[~2024-02-19  6:28 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-19  6:27 put the xfs xfile abstraction on a diet v4 Christoph Hellwig
2024-02-19  6:27 ` [PATCH 01/22] mm: move mapping_set_update out of <linux/swap.h> Christoph Hellwig
2024-02-19  6:27 ` [PATCH 02/22] shmem: move shmem_mapping out of line Christoph Hellwig
2024-02-19  6:27 ` [PATCH 03/22] shmem: set a_ops earlier in shmem_symlink Christoph Hellwig
2024-02-19  6:27 ` [PATCH 04/22] shmem: move the shmem_mapping assert into shmem_get_folio_gfp Christoph Hellwig
2024-02-19  6:27 ` [PATCH 05/22] shmem: export shmem_get_folio Christoph Hellwig
2024-02-19  6:27 ` [PATCH 06/22] shmem: export shmem_kernel_file_setup Christoph Hellwig
2024-02-19  6:27 ` [PATCH 07/22] shmem: document how to "persist" data when using shmem_*file_setup Christoph Hellwig
2024-02-19  6:27 ` [PATCH 08/22] xfs: use VM_NORESERVE in xfile_create Christoph Hellwig
2024-02-20 23:55   ` Dave Chinner
2024-02-19  6:27 ` [PATCH 09/22] xfs: shmem_file_setup can't return NULL Christoph Hellwig
2024-02-19  6:27 ` [PATCH 10/22] xfs: use shmem_kernel_file_setup in xfile_create Christoph Hellwig
2024-02-20 23:56   ` Dave Chinner
2024-02-21  2:17   ` Darrick J. Wong
2024-02-19  6:27 ` [PATCH 11/22] xfs: don't modify file and inode flags for shmem files Christoph Hellwig
2024-02-19  6:27 ` [PATCH 12/22] xfs: remove xfile_stat Christoph Hellwig
2024-02-19  6:27 ` [PATCH 13/22] xfs: remove the xfile_pread/pwrite APIs Christoph Hellwig
2024-02-19  6:27 ` [PATCH 14/22] xfs: don't try to handle non-update pages in xfile_obj_load Christoph Hellwig
2024-02-19  6:27 ` [PATCH 15/22] xfs: don't allow highmem pages in xfile mappings Christoph Hellwig
2024-02-19  6:27 ` [PATCH 16/22] xfs: use shmem_get_folio in xfile_obj_store Christoph Hellwig
2024-02-19  6:27 ` [PATCH 17/22] xfs: use shmem_get_folio in in xfile_load Christoph Hellwig
2024-02-19  6:27 ` Christoph Hellwig [this message]
2024-02-19  6:27 ` [PATCH 19/22] xfs: remove xfarray_sortinfo.page_kaddr Christoph Hellwig
2024-02-19  6:27 ` [PATCH 20/22] xfs: fix a comment in xfarray.c Christoph Hellwig
2024-02-19  6:27 ` [PATCH 21/22] xfs: convert xfarray_pagesort to deal with large folios Christoph Hellwig
2024-02-19  6:27 ` [PATCH 22/22] xfs: remove xfile_{get,put}_page Christoph Hellwig
2024-02-20 23:57   ` Dave Chinner
2024-02-21  2:17     ` Darrick J. Wong
2024-02-19 22:17 ` put the xfs xfile abstraction on a diet v4 Andrew Morton
2024-02-19 22:35 ` Hugh Dickins
2024-02-20  4:12 ` Chandan Babu R
2024-02-20 15:54   ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240219062730.3031391-19-hch@lst.de \
    --to=hch@lst.de \
    --cc=akpm@linux-foundation.org \
    --cc=chandan.babu@oracle.com \
    --cc=djwong@kernel.org \
    --cc=hughd@google.com \
    --cc=kent.overstreet@linux.dev \
    --cc=linux-mm@kvack.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sh_def@163.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.