netfs, ceph: Partially revert "netfs: Replace PG_fscache by setting folio->private...

This partially reverts commit 2ff1e97587f4d398686f52c07afde3faf3da4e5c.

In addition to reverting the removal of PG_private_2 wrangling from the
buffered read code[1][2], the removal of the waits for PG_private_2 from
netfs_release_folio() and netfs_invalidate_folio() need reverting too.

It also adds a wait into ceph_evict_inode() to wait for netfs read and
copy-to-cache ops to complete.

Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Signed-off-by: David Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk
Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8e5ced7804cb9184c4a23f8054551240562a8eda
Link: https://lore.kernel.org/r/20240814203850.2240469-2-dhowells@redhat.com
cc: Max Kellermann <max.kellermann@ionos.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 71cd70514efa5562bbee937b176f6431abd59363..4a8eec46254b1695be4ed9292c83a34544a0d8f1 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -695,6 +695,7 @@ void ceph_evict_inode(struct inode *inode)
 
        percpu_counter_dec(&mdsc->metric.total_inodes);
 
+       netfs_wait_for_outstanding_io(inode);
        truncate_inode_pages_final(&inode->i_data);
        if (inode->i_state & I_PINNING_NETFS_WB)
                ceph_fscache_unuse_cookie(inode, true);

diff --git a/fs/netfs/misc.c b/fs/netfs/misc.c
index 83e644bd518f3f037a7621a697bbaca5fa698585..554a1a4615adee3a9d5eba8f5cd4d233ea452d09 100644 (file)
--- a/fs/netfs/misc.c
+++ b/fs/netfs/misc.c
@@ -101,6 +101,8 @@ void netfs_invalidate_folio(struct folio *folio, size_t offset, size_t length)
 
        _enter("{%lx},%zx,%zx", folio->index, offset, length);
 
+       folio_wait_private_2(folio); /* [DEPRECATED] */
+
        if (!folio_test_private(folio))
                return;
 
@@ -165,6 +167,11 @@ bool netfs_release_folio(struct folio *folio, gfp_t gfp)
 
        if (folio_test_private(folio))
                return false;
+       if (unlikely(folio_test_private_2(folio))) { /* [DEPRECATED] */
+               if (current_is_kswapd() || !(gfp & __GFP_FS))
+                       return false;
+               folio_wait_private_2(folio);
+       }
        fscache_note_page_release(netfs_i_cookie(ctx));
        return true;
 }