]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
netfs: Cancel dirty folios that have no storage destination
authorDavid Howells <dhowells@redhat.com>
Mon, 29 Jul 2024 11:23:11 +0000 (12:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Oct 2024 10:03:18 +0000 (12:03 +0200)
[ Upstream commit 8f246b7c0a1be0882374f2ff831a61f0dbe77678 ]

Kafs wants to be able to cache the contents of directories (and symlinks),
but whilst these are downloaded from the server with the FS.FetchData RPC
op and similar, the same as for regular files, they can't be updated by
FS.StoreData, but rather have special operations (FS.MakeDir, etc.).

Now, rather than redownloading a directory's content after each change made
to that directory, kafs modifies the local blob.  This blob can be saved
out to the cache, and since it's using netfslib, kafs just marks the folios
dirty and lets ->writepages() on the directory take care of it, as for an
regular file.

This is fine as long as there's a cache as although the upload stream is
disabled, there's a cache stream to drive the procedure.  But if the cache
goes away in the meantime, suddenly there's no way do any writes and the
code gets confused, complains "R=%x: No submit" to dmesg and leaves the
dirty folio hanging.

Fix this by just cancelling the store of the folio if neither stream is
active.  (If there's no cache at the time of dirtying, we should just not
mark the folio dirty).

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/20240814203850.2240469-23-dhowells@redhat.com/
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/netfs/write_issue.c
include/trace/events/netfs.h

index 9486e54b1e563542a4071c3e2949b4399c58451d..b08673d97470c95c2efaef2ffb8724ca8e496f84 100644 (file)
@@ -410,13 +410,17 @@ static int netfs_write_folio(struct netfs_io_request *wreq,
        folio_unlock(folio);
 
        if (fgroup == NETFS_FOLIO_COPY_TO_CACHE) {
-               if (!fscache_resources_valid(&wreq->cache_resources)) {
+               if (!cache->avail) {
                        trace_netfs_folio(folio, netfs_folio_trace_cancel_copy);
                        netfs_issue_write(wreq, upload);
                        netfs_folio_written_back(folio);
                        return 0;
                }
                trace_netfs_folio(folio, netfs_folio_trace_store_copy);
+       } else if (!upload->avail && !cache->avail) {
+               trace_netfs_folio(folio, netfs_folio_trace_cancel_store);
+               netfs_folio_written_back(folio);
+               return 0;
        } else if (!upload->construct) {
                trace_netfs_folio(folio, netfs_folio_trace_store);
        } else {
index 606b4a0f92dae2763ec9f389aa3ae96ced962f81..edcc3b3a3ecf83f4f7344648652f85684d62fbfe 100644 (file)
        EM(netfs_streaming_cont_filled_page,    "mod-streamw-f+") \
        /* The rest are for writeback */                        \
        EM(netfs_folio_trace_cancel_copy,       "cancel-copy")  \
+       EM(netfs_folio_trace_cancel_store,      "cancel-store") \
        EM(netfs_folio_trace_clear,             "clear")        \
        EM(netfs_folio_trace_clear_cc,          "clear-cc")     \
        EM(netfs_folio_trace_clear_g,           "clear-g")      \