0b1b213fcf
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>
95 lines
3.5 KiB
C
95 lines
3.5 KiB
C
/*
|
|
* Copyright (c) 2003-2005 Silicon Graphics, Inc.
|
|
* 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
|
|
*/
|
|
#ifndef __XFS_IOMAP_H__
|
|
#define __XFS_IOMAP_H__
|
|
|
|
#define IOMAP_DADDR_NULL ((xfs_daddr_t) (-1LL))
|
|
|
|
|
|
typedef enum { /* iomap_flags values */
|
|
IOMAP_READ = 0, /* mapping for a read */
|
|
IOMAP_HOLE = 0x02, /* mapping covers a hole */
|
|
IOMAP_DELAY = 0x04, /* mapping covers delalloc region */
|
|
IOMAP_REALTIME = 0x10, /* mapping on the realtime device */
|
|
IOMAP_UNWRITTEN = 0x20, /* mapping covers allocated */
|
|
/* but uninitialized file data */
|
|
IOMAP_NEW = 0x40 /* just allocate */
|
|
} iomap_flags_t;
|
|
|
|
typedef enum {
|
|
/* base extent manipulation calls */
|
|
BMAPI_READ = (1 << 0), /* read extents */
|
|
BMAPI_WRITE = (1 << 1), /* create extents */
|
|
BMAPI_ALLOCATE = (1 << 2), /* delayed allocate to real extents */
|
|
/* modifiers */
|
|
BMAPI_IGNSTATE = (1 << 4), /* ignore unwritten state on read */
|
|
BMAPI_DIRECT = (1 << 5), /* direct instead of buffered write */
|
|
BMAPI_MMAP = (1 << 6), /* allocate for mmap write */
|
|
BMAPI_TRYLOCK = (1 << 7), /* non-blocking request */
|
|
} bmapi_flags_t;
|
|
|
|
#define BMAPI_FLAGS \
|
|
{ BMAPI_READ, "READ" }, \
|
|
{ BMAPI_WRITE, "WRITE" }, \
|
|
{ BMAPI_ALLOCATE, "ALLOCATE" }, \
|
|
{ BMAPI_IGNSTATE, "IGNSTATE" }, \
|
|
{ BMAPI_DIRECT, "DIRECT" }, \
|
|
{ BMAPI_MMAP, "MMAP" }, \
|
|
{ BMAPI_TRYLOCK, "TRYLOCK" }
|
|
|
|
/*
|
|
* xfs_iomap_t: File system I/O map
|
|
*
|
|
* The iomap_bn field is expressed in 512-byte blocks, and is where the
|
|
* mapping starts on disk.
|
|
*
|
|
* The iomap_offset, iomap_bsize and iomap_delta fields are in bytes.
|
|
* iomap_offset is the offset of the mapping in the file itself.
|
|
* iomap_bsize is the size of the mapping, iomap_delta is the
|
|
* desired data's offset into the mapping, given the offset supplied
|
|
* to the file I/O map routine.
|
|
*
|
|
* When a request is made to read beyond the logical end of the object,
|
|
* iomap_size may be set to 0, but iomap_offset and iomap_length should be set
|
|
* to the actual amount of underlying storage that has been allocated, if any.
|
|
*/
|
|
|
|
typedef struct xfs_iomap {
|
|
xfs_daddr_t iomap_bn; /* first 512B blk of mapping */
|
|
xfs_buftarg_t *iomap_target;
|
|
xfs_off_t iomap_offset; /* offset of mapping, bytes */
|
|
xfs_off_t iomap_bsize; /* size of mapping, bytes */
|
|
xfs_off_t iomap_delta; /* offset into mapping, bytes */
|
|
iomap_flags_t iomap_flags;
|
|
} xfs_iomap_t;
|
|
|
|
struct xfs_inode;
|
|
struct xfs_bmbt_irec;
|
|
|
|
extern int xfs_iomap(struct xfs_inode *, xfs_off_t, ssize_t, int,
|
|
struct xfs_iomap *, int *);
|
|
extern int xfs_iomap_write_direct(struct xfs_inode *, xfs_off_t, size_t,
|
|
int, struct xfs_bmbt_irec *, int *, int);
|
|
extern int xfs_iomap_write_delay(struct xfs_inode *, xfs_off_t, size_t, int,
|
|
struct xfs_bmbt_irec *, int *);
|
|
extern int xfs_iomap_write_allocate(struct xfs_inode *, xfs_off_t, size_t,
|
|
struct xfs_bmbt_irec *, int *);
|
|
extern int xfs_iomap_write_unwritten(struct xfs_inode *, xfs_off_t, size_t);
|
|
|
|
#endif /* __XFS_IOMAP_H__*/
|