From: Andreas Gruenbacher <agruenba@redhat.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Andreas Dilger <adilger.kernel@dilger.ca>,
"J. Bruce Fields" <bfields@fieldses.org>,
Jeff Layton <jlayton@poochiereds.net>,
Trond Myklebust <trond.myklebust@primarydata.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
Dave Chinner <david@fromorbit.com>,
linux-ext4@vger.kernel.org, xfs@oss.sgi.com,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org,
linux-api@vger.kernel.org
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH v13 12/51] vfs: Cache richacl in struct inode
Date: Tue, 3 Nov 2015 16:16:48 +0100 [thread overview]
Message-ID: <1446563847-14005-13-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1446563847-14005-1-git-send-email-agruenba@redhat.com>
Cache richacls in struct inode so that this doesn't have to be done
individually in each filesystem. This is similar to POSIX ACLs.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/inode.c | 11 ++++++--
fs/posix_acl.c | 2 +-
fs/richacl_base.c | 4 +--
fs/richacl_inode.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/fs.h | 5 +++-
include/linux/richacl.h | 15 ++++++----
6 files changed, 100 insertions(+), 12 deletions(-)
diff --git a/fs/inode.c b/fs/inode.c
index 2a387f4..8462ddb 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -174,8 +174,11 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
inode->i_private = NULL;
inode->i_mapping = mapping;
INIT_HLIST_HEAD(&inode->i_dentry); /* buggered by rcu freeing */
-#ifdef CONFIG_FS_POSIX_ACL
- inode->i_acl = inode->i_default_acl = ACL_NOT_CACHED;
+#if defined(CONFIG_FS_POSIX_ACL) || defined(CONFIG_FS_RICHACL)
+ inode->i_acl = ACL_NOT_CACHED;
+# if defined(CONFIG_FS_POSIX_ACL)
+ inode->i_default_acl = ACL_NOT_CACHED;
+# endif
#endif
#ifdef CONFIG_FSNOTIFY
@@ -231,11 +234,13 @@ void __destroy_inode(struct inode *inode)
atomic_long_dec(&inode->i_sb->s_remove_count);
}
-#ifdef CONFIG_FS_POSIX_ACL
+#if defined(CONFIG_FS_POSIX_ACL) || defined(CONFIG_FS_RICHACL)
if (inode->i_acl && inode->i_acl != ACL_NOT_CACHED)
put_base_acl(inode->i_acl);
+# if defined(CONFIG_FS_POSIX_ACL)
if (inode->i_default_acl && inode->i_default_acl != ACL_NOT_CACHED)
put_base_acl(inode->i_default_acl);
+# endif
#endif
this_cpu_dec(nr_inodes);
}
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index b3b2265..1d766a5 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -38,7 +38,7 @@ struct posix_acl *get_cached_acl(struct inode *inode, int type)
{
struct posix_acl **p = acl_by_type(inode, type);
struct posix_acl *acl = ACCESS_ONCE(*p);
- if (acl) {
+ if (acl && IS_POSIXACL(inode)) {
spin_lock(&inode->i_lock);
acl = *p;
if (acl != ACL_NOT_CACHED)
diff --git a/fs/richacl_base.c b/fs/richacl_base.c
index 69b806c..d0ab5e9 100644
--- a/fs/richacl_base.c
+++ b/fs/richacl_base.c
@@ -33,7 +33,7 @@ richacl_alloc(int count, gfp_t gfp)
struct richacl *acl = kzalloc(size, gfp);
if (acl) {
- atomic_set(&acl->a_refcount, 1);
+ atomic_set(&acl->a_base.ba_refcount, 1);
acl->a_count = count;
}
return acl;
@@ -52,7 +52,7 @@ richacl_clone(const struct richacl *acl, gfp_t gfp)
if (dup) {
memcpy(dup, acl, size);
- atomic_set(&dup->a_refcount, 1);
+ atomic_set(&dup->a_base.ba_refcount, 1);
}
return dup;
}
diff --git a/fs/richacl_inode.c b/fs/richacl_inode.c
index 99b3c93..c41a6c4 100644
--- a/fs/richacl_inode.c
+++ b/fs/richacl_inode.c
@@ -20,6 +20,81 @@
#include <linux/slab.h>
#include <linux/richacl.h>
+struct richacl *get_cached_richacl(struct inode *inode)
+{
+ struct richacl *acl;
+
+ acl = (struct richacl *)ACCESS_ONCE(inode->i_acl);
+ if (acl && IS_RICHACL(inode)) {
+ spin_lock(&inode->i_lock);
+ acl = (struct richacl *)inode->i_acl;
+ if (acl != ACL_NOT_CACHED)
+ acl = richacl_get(acl);
+ spin_unlock(&inode->i_lock);
+ }
+ return acl;
+}
+EXPORT_SYMBOL_GPL(get_cached_richacl);
+
+struct richacl *get_cached_richacl_rcu(struct inode *inode)
+{
+ return (struct richacl *)rcu_dereference(inode->i_acl);
+}
+EXPORT_SYMBOL_GPL(get_cached_richacl_rcu);
+
+void set_cached_richacl(struct inode *inode, struct richacl *acl)
+{
+ struct base_acl *old = NULL;
+
+ spin_lock(&inode->i_lock);
+ old = inode->i_acl;
+ rcu_assign_pointer(inode->i_acl, &richacl_get(acl)->a_base);
+ spin_unlock(&inode->i_lock);
+ if (old != ACL_NOT_CACHED)
+ put_base_acl(old);
+}
+EXPORT_SYMBOL_GPL(set_cached_richacl);
+
+void forget_cached_richacl(struct inode *inode)
+{
+ struct base_acl *old = NULL;
+
+ spin_lock(&inode->i_lock);
+ old = inode->i_acl;
+ inode->i_acl = ACL_NOT_CACHED;
+ spin_unlock(&inode->i_lock);
+ if (old != ACL_NOT_CACHED)
+ put_base_acl(old);
+}
+EXPORT_SYMBOL_GPL(forget_cached_richacl);
+
+struct richacl *get_richacl(struct inode *inode)
+{
+ struct richacl *acl;
+
+ acl = get_cached_richacl(inode);
+ if (acl != ACL_NOT_CACHED)
+ return acl;
+
+ if (!IS_RICHACL(inode))
+ return NULL;
+
+ /*
+ * A filesystem can force a ACL callback by just never filling the
+ * ACL cache. But normally you'd fill the cache either at inode
+ * instantiation time, or on the first ->get_richacl call.
+ *
+ * If the filesystem doesn't have a get_richacl() function at all,
+ * we'll just create the negative cache entry.
+ */
+ if (!inode->i_op->get_richacl) {
+ set_cached_richacl(inode, NULL);
+ return NULL;
+ }
+ return inode->i_op->get_richacl(inode);
+}
+EXPORT_SYMBOL_GPL(get_richacl);
+
/**
* richacl_permission - richacl permission check algorithm
* @inode: inode to check
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 08fde42..d91deef 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -583,6 +583,7 @@ struct base_acl {
};
};
struct posix_acl;
+struct richacl;
#define ACL_NOT_CACHED ((void *)(-1))
#define IOP_FASTPERM 0x0001
@@ -601,9 +602,11 @@ struct inode {
kgid_t i_gid;
unsigned int i_flags;
-#if defined(CONFIG_FS_POSIX_ACL)
+#if defined(CONFIG_FS_POSIX_ACL) || defined(CONFIG_FS_RICHACL)
struct base_acl *i_acl;
+# if defined(CONFIG_FS_POSIX_ACL)
struct base_acl *i_default_acl;
+# endif
#endif
const struct inode_operations *i_op;
diff --git a/include/linux/richacl.h b/include/linux/richacl.h
index 2baef35..de7d0d9 100644
--- a/include/linux/richacl.h
+++ b/include/linux/richacl.h
@@ -31,7 +31,7 @@ struct richace {
};
struct richacl {
- atomic_t a_refcount;
+ struct base_acl a_base;
unsigned int a_owner_mask;
unsigned int a_group_mask;
unsigned int a_other_mask;
@@ -56,8 +56,7 @@ struct richacl {
static inline struct richacl *
richacl_get(struct richacl *acl)
{
- if (acl)
- atomic_inc(&acl->a_base.ba_refcount);
+ get_base_acl(&acl->a_base);
return acl;
}
@@ -67,10 +66,16 @@ richacl_get(struct richacl *acl)
static inline void
richacl_put(struct richacl *acl)
{
- if (acl && atomic_dec_and_test(&acl->a_refcount))
- kfree(acl);
+ BUILD_BUG_ON(offsetof(struct richacl, a_base) != 0);
+ put_base_acl(&acl->a_base);
}
+extern struct richacl *get_cached_richacl(struct inode *);
+extern struct richacl *get_cached_richacl_rcu(struct inode *);
+extern void set_cached_richacl(struct inode *, struct richacl *);
+extern void forget_cached_richacl(struct inode *);
+extern struct richacl *get_richacl(struct inode *);
+
/**
* richace_is_owner - check if @ace is an OWNER@ entry
*/
--
2.5.0
next prev parent reply other threads:[~2015-11-03 15:19 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-03 15:16 [PATCH v13 00/51] Richacls Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 01/51] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 02/51] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-11-04 2:33 ` Andreas Dilger
2015-11-04 3:02 ` Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 03/51] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 04/51] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 05/51] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 06/51] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 07/51] richacl: Permission mapping functions Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 08/51] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 09/51] richacl: Permission check algorithm Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 10/51] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-11-03 22:29 ` Andreas Dilger
2015-11-04 21:54 ` Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 11/51] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher
2015-11-03 15:16 ` Andreas Gruenbacher [this message]
2015-11-04 2:03 ` [PATCH v13 12/51] vfs: Cache richacl in struct inode Andreas Dilger
2015-11-04 22:10 ` Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 13/51] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 14/51] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 15/51] richacl: Create-time inheritance Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 16/51] richacl: Automatic Inheritance Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 17/51] richacl: xattr mapping functions Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 18/51] richacl: Add richacl xattr handler Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 19/51] vfs: Add richacl permission checking Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 20/51] ext4: Add richacl support Andreas Gruenbacher
2015-11-04 2:13 ` Andreas Dilger
2015-11-04 2:19 ` Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 21/51] ext4: Add richacl feature flag Andreas Gruenbacher
2015-11-04 2:18 ` Andreas Dilger
2015-11-04 2:28 ` Andreas Gruenbacher
2015-11-04 2:43 ` Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 22/51] xfs: Fix error path in xfs_get_acl Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 23/51] xfs: Make xfs_set_mode non-static Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 24/51] xfs: Change how listxattr generates synthetic attributes Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 25/51] xfs: Add richacl support Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 26/51] xfs: Plug memory leak in xfs_attrmulti_attr_set Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 27/51] xfs: Fix richacl access by ioctl Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 28/51] richacl: acl editing helper functions Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 29/51] richacl: Move everyone@ aces down the acl Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 30/51] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 31/51] richacl: Set the owner permissions to the owner mask Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 32/51] richacl: Set the other permissions to the other mask Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 33/51] richacl: Isolate the owner and group classes Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 34/51] richacl: Apply the file masks to a richacl Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 35/51] richacl: Create richacl from mode values Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 36/51] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 37/51] nfsd: Use richacls as internal acl representation Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 38/51] nfsd: Add richacl support Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 39/51] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 40/51] nfsd: Add support for the MAY_CREATE_{FILE,DIR} permissions Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 41/51] richacl: Add support for unmapped identifiers Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 42/51] nfsd: Add support for unmapped richace identifiers Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 43/51] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher
2015-11-04 2:20 ` Andreas Dilger
2015-11-03 15:17 ` [PATCH v13 44/51] xfs: " Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 45/51] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher
2015-11-03 16:25 ` Trond Myklebust
2015-11-05 11:07 ` Andreas Gruenbacher
2015-11-05 15:57 ` Trond Myklebust
2015-11-08 22:19 ` Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 46/51] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 47/51] nfs: Fix GETATTR bitmap verification Andreas Gruenbacher
2015-11-03 16:30 ` Trond Myklebust
2015-11-03 15:17 ` [PATCH v13 48/51] nfs: Remove unused xdr page offsets in getacl/setacl arguments Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 49/51] nfs: Distinguish missing users and groups from nobody Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 50/51] nfs: Add richacl support Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 51/51] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher
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=1446563847-14005-13-git-send-email-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=adilger.kernel@dilger.ca \
--cc=anna.schumaker@netapp.com \
--cc=bfields@fieldses.org \
--cc=david@fromorbit.com \
--cc=jlayton@poochiereds.net \
--cc=linux-api@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=xfs@oss.sgi.com \
/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).