From patchwork Sun Jul 22 07:46:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 172485 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 37D772C0143 for ; Sun, 22 Jul 2012 17:38:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751394Ab2GVHiw (ORCPT ); Sun, 22 Jul 2012 03:38:52 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:36677 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751153Ab2GVHiQ (ORCPT ); Sun, 22 Jul 2012 03:38:16 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so8900821pbb.19 for ; Sun, 22 Jul 2012 00:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=UXO38POCqaC8QxtDFGune7L7RkAI82xPs1gfDu8C+bQ=; b=zCw9ge6V5P4U7CCLcLLoG+4otPDvjdlGTaUNROkpgBIz3AcQ2FOPFO/LTH0z4Gk2ZR LZUpYKDtav24XLZbJvPccHZQlqjMIAel0gxSvLyAymwDgE8HFBg9+HtGdEJIiKzMBzsN O5GSXmJXkzUTEx2vF66/yaGWOiOourV7AZ5yfg6uAMgDH14tKl36ruioimi5gE9/u3+P Urzm6mL+rQ0SjfsKiHxb2u2uYxqzN7ZaKGAJx4CyYo9W9MLlJB8bUArZmfllrDxvovWF x2eZcrjdgEl6u/jxDcof70lCUCOXLgsldaby2akylxK4yrhEg+mKV1dDjhv0Yj7nMYuD GtnQ== Received: by 10.66.86.2 with SMTP id l2mr14414229paz.58.1342942696623; Sun, 22 Jul 2012 00:38:16 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id ru10sm7481626pbc.50.2012.07.22.00.38.14 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jul 2012 00:38:16 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: xiaoqiangnk@gmail.com, achender@linux.vnet.ibm.com, wenqing.lz@taobao.com Subject: [RFC][PATCH 05/10 v1] ext4: add some tracepoints in extent status tree Date: Sun, 22 Jul 2012 15:46:02 +0800 Message-Id: <1342943167-12153-6-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1342943167-12153-1-git-send-email-wenqing.lz@taobao.com> References: <1342943167-12153-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu This patch adds some tracepoints in extent status tree. Signed-off-by: Zheng Liu --- fs/ext4/extents_status.c | 8 +++ include/trace/events/ext4.h | 101 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 0 deletions(-) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index bd4e589..1c82340 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -10,6 +10,8 @@ #include "extents_status.h" #include "ext4_extents.h" +#include + /* * extents status tree implementation for ext4. * @@ -188,6 +190,8 @@ ext4_lblk_t ext4_es_find_extent(struct inode *inode, struct extent_status *es) struct rb_node *node; ext4_lblk_t ret = EXT_MAX_BLOCKS; + trace_ext4_es_find_extent_enter(inode, es->start); + es->len = 0; tree = &EXT4_I(inode)->i_es_tree; es1 = __es_tree_search(&tree->root, es->start); @@ -202,6 +206,8 @@ ext4_lblk_t ext4_es_find_extent(struct inode *inode, struct extent_status *es) } } + trace_ext4_es_find_extent_exit(inode, es, ret); + return ret; } @@ -282,6 +288,7 @@ int ext4_es_add_space(struct inode *inode, ext4_lblk_t offset, ext4_lblk_t len) BUG_ON(end <= offset); es = tree->cache_es; + trace_ext4_es_add_space(inode, offset, len); es_debug("add [%u/%u) to extent status tree of inode %lu\n", offset, len, inode->i_ino); @@ -351,6 +358,7 @@ int ext4_es_remove_space(struct inode *inode, ext4_lblk_t offset, struct extent_status orig_es; ext4_lblk_t len1, len2, end; + trace_ext4_es_remove_space(inode, offset, len); es_debug("remove [%u/%u) from extent status tree of inode %lu\n", offset, len, inode->i_ino); diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 69d8a69..5c17592 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h @@ -15,6 +15,7 @@ struct ext4_inode_info; struct mpage_da_data; struct ext4_map_blocks; struct ext4_extent; +struct extent_status; #define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode)) @@ -2055,6 +2056,106 @@ TRACE_EVENT(ext4_ext_remove_space_done, (unsigned short) __entry->eh_entries) ); +TRACE_EVENT(ext4_es_add_space, + TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t len), + + TP_ARGS(inode, start, len), + + TP_STRUCT__entry( + __field( dev_t, dev ) + __field( ino_t, ino ) + __field( loff_t, start ) + __field( loff_t, len ) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->start = start; + __entry->len = len; + ), + + TP_printk("dev %d,%d ino %lu es [%lld/%lld)", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long) __entry->ino, + __entry->start, __entry->len) +); + +TRACE_EVENT(ext4_es_remove_space, + TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t len), + + TP_ARGS(inode, start, len), + + TP_STRUCT__entry( + __field( dev_t, dev ) + __field( ino_t, ino ) + __field( loff_t, start ) + __field( loff_t, len ) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->start = start; + __entry->len = len; + ), + + TP_printk("dev %d,%d ino %lu es [%lld/%lld)", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long) __entry->ino, + __entry->start, __entry->len) +); + +TRACE_EVENT(ext4_es_find_extent_enter, + TP_PROTO(struct inode *inode, ext4_lblk_t start), + + TP_ARGS(inode, start), + + TP_STRUCT__entry( + __field( dev_t, dev ) + __field( ino_t, ino ) + __field( ext4_lblk_t, start ) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->start = start; + ), + + TP_printk("dev %d,%d ino %lu start %u", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long) __entry->ino, __entry->start) +); + +TRACE_EVENT(ext4_es_find_extent_exit, + TP_PROTO(struct inode *inode, struct extent_status *es, + ext4_lblk_t ret), + + TP_ARGS(inode, es, ret), + + TP_STRUCT__entry( + __field( dev_t, dev ) + __field( ino_t, ino ) + __field( ext4_lblk_t, start ) + __field( ext4_lblk_t, len ) + __field( ext4_lblk_t, ret ) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->start = es->start; + __entry->len = es->len; + __entry->ret = ret; + ), + + TP_printk("dev %d,%d ino %lu es [%u/%u) ret %u", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long) __entry->ino, + __entry->start, __entry->len, __entry->ret) +); + #endif /* _TRACE_EXT4_H */ /* This part must be outside protection */