afs: Copy local writes to the cache when writing to the server

When writing to the server from afs_writepage() or afs_writepages(), copy
the data to the cache object too.

To make this possible, the cookie must have its active users count
incremented when the page is dirtied and kept incremented until we manage
to clean up all the pages.  This allows the writeback to take place after
the last file struct is released.

Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: kafs-testing@auristor.com
Acked-by: Jeff Layton <jlayton@kernel.org>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
cc: linux-cachefs@redhat.com
Link: https://lore.kernel.org/r/163819662333.215744.7531373404219224438.stgit@warthog.procyon.org.uk/
Link: https://lore.kernel.org/r/163906970998.143852.674420788614608063.stgit@warthog.procyon.org.uk/
Link: https://lore.kernel.org/r/163967176564.1823006.16666056085593949570.stgit@warthog.procyon.org.uk/
Link: https://lore.kernel.org/r/164021570208.640689.9193494979708031862.stgit@warthog.procyon.org.uk/

diff --git a/fs/afs/file.c b/fs/afs/file.c
index be23635f35b80c09d92b0c1f9597463c15c454aa..572063dad0b3378643ea4b36afb0240a555f68f5 100644 (file)
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -416,6 +416,12 @@ static void afs_readahead(struct readahead_control *ractl)
        netfs_readahead(ractl, &afs_req_ops, NULL);
 }
 
