fs/9p: add new feature of xattr cache

index 620d934..94d2fce 100644
@@ -38,10 +38,12 @@
 #include "v9fs.h"
 #include "v9fs_vfs.h"
 #include "cache.h"
+#include "xattr_cache.h"
 
 static DEFINE_SPINLOCK(v9fs_sessionlist_lock);
 static LIST_HEAD(v9fs_sessionlist);
 struct kmem_cache *v9fs_inode_cache;
+struct kmem_cache *v9fs_xattr_cache;
 
 /*
  * Option Parsing (code inspired by NFS code)

@@ -59,6 +61,8 @@ enum {
 	Opt_cache_loose, Opt_fscache, Opt_mmap,
 	/* Access options */
 	Opt_access, Opt_posixacl,
+	/* xattr cache */
+	Opt_xcache,
 	/* Error token */
 	Opt_err
 };

@@ -78,6 +82,7 @@ static const match_table_t tokens = {
 	{Opt_cachetag, "cachetag=%s"},
 	{Opt_access, "access=%s"},
 	{Opt_posixacl, "posixacl"},
+	{Opt_xcache, "xattrcache"},
 	{Opt_err, NULL}
 };
 

@@ -126,6 +131,7 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
 #ifdef CONFIG_9P_FSCACHE
 	v9ses->cachetag = NULL;
 #endif
+	v9ses->xcache = 0;
 
 	if (!opts)
 		return 0;

@@ -297,7 +303,9 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
 				 "Not defined CONFIG_9P_FS_POSIX_ACL. Ignoring posixacl option\n");
 #endif
 			break;
-
+		case Opt_xcache:
+			v9ses->xcache = 1;
+			break;
 		default:
 			continue;
 		}

@@ -589,6 +597,17 @@ static int v9fs_init_inode_cache(void)
 	return 0;
 }
 
+static int v9fs_init_xattr_cache(void)
+{
+	v9fs_xattr_cache = kmem_cache_create("v9fs_xattr_cache",
+					sizeof(struct xattr_item),
+					0, 0, NULL);
+	if (!v9fs_xattr_cache)
+		return -ENOMEM;
+
+	return 0;
+}
+
 /**
  * v9fs_destroy_inode_cache - destroy the cache of 9P inode
  *

@@ -603,16 +622,30 @@ static void v9fs_destroy_inode_cache(void)
 	kmem_cache_destroy(v9fs_inode_cache);
 }
 
+static void v9fs_destroy_xattr_cache(void)
+{
+	kmem_cache_destroy(v9fs_xattr_cache);
+}
+
 static int v9fs_cache_register(void)
 {
 	int ret;
 	ret = v9fs_init_inode_cache();
 	if (ret < 0)
 		return ret;
+
+	ret = v9fs_init_xattr_cache();
+	if (ret < 0) {
+		v9fs_destroy_inode_cache();
+		return ret;
+	}
+
 #ifdef CONFIG_9P_FSCACHE
 	ret = fscache_register_netfs(&v9fs_cache_netfs);
-	if (ret < 0)
+	if (ret < 0) {
 		v9fs_destroy_inode_cache();
+		v9fs_destroy_xattr_cache();
+	}
 #endif
 	return ret;
 }

@@ -620,6 +653,7 @@ static int v9fs_cache_register(void)
 static void v9fs_cache_unregister(void)
 {
 	v9fs_destroy_inode_cache();
+	v9fs_destroy_xattr_cache();
 #ifdef CONFIG_9P_FSCACHE
 	fscache_unregister_netfs(&v9fs_cache_netfs);
 #endif

index fb9ffcb..58ac5d8 100644
@@ -101,6 +101,7 @@ struct v9fs_session_info {
 	unsigned short debug;
 	unsigned int afid;
 	unsigned int cache;
+	unsigned short xcache;
 #ifdef CONFIG_9P_FSCACHE
 	char *cachetag;
 	struct fscache_cookie *fscache;

@@ -121,6 +122,15 @@ struct v9fs_session_info {
 /* cache_validity flags */
 #define V9FS_INO_INVALID_ATTR 0x01
 
+/**
+ * @xal_head: fast path, the xattr has beed queried from backend
+ * @xaf_head: slow path, the xattr is looking up from backend
+ *
+ * Ensure implementation query request as soon as possible from xal_head
+ *
+ * Return from query, if there is not error, except -ENOTSUPP and -ERANGE,
+ * move xattr_item from xaf_head to xal_head, or set  V9FS_XI_Removing
+ */
 struct v9fs_inode {
 #ifdef CONFIG_9P_FSCACHE
 	spinlock_t fscache_lock;

@@ -131,6 +141,11 @@ struct v9fs_inode {
 	struct p9_fid *writeback_fid;
 	struct mutex v_mutex;
 	struct inode vfs_inode;
+
+	rwlock_t xal_lock;
+	struct list_head xal_head;
+	spinlock_t xaf_lock;
+	struct list_head xaf_head;
 };
 
 static inline struct v9fs_inode *V9FS_I(const struct inode *inode)

index 5a0db6d..41bcd2d 100644
@@ -53,6 +53,7 @@ extern const struct file_operations v9fs_cached_file_operations_dotl;
 extern const struct file_operations v9fs_mmap_file_operations;
 extern const struct file_operations v9fs_mmap_file_operations_dotl;
 extern struct kmem_cache *v9fs_inode_cache;
+extern struct kmem_cache *v9fs_xattr_cache;
 
 struct inode *v9fs_alloc_inode(struct super_block *sb);
 void v9fs_destroy_inode(struct inode *inode);

index 39eb2bc..718dd45 100644
@@ -249,6 +249,12 @@ struct inode *v9fs_alloc_inode(struct super_block *sb)
 	v9inode->writeback_fid = NULL;
 	v9inode->cache_validity = 0;
 	mutex_init(&v9inode->v_mutex);
+
+	rwlock_init(&v9inode->xal_lock);
+	INIT_LIST_HEAD(&v9inode->xal_head);
+	spin_lock_init(&v9inode->xaf_lock);
+	INIT_LIST_HEAD(&v9inode->xaf_head);
+
 	return &v9inode->vfs_inode;
 }
 

@@ -260,6 +266,8 @@ struct inode *v9fs_alloc_inode(struct super_block *sb)
 static void v9fs_i_callback(struct rcu_head *head)
 {
 	struct inode *inode = container_of(head, struct inode, i_rcu);
+
+	v9fs_free_inode_xattr_items(inode);
 	kmem_cache_free(v9fs_inode_cache, V9FS_I(inode));
 }
 

246 lines not on this page · raw message

index d3e2ea3..d687382 100644
@@ -18,6 +18,8 @@
 #include <net/9p/9p.h>
 #include <net/9p/client.h>
 
+#include "xattr_cache.h"
+
 extern const struct xattr_handler *v9fs_xattr_handlers[];
 extern struct xattr_handler v9fs_xattr_user_handler;
 extern struct xattr_handler v9fs_xattr_trusted_handler;

228 lines not on this page · raw message

100 lines not on this page · raw message

index 27dfe85..8346030 100644
@@ -59,6 +59,7 @@ enum p9_debug_flags {
 	P9_DEBUG_PKT =		(1<<10),
 	P9_DEBUG_FSC =		(1<<11),
 	P9_DEBUG_VPKT =		(1<<12),
+	P9_DEBUG_XCACHE =	(1<<13),
 };
 
 #ifdef CONFIG_NET_9P_DEBUG