forked from Minki/linux
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>
210 lines
7.1 KiB
C
210 lines
7.1 KiB
C
/*
|
|
* Copyright (c) 2000-2002,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_ALLOC_H__
|
|
#define __XFS_ALLOC_H__
|
|
|
|
struct xfs_buf;
|
|
struct xfs_mount;
|
|
struct xfs_perag;
|
|
struct xfs_trans;
|
|
|
|
/*
|
|
* Freespace allocation types. Argument to xfs_alloc_[v]extent.
|
|
*/
|
|
typedef enum xfs_alloctype
|
|
{
|
|
XFS_ALLOCTYPE_ANY_AG, /* allocate anywhere, use rotor */
|
|
XFS_ALLOCTYPE_FIRST_AG, /* ... start at ag 0 */
|
|
XFS_ALLOCTYPE_START_AG, /* anywhere, start in this a.g. */
|
|
XFS_ALLOCTYPE_THIS_AG, /* anywhere in this a.g. */
|
|
XFS_ALLOCTYPE_START_BNO, /* near this block else anywhere */
|
|
XFS_ALLOCTYPE_NEAR_BNO, /* in this a.g. and near this block */
|
|
XFS_ALLOCTYPE_THIS_BNO /* at exactly this block */
|
|
} xfs_alloctype_t;
|
|
|
|
#define XFS_ALLOC_TYPES \
|
|
{ XFS_ALLOCTYPE_ANY_AG, "ANY_AG" }, \
|
|
{ XFS_ALLOCTYPE_FIRST_AG, "FIRST_AG" }, \
|
|
{ XFS_ALLOCTYPE_START_AG, "START_AG" }, \
|
|
{ XFS_ALLOCTYPE_THIS_AG, "THIS_AG" }, \
|
|
{ XFS_ALLOCTYPE_START_BNO, "START_BNO" }, \
|
|
{ XFS_ALLOCTYPE_NEAR_BNO, "NEAR_BNO" }, \
|
|
{ XFS_ALLOCTYPE_THIS_BNO, "THIS_BNO" }
|
|
|
|
/*
|
|
* Flags for xfs_alloc_fix_freelist.
|
|
*/
|
|
#define XFS_ALLOC_FLAG_TRYLOCK 0x00000001 /* use trylock for buffer locking */
|
|
#define XFS_ALLOC_FLAG_FREEING 0x00000002 /* indicate caller is freeing extents*/
|
|
|
|
/*
|
|
* In order to avoid ENOSPC-related deadlock caused by
|
|
* out-of-order locking of AGF buffer (PV 947395), we place
|
|
* constraints on the relationship among actual allocations for
|
|
* data blocks, freelist blocks, and potential file data bmap
|
|
* btree blocks. However, these restrictions may result in no
|
|
* actual space allocated for a delayed extent, for example, a data
|
|
* block in a certain AG is allocated but there is no additional
|
|
* block for the additional bmap btree block due to a split of the
|
|
* bmap btree of the file. The result of this may lead to an
|
|
* infinite loop in xfssyncd when the file gets flushed to disk and
|
|
* all delayed extents need to be actually allocated. To get around
|
|
* this, we explicitly set aside a few blocks which will not be
|
|
* reserved in delayed allocation. Considering the minimum number of
|
|
* needed freelist blocks is 4 fsbs _per AG_, a potential split of file's bmap
|
|
* btree requires 1 fsb, so we set the number of set-aside blocks
|
|
* to 4 + 4*agcount.
|
|
*/
|
|
#define XFS_ALLOC_SET_ASIDE(mp) (4 + ((mp)->m_sb.sb_agcount * 4))
|
|
|
|
/*
|
|
* Argument structure for xfs_alloc routines.
|
|
* This is turned into a structure to avoid having 20 arguments passed
|
|
* down several levels of the stack.
|
|
*/
|
|
typedef struct xfs_alloc_arg {
|
|
struct xfs_trans *tp; /* transaction pointer */
|
|
struct xfs_mount *mp; /* file system mount point */
|
|
struct xfs_buf *agbp; /* buffer for a.g. freelist header */
|
|
struct xfs_perag *pag; /* per-ag struct for this agno */
|
|
xfs_fsblock_t fsbno; /* file system block number */
|
|
xfs_agnumber_t agno; /* allocation group number */
|
|
xfs_agblock_t agbno; /* allocation group-relative block # */
|
|
xfs_extlen_t minlen; /* minimum size of extent */
|
|
xfs_extlen_t maxlen; /* maximum size of extent */
|
|
xfs_extlen_t mod; /* mod value for extent size */
|
|
xfs_extlen_t prod; /* prod value for extent size */
|
|
xfs_extlen_t minleft; /* min blocks must be left after us */
|
|
xfs_extlen_t total; /* total blocks needed in xaction */
|
|
xfs_extlen_t alignment; /* align answer to multiple of this */
|
|
xfs_extlen_t minalignslop; /* slop for minlen+alignment calcs */
|
|
xfs_extlen_t len; /* output: actual size of extent */
|
|
xfs_alloctype_t type; /* allocation type XFS_ALLOCTYPE_... */
|
|
xfs_alloctype_t otype; /* original allocation type */
|
|
char wasdel; /* set if allocation was prev delayed */
|
|
char wasfromfl; /* set if allocation is from freelist */
|
|
char isfl; /* set if is freelist blocks - !acctg */
|
|
char userdata; /* set if this is user data */
|
|
xfs_fsblock_t firstblock; /* io first block allocated */
|
|
} xfs_alloc_arg_t;
|
|
|
|
/*
|
|
* Defines for userdata
|
|
*/
|
|
#define XFS_ALLOC_USERDATA 1 /* allocation is for user data*/
|
|
#define XFS_ALLOC_INITIAL_USER_DATA 2 /* special case start of file */
|
|
|
|
/*
|
|
* Find the length of the longest extent in an AG.
|
|
*/
|
|
xfs_extlen_t
|
|
xfs_alloc_longest_free_extent(struct xfs_mount *mp,
|
|
struct xfs_perag *pag);
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
void
|
|
xfs_alloc_mark_busy(xfs_trans_t *tp,
|
|
xfs_agnumber_t agno,
|
|
xfs_agblock_t bno,
|
|
xfs_extlen_t len);
|
|
|
|
void
|
|
xfs_alloc_clear_busy(xfs_trans_t *tp,
|
|
xfs_agnumber_t ag,
|
|
int idx);
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
/*
|
|
* Compute and fill in value of m_ag_maxlevels.
|
|
*/
|
|
void
|
|
xfs_alloc_compute_maxlevels(
|
|
struct xfs_mount *mp); /* file system mount structure */
|
|
|
|
/*
|
|
* Get a block from the freelist.
|
|
* Returns with the buffer for the block gotten.
|
|
*/
|
|
int /* error */
|
|
xfs_alloc_get_freelist(
|
|
struct xfs_trans *tp, /* transaction pointer */
|
|
struct xfs_buf *agbp, /* buffer containing the agf structure */
|
|
xfs_agblock_t *bnop, /* block address retrieved from freelist */
|
|
int btreeblk); /* destination is a AGF btree */
|
|
|
|
/*
|
|
* Log the given fields from the agf structure.
|
|
*/
|
|
void
|
|
xfs_alloc_log_agf(
|
|
struct xfs_trans *tp, /* transaction pointer */
|
|
struct xfs_buf *bp, /* buffer for a.g. freelist header */
|
|
int fields);/* mask of fields to be logged (XFS_AGF_...) */
|
|
|
|
/*
|
|
* Interface for inode allocation to force the pag data to be initialized.
|
|
*/
|
|
int /* error */
|
|
xfs_alloc_pagf_init(
|
|
struct xfs_mount *mp, /* file system mount structure */
|
|
struct xfs_trans *tp, /* transaction pointer */
|
|
xfs_agnumber_t agno, /* allocation group number */
|
|
int flags); /* XFS_ALLOC_FLAGS_... */
|
|
|
|
/*
|
|
* Put the block on the freelist for the allocation group.
|
|
*/
|
|
int /* error */
|
|
xfs_alloc_put_freelist(
|
|
struct xfs_trans *tp, /* transaction pointer */
|
|
struct xfs_buf *agbp, /* buffer for a.g. freelist header */
|
|
struct xfs_buf *agflbp,/* buffer for a.g. free block array */
|
|
xfs_agblock_t bno, /* block being freed */
|
|
int btreeblk); /* owner was a AGF btree */
|
|
|
|
/*
|
|
* Read in the allocation group header (free/alloc section).
|
|
*/
|
|
int /* error */
|
|
xfs_alloc_read_agf(
|
|
struct xfs_mount *mp, /* mount point structure */
|
|
struct xfs_trans *tp, /* transaction pointer */
|
|
xfs_agnumber_t agno, /* allocation group number */
|
|
int flags, /* XFS_ALLOC_FLAG_... */
|
|
struct xfs_buf **bpp); /* buffer for the ag freelist header */
|
|
|
|
/*
|
|
* Allocate an extent (variable-size).
|
|
*/
|
|
int /* error */
|
|
xfs_alloc_vextent(
|
|
xfs_alloc_arg_t *args); /* allocation argument structure */
|
|
|
|
/*
|
|
* Free an extent.
|
|
*/
|
|
int /* error */
|
|
xfs_free_extent(
|
|
struct xfs_trans *tp, /* transaction pointer */
|
|
xfs_fsblock_t bno, /* starting block number of extent */
|
|
xfs_extlen_t len); /* length of extent */
|
|
|
|
#endif /* __XFS_ALLOC_H__ */
|