From patchwork Fri Oct 26 13:23:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 194473 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 BD9492C008A for ; Sat, 27 Oct 2012 00:13:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756847Ab2JZNNG (ORCPT ); Fri, 26 Oct 2012 09:13:06 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:42938 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756375Ab2JZNND (ORCPT ); Fri, 26 Oct 2012 09:13:03 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr4so2768601pbb.19 for ; Fri, 26 Oct 2012 06:13:02 -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=ogWd47XFewZ/U1jBf4ptegApVJshB3Z9b/3GbcD/nno=; b=WYulRAWQYCTLN+N04h/9rh/NNtokweYXd22ioDZzzwJ8tkZl5O1mf/IJIh1OM3Oi6t WWgMm2c3Vnx3rYOPTu73jeiw+jofTyAQoUwmLU8JAgk0YftDeuELBANLrTT/EP033hjg z8vkNNjGI+1bcTf9NJtbOhLc7wqt4DUUnl3pK8U2HoJQ8clTXepAAn5w1Kkewg8aXWHx REFLZ6TKZKi5ZnbDpigrKd/Pl1vesVLbuRHKhY7CGNvYFDwGSBxH4VL0zh+9NOw75V4f nIpa5ZaRCMacgkABL0AEdMRL/x5rzX0uCMixfNlP7OcW67At+AoPf5qNSF8FyTTXr+Ja Zk7g== Received: by 10.68.135.234 with SMTP id pv10mr69013265pbb.156.1351257182898; Fri, 26 Oct 2012 06:13:02 -0700 (PDT) Received: from lz-desktop.hz.ali.com ([182.92.247.2]) by mx.google.com with ESMTPS id a10sm1000164paw.17.2012.10.26.06.12.59 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Oct 2012 06:13:02 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org, jeff.liu@oracle.com Cc: tytso@mit.edu, hughd@google.com, xiaoqiangnk@gmail.com, achender@linux.vnet.ibm.com, lczerner@redhat.com, Zheng Liu Subject: [PATCH 5/8 v3] ext4: add some tracepoints in extent status tree Date: Fri, 26 Oct 2012 21:23:42 +0800 Message-Id: <1351257825-3701-6-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: <1351257825-3701-1-git-send-email-wenqing.lz@taobao.com> References: <1351257825-3701-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(+) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 048ae8c..1c4af0a 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -14,6 +14,8 @@ #include "extents_status.h" #include "ext4_extents.h" +#include + /* * According to previous discussion in Ext4 Developer Workshop, we will * introduce a new structure called io tree to track all extent status in order @@ -223,6 +225,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); + read_lock(&EXT4_I(inode)->i_es_lock); tree = &EXT4_I(inode)->i_es_tree; @@ -252,6 +256,8 @@ out: } read_unlock(&EXT4_I(inode)->i_es_lock); + + trace_ext4_es_find_extent_exit(inode, es, ret); return ret; } @@ -392,6 +398,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t offset, struct ext4_es_tree *tree; int err = 0; + trace_ext4_es_insert_extent(inode, offset, len); es_debug("add [%u/%u) to extent status tree of inode %lu\n", offset, len, inode->i_ino); @@ -421,6 +428,7 @@ int ext4_es_remove_extent(struct inode *inode, ext4_lblk_t offset, ext4_lblk_t len1, len2, end; int err = 0; + trace_ext4_es_remove_extent(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 d49b285..b01a901 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_insert_extent, + 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_extent, + 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 */