Skip to contentSkip to conversation

f2fs: add tracepoints for sync & Inode operations

PATCH In review Namjae Jeon 2 participants 2 messages Apr 19, 2013 – Apr 23, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/7 f2fs: add tracepoints for sync & Inode operations

From: Namjae Jeon <[email protected]>

Add tracepoints in f2fs for tracing the syncing operations like filesystem sync, file sync enter/exit. It will helf to trace the code under debugging scenarios.

Also add tracepoints for tracing the various inode operations like building inode, eviction of inode, link/unlike of inodes.

---
 fs/f2fs/file.c              |    8 +-
 fs/f2fs/inode.c             |   15 ++-
 fs/f2fs/namei.c             |    3 +
 fs/f2fs/super.c             |    4 +
 include/trace/events/f2fs.h |  217 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 243 insertions(+), 4 deletions(-)
 create mode 100644 include/trace/events/f2fs.h
fs/f2fs/file.c +7 -1
index 7be0f4b..830762a 100644
@@ -25,6 +25,7 @@
 #include "segment.h"
 #include "xattr.h"
 #include "acl.h"
+#include <trace/events/f2fs.h>
 
 static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,
 						struct vm_fault *vmf)
@@ -105,6 +106,7 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 {
 	struct inode *inode = file->f_mapping->host;
 	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
+	struct f2fs_inode_info *fi = F2FS_I(inode);
 	int ret = 0;
 	bool need_cp = false;
 	struct writeback_control wbc = {
@@ -116,9 +118,12 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 	if (inode->i_sb->s_flags & MS_RDONLY)
 		return 0;
 
+	trace_f2fs_sync_file_enter(file, fi->i_advise, datasync);
 	ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
-	if (ret)
+	if (ret) {
+		trace_f2fs_sync_file_exit(inode, need_cp, ret);
 		return ret;
+	}
 
 	/* guarantee free sections for fsync */
 	f2fs_balance_fs(sbi);
@@ -153,6 +158,7 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 	}
 out:
 	mutex_unlock(&inode->i_mutex);
+	trace_f2fs_sync_file_exit(inode, need_cp, ret);
 	return ret;
 }
 
fs/f2fs/inode.c +12 -3
index 60105b7..56cfa02 100644
@@ -15,6 +15,7 @@
 
 #include "f2fs.h"
 #include "node.h"
+#include <trace/events/f2fs.h>
 
 void f2fs_set_inode_flags(struct inode *inode)
 {
@@ -91,13 +92,18 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)
 {
 	struct f2fs_sb_info *sbi = F2FS_SB(sb);
 	struct inode *inode;
-	int ret;
+	int ret = 0;
 
+	trace_f2fs_iget_enter(sb, ino);
 	inode = iget_locked(sb, ino);
-	if (!inode)
+	if (!inode) {
+		trace_f2fs_iget_exit(sb, ino, -ENOMEM);
 		return ERR_PTR(-ENOMEM);
-	if (!(inode->i_state & I_NEW))
+	}
+	if (!(inode->i_state & I_NEW)) {
+		trace_f2fs_iget_exit(sb, ino, ret);
 		return inode;
+	}
 	if (ino == F2FS_NODE_INO(sbi) || ino == F2FS_META_INO(sbi))
 		goto make_now;
 
@@ -140,10 +146,12 @@ make_now:
 	}
 	unlock_new_inode(inode);
 
+	trace_f2fs_iget_exit(sb, ino, ret);
 	return inode;
 
 bad_inode:
 	iget_failed(inode);
+	trace_f2fs_iget_exit(sb, ino, ret);
 	return ERR_PTR(ret);
 }
 
@@ -239,6 +247,7 @@ void f2fs_evict_inode(struct inode *inode)
 	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
 	int ilock;
 
+	trace_f2fs_evict_inode(inode);
 	truncate_inode_pages(&inode->i_data, 0);
 
 	if (inode->i_ino == F2FS_NODE_INO(sbi) ||
fs/f2fs/namei.c +3 -0
index 841f6b4..6c5e804 100644
@@ -18,6 +18,7 @@
 #include "node.h"
 #include "xattr.h"
 #include "acl.h"
+#include <trace/events/f2fs.h>
 
 static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
 {
@@ -235,6 +236,7 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)
 	int err = -ENOENT;
 	int ilock;
 
+	trace_f2fs_unlink_enter(dir, dentry);
 	f2fs_balance_fs(sbi);
 
 	de = f2fs_find_entry(dir, &dentry->d_name, &page);
@@ -255,6 +257,7 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)
 	/* In order to evict this inode,  we set it dirty */
 	mark_inode_dirty(inode);
 fail:
+	trace_f2fs_unlink_exit(inode, err);
 	return err;
 }
 
