Patchwork [3/4] ext4: Add new ext4 trim tracepoints

login
register
mail settings
Submitter Tao Ma
Date June 30, 2011, 2:50 p.m.
Message ID <1309445439-3753-3-git-send-email-tm@tao.ma>
Download mbox | patch
Permalink /patch/102769/
State Superseded
Headers show

Comments

Tao Ma - June 30, 2011, 2:50 p.m.
From: Tao Ma <boyu.mt@taobao.com>

Add ext4_trim_extent and ext4_trim_all_free.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
 fs/ext4/mballoc.c           |    4 +++
 include/trace/events/ext4.h |   49 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 0 deletions(-)
Lukas Czerner - July 1, 2011, 9:54 a.m.
On Thu, 30 Jun 2011, Tao Ma wrote:

> From: Tao Ma <boyu.mt@taobao.com>
> 
> Add ext4_trim_extent and ext4_trim_all_free.
> 

I have some nitpicky comment bellow, but other than that it
looks good, you can add:

Reviewed-by: Lukas Czerner <lczerner@redhat.com>

Thanks!
-Lukas

> Signed-off-by: Tao Ma <boyu.mt@taobao.com>
> ---
>  fs/ext4/mballoc.c           |    4 +++
>  include/trace/events/ext4.h |   49 +++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 53 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
> index 83fb04b..a822f2a 100644
> --- a/fs/ext4/mballoc.c
> +++ b/fs/ext4/mballoc.c
> @@ -4782,6 +4782,8 @@ static void ext4_trim_extent(struct super_block *sb, int start, int count,
>  {
>  	struct ext4_free_extent ex;
>  
> +	trace_ext4_trim_extent(sb, group, start, count);
> +
>  	assert_spin_locked(ext4_group_lock_ptr(sb, group));
>  
>  	ex.fe_start = start;
> @@ -4827,6 +4829,8 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group,
>  	struct ext4_buddy e4b;
>  	int ret;
>  
> +	trace_ext4_trim_all_free(sb, group, start, max);
> +
>  	ret = ext4_mb_load_buddy(sb, group, &e4b);
>  	if (ret) {
>  		ext4_error(sb, "Error in loading buddy "
> diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
> index 5ce2b2f..405ea6b 100644
> --- a/include/trace/events/ext4.h
> +++ b/include/trace/events/ext4.h
> @@ -1520,6 +1520,55 @@ TRACE_EVENT(ext4_load_inode,
>  		  (unsigned long) __entry->ino)
>  );
>  
> +DECLARE_EVENT_CLASS(ext4__trim,
> +	TP_PROTO(struct super_block *sb,
> +		 ext4_group_t group,
> +		 ext4_grpblk_t start,
> +		 ext4_grpblk_t len),
> +
> +	TP_ARGS(sb, group, start, len),
> +
> +	TP_STRUCT__entry(
> +		__field(	int,	dev_major               )
> +		__field(	int,	dev_minor               )

You can rather use tabs for indent.              ^^^^^^^^^^^^^^^

> +		__field(	__u32, 	group			)
> +		__field(	int,	start			)
> +		__field(	int,	len			)
> +	),
> +
> +	TP_fast_assign(
> +		__entry->dev_major	= MAJOR(sb->s_dev);
> +		__entry->dev_minor	= MINOR(sb->s_dev);
> +		__entry->group		= group;
> +		__entry->start		= start;
> +		__entry->len		= len;
> +	),
> +
> +	TP_printk("dev %d,%d group %u, start %d, len %d",
> +		  __entry->dev_major, __entry->dev_minor,
> +		  __entry->group, __entry->start, __entry->len)
> +);
> +
> +DEFINE_EVENT(ext4__trim, ext4_trim_extent,
> +
> +	TP_PROTO(struct super_block *sb,
> +		 ext4_group_t group,
> +		 ext4_grpblk_t start,
> +		 ext4_grpblk_t len),
> +
> +	TP_ARGS(sb, group, start, len)
> +);
> +
> +DEFINE_EVENT(ext4__trim, ext4_trim_all_free,
> +
> +	TP_PROTO(struct super_block *sb,
> +		 ext4_group_t group,
> +		 ext4_grpblk_t start,
> +		 ext4_grpblk_t len),
> +
> +	TP_ARGS(sb, group, start, len)
> +);
> +
>  #endif /* _TRACE_EXT4_H */
>  
>  /* This part must be outside protection */
>

Patch

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 83fb04b..a822f2a 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -4782,6 +4782,8 @@  static void ext4_trim_extent(struct super_block *sb, int start, int count,
 {
 	struct ext4_free_extent ex;
 
+	trace_ext4_trim_extent(sb, group, start, count);
+
 	assert_spin_locked(ext4_group_lock_ptr(sb, group));
 
 	ex.fe_start = start;
@@ -4827,6 +4829,8 @@  ext4_trim_all_free(struct super_block *sb, ext4_group_t group,
 	struct ext4_buddy e4b;
 	int ret;
 
+	trace_ext4_trim_all_free(sb, group, start, max);
+
 	ret = ext4_mb_load_buddy(sb, group, &e4b);
 	if (ret) {
 		ext4_error(sb, "Error in loading buddy "
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 5ce2b2f..405ea6b 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -1520,6 +1520,55 @@  TRACE_EVENT(ext4_load_inode,
 		  (unsigned long) __entry->ino)
 );
 
+DECLARE_EVENT_CLASS(ext4__trim,
+	TP_PROTO(struct super_block *sb,
+		 ext4_group_t group,
+		 ext4_grpblk_t start,
+		 ext4_grpblk_t len),
+
+	TP_ARGS(sb, group, start, len),
+
+	TP_STRUCT__entry(
+		__field(	int,	dev_major               )
+		__field(	int,	dev_minor               )
+		__field(	__u32, 	group			)
+		__field(	int,	start			)
+		__field(	int,	len			)
+	),
+
+	TP_fast_assign(
+		__entry->dev_major	= MAJOR(sb->s_dev);
+		__entry->dev_minor	= MINOR(sb->s_dev);
+		__entry->group		= group;
+		__entry->start		= start;
+		__entry->len		= len;
+	),
+
+	TP_printk("dev %d,%d group %u, start %d, len %d",
+		  __entry->dev_major, __entry->dev_minor,
+		  __entry->group, __entry->start, __entry->len)
+);
+
+DEFINE_EVENT(ext4__trim, ext4_trim_extent,
+
+	TP_PROTO(struct super_block *sb,
+		 ext4_group_t group,
+		 ext4_grpblk_t start,
+		 ext4_grpblk_t len),
+
+	TP_ARGS(sb, group, start, len)
+);
+
+DEFINE_EVENT(ext4__trim, ext4_trim_all_free,
+
+	TP_PROTO(struct super_block *sb,
+		 ext4_group_t group,
+		 ext4_grpblk_t start,
+		 ext4_grpblk_t len),
+
+	TP_ARGS(sb, group, start, len)
+);
+
 #endif /* _TRACE_EXT4_H */
 
 /* This part must be outside protection */