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>,
linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-api@vger.kernel.org
Subject: [PATCH v8 11/41] vfs: Cache base_acl objects in inodes
Date: Mon, 28 Sep 2015 00:09:02 +0200 [thread overview]
Message-ID: <1443391772-10171-12-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1443391772-10171-1-git-send-email-agruenba@redhat.com>
POSIX ACLs and richacls are both objects allocated by kmalloc() with a
reference count which are freed by kfree_rcu(). An inode can either
cache an access and a default POSIX ACL, or a richacl (richacls do not
have default acls). To allow an inode to cache either of the two kinds
of acls, introduce a new base_acl type and convert i_acl and
i_default_acl to that type. In most cases, the vfs then doesn't have to
care which kind of acl an inode caches (if any).
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
drivers/staging/lustre/lustre/llite/llite_lib.c | 2 +-
fs/f2fs/acl.c | 4 ++--
fs/inode.c | 4 ++--
fs/jffs2/acl.c | 6 ++++--
fs/posix_acl.c | 18 +++++++++---------
include/linux/fs.h | 25 ++++++++++++++++++++++---
include/linux/posix_acl.h | 12 ++++--------
include/linux/richacl.h | 2 +-
8 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index b4ed6c8..5766f69 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -1118,7 +1118,7 @@ void ll_clear_inode(struct inode *inode)
}
#ifdef CONFIG_FS_POSIX_ACL
else if (lli->lli_posix_acl) {
- LASSERT(atomic_read(&lli->lli_posix_acl->a_refcount) == 1);
+ LASSERT(atomic_read(&lli->lli_posix_acl->a_base.ba_refcount) == 1);
LASSERT(lli->lli_remote_perms == NULL);
posix_acl_release(lli->lli_posix_acl);
lli->lli_posix_acl = NULL;
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index c8f25f7..a4207de 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -270,7 +270,7 @@ static struct posix_acl *f2fs_acl_clone(const struct posix_acl *acl,
sizeof(struct posix_acl_entry);
clone = kmemdup(acl, size, flags);
if (clone)
- atomic_set(&clone->a_refcount, 1);
+ atomic_set(&clone->a_base.ba_refcount, 1);
}
return clone;
}
@@ -282,7 +282,7 @@ static int f2fs_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
umode_t mode = *mode_p;
int not_equiv = 0;
- /* assert(atomic_read(acl->a_refcount) == 1); */
+ /* assert(atomic_read(acl->a_base.ba_refcount) == 1); */
FOREACH_ACL_ENTRY(pa, acl, pe) {
switch(pa->e_tag) {
diff --git a/fs/inode.c b/fs/inode.c
index 78a17b8..2a387f4 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -233,9 +233,9 @@ void __destroy_inode(struct inode *inode)
#ifdef CONFIG_FS_POSIX_ACL
if (inode->i_acl && inode->i_acl != ACL_NOT_CACHED)
- posix_acl_release(inode->i_acl);
+ put_base_acl(inode->i_acl);
if (inode->i_default_acl && inode->i_default_acl != ACL_NOT_CACHED)
- posix_acl_release(inode->i_default_acl);
+ put_base_acl(inode->i_default_acl);
#endif
this_cpu_dec(nr_inodes);
}
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 2f7a3c0..04a5836 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -294,13 +294,15 @@ int jffs2_init_acl_post(struct inode *inode)
int rc;
if (inode->i_default_acl) {
- rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_DEFAULT, inode->i_default_acl);
+ rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_DEFAULT,
+ *acl_by_type(inode, ACL_TYPE_DEFAULT));
if (rc)
return rc;
}
if (inode->i_acl) {
- rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_ACCESS, inode->i_acl);
+ rc = __jffs2_set_acl(inode, JFFS2_XPREFIX_ACL_ACCESS,
+ *acl_by_type(inode, ACL_TYPE_ACCESS));
if (rc)
return rc;
}
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 4fb17de..b3b2265 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -25,9 +25,9 @@ struct posix_acl **acl_by_type(struct inode *inode, int type)
{
switch (type) {
case ACL_TYPE_ACCESS:
- return &inode->i_acl;
+ return (struct posix_acl **)&inode->i_acl;
case ACL_TYPE_DEFAULT:
- return &inode->i_default_acl;
+ return (struct posix_acl **)&inode->i_default_acl;
default:
BUG();
}
@@ -83,16 +83,16 @@ EXPORT_SYMBOL(forget_cached_acl);
void forget_all_cached_acls(struct inode *inode)
{
- struct posix_acl *old_access, *old_default;
+ struct base_acl *old_access, *old_default;
spin_lock(&inode->i_lock);
old_access = inode->i_acl;
old_default = inode->i_default_acl;
inode->i_acl = inode->i_default_acl = ACL_NOT_CACHED;
spin_unlock(&inode->i_lock);
if (old_access != ACL_NOT_CACHED)
- posix_acl_release(old_access);
+ put_base_acl(old_access);
if (old_default != ACL_NOT_CACHED)
- posix_acl_release(old_default);
+ put_base_acl(old_default);
}
EXPORT_SYMBOL(forget_all_cached_acls);
@@ -129,7 +129,7 @@ EXPORT_SYMBOL(get_acl);
void
posix_acl_init(struct posix_acl *acl, int count)
{
- atomic_set(&acl->a_refcount, 1);
+ atomic_set(&acl->a_base.ba_refcount, 1);
acl->a_count = count;
}
EXPORT_SYMBOL(posix_acl_init);
@@ -162,7 +162,7 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
sizeof(struct posix_acl_entry);
clone = kmemdup(acl, size, flags);
if (clone)
- atomic_set(&clone->a_refcount, 1);
+ atomic_set(&clone->a_base.ba_refcount, 1);
}
return clone;
}
@@ -384,7 +384,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
umode_t mode = *mode_p;
int not_equiv = 0;
- /* assert(atomic_read(acl->a_refcount) == 1); */
+ /* assert(atomic_read(acl->a_base.ba_refcount) == 1); */
FOREACH_ACL_ENTRY(pa, acl, pe) {
switch(pa->e_tag) {
@@ -439,7 +439,7 @@ static int __posix_acl_chmod_masq(struct posix_acl *acl, umode_t mode)
struct posix_acl_entry *group_obj = NULL, *mask_obj = NULL;
struct posix_acl_entry *pa, *pe;
- /* assert(atomic_read(acl->a_refcount) == 1); */
+ /* assert(atomic_read(acl->a_base.ba_refcount) == 1); */
FOREACH_ACL_ENTRY(pa, acl, pe) {
switch(pa->e_tag) {
diff --git a/include/linux/fs.h b/include/linux/fs.h
index ba91a89..3c22c92 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -576,6 +576,12 @@ static inline void mapping_allow_writable(struct address_space *mapping)
#define i_size_ordered_init(inode) do { } while (0)
#endif
+struct base_acl {
+ union {
+ atomic_t ba_refcount;
+ struct rcu_head ba_rcu;
+ };
+};
struct posix_acl;
#define ACL_NOT_CACHED ((void *)(-1))
@@ -595,9 +601,9 @@ struct inode {
kgid_t i_gid;
unsigned int i_flags;
-#ifdef CONFIG_FS_POSIX_ACL
- struct posix_acl *i_acl;
- struct posix_acl *i_default_acl;
+#if defined(CONFIG_FS_POSIX_ACL)
+ struct base_acl *i_acl;
+ struct base_acl *i_default_acl;
#endif
const struct inode_operations *i_op;
@@ -3059,4 +3065,17 @@ static inline bool dir_relax(struct inode *inode)
extern bool path_noexec(const struct path *path);
+static inline struct base_acl *get_base_acl(struct base_acl *acl)
+{
+ if (acl)
+ atomic_inc(&acl->ba_refcount);
+ return acl;
+}
+
+static inline void put_base_acl(struct base_acl *acl)
+{
+ if (acl && atomic_dec_and_test(&acl->ba_refcount))
+ kfree_rcu(acl, ba_rcu);
+}
+
#endif /* _LINUX_FS_H */
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 3e96a6a..2c46441 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -43,10 +43,7 @@ struct posix_acl_entry {
};
struct posix_acl {
- union {
- atomic_t a_refcount;
- struct rcu_head a_rcu;
- };
+ struct base_acl a_base;
unsigned int a_count;
struct posix_acl_entry a_entries[0];
};
@@ -61,8 +58,7 @@ struct posix_acl {
static inline struct posix_acl *
posix_acl_dup(struct posix_acl *acl)
{
- if (acl)
- atomic_inc(&acl->a_refcount);
+ get_base_acl(&acl->a_base);
return acl;
}
@@ -72,8 +68,8 @@ posix_acl_dup(struct posix_acl *acl)
static inline void
posix_acl_release(struct posix_acl *acl)
{
- if (acl && atomic_dec_and_test(&acl->a_refcount))
- kfree_rcu(acl, a_rcu);
+ BUILD_BUG_ON(offsetof(struct posix_acl, a_base) != 0);
+ put_base_acl(&acl->a_base);
}
diff --git a/include/linux/richacl.h b/include/linux/richacl.h
index 9768eeb..61836f1 100644
--- a/include/linux/richacl.h
+++ b/include/linux/richacl.h
@@ -176,7 +176,7 @@ static inline struct richacl *
richacl_get(struct richacl *acl)
{
if (acl)
- atomic_inc(&acl->a_refcount);
+ atomic_inc(&acl->a_base.ba_refcount);
return acl;
}
--
2.4.3
next prev parent reply other threads:[~2015-09-27 22:09 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-27 22:08 [PATCH v8 00/41] Richacls Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 01/41] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 02/41] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 03/41] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 04/41] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 05/41] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 06/41] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 07/41] richacl: Permission mapping functions Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 08/41] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 09/41] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-09-28 15:28 ` J. Bruce Fields
2015-09-28 23:42 ` Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 10/41] richacl: Permission check algorithm Andreas Gruenbacher
2015-09-28 16:08 ` J. Bruce Fields
[not found] ` <20150928160855.GD1358-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2015-09-28 16:25 ` Andreas Grünbacher
[not found] ` <CAHpGcMLHxF8uqbv-hCjKFHKxwemn0QdxZifT7WC95oHs7D3MfA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-09-28 16:29 ` J. Bruce Fields
[not found] ` <20150928162905.GE1358-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2015-09-28 16:51 ` Andreas Grünbacher
2015-09-27 22:09 ` Andreas Gruenbacher [this message]
2015-09-27 22:09 ` [PATCH v8 12/41] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 13/41] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 14/41] richacl: Create-time inheritance Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 15/41] richacl: Automatic Inheritance Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 16/41] richacl: xattr mapping functions Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 17/41] vfs: Add richacl permission checking Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 18/41] ext4: Add richacl support Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 19/41] ext4: Add richacl feature flag Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 20/41] richacl: acl editing helper functions Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 21/41] richacl: Move everyone@ aces down the acl Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 22/41] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 23/41] richacl: Set the owner permissions to the owner mask Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 24/41] richacl: Set the other permissions to the other mask Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 25/41] richacl: Isolate the owner and group classes Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 26/41] richacl: Apply the file masks to a richacl Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 27/41] richacl: Create richacl from mode values Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 28/41] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 29/41] nfsd: Use richacls as internal acl representation Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 30/41] nfsd: Add richacl support Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 31/41] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 32/41] nfsd: Add support for the MAY_CREATE_{FILE,DIR} permissions Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 33/41] richacl: Add support for unmapped identifiers Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 34/41] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 35/41] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 36/41] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 37/41] nfs: Fix GETATTR bitmap verification Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 38/41] nfs: Remove unused xdr page offsets in getacl/setacl arguments Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 39/41] nfs: Add richacl support Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 40/41] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 41/41] richacl: uapi header split Andreas Gruenbacher
[not found] ` <1443391772-10171-1-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-09-28 16:35 ` [PATCH v8 00/41] Richacls J. Bruce Fields
[not found] ` <20150928163543.GF1358-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2015-09-28 17:10 ` Andreas Grünbacher
2015-09-28 17:46 ` J. Bruce Fields
[not found] ` <20150928174648.GA3190-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2015-09-29 14:54 ` Andreas Grünbacher
2015-10-16 18:12 ` Andreas Gruenbacher
2015-10-04 6:23 ` Christoph Hellwig
[not found] ` <20151004062313.GA20212-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2015-10-05 18:45 ` Andreas Gruenbacher
2015-10-05 18:58 ` Austin S Hemmelgarn
2015-10-06 9:49 ` Christoph Hellwig
[not found] ` <20151006094935.GA14144-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2015-10-06 13:12 ` Andreas Gruenbacher
[not found] ` <CAHc6FU5aZJDC3N1iGyVeHfbqMyquM93ONJvUR-t0a9+AjmtAXQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-06 20:26 ` Andreas Dilger
[not found] ` <CF738526-0807-4CE5-A52B-413164D41AA9-m1MBpc4rdrD3fQ9qLvQP4Q@public.gmane.org>
2015-10-06 20:55 ` Steve French
2015-10-07 7:50 ` Christoph Hellwig
2015-10-07 13:38 ` Andreas Gruenbacher
[not found] ` <CAHc6FU7TM5LDu_vVvDc3WPuzQN2mkGGp2AvCY+=qN0GvWuC=Ew-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-07 15:15 ` Steve French
[not found] ` <CAHc6FU53mXg1k0KCNkWEjxyuC8iAUgWh-A76qX=C3Yth+qEyuQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-05 21:17 ` Dave Chinner
2015-10-05 22:01 ` Andreas Gruenbacher
[not found] ` <CAHc6FU5=nPVRRO+0MycYMMmp66hg7YvY4kMGy-D4JfgD3_FkLQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-06 1:20 ` Dave Chinner
2015-10-06 9:49 ` James Morris
[not found] ` <alpine.LRH.2.20.1510062047220.2329-gx6/JNMH7DfYtjvyW6yDsg@public.gmane.org>
2015-10-06 12:24 ` Andreas Grünbacher
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=1443391772-10171-12-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=jlayton@poochiereds.net \
--cc=linux-api@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 \
/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).