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 v14 13/22] vfs: Cache richacl in struct inode Date: Thu, 5 Nov 2015 12:39:31 +0100 [thread overview] Message-ID: <1446723580-3747-14-git-send-email-agruenba@redhat.com> (raw) In-Reply-To: <1446723580-3747-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_inode.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 5 +++- include/linux/richacl.h | 6 ++++ 5 files changed, 96 insertions(+), 5 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 5c46ae5..5e8710c 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) base_acl_put(inode->i_acl); +# if defined(CONFIG_FS_POSIX_ACL) if (inode->i_default_acl && inode->i_default_acl != ACL_NOT_CACHED) base_acl_put(inode->i_default_acl); +# endif #endif this_cpu_dec(nr_inodes); } diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 4573315..b0eb1dc 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -37,7 +37,7 @@ struct posix_acl *get_cached_acl(struct inode *inode, int type) { struct base_acl **p = acl_by_type(inode, type); struct base_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_inode.c b/fs/richacl_inode.c index 99b3c93..52c1595 100644 --- a/fs/richacl_inode.c +++ b/fs/richacl_inode.c @@ -20,6 +20,83 @@ #include <linux/slab.h> #include <linux/richacl.h> +struct richacl *get_cached_richacl(struct inode *inode) +{ + struct base_acl *acl; + + acl = ACCESS_ONCE(inode->i_acl); + if (acl && IS_RICHACL(inode)) { + spin_lock(&inode->i_lock); + acl = inode->i_acl; + if (acl != ACL_NOT_CACHED) + base_acl_get(acl); + spin_unlock(&inode->i_lock); + } + return container_of(acl, struct richacl, a_base); +} +EXPORT_SYMBOL_GPL(get_cached_richacl); + +struct richacl *get_cached_richacl_rcu(struct inode *inode) +{ + struct base_acl *acl = rcu_dereference(inode->i_acl); + + return container_of(acl, struct richacl, a_base); +} +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) + base_acl_put(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) + base_acl_put(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 3c36c72..05fb943 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 7628fad..7bf912b6 100644 --- a/include/linux/richacl.h +++ b/include/linux/richacl.h @@ -70,6 +70,12 @@ richacl_put(struct richacl *acl) base_acl_put(&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
WARNING: multiple messages have this Message-ID (diff)
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 v14 13/22] vfs: Cache richacl in struct inode Date: Thu, 5 Nov 2015 12:39:31 +0100 [thread overview] Message-ID: <1446723580-3747-14-git-send-email-agruenba@redhat.com> (raw) In-Reply-To: <1446723580-3747-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_inode.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 5 +++- include/linux/richacl.h | 6 ++++ 5 files changed, 96 insertions(+), 5 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 5c46ae5..5e8710c 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) base_acl_put(inode->i_acl); +# if defined(CONFIG_FS_POSIX_ACL) if (inode->i_default_acl && inode->i_default_acl != ACL_NOT_CACHED) base_acl_put(inode->i_default_acl); +# endif #endif this_cpu_dec(nr_inodes); } diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 4573315..b0eb1dc 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -37,7 +37,7 @@ struct posix_acl *get_cached_acl(struct inode *inode, int type) { struct base_acl **p = acl_by_type(inode, type); struct base_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_inode.c b/fs/richacl_inode.c index 99b3c93..52c1595 100644 --- a/fs/richacl_inode.c +++ b/fs/richacl_inode.c @@ -20,6 +20,83 @@ #include <linux/slab.h> #include <linux/richacl.h> +struct richacl *get_cached_richacl(struct inode *inode) +{ + struct base_acl *acl; + + acl = ACCESS_ONCE(inode->i_acl); + if (acl && IS_RICHACL(inode)) { + spin_lock(&inode->i_lock); + acl = inode->i_acl; + if (acl != ACL_NOT_CACHED) + base_acl_get(acl); + spin_unlock(&inode->i_lock); + } + return container_of(acl, struct richacl, a_base); +} +EXPORT_SYMBOL_GPL(get_cached_richacl); + +struct richacl *get_cached_richacl_rcu(struct inode *inode) +{ + struct base_acl *acl = rcu_dereference(inode->i_acl); + + return container_of(acl, struct richacl, a_base); +} +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) + base_acl_put(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) + base_acl_put(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 3c36c72..05fb943 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 7628fad..7bf912b6 100644 --- a/include/linux/richacl.h +++ b/include/linux/richacl.h @@ -70,6 +70,12 @@ richacl_put(struct richacl *acl) base_acl_put(&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 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-11-05 11:39 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-05 11:39 [PATCH v14 00/22] Richacls (Core and Ext4) Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 01/22] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-06 20:40 ` Andreas Dilger 2015-11-06 20:40 ` Andreas Dilger 2015-11-05 11:39 ` [PATCH v14 02/22] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-06 20:58 ` Andreas Dilger 2015-11-06 20:58 ` Andreas Dilger [not found] ` <ABAAFEBD-0C80-41A3-8D29-F2AB9BAF1823-m1MBpc4rdrD3fQ9qLvQP4Q@public.gmane.org> 2015-11-07 17:44 ` Andreas Gruenbacher 2015-11-07 17:44 ` Andreas Gruenbacher 2015-11-07 17:44 ` Andreas Gruenbacher [not found] ` <1446918268-858-1-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-11-08 8:18 ` Andreas Dilger 2015-11-08 8:18 ` Andreas Dilger 2015-11-08 8:18 ` Andreas Dilger 2015-11-05 11:39 ` [PATCH v14 03/22] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-06 21:26 ` Andreas Dilger 2015-11-06 21:26 ` Andreas Dilger 2015-11-07 20:47 ` Andreas Gruenbacher 2015-11-07 20:47 ` Andreas Gruenbacher 2015-11-06 21:26 ` Andreas Dilger 2015-11-06 21:26 ` Andreas Dilger 2015-11-05 11:39 ` [PATCH v14 04/22] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher [not found] ` <1446723580-3747-5-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-11-06 21:04 ` Andreas Dilger 2015-11-06 21:04 ` Andreas Dilger 2015-11-06 21:04 ` Andreas Dilger [not found] ` <1446723580-3747-1-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-11-05 11:39 ` [PATCH v14 05/22] vfs: Add permission flags for setting file attributes Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 06/22] richacl: In-memory representation and helper functions Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 17/22] richacl: Automatic Inheritance Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 07/22] richacl: Permission mapping functions Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 08/22] richacl: Compute maximum file masks from an acl Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 09/22] richacl: Permission check algorithm Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 10/22] posix_acl: Unexport acl_by_type and make it static Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 11/22] vfs: Cache base_acl objects in inodes Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher [not found] ` <1446723580-3747-12-git-send-email-agruenba-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-11-08 8:06 ` Andreas Dilger 2015-11-08 8:06 ` Andreas Dilger 2015-11-08 8:06 ` Andreas Dilger 2015-11-05 11:39 ` [PATCH v14 12/22] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher [this message] 2015-11-05 11:39 ` [PATCH v14 13/22] vfs: Cache richacl in struct inode Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 14/22] richacl: Update the file masks in chmod() Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 15/22] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 16/22] richacl: Create-time inheritance Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 18/22] richacl: xattr mapping functions Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 19/22] richacl: Add richacl xattr handler Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 20/22] vfs: Add richacl permission checking Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 21/22] ext4: Add richacl support Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-05 11:39 ` [PATCH v14 22/22] ext4: Add richacl feature flag Andreas Gruenbacher 2015-11-05 11:39 ` Andreas Gruenbacher 2015-11-08 8:12 ` Andreas Dilger 2015-11-08 8:12 ` Andreas Dilger
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=1446723580-3747-14-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.