mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
![Christoph Hellwig](/assets/img/avatar_default.png)
Convert the old xfs tracing support that could only be used with the out of tree kdb and xfsidbg patches to use the generic event tracer. To use it make sure CONFIG_EVENT_TRACING is enabled and then enable all xfs trace channels by: echo 1 > /sys/kernel/debug/tracing/events/xfs/enable or alternatively enable single events by just doing the same in one event subdirectory, e.g. echo 1 > /sys/kernel/debug/tracing/events/xfs/xfs_ihold/enable or set more complex filters, etc. In Documentation/trace/events.txt all this is desctribed in more detail. To reads the events do a cat /sys/kernel/debug/tracing/trace Compared to the last posting this patch converts the tracing mostly to the one tracepoint per callsite model that other users of the new tracing facility also employ. This allows a very fine-grained control of the tracing, a cleaner output of the traces and also enables the perf tool to use each tracepoint as a virtual performance counter, allowing us to e.g. count how often certain workloads git various spots in XFS. Take a look at http://lwn.net/Articles/346470/ for some examples. Also the btree tracing isn't included at all yet, as it will require additional core tracing features not in mainline yet, I plan to deliver it later. And the really nice thing about this patch is that it actually removes many lines of code while adding this nice functionality: fs/xfs/Makefile | 8 fs/xfs/linux-2.6/xfs_acl.c | 1 fs/xfs/linux-2.6/xfs_aops.c | 52 - fs/xfs/linux-2.6/xfs_aops.h | 2 fs/xfs/linux-2.6/xfs_buf.c | 117 +-- fs/xfs/linux-2.6/xfs_buf.h | 33 fs/xfs/linux-2.6/xfs_fs_subr.c | 3 fs/xfs/linux-2.6/xfs_ioctl.c | 1 fs/xfs/linux-2.6/xfs_ioctl32.c | 1 fs/xfs/linux-2.6/xfs_iops.c | 1 fs/xfs/linux-2.6/xfs_linux.h | 1 fs/xfs/linux-2.6/xfs_lrw.c | 87 -- fs/xfs/linux-2.6/xfs_lrw.h | 45 - fs/xfs/linux-2.6/xfs_super.c | 104 --- fs/xfs/linux-2.6/xfs_super.h | 7 fs/xfs/linux-2.6/xfs_sync.c | 1 fs/xfs/linux-2.6/xfs_trace.c | 75 ++ fs/xfs/linux-2.6/xfs_trace.h | 1369 +++++++++++++++++++++++++++++++++++++++++ fs/xfs/linux-2.6/xfs_vnode.h | 4 fs/xfs/quota/xfs_dquot.c | 110 --- fs/xfs/quota/xfs_dquot.h | 21 fs/xfs/quota/xfs_qm.c | 40 - fs/xfs/quota/xfs_qm_syscalls.c | 4 fs/xfs/support/ktrace.c | 323 --------- fs/xfs/support/ktrace.h | 85 -- fs/xfs/xfs.h | 16 fs/xfs/xfs_ag.h | 14 fs/xfs/xfs_alloc.c | 230 +----- fs/xfs/xfs_alloc.h | 27 fs/xfs/xfs_alloc_btree.c | 1 fs/xfs/xfs_attr.c | 107 --- fs/xfs/xfs_attr.h | 10 fs/xfs/xfs_attr_leaf.c | 14 fs/xfs/xfs_attr_sf.h | 40 - fs/xfs/xfs_bmap.c | 507 +++------------ fs/xfs/xfs_bmap.h | 49 - fs/xfs/xfs_bmap_btree.c | 6 fs/xfs/xfs_btree.c | 5 fs/xfs/xfs_btree_trace.h | 17 fs/xfs/xfs_buf_item.c | 87 -- fs/xfs/xfs_buf_item.h | 20 fs/xfs/xfs_da_btree.c | 3 fs/xfs/xfs_da_btree.h | 7 fs/xfs/xfs_dfrag.c | 2 fs/xfs/xfs_dir2.c | 8 fs/xfs/xfs_dir2_block.c | 20 fs/xfs/xfs_dir2_leaf.c | 21 fs/xfs/xfs_dir2_node.c | 27 fs/xfs/xfs_dir2_sf.c | 26 fs/xfs/xfs_dir2_trace.c | 216 ------ fs/xfs/xfs_dir2_trace.h | 72 -- fs/xfs/xfs_filestream.c | 8 fs/xfs/xfs_fsops.c | 2 fs/xfs/xfs_iget.c | 111 --- fs/xfs/xfs_inode.c | 67 -- fs/xfs/xfs_inode.h | 76 -- fs/xfs/xfs_inode_item.c | 5 fs/xfs/xfs_iomap.c | 85 -- fs/xfs/xfs_iomap.h | 8 fs/xfs/xfs_log.c | 181 +---- fs/xfs/xfs_log_priv.h | 20 fs/xfs/xfs_log_recover.c | 1 fs/xfs/xfs_mount.c | 2 fs/xfs/xfs_quota.h | 8 fs/xfs/xfs_rename.c | 1 fs/xfs/xfs_rtalloc.c | 1 fs/xfs/xfs_rw.c | 3 fs/xfs/xfs_trans.h | 47 + fs/xfs/xfs_trans_buf.c | 62 - fs/xfs/xfs_vnodeops.c | 8 70 files changed, 2151 insertions(+), 2592 deletions(-) Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Alex Elder <aelder@sgi.com>
469 lines
9.5 KiB
C
469 lines
9.5 KiB
C
/*
|
|
* Copyright (c) 2008, Christoph Hellwig
|
|
* All Rights Reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it would be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write the Free Software Foundation,
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
#include "xfs.h"
|
|
#include "xfs_acl.h"
|
|
#include "xfs_attr.h"
|
|
#include "xfs_bmap_btree.h"
|
|
#include "xfs_inode.h"
|
|
#include "xfs_vnodeops.h"
|
|
#include "xfs_trace.h"
|
|
#include <linux/xattr.h>
|
|
#include <linux/posix_acl_xattr.h>
|
|
|
|
|
|
/*
|
|
* Locking scheme:
|
|
* - all ACL updates are protected by inode->i_mutex, which is taken before
|
|
* calling into this file.
|
|
*/
|
|
|
|
STATIC struct posix_acl *
|
|
xfs_acl_from_disk(struct xfs_acl *aclp)
|
|
{
|
|
struct posix_acl_entry *acl_e;
|
|
struct posix_acl *acl;
|
|
struct xfs_acl_entry *ace;
|
|
int count, i;
|
|
|
|
count = be32_to_cpu(aclp->acl_cnt);
|
|
|
|
acl = posix_acl_alloc(count, GFP_KERNEL);
|
|
if (!acl)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
for (i = 0; i < count; i++) {
|
|
acl_e = &acl->a_entries[i];
|
|
ace = &aclp->acl_entry[i];
|
|
|
|
/*
|
|
* The tag is 32 bits on disk and 16 bits in core.
|
|
*
|
|
* Because every access to it goes through the core
|
|
* format first this is not a problem.
|
|
*/
|
|
acl_e->e_tag = be32_to_cpu(ace->ae_tag);
|
|
acl_e->e_perm = be16_to_cpu(ace->ae_perm);
|
|
|
|
switch (acl_e->e_tag) {
|
|
case ACL_USER:
|
|
case ACL_GROUP:
|
|
acl_e->e_id = be32_to_cpu(ace->ae_id);
|
|
break;
|
|
case ACL_USER_OBJ:
|
|
case ACL_GROUP_OBJ:
|
|
case ACL_MASK:
|
|
case ACL_OTHER:
|
|
acl_e->e_id = ACL_UNDEFINED_ID;
|
|
break;
|
|
default:
|
|
goto fail;
|
|
}
|
|
}
|
|
return acl;
|
|
|
|
fail:
|
|
posix_acl_release(acl);
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
STATIC void
|
|
xfs_acl_to_disk(struct xfs_acl *aclp, const struct posix_acl *acl)
|
|
{
|
|
const struct posix_acl_entry *acl_e;
|
|
struct xfs_acl_entry *ace;
|
|
int i;
|
|
|
|
aclp->acl_cnt = cpu_to_be32(acl->a_count);
|
|
for (i = 0; i < acl->a_count; i++) {
|
|
ace = &aclp->acl_entry[i];
|
|
acl_e = &acl->a_entries[i];
|
|
|
|
ace->ae_tag = cpu_to_be32(acl_e->e_tag);
|
|
ace->ae_id = cpu_to_be32(acl_e->e_id);
|
|
ace->ae_perm = cpu_to_be16(acl_e->e_perm);
|
|
}
|
|
}
|
|
|
|
struct posix_acl *
|
|
xfs_get_acl(struct inode *inode, int type)
|
|
{
|
|
struct xfs_inode *ip = XFS_I(inode);
|
|
struct posix_acl *acl;
|
|
struct xfs_acl *xfs_acl;
|
|
int len = sizeof(struct xfs_acl);
|
|
char *ea_name;
|
|
int error;
|
|
|
|
acl = get_cached_acl(inode, type);
|
|
if (acl != ACL_NOT_CACHED)
|
|
return acl;
|
|
|
|
switch (type) {
|
|
case ACL_TYPE_ACCESS:
|
|
ea_name = SGI_ACL_FILE;
|
|
break;
|
|
case ACL_TYPE_DEFAULT:
|
|
ea_name = SGI_ACL_DEFAULT;
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
|
|
/*
|
|
* If we have a cached ACLs value just return it, not need to
|
|
* go out to the disk.
|
|
*/
|
|
|
|
xfs_acl = kzalloc(sizeof(struct xfs_acl), GFP_KERNEL);
|
|
if (!xfs_acl)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
error = -xfs_attr_get(ip, ea_name, (char *)xfs_acl, &len, ATTR_ROOT);
|
|
if (error) {
|
|
/*
|
|
* If the attribute doesn't exist make sure we have a negative
|
|
* cache entry, for any other error assume it is transient and
|
|
* leave the cache entry as ACL_NOT_CACHED.
|
|
*/
|
|
if (error == -ENOATTR) {
|
|
acl = NULL;
|
|
goto out_update_cache;
|
|
}
|
|
goto out;
|
|
}
|
|
|
|
acl = xfs_acl_from_disk(xfs_acl);
|
|
if (IS_ERR(acl))
|
|
goto out;
|
|
|
|
out_update_cache:
|
|
set_cached_acl(inode, type, acl);
|
|
out:
|
|
kfree(xfs_acl);
|
|
return acl;
|
|
}
|
|
|
|
STATIC int
|
|
xfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
|
|
{
|
|
struct xfs_inode *ip = XFS_I(inode);
|
|
char *ea_name;
|
|
int error;
|
|
|
|
if (S_ISLNK(inode->i_mode))
|
|
return -EOPNOTSUPP;
|
|
|
|
switch (type) {
|
|
case ACL_TYPE_ACCESS:
|
|
ea_name = SGI_ACL_FILE;
|
|
break;
|
|
case ACL_TYPE_DEFAULT:
|
|
if (!S_ISDIR(inode->i_mode))
|
|
return acl ? -EACCES : 0;
|
|
ea_name = SGI_ACL_DEFAULT;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (acl) {
|
|
struct xfs_acl *xfs_acl;
|
|
int len;
|
|
|
|
xfs_acl = kzalloc(sizeof(struct xfs_acl), GFP_KERNEL);
|
|
if (!xfs_acl)
|
|
return -ENOMEM;
|
|
|
|
xfs_acl_to_disk(xfs_acl, acl);
|
|
len = sizeof(struct xfs_acl) -
|
|
(sizeof(struct xfs_acl_entry) *
|
|
(XFS_ACL_MAX_ENTRIES - acl->a_count));
|
|
|
|
error = -xfs_attr_set(ip, ea_name, (char *)xfs_acl,
|
|
len, ATTR_ROOT);
|
|
|
|
kfree(xfs_acl);
|
|
} else {
|
|
/*
|
|
* A NULL ACL argument means we want to remove the ACL.
|
|
*/
|
|
error = -xfs_attr_remove(ip, ea_name, ATTR_ROOT);
|
|
|
|
/*
|
|
* If the attribute didn't exist to start with that's fine.
|
|
*/
|
|
if (error == -ENOATTR)
|
|
error = 0;
|
|
}
|
|
|
|
if (!error)
|
|
set_cached_acl(inode, type, acl);
|
|
return error;
|
|
}
|
|
|
|
int
|
|
xfs_check_acl(struct inode *inode, int mask)
|
|
{
|
|
struct xfs_inode *ip = XFS_I(inode);
|
|
struct posix_acl *acl;
|
|
int error = -EAGAIN;
|
|
|
|
xfs_itrace_entry(ip);
|
|
|
|
/*
|
|
* If there is no attribute fork no ACL exists on this inode and
|
|
* we can skip the whole exercise.
|
|
*/
|
|
if (!XFS_IFORK_Q(ip))
|
|
return -EAGAIN;
|
|
|
|
acl = xfs_get_acl(inode, ACL_TYPE_ACCESS);
|
|
if (IS_ERR(acl))
|
|
return PTR_ERR(acl);
|
|
if (acl) {
|
|
error = posix_acl_permission(inode, acl, mask);
|
|
posix_acl_release(acl);
|
|
}
|
|
|
|
return error;
|
|
}
|
|
|
|
static int
|
|
xfs_set_mode(struct inode *inode, mode_t mode)
|
|
{
|
|
int error = 0;
|
|
|
|
if (mode != inode->i_mode) {
|
|
struct iattr iattr;
|
|
|
|
iattr.ia_valid = ATTR_MODE;
|
|
iattr.ia_mode = mode;
|
|
|
|
error = -xfs_setattr(XFS_I(inode), &iattr, XFS_ATTR_NOACL);
|
|
}
|
|
|
|
return error;
|
|
}
|
|
|
|
static int
|
|
xfs_acl_exists(struct inode *inode, char *name)
|
|
{
|
|
int len = sizeof(struct xfs_acl);
|
|
|
|
return (xfs_attr_get(XFS_I(inode), name, NULL, &len,
|
|
ATTR_ROOT|ATTR_KERNOVAL) == 0);
|
|
}
|
|
|
|
int
|
|
posix_acl_access_exists(struct inode *inode)
|
|
{
|
|
return xfs_acl_exists(inode, SGI_ACL_FILE);
|
|
}
|
|
|
|
int
|
|
posix_acl_default_exists(struct inode *inode)
|
|
{
|
|
if (!S_ISDIR(inode->i_mode))
|
|
return 0;
|
|
return xfs_acl_exists(inode, SGI_ACL_DEFAULT);
|
|
}
|
|
|
|
/*
|
|
* No need for i_mutex because the inode is not yet exposed to the VFS.
|
|
*/
|
|
int
|
|
xfs_inherit_acl(struct inode *inode, struct posix_acl *default_acl)
|
|
{
|
|
struct posix_acl *clone;
|
|
mode_t mode;
|
|
int error = 0, inherit = 0;
|
|
|
|
if (S_ISDIR(inode->i_mode)) {
|
|
error = xfs_set_acl(inode, ACL_TYPE_DEFAULT, default_acl);
|
|
if (error)
|
|
return error;
|
|
}
|
|
|
|
clone = posix_acl_clone(default_acl, GFP_KERNEL);
|
|
if (!clone)
|
|
return -ENOMEM;
|
|
|
|
mode = inode->i_mode;
|
|
error = posix_acl_create_masq(clone, &mode);
|
|
if (error < 0)
|
|
goto out_release_clone;
|
|
|
|
/*
|
|
* If posix_acl_create_masq returns a positive value we need to
|
|
* inherit a permission that can't be represented using the Unix
|
|
* mode bits and we actually need to set an ACL.
|
|
*/
|
|
if (error > 0)
|
|
inherit = 1;
|
|
|
|
error = xfs_set_mode(inode, mode);
|
|
if (error)
|
|
goto out_release_clone;
|
|
|
|
if (inherit)
|
|
error = xfs_set_acl(inode, ACL_TYPE_ACCESS, clone);
|
|
|
|
out_release_clone:
|
|
posix_acl_release(clone);
|
|
return error;
|
|
}
|
|
|
|
int
|
|
xfs_acl_chmod(struct inode *inode)
|
|
{
|
|
struct posix_acl *acl, *clone;
|
|
int error;
|
|
|
|
if (S_ISLNK(inode->i_mode))
|
|
return -EOPNOTSUPP;
|
|
|
|
acl = xfs_get_acl(inode, ACL_TYPE_ACCESS);
|
|
if (IS_ERR(acl) || !acl)
|
|
return PTR_ERR(acl);
|
|
|
|
clone = posix_acl_clone(acl, GFP_KERNEL);
|
|
posix_acl_release(acl);
|
|
if (!clone)
|
|
return -ENOMEM;
|
|
|
|
error = posix_acl_chmod_masq(clone, inode->i_mode);
|
|
if (!error)
|
|
error = xfs_set_acl(inode, ACL_TYPE_ACCESS, clone);
|
|
|
|
posix_acl_release(clone);
|
|
return error;
|
|
}
|
|
|
|
/*
|
|
* System xattr handlers.
|
|
*
|
|
* Currently Posix ACLs are the only system namespace extended attribute
|
|
* handlers supported by XFS, so we just implement the handlers here.
|
|
* If we ever support other system extended attributes this will need
|
|
* some refactoring.
|
|
*/
|
|
|
|
static int
|
|
xfs_decode_acl(const char *name)
|
|
{
|
|
if (strcmp(name, "posix_acl_access") == 0)
|
|
return ACL_TYPE_ACCESS;
|
|
else if (strcmp(name, "posix_acl_default") == 0)
|
|
return ACL_TYPE_DEFAULT;
|
|
return -EINVAL;
|
|
}
|
|
|
|
static int
|
|
xfs_xattr_system_get(struct inode *inode, const char *name,
|
|
void *value, size_t size)
|
|
{
|
|
struct posix_acl *acl;
|
|
int type, error;
|
|
|
|
type = xfs_decode_acl(name);
|
|
if (type < 0)
|
|
return type;
|
|
|
|
acl = xfs_get_acl(inode, type);
|
|
if (IS_ERR(acl))
|
|
return PTR_ERR(acl);
|
|
if (acl == NULL)
|
|
return -ENODATA;
|
|
|
|
error = posix_acl_to_xattr(acl, value, size);
|
|
posix_acl_release(acl);
|
|
|
|
return error;
|
|
}
|
|
|
|
static int
|
|
xfs_xattr_system_set(struct inode *inode, const char *name,
|
|
const void *value, size_t size, int flags)
|
|
{
|
|
struct posix_acl *acl = NULL;
|
|
int error = 0, type;
|
|
|
|
type = xfs_decode_acl(name);
|
|
if (type < 0)
|
|
return type;
|
|
if (flags & XATTR_CREATE)
|
|
return -EINVAL;
|
|
if (type == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode))
|
|
return value ? -EACCES : 0;
|
|
if ((current_fsuid() != inode->i_uid) && !capable(CAP_FOWNER))
|
|
return -EPERM;
|
|
|
|
if (!value)
|
|
goto set_acl;
|
|
|
|
acl = posix_acl_from_xattr(value, size);
|
|
if (!acl) {
|
|
/*
|
|
* acl_set_file(3) may request that we set default ACLs with
|
|
* zero length -- defend (gracefully) against that here.
|
|
*/
|
|
goto out;
|
|
}
|
|
if (IS_ERR(acl)) {
|
|
error = PTR_ERR(acl);
|
|
goto out;
|
|
}
|
|
|
|
error = posix_acl_valid(acl);
|
|
if (error)
|
|
goto out_release;
|
|
|
|
error = -EINVAL;
|
|
if (acl->a_count > XFS_ACL_MAX_ENTRIES)
|
|
goto out_release;
|
|
|
|
if (type == ACL_TYPE_ACCESS) {
|
|
mode_t mode = inode->i_mode;
|
|
error = posix_acl_equiv_mode(acl, &mode);
|
|
|
|
if (error <= 0) {
|
|
posix_acl_release(acl);
|
|
acl = NULL;
|
|
|
|
if (error < 0)
|
|
return error;
|
|
}
|
|
|
|
error = xfs_set_mode(inode, mode);
|
|
if (error)
|
|
goto out_release;
|
|
}
|
|
|
|
set_acl:
|
|
error = xfs_set_acl(inode, type, acl);
|
|
out_release:
|
|
posix_acl_release(acl);
|
|
out:
|
|
return error;
|
|
}
|
|
|
|
struct xattr_handler xfs_xattr_system_handler = {
|
|
.prefix = XATTR_SYSTEM_PREFIX,
|
|
.get = xfs_xattr_system_get,
|
|
.set = xfs_xattr_system_set,
|
|
};
|