ext3: Add fixed tracepoints

This commit adds fixed tracepoints to the ext3 code. It is based on ext4
tracepoints, however due to the differences of both file systems, there
are some tracepoints missing (those for delaloc and for multi-block
allocator) and there are some ext3 specific as well (for reservation
windows).

Here is a list:

ext3_free_inode
ext3_request_inode
ext3_allocate_inode
ext3_evict_inode
ext3_drop_inode
ext3_mark_inode_dirty
ext3_write_begin
ext3_ordered_write_end
ext3_writeback_write_end
ext3_journalled_write_end
ext3_ordered_writepage
ext3_writeback_writepage
ext3_journalled_writepage
ext3_readpage
ext3_releasepage
ext3_invalidatepage
ext3_discard_blocks
ext3_request_blocks
ext3_allocate_blocks
ext3_free_blocks
ext3_sync_file_enter
ext3_sync_file_exit
ext3_sync_fs
ext3_rsv_window_add
ext3_discard_reservation
ext3_alloc_new_reservation
ext3_reserved
ext3_forget
ext3_read_block_bitmap
ext3_direct_IO_enter
ext3_direct_IO_exit
ext3_unlink_enter
ext3_unlink_exit
ext3_truncate_enter
ext3_truncate_exit
ext3_get_blocks_enter
ext3_get_blocks_exit
ext3_load_inode

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Jan Kara <jack@suse.cz>

1 files changed, 21 insertions, 13 deletions

diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index fe52297e31ad..f7d111e499ad 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -21,6 +21,7 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/blkdev.h>
+#include <trace/events/ext3.h>
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
@@ -161,6 +162,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
         desc = ext3_get_group_desc(sb, block_group, NULL);
         if (!desc)
                 return NULL;
+        trace_ext3_read_block_bitmap(sb, block_group);
         bitmap_blk = le32_to_cpu(desc->bg_block_bitmap);
         bh = sb_getblk(sb, bitmap_blk);
         if (unlikely(!bh)) {
@@ -351,6 +353,7 @@ void ext3_rsv_window_add(struct super_block *sb,
         struct rb_node * parent = NULL;
         struct ext3_reserve_window_node *this;
 
+        trace_ext3_rsv_window_add(sb, rsv);
         while (*p)
         {
                 parent = *p;
@@ -476,8 +479,10 @@ void ext3_discard_reservation(struct inode *inode)
         rsv = &block_i->rsv_window_node;
         if (!rsv_is_empty(&rsv->rsv_window)) {
                 spin_lock(rsv_lock);
-                if (!rsv_is_empty(&rsv->rsv_window))
+                if (!rsv_is_empty(&rsv->rsv_window)) {
+                        trace_ext3_discard_reservation(inode, rsv);
                         rsv_window_remove(inode->i_sb, rsv);
+                }
                 spin_unlock(rsv_lock);
         }
 }
@@ -683,14 +688,10 @@ error_return:
 void ext3_free_blocks(handle_t *handle, struct inode *inode,
                         ext3_fsblk_t block, unsigned long count)
 {
-        struct super_block * sb;
+        struct super_block *sb = inode->i_sb;
         unsigned long dquot_freed_blocks;
 
-        sb = inode->i_sb;
-        if (!sb) {
-                printk ("ext3_free_blocks: nonexistent device");
-                return;
-        }
+        trace_ext3_free_blocks(inode, block, count);
         ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks);
         if (dquot_freed_blocks)
                 dquot_free_block(inode, dquot_freed_blocks);
@@ -1136,6 +1137,7 @@ static int alloc_new_reservation(struct ext3_reserve_window_node *my_rsv,
         else
                 start_block = grp_goal + group_first_block;
 
+        trace_ext3_alloc_new_reservation(sb, start_block);
         size = my_rsv->rsv_goal_size;
 
         if (!rsv_is_empty(&my_rsv->rsv_window)) {
@@ -1230,8 +1232,11 @@ retry:
          * check if the first free block is within the
          * free space we just reserved
          */
-        if (start_block >= my_rsv->rsv_start && start_block <= my_rsv->rsv_end)
+        if (start_block >= my_rsv->rsv_start &&
+            start_block <= my_rsv->rsv_end) {
+                trace_ext3_reserved(sb, start_block, my_rsv);
                 return 0;               /* success */
+        }
         /*
          * if the first free bit we found is out of the reservable space
          * continue search for next reservable space,
@@ -1514,10 +1519,6 @@ ext3_fsblk_t ext3_new_blocks(handle_t *handle, struct inode *inode,
 
         *errp = -ENOSPC;
         sb = inode->i_sb;
-        if (!sb) {
-                printk("ext3_new_block: nonexistent device");
-                return 0;
-        }
 
         /*
          * Check quota for allocation of this block.
@@ -1528,8 +1529,10 @@ ext3_fsblk_t ext3_new_blocks(handle_t *handle, struct inode *inode,
                 return 0;
         }
 
+        trace_ext3_request_blocks(inode, goal, num);
+
         sbi = EXT3_SB(sb);
-        es = EXT3_SB(sb)->s_es;
+        es = sbi->s_es;
         ext3_debug("goal=%lu.\n", goal);
         /*
          * Allocate a block from reservation only when
@@ -1742,6 +1745,10 @@ allocated:
         brelse(bitmap_bh);
         dquot_free_block(inode, *count-num);
         *count = num;
+
+        trace_ext3_allocate_blocks(inode, goal, num,
+                                   (unsigned long long)ret_block);
+
         return ret_block;
 
 io_error:
@@ -1996,6 +2003,7 @@ ext3_grpblk_t ext3_trim_all_free(struct super_block *sb, unsigned int group,
                 if ((next - start) < minblocks)
                         goto free_extent;
 
+                trace_ext3_discard_blocks(sb, discard_block, next - start);
                  /* Send the TRIM command down to the device */
                 err = sb_issue_discard(sb, discard_block, next - start,
                                        GFP_NOFS, 0);