From patchwork Thu Jun 30 14:50:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Ma X-Patchwork-Id: 102769 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6DE3AB6F54 for ; Fri, 1 Jul 2011 00:51:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751609Ab1F3OvA (ORCPT ); Thu, 30 Jun 2011 10:51:00 -0400 Received: from oproxy3-pub.bluehost.com ([69.89.21.8]:34638 "HELO oproxy3-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751146Ab1F3Ou7 (ORCPT ); Thu, 30 Jun 2011 10:50:59 -0400 Received: (qmail 31827 invoked by uid 0); 30 Jun 2011 14:50:59 -0000 Received: from unknown (HELO box585.bluehost.com) (66.147.242.185) by oproxy3.bluehost.com with SMTP; 30 Jun 2011 14:50:59 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=tao.ma; h=Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-Identified-User; b=jU/wGj2AM7gOhxzPvSTUSRB5WTJ0WtNp2kl0PYHbc7Bo1BnyC60HcYPjNJOsZzMFKVK33OY43RUJZyrOPR+CE2Ko+N34OSRvu09llfycmWHmXs9pQHEou4z/Z5DERtOS; Received: from [114.245.229.98] (helo=taoma-laptop2.localdomain6) by box585.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1QcIa2-00071p-AF; Thu, 30 Jun 2011 08:50:59 -0600 From: Tao Ma To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu Subject: [PATCH 3/4] ext4: Add new ext4 trim tracepoints Date: Thu, 30 Jun 2011 22:50:38 +0800 Message-Id: <1309445439-3753-3-git-send-email-tm@tao.ma> X-Mailer: git-send-email 1.7.1 In-Reply-To: <4E0C8B6C.8030403@tao.ma> References: <4E0C8B6C.8030403@tao.ma> X-Identified-User: {1390:box585.bluehost.com:colyli:tao.ma} {sentby:smtp auth 114.245.229.98 authed with tm@tao.ma} Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Tao Ma Add ext4_trim_extent and ext4_trim_all_free. Signed-off-by: Tao Ma Reviewed-by: Lukas Czerner --- 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 ) + __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 */