+int afs_write_inode(struct inode *inode, struct writeback_control *wbc)
+{
+       fscache_unpin_writeback(wbc, afs_vnode_cache(AFS_FS_I(inode)));
+       return 0;
+}
+
 /*
  * Adjust the dirty region of the page on truncation or full invalidation,
  * getting rid of the markers altogether if the region is entirely invalidated.

diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index 509208825907652ca7a6ef9d2892411302713538..8db902405031fd903f5f49b8cd43d41a60c8f8d0 100644 (file)
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -761,9 +761,8 @@ int afs_drop_inode(struct inode *inode)
  */
 void afs_evict_inode(struct inode *inode)
 {
-       struct afs_vnode *vnode;
-
-       vnode = AFS_FS_I(inode);
+       struct afs_vnode_cache_aux aux;
+       struct afs_vnode *vnode = AFS_FS_I(inode);
 
        _enter("{%llx:%llu.%d}",
               vnode->fid.vid,
@@ -775,6 +774,9 @@ void afs_evict_inode(struct inode *inode)
        ASSERTCMP(inode->i_ino, ==, vnode->fid.vnode);
 
        truncate_inode_pages_final(&inode->i_data);
+
+       afs_set_cache_aux(vnode, &aux);
+       fscache_clear_inode_writeback(afs_vnode_cache(vnode), inode, &aux);
        clear_inode(inode);
 
        while (!list_empty(&vnode->wb_keys)) {

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 1d80649aec722a4d1e150163d4e884f03878d976..b6f02321fc09e5e93eff62010aa873cbd187f759 100644 (file)
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -1072,6 +1072,7 @@ extern int afs_release(struct inode *, struct file *);
 extern int afs_fetch_data(struct afs_vnode *, struct afs_read *);
 extern struct afs_read *afs_alloc_read(gfp_t);
 extern void afs_put_read(struct afs_read *);
+extern int afs_write_inode(struct inode *, struct writeback_control *);
 
 static inline struct afs_read *afs_get_read(struct afs_read *req)
 {
@@ -1519,7 +1520,11 @@ extern int afs_check_volume_status(struct afs_volume *, struct afs_operation *);
 /*
  * write.c
  */
+#ifdef CONFIG_AFS_FSCACHE
 extern int afs_set_page_dirty(struct page *);
+#else
+#define afs_set_page_dirty __set_page_dirty_nobuffers
+#endif
 extern int afs_write_begin(struct file *file, struct address_space *mapping,
                        loff_t pos, unsigned len, unsigned flags,
                        struct page **pagep, void **fsdata);

diff --git a/fs/afs/super.c b/fs/afs/super.c
index d110def8aa8eb993212c00ed161089eba89a7545..af7cbd9949c5761440142a215403dc4e1996335b 100644 (file)
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -55,6 +55,7 @@ int afs_net_id;
 static const struct super_operations afs_super_ops = {
        .statfs         = afs_statfs,
        .alloc_inode    = afs_alloc_inode,
+       .write_inode    = afs_write_inode,
        .drop_inode     = afs_drop_inode,
        .destroy_inode  = afs_destroy_inode,
        .free_inode     = afs_free_inode,

diff --git a/fs/afs/write.c b/fs/afs/write.c
index 1c8ee6eae90565b94615762b66959971e90a9530..5e9157d0da294bbd768c45cc231ba9f0e6160da2 100644 (file)
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -14,14 +14,28 @@
 #include <linux/netfs.h>
 #include "internal.h"
 
+static void afs_write_to_cache(struct afs_vnode *vnode, loff_t start, size_t len,
+                              loff_t i_size, bool caching);
+
+#ifdef CONFIG_AFS_FSCACHE
 /*
- * mark a page as having been made dirty and thus needing writeback
+ * Mark a page as having been made dirty and thus needing writeback.  We also
+ * need to pin the cache object to write back to.
  */
 int afs_set_page_dirty(struct page *page)
 {
-       _enter("");
-       return __set_page_dirty_nobuffers(page);
+       return fscache_set_page_dirty(page, afs_vnode_cache(AFS_FS_I(page->mapping->host)));
+}
+static void afs_folio_start_fscache(bool caching, struct folio *folio)
+{
+       if (caching)
+               folio_start_fscache(folio);
+}
+#else
+static void afs_folio_start_fscache(bool caching, struct folio *folio)
+{
 }
+#endif
 
 /*
  * prepare to perform part of a write to a page
@@ -113,7 +127,7 @@ int afs_write_end(struct file *file, struct address_space *mapping,
        unsigned long priv;
        unsigned int f, from = offset_in_folio(folio, pos);
        unsigned int t, to = from + copied;
-       loff_t i_size, maybe_i_size;
+       loff_t i_size, write_end_pos;
 
        _enter("{%llx:%llu},{%lx}",
               vnode->fid.vid, vnode->fid.vnode, folio_index(folio));
@@ -130,15 +144,16 @@ int afs_write_end(struct file *file, struct address_space *mapping,
        if (copied == 0)
                goto out;
 
-       maybe_i_size = pos + copied;
+       write_end_pos = pos + copied;
 
        i_size = i_size_read(&vnode->vfs_inode);
-       if (maybe_i_size > i_size) {
+       if (write_end_pos > i_size) {
                write_seqlock(&vnode->cb_lock);
                i_size = i_size_read(&vnode->vfs_inode);
-               if (maybe_i_size > i_size)
-                       afs_set_i_size(vnode, maybe_i_size);
+               if (write_end_pos > i_size)
+                       afs_set_i_size(vnode, write_end_pos);
                write_sequnlock(&vnode->cb_lock);
+               fscache_update_cookie(afs_vnode_cache(vnode), NULL, &write_end_pos);
        }
 
        if (folio_test_private(folio)) {
@@ -417,6 +432,7 @@ static void afs_extend_writeback(struct address_space *mapping,
                                 loff_t start,
                                 loff_t max_len,
                                 bool new_content,
+                                bool caching,
                                 unsigned int *_len)
 {
        struct pagevec pvec;
@@ -463,7 +479,9 @@ static void afs_extend_writeback(struct address_space *mapping,
                                folio_put(folio);
                                break;
                        }
-                       if (!folio_test_dirty(folio) || folio_test_writeback(folio)) {
+                       if (!folio_test_dirty(folio) ||
+                           folio_test_writeback(folio) ||
+                           folio_test_fscache(folio)) {
                                folio_unlock(folio);
                                folio_put(folio);
                                break;
@@ -511,6 +529,7 @@ static void afs_extend_writeback(struct address_space *mapping,
                                BUG();
                        if (folio_start_writeback(folio))
                                BUG();
+                       afs_folio_start_fscache(caching, folio);
 
                        *_count -= folio_nr_pages(folio);
                        folio_unlock(folio);
@@ -538,6 +557,7 @@ static ssize_t afs_write_back_from_locked_folio(struct address_space *mapping,
        unsigned int offset, to, len, max_len;
        loff_t i_size = i_size_read(&vnode->vfs_inode);
        bool new_content = test_bit(AFS_VNODE_NEW_CONTENT, &vnode->flags);
+       bool caching = fscache_cookie_enabled(afs_vnode_cache(vnode));
        long count = wbc->nr_to_write;
        int ret;
 
@@ -545,6 +565,7 @@ static ssize_t afs_write_back_from_locked_folio(struct address_space *mapping,
 
        if (folio_start_writeback(folio))
                BUG();
+       afs_folio_start_fscache(caching, folio);
 
        count -= folio_nr_pages(folio);
 
@@ -571,7 +592,8 @@ static ssize_t afs_write_back_from_locked_folio(struct address_space *mapping,
                if (len < max_len &&
                    (to == folio_size(folio) || new_content))
                        afs_extend_writeback(mapping, vnode, &count,
-                                            start, max_len, new_content, &len);
+                                            start, max_len, new_content,
+                                            caching, &len);
                len = min_t(loff_t, len, max_len);
        }
 
@@ -584,12 +606,19 @@ static ssize_t afs_write_back_from_locked_folio(struct address_space *mapping,
        if (start < i_size) {
                _debug("write back %x @%llx [%llx]", len, start, i_size);
 
+               /* Speculatively write to the cache.  We have to fix this up
+                * later if the store fails.
+                */
+               afs_write_to_cache(vnode, start, len, i_size, caching);
+
                iov_iter_xarray(&iter, WRITE, &mapping->i_pages, start, len);
                ret = afs_store_data(vnode, &iter, start, false);
        } else {
                _debug("write discard %x @%llx [%llx]", len, start, i_size);
 
                /* The dirty region was entirely beyond the EOF. */
+               fscache_clear_page_bits(afs_vnode_cache(vnode),
+                                       mapping, start, len, caching);
                afs_pages_written_back(vnode, start, len);
                ret = 0;
        }
@@ -648,6 +677,10 @@ int afs_writepage(struct page *subpage, struct writeback_control *wbc)
 
        _enter("{%lx},", folio_index(folio));
 
+#ifdef CONFIG_AFS_FSCACHE
+       folio_wait_fscache(folio);
+#endif
+
        start = folio_index(folio) * PAGE_SIZE;
        ret = afs_write_back_from_locked_folio(folio_mapping(folio), wbc,
                                               folio, start, LLONG_MAX - start);
@@ -713,10 +746,15 @@ static int afs_writepages_region(struct address_space *mapping,
                        continue;
                }
 
-               if (folio_test_writeback(folio)) {
+               if (folio_test_writeback(folio) ||
+                   folio_test_fscache(folio)) {
                        folio_unlock(folio);
-                       if (wbc->sync_mode != WB_SYNC_NONE)
+                       if (wbc->sync_mode != WB_SYNC_NONE) {
                                folio_wait_writeback(folio);
+#ifdef CONFIG_AFS_FSCACHE
+                               folio_wait_fscache(folio);
+#endif
+                       }
                        folio_put(folio);
                        continue;
                }
@@ -969,3 +1007,28 @@ int afs_launder_page(struct page *subpage)
        folio_wait_fscache(folio);
        return ret;
 }
+
+/*
+ * Deal with the completion of writing the data to the cache.
+ */
+static void afs_write_to_cache_done(void *priv, ssize_t transferred_or_error,
+                                   bool was_async)
+{
+       struct afs_vnode *vnode = priv;
+
+       if (IS_ERR_VALUE(transferred_or_error) &&
+           transferred_or_error != -ENOBUFS)
+               afs_invalidate_cache(vnode, 0);
+}
+
+/*
+ * Save the write to the cache also.
+ */
+static void afs_write_to_cache(struct afs_vnode *vnode,
+                              loff_t start, size_t len, loff_t i_size,
+                              bool caching)
+{
+       fscache_write_to_cache(afs_vnode_cache(vnode),
+                              vnode->vfs_inode.i_mapping, start, len, i_size,
+                              afs_write_to_cache_done, vnode, caching);
+}