Patch "netfs, ceph: Revert "netfs: Remove deprecated use of PG_private_2 as a second writeback flag"" has been added to the 6.10-stable tree
Subsystems (4)
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
netfs, ceph: Revert "netfs: Remove deprecated use of PG_private_2 as a second writeback flag"
to the 6.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
netfs-ceph-revert-netfs-remove-deprecated-use-of-pg_private_2-as-a-second-writeback-flag.patch
and it can be found in the queue-6.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From 8e5ced7804cb9184c4a23f8054551240562a8eda Mon Sep 17 00:00:00 2001
From: David Howells <[email protected]>
Date: Tue, 30 Jul 2024 17:01:40 +0100
Subject: netfs, ceph: Revert "netfs: Remove deprecated use of PG_private_2 as a second writeback flag"
From: David Howells <[email protected]>
commit 8e5ced7804cb9184c4a23f8054551240562a8eda upstream.
This reverts commit ae678317b95e760607c7b20b97c9cd4ca9ed6e1a.
Revert the patch that removes the deprecated use of PG_private_2 in netfslib for the moment as Ceph is actually still using this to track data copied to the cache.
https: //lore.kernel.org/r/[email protected]
--- fs/ceph/addr.c | 19 +++++ fs/netfs/buffered_read.c | 8 ++ fs/netfs/io.c | 144 +++++++++++++++++++++++++++++++++++++++++++ include/trace/events/netfs.h | 1 4 files changed, 170 insertions(+), 2 deletions(-)
fs/ceph/addr.c +18 -1
@@ -498,6 +498,11 @@ const struct netfs_request_ops ceph_netf };#ifdef CONFIG_CEPH_FSCACHE +static void ceph_set_page_fscache (struct page *page) +{ +folio_start_private_2 (page_folio (page));/* [DEPRECATED] */ +} +static void ceph_fscache_write_terminated (void *priv,ssize_t error,bool was_async) {struct inode *inode = priv;
@@ -515,6 +520,10 @@ static void ceph_fscache_write_to_cache( ceph_fscache_write_terminated, inode, true, caching); }#else +static inline void ceph_set_page_fscache (struct page *page) +{ +} +static inline void ceph_fscache_write_to_cache (struct inode *inode,u64 off,u64 len,bool caching) { }
@@ -706,6 +715,8 @@ static int writepage_nounlock(struct pag len = wlen;set_page_writeback (page); +if (caching) +ceph_set_page_fscache (page);ceph_fscache_write_to_cache (inode, page_off, len, caching);if (IS_ENCRYPTED (inode)) {
@@ -789,6 +800,8 @@ static int ceph_writepage(struct page *preturn AOP_WRITEPAGE_ACTIVATE ; } +folio_wait_private_2 (page_folio (page));/* [DEPRECATED] */ + err =writepage_nounlock (page, wbc);if (err == -ERESTARTSYS ) {/* direct memory reclaimer was killed by SIGKILL. return 0
@@ -1062,7 +1075,8 @@ get_more_pages:unlock_page (page);break ; } -if (PageWriteback (page)) { +if (PageWriteback (page) || +PagePrivate2 (page)/* [DEPRECATED] */ ) {if (wbc->sync_mode ==WB_SYNC_NONE ) {doutc (cl,"%p under writeback\n" , page);unlock_page (page);
@@ -1070,6 +1084,7 @@ get_more_pages: }doutc (cl,"waiting on writeback %p\n" , page);wait_on_page_writeback (page); +folio_wait_private_2 (page_folio (page));/* [DEPRECATED] */ }if (!clear_page_dirty_for_io (page)) {
@@ -1254,6 +1269,8 @@ new_request: }set_page_writeback (page); +if (caching) +ceph_set_page_fscache (page); len +=thp_size (page); }ceph_fscache_write_to_cache (inode, offset, len, caching);
fs/netfs/buffered_read.c +7 -1
@@ -466,7 +466,7 @@ retry:if (!netfs_is_cache_enabled (ctx) &&netfs_skip_folio_read (folio, pos, len, false)) {netfs_stat (&netfs_n_rh_write_zskip); - goto have_folio; + goto have_folio_no_wait; } rreq = netfs_alloc_request(mapping, file,
@@ -507,6 +507,12 @@ retry:netfs_put_request (rreq, false, netfs_rreq_trace_put_return); have_folio: +if (test_bit (NETFS_ICTX_USE_PGPRIV2 , &ctx->flags)) { + ret =folio_wait_private_2_killable (folio); +if (ret <0 ) + goto error; + } +have_folio_no_wait: *_folio = folio;kleave (" = 0" );return 0 ;
fs/netfs/io.c +144 -0
156 lines not on this page · raw message
include/trace/events/netfs.h +1 -0
@@ -145,6 +145,7 @@ EM(netfs_folio_trace_clear_g, "clear-g") \ EM(netfs_folio_trace_clear_s, "clear-s") \ EM(netfs_folio_trace_copy_to_cache, "mark-copy") \ + EM(netfs_folio_trace_end_copy, "end-copy") \ EM(netfs_folio_trace_filled_gaps, "filled-gaps") \ EM(netfs_folio_trace_kill, "kill") \EM (netfs_folio_trace_kill_cc,"kill-cc" ) \
Patches currently in stable-queue which might be from [email protected] are
queue-6.10/netfs-ceph-revert-netfs-remove-deprecated-use-of-pg_private_2-as-a-second-writeback-flag.patch