fs/f2fs/super.c +4 -0
index 1b16cea..ddd284a 100644
@@ -29,6 +29,9 @@
 #include "segment.h"
 #include "xattr.h"
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/f2fs.h>
+
 static struct kmem_cache *f2fs_inode_cachep;
 
 enum {
@@ -134,6 +137,7 @@ int f2fs_sync_fs(struct super_block *sb, int sync)
 {
 	struct f2fs_sb_info *sbi = F2FS_SB(sb);
 
+	trace_f2fs_sync_fs(sb, sbi->s_dirty, sync);
 	if (!sbi->s_dirty && !get_pages(sbi, F2FS_DIRTY_NODES))
 		return 0;
 
include/trace/events/f2fs.h new file +217 -0

217 lines not on this page · raw message

Signature · 1 line
1.7.9.5
Acked-by Steven Rostedt on v4 1/7
#1 lore raw

From a2a4a7e4abb27c833d4e09ac1d434ab48a64062c Mon Sep 17 00:00:00 2001
From: Namjae Jeon <[email protected]>
Date: Sat, 20 Apr 2013 01:28:40 +0900
Subject: [PATCH 1/7] f2fs: add tracepoints for sync & inode operations
Cc: [email protected], [email protected], [email protected]

Add tracepoints in f2fs for tracing the syncing operations like filesystem sync, file sync enter/exit. It will helf to trace the code under debugging scenarios.

Also add tracepoints for tracing the various inode operations like building inode, eviction of inode, link/unlike of inodes.

[Jaegeuk: combine and modify the tracepoint structures]
---
 fs/f2fs/file.c              |   7 +-
 fs/f2fs/inode.c             |  13 ++-
 fs/f2fs/namei.c             |   3 +
 fs/f2fs/super.c             |   5 ++
 include/trace/events/f2fs.h | 195
++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 219 insertions(+), 4 deletions(-)
 create mode 100644 include/trace/events/f2fs.h
fs/f2fs/file.c +1 -0
index 07be88d..0b0ba26 100644
@@ -25,6 +25,7 @@
 #include "segment.h"
 #include "xattr.h"
 #include "acl.h"
+#include <trace/events/f2fs.h>
 
 static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,
 						struct vm_fault *vmf)
@@ -116,9 +117,12 @@ int f2fs_sync_file(struct file *file, loff_t start,

loff_t end, int datasync)
if (inode->i_sb->s_flags & MS_RDONLY)
return 0;

+ trace_f2fs_sync_file_enter(inode);
ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
- if (ret)
+ if (ret) {
+ trace_f2fs_sync_file_exit(inode, need_cp, datasync, ret);
return ret;
+ }

/* guarantee free sections for fsync */ f2fs_balance_fs(sbi);
@@ -153,6 +157,7 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
}
out:
mutex_unlock(&inode->i_mutex);
+ trace_f2fs_sync_file_exit(inode, need_cp, datasync, ret);
return ret;
}

fs/f2fs/inode.c +2 -0
index 60105b7..91ac7f9 100644
@@ -16,6 +16,8 @@
 #include "f2fs.h"
 #include "node.h"
 
+#include <trace/events/f2fs.h>
+
 void f2fs_set_inode_flags(struct inode *inode)
 {
 	unsigned int flags = F2FS_I(inode)->i_flags;
@@ -91,13 +93,16 @@ struct inode *f2fs_iget(struct super_block *sb,

unsigned long ino)
{
struct f2fs_sb_info *sbi = F2FS_SB(sb);
struct inode *inode;
- int ret;
+ int ret = 0;

inode = iget_locked(sb, ino);
if (!inode)
return ERR_PTR(-ENOMEM);
- if (!(inode->i_state & I_NEW))
+
+ if (!(inode->i_state & I_NEW)) {
+ trace_f2fs_iget(inode);
return inode;
+ }
if (ino == F2FS_NODE_INO(sbi) || ino == F2FS_META_INO(sbi))
goto make_now;

@@ -139,11 +144,12 @@ make_now:
goto bad_inode;
}
unlock_new_inode(inode);
-
+ trace_f2fs_iget(inode);
return inode;

bad_inode:
iget_failed(inode);
+ trace_f2fs_iget_exit(inode, ret);
return ERR_PTR(ret);
}

@@ -239,6 +245,7 @@ void f2fs_evict_inode(struct inode *inode)
struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); int ilock;

+ trace_f2fs_evict_inode(inode);
truncate_inode_pages(&inode->i_data, 0);

if (inode->i_ino == F2FS_NODE_INO(sbi) ||

fs/f2fs/namei.c +1 -0
index 1dbf11d..c57fd18 100644
@@ -18,6 +18,7 @@
 #include "node.h"
 #include "xattr.h"
 #include "acl.h"
+#include <trace/events/f2fs.h>
 
 static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
 {
@@ -235,6 +236,7 @@ static int f2fs_unlink(struct inode *dir, struct

dentry *dentry)
int err = -ENOENT;
int ilock;

+ trace_f2fs_unlink_enter(dir, dentry);
f2fs_balance_fs(sbi);

de = f2fs_find_entry(dir, &dentry->d_name, &page);
@@ -255,6 +257,7 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)
/* In order to evict this inode, we set it dirty */ mark_inode_dirty(inode);
fail:
+ trace_f2fs_unlink_exit(inode, err);
return err;
}

fs/f2fs/super.c +5 -0
index 541f21ff..b015b6c 100644
@@ -29,6 +29,9 @@
 #include "segment.h"
 #include "xattr.h"
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/f2fs.h>
+
 static struct kmem_cache *f2fs_inode_cachep;
 
 enum {
@@ -134,6 +137,8 @@ int f2fs_sync_fs(struct super_block *sb, int sync)
 {
 	struct f2fs_sb_info *sbi = F2FS_SB(sb);
 
+	trace_f2fs_sync_fs(sb, sync);
+
 	if (!sbi->s_dirty && !get_pages(sbi, F2FS_DIRTY_NODES))
 		return 0;
 
include/trace/events/f2fs.h new file +195 -0

195 lines not on this page · raw message

Signature · 7 lines
1.8.1.3.566.gaa39828



-- 
Jaegeuk Kim
Samsung