From: Eric Van Hensbergen <ericvh@kernel.org>
To: v9fs-developer@lists.sourceforge.net, asmadeus@codewreck.org,
rminnich@gmail.com, lucho@ionkov.net
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux_oss@crudebyte.com, Eric Van Hensbergen <ericvh@kernel.org>
Subject: [PATCH v3 02/11] Expand setup of writeback cache to all levels
Date: Tue, 24 Jan 2023 02:38:25 +0000 [thread overview]
Message-ID: <20230124023834.106339-3-ericvh@kernel.org> (raw)
In-Reply-To: <20230124023834.106339-1-ericvh@kernel.org>
If cache is enabled, make sure we are putting the right things
in place (mainly impacts mmap). This also sets us up for more
cache levels.
Signed-off-by: Eric Van Hensbergen <ericvh@kernel.org>
---
fs/9p/v9fs.c | 2 +-
fs/9p/vfs_addr.c | 2 --
fs/9p/vfs_file.c | 7 ++++---
fs/9p/vfs_inode.c | 3 +--
fs/9p/vfs_inode_dotl.c | 7 ++++---
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 3a9c4517265f..61a51b90600d 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -468,7 +468,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,
#ifdef CONFIG_9P_FSCACHE
/* register the session for caching */
- if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
+ if (v9ses->cache == CACHE_FSCACHE) {
rc = v9fs_cache_session_get_cookie(v9ses, dev_name);
if (rc < 0)
goto err_clnt;
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index 97599edbc300..6f46d7e4c750 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -279,8 +279,6 @@ static int v9fs_write_begin(struct file *filp, struct address_space *mapping,
p9_debug(P9_DEBUG_VFS, "filp %p, mapping %p\n", filp, mapping);
- BUG_ON(!v9inode->writeback_fid);
-
/* Prefetch area to be written into the cache if we're caching this
* file. We need to do this before we get a lock on the page in case
* there's more than one writer competing for the same cache block.
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index b740017634ef..3b6458846a0b 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -73,8 +73,7 @@ int v9fs_file_open(struct inode *inode, struct file *file)
}
mutex_lock(&v9inode->v_mutex);
- if ((v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) &&
- !v9inode->writeback_fid &&
+ if ((v9ses->cache) && !v9inode->writeback_fid &&
((file->f_flags & O_ACCMODE) != O_RDONLY)) {
/*
* clone a fid and add it to writeback_fid
@@ -92,9 +91,11 @@ int v9fs_file_open(struct inode *inode, struct file *file)
v9inode->writeback_fid = (void *) writeback_fid;
}
mutex_unlock(&v9inode->v_mutex);
- if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)
+#ifdef CONFIG_9P_FSCACHE
+ if (v9ses->cache == CACHE_FSCACHE)
fscache_use_cookie(v9fs_inode_cookie(v9inode),
file->f_mode & FMODE_WRITE);
+#endif
v9fs_open_fid_add(inode, &fid);
return 0;
out_error:
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 27a04a226d97..33e521c60e2c 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -843,8 +843,7 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
inode = d_inode(dentry);
v9inode = V9FS_I(inode);
mutex_lock(&v9inode->v_mutex);
- if ((v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) &&
- !v9inode->writeback_fid &&
+ if ((v9ses->cache) && !v9inode->writeback_fid &&
((flags & O_ACCMODE) != O_RDONLY)) {
/*
* clone a fid and add it to writeback_fid
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index f806b3f11649..bff37a312e64 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -316,8 +316,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
v9inode = V9FS_I(inode);
mutex_lock(&v9inode->v_mutex);
- if ((v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) &&
- !v9inode->writeback_fid &&
+ if ((v9ses->cache) && !v9inode->writeback_fid &&
((flags & O_ACCMODE) != O_RDONLY)) {
/*
* clone a fid and add it to writeback_fid
@@ -340,9 +339,11 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
if (err)
goto out;
file->private_data = ofid;
- if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)
+#ifdef CONFIG_9P_FSCACHE
+ if (v9ses->cache == CACHE_FSCACHE)
fscache_use_cookie(v9fs_inode_cookie(v9inode),
file->f_mode & FMODE_WRITE);
+#endif
v9fs_open_fid_add(inode, &ofid);
file->f_mode |= FMODE_CREATED;
out:
--
2.37.2
next prev parent reply other threads:[~2023-01-24 2:39 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20221217183142.1425132-1-evanhensbergen@icloud.com>
2022-12-18 23:22 ` [PATCH v2 00/10] Performance fixes for 9p filesystem Eric Van Hensbergen
2022-12-18 23:22 ` [PATCH v2 01/10] Adjust maximum MSIZE to account for p9 header Eric Van Hensbergen
2022-12-18 23:22 ` [PATCH v2 02/10] Expand setup of writeback cache to all levels Eric Van Hensbergen
2022-12-18 23:22 ` [PATCH v2 03/10] Consolidate file operations and add readahead and writeback Eric Van Hensbergen
2023-01-24 2:43 ` asmadeus
2023-01-24 3:03 ` Eric Van Hensbergen
2022-12-18 23:22 ` [PATCH v2 04/10] Remove unnecessary superblock flags Eric Van Hensbergen
2022-12-18 23:22 ` [PATCH v2 05/10] allow disable of xattr support on mount Eric Van Hensbergen
2022-12-18 23:22 ` [PATCH v2 06/10] fix bug in client create for .L Eric Van Hensbergen
2022-12-18 23:22 ` [PATCH v2 07/10] Add additional debug flags and open modes Eric Van Hensbergen
2022-12-18 23:22 ` [PATCH v2 08/10] Add new mount modes Eric Van Hensbergen
2023-01-24 3:35 ` Amir Goldstein
2022-12-18 23:22 ` [PATCH v2 09/10] fix error reporting in v9fs_dir_release Eric Van Hensbergen
2022-12-18 23:22 ` [PATCH v2 10/10] writeback mode fixes Eric Van Hensbergen
2023-01-23 16:31 ` [PATCH v2 00/10] Performance fixes for 9p filesystem Christian Schoenebeck
2023-01-24 2:33 ` evanhensbergen
2023-01-24 2:49 ` asmadeus
2023-01-24 2:38 ` [PATCH v3 00/11] " Eric Van Hensbergen
2023-01-24 2:38 ` [PATCH v3 01/11] Adjust maximum MSIZE to account for p9 header Eric Van Hensbergen
2023-01-24 2:38 ` Eric Van Hensbergen [this message]
2023-01-24 2:38 ` [PATCH v3 03/11] Consolidate file operations and add readahead and writeback Eric Van Hensbergen
2023-01-24 2:38 ` [PATCH v3 04/11] Remove unnecessary superblock flags Eric Van Hensbergen
2023-01-24 2:38 ` [PATCH v3 05/11] allow disable of xattr support on mount Eric Van Hensbergen
2023-01-24 2:38 ` [PATCH v3 06/11] fix bug in client create for .L Eric Van Hensbergen
2023-01-24 2:38 ` [PATCH v3 07/11] Add additional debug flags and open modes Eric Van Hensbergen
2023-01-24 2:38 ` [PATCH v3 08/11] Add new mount modes Eric Van Hensbergen
2023-01-24 2:38 ` [PATCH v3 09/11] fix error reporting in v9fs_dir_release Eric Van Hensbergen
2023-01-24 2:38 ` [PATCH v3 10/11] writeback mode fixes Eric Van Hensbergen
2023-01-24 2:38 ` [PATCH v3 11/11] Fix revalidate Eric Van Hensbergen
2023-02-02 11:27 ` [PATCH v3 00/11] Performance fixes for 9p filesystem Christian Schoenebeck
2023-02-03 19:12 ` Eric Van Hensbergen
2023-02-04 13:40 ` Christian Schoenebeck
2023-02-04 21:38 ` Eric Van Hensbergen
2023-02-05 16:37 ` Eric Van Hensbergen
2023-02-06 13:20 ` Christian Schoenebeck
2023-02-06 13:37 ` Eric Van Hensbergen
2023-02-18 0:33 ` [PATCH v4 " Eric Van Hensbergen
2023-02-18 0:33 ` [PATCH v4 01/11] net/9p: Adjust maximum MSIZE to account for p9 header Eric Van Hensbergen
2023-02-18 7:50 ` asmadeus
2023-02-18 0:33 ` [PATCH v4 02/11] fs/9p: Expand setup of writeback cache to all levels Eric Van Hensbergen
2023-02-18 8:57 ` asmadeus
2023-02-18 0:33 ` [PATCH v4 03/11] fs/9p: Consolidate file operations and add readahead and writeback Eric Van Hensbergen
2023-02-18 9:24 ` asmadeus
2023-02-18 16:17 ` Eric Van Hensbergen
2023-02-18 16:19 ` Eric Van Hensbergen
2023-02-18 20:35 ` asmadeus
2023-02-27 2:50 ` [PATCH v5 3/11] " Eric Van Hensbergen
2023-02-18 0:33 ` [PATCH v4 04/11] fs/9p: Remove unnecessary superblock flags Eric Van Hensbergen
2023-02-18 9:33 ` asmadeus
2023-02-18 16:24 ` Eric Van Hensbergen
2023-02-18 20:30 ` asmadeus
2023-02-18 0:33 ` [PATCH v4 05/11] fs/9p: allow disable of xattr support on mount Eric Van Hensbergen
2023-02-18 7:52 ` asmadeus
2023-02-18 0:33 ` [PATCH v4 06/11] net/9p: fix bug in client create for .L Eric Van Hensbergen
2023-02-18 8:01 ` asmadeus
2023-02-18 0:33 ` [PATCH v4 07/11] 9p: Add additional debug flags and open modes Eric Van Hensbergen
2023-02-18 8:05 ` asmadeus
2023-02-27 2:53 ` [PATCH v5 7/11] " Eric Van Hensbergen
2023-02-18 0:33 ` [PATCH v4 08/11] fs/9p: Add new mount modes Eric Van Hensbergen
2023-02-18 8:46 ` asmadeus
2023-02-27 2:55 ` [PATCH v5 8/11] " Eric Van Hensbergen
2023-02-18 0:33 ` [PATCH v4 09/11] fs/9p: fix error reporting in v9fs_dir_release Eric Van Hensbergen
2023-02-18 8:49 ` asmadeus
2023-02-18 0:33 ` [PATCH v4 10/11] fs/9p: writeback mode fixes Eric Van Hensbergen
2023-02-18 8:38 ` asmadeus
2023-02-18 10:01 ` asmadeus
2023-02-18 12:15 ` asmadeus
2023-02-18 16:40 ` Eric Van Hensbergen
2023-02-18 20:29 ` asmadeus
2023-03-21 1:12 ` Eric Van Hensbergen
2023-02-18 19:58 ` Christian Schoenebeck
2023-02-18 22:24 ` Eric Van Hensbergen
2023-02-18 23:40 ` asmadeus
2023-02-18 23:52 ` Eric Van Hensbergen
2023-03-27 2:59 ` [PATCH v5] fs/9p: remove writeback fid and fix per-file modes Eric Van Hensbergen
2023-04-25 7:11 ` Christophe JAILLET
2023-04-25 11:13 ` asmadeus
2023-04-26 0:01 ` Eric Van Hensbergen
2023-02-18 0:33 ` [PATCH v4 11/11] fs/9p: Fix revalidate Eric Van Hensbergen
2023-02-18 8:55 ` asmadeus
2023-02-18 7:48 ` [PATCH v4 00/11] Performance fixes for 9p filesystem asmadeus
2023-02-19 21:36 ` Christian Schoenebeck
2023-02-20 1:13 ` Eric Van Hensbergen
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=20230124023834.106339-3-ericvh@kernel.org \
--to=ericvh@kernel.org \
--cc=asmadeus@codewreck.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux_oss@crudebyte.com \
--cc=lucho@ionkov.net \
--cc=rminnich@gmail.com \
--cc=v9fs-developer@lists.sourceforge.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).