From: Theodore Ts'o <tytso@mit.edu>
To: Ext4 Developers List <linux-ext4@vger.kernel.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 05/28] ext4: Add new tracepoints to debug delayed allocation space functions
Date: Tue, 2 Mar 2010 13:18:22 -0500 [thread overview]
Message-ID: <1267553925-6308-6-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1267553925-6308-1-git-send-email-tytso@mit.edu>
Add tracepoints for ext4_da_reserve_space(),
ext4_da_update_reserve_space(), and ext4_da_release_space().
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
fs/ext4/inode.c | 2 +
include/trace/events/ext4.h | 101 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 103 insertions(+), 0 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 3e8afd9..1a3d7b2 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1061,6 +1061,7 @@ void ext4_da_update_reserve_space(struct inode *inode,
int mdb_free = 0, allocated_meta_blocks = 0;
spin_lock(&ei->i_block_reservation_lock);
+ trace_ext4_da_update_reserve_space(inode, used);
if (unlikely(used > ei->i_reserved_data_blocks)) {
ext4_msg(inode->i_sb, KERN_NOTICE, "%s: ino %lu, used %d "
"with only %d reserved data blocks\n",
@@ -1846,6 +1847,7 @@ repeat:
spin_lock(&ei->i_block_reservation_lock);
md_reserved = ei->i_reserved_meta_blocks;
md_needed = ext4_calc_metadata_amount(inode, lblock);
+ trace_ext4_da_reserve_space(inode, md_needed);
spin_unlock(&ei->i_block_reservation_lock);
/*
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index d0b6cd3..2aa6aa3 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -874,6 +874,107 @@ TRACE_EVENT(ext4_forget,
__entry->mode, __entry->is_metadata, __entry->block)
);
+TRACE_EVENT(ext4_da_update_reserve_space,
+ TP_PROTO(struct inode *inode, int used_blocks),
+
+ TP_ARGS(inode, used_blocks),
+
+ TP_STRUCT__entry(
+ __field( dev_t, dev )
+ __field( ino_t, ino )
+ __field( umode_t, mode )
+ __field( __u64, i_blocks )
+ __field( int, used_blocks )
+ __field( int, reserved_data_blocks )
+ __field( int, reserved_meta_blocks )
+ __field( int, allocated_meta_blocks )
+ ),
+
+ TP_fast_assign(
+ __entry->dev = inode->i_sb->s_dev;
+ __entry->ino = inode->i_ino;
+ __entry->mode = inode->i_mode;
+ __entry->i_blocks = inode->i_blocks;
+ __entry->used_blocks = used_blocks;
+ __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
+ __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
+ __entry->allocated_meta_blocks = EXT4_I(inode)->i_allocated_meta_blocks;
+ ),
+
+ TP_printk("dev %s ino %lu mode 0%o i_blocks %llu used_blocks %d reserved_data_blocks %d reserved_meta_blocks %d allocated_meta_blocks %d",
+ jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+ __entry->mode, (unsigned long long) __entry->i_blocks,
+ __entry->used_blocks, __entry->reserved_data_blocks,
+ __entry->reserved_meta_blocks, __entry->allocated_meta_blocks)
+);
+
+TRACE_EVENT(ext4_da_reserve_space,
+ TP_PROTO(struct inode *inode, int md_needed),
+
+ TP_ARGS(inode, md_needed),
+
+ TP_STRUCT__entry(
+ __field( dev_t, dev )
+ __field( ino_t, ino )
+ __field( umode_t, mode )
+ __field( __u64, i_blocks )
+ __field( int, md_needed )
+ __field( int, reserved_data_blocks )
+ __field( int, reserved_meta_blocks )
+ ),
+
+ TP_fast_assign(
+ __entry->dev = inode->i_sb->s_dev;
+ __entry->ino = inode->i_ino;
+ __entry->mode = inode->i_mode;
+ __entry->i_blocks = inode->i_blocks;
+ __entry->md_needed = md_needed;
+ __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
+ __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
+ ),
+
+ TP_printk("dev %s ino %lu mode 0%o i_blocks %llu md_needed %d reserved_data_blocks %d reserved_meta_blocks %d",
+ jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+ __entry->mode, (unsigned long long) __entry->i_blocks,
+ __entry->md_needed, __entry->reserved_data_blocks,
+ __entry->reserved_meta_blocks)
+);
+
+TRACE_EVENT(ext4_da_release_space,
+ TP_PROTO(struct inode *inode, int freed_blocks),
+
+ TP_ARGS(inode, freed_blocks),
+
+ TP_STRUCT__entry(
+ __field( dev_t, dev )
+ __field( ino_t, ino )
+ __field( umode_t, mode )
+ __field( __u64, i_blocks )
+ __field( int, freed_blocks )
+ __field( int, reserved_data_blocks )
+ __field( int, reserved_meta_blocks )
+ __field( int, allocated_meta_blocks )
+ ),
+
+ TP_fast_assign(
+ __entry->dev = inode->i_sb->s_dev;
+ __entry->ino = inode->i_ino;
+ __entry->mode = inode->i_mode;
+ __entry->i_blocks = inode->i_blocks;
+ __entry->freed_blocks = freed_blocks;
+ __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
+ __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
+ __entry->allocated_meta_blocks = EXT4_I(inode)->i_allocated_meta_blocks;
+ ),
+
+ TP_printk("dev %s ino %lu mode 0%o i_blocks %llu freed_blocks %d reserved_data_blocks %d reserved_meta_blocks %d allocated_meta_blocks %d",
+ jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+ __entry->mode, (unsigned long long) __entry->i_blocks,
+ __entry->freed_blocks, __entry->reserved_data_blocks,
+ __entry->reserved_meta_blocks, __entry->allocated_meta_blocks)
+);
+
+
#endif /* _TRACE_EXT4_H */
/* This part must be outside protection */
--
1.6.6.1.1.g974db.dirty
next prev parent reply other threads:[~2010-03-02 18:18 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-02 18:18 [PATCH 00/28] Ext4 patch queue for the 2.6.34 merge window Theodore Ts'o
2010-03-02 18:18 ` [PATCH 01/28] ext4: fix async i/o writes beyond 4GB to a sparse file Theodore Ts'o
2010-03-02 18:18 ` [PATCH 02/28] ext4: Fix optional-arg mount options Theodore Ts'o
2010-03-02 18:18 ` [PATCH 03/28] ext4: Add block validity check when truncating indirect block mapped inodes Theodore Ts'o
2010-03-02 18:18 ` [PATCH 04/28] ext4: Add new tracepoint for jbd2_cleanup_journal_tail Theodore Ts'o
2010-03-02 18:18 ` Theodore Ts'o [this message]
2010-03-02 18:18 ` [PATCH 06/28] ext4: Use slab allocator for sub-page sized allocations Theodore Ts'o
2010-03-02 18:18 ` [PATCH 07/28] ext4: Use bitops to read/modify EXT4_I(inode)->i_state Theodore Ts'o
2010-03-02 18:18 ` [PATCH 08/28] ext4: Reserve INCOMPAT_EA_INODE and INCOMPAT_DIRDATA feature codepoints Theodore Ts'o
2010-03-02 18:18 ` [PATCH 09/28] ext4: move __func__ into a macro for ext4_warning, ext4_error Theodore Ts'o
2010-03-02 18:18 ` [PATCH 10/28] ext4: add missing error checking to ext4_expand_extra_isize_ea() Theodore Ts'o
2010-03-02 18:18 ` [PATCH 11/28] ext4: correctly calculate number of blocks for fiemap Theodore Ts'o
2010-03-03 7:47 ` Akira Fujita
2010-03-03 8:34 ` Leonard Michlmayr
2010-03-03 17:52 ` tytso
2010-03-04 5:40 ` Akira Fujita
2010-03-04 21:44 ` Leonard Michlmayr
2010-03-04 22:28 ` [incomplete PATCH] ext4: avoid overflow in fiemap Leonard Michlmayr
2010-03-07 3:38 ` tytso
2010-03-04 23:38 ` [PATCH 11/28] ext4: correctly calculate number of blocks for fiemap Eric Sandeen
2010-03-05 16:46 ` Leonard Michlmayr
2010-03-04 22:08 ` tytso
2010-03-04 23:47 ` Eric Sandeen
2010-03-02 18:18 ` [PATCH 12/28] jbd2: delay discarding buffers in journal_unmap_buffer Theodore Ts'o
2010-03-02 18:18 ` [PATCH 13/28] ext4: Fix BUG_ON at fs/buffer.c:652 in no journal mode Theodore Ts'o
2010-03-02 18:18 ` [PATCH 14/28] ext4: Add flag to files with blocks intentionally past EOF Theodore Ts'o
2010-03-02 18:18 ` [PATCH 15/28] ext4: mount flags manipulation cleanup Theodore Ts'o
2010-03-02 18:18 ` [PATCH 16/28] ext4: trivial quota cleanup Theodore Ts'o
2010-03-02 18:18 ` [PATCH 17/28] jbd2: clean up an assertion in jbd2_journal_commit_transaction() Theodore Ts'o
2010-03-02 18:18 ` [PATCH 18/28] ext4: Fix fencepost error in chosing choosing group vs file preallocation Theodore Ts'o
2010-03-02 18:18 ` [PATCH 19/28] ext4: deprecate obsoleted mount options Theodore Ts'o
2010-03-02 18:18 ` [PATCH 20/28] ext4: fix error handling in migrate Theodore Ts'o
2010-03-02 18:18 ` [PATCH 21/28] ext4: explicitly remove inode from orphan list after failed direct io Theodore Ts'o
2010-03-02 18:18 ` [PATCH 22/28] ext4: Handle non empty on-disk orphan link Theodore Ts'o
2010-03-02 18:18 ` [PATCH 23/28] ext4: make "offset" consistent in ext4_check_dir_entry() Theodore Ts'o
2010-03-02 18:18 ` [PATCH 24/28] ext4: mechanical change on dio get_block code in prepare for it to be used by buffer write Theodore Ts'o
2010-03-02 18:18 ` [PATCH 25/28] ext4: use ext4_get_block_write in " Theodore Ts'o
2010-03-02 18:18 ` [PATCH 26/28] ext4: Use direct_IO_no_locking in ext4 dio read Theodore Ts'o
2010-03-02 18:18 ` [PATCH 27/28] ext4: Convert BUG_ON checks to use ext4_error() instead Theodore Ts'o
2010-03-06 13:03 ` Aneesh Kumar K. V
2010-03-07 2:45 ` tytso
2010-03-07 5:51 ` Eric Sandeen
2010-03-07 17:36 ` Andreas Dilger
2010-03-08 17:46 ` Frank Mayhar
2010-03-02 18:18 ` [PATCH 28/28] ext4: Fix ext4_quota_write cross block boundary behaviour Theodore Ts'o
2010-03-02 18:26 ` [PATCH 00/28] Ext4 patch queue for the 2.6.34 merge window tytso
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=1267553925-6308-6-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=linux-ext4@vger.kernel.org \
/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).