[09/24] orangefs: tracepoints for orangefs_devreq_{read,write_iter,poll}

Commit Message

Martin Brandenburg March 20, 2018, 5:02 p.m. UTC

Signed-off-by: Martin Brandenburg <[e-mail]>
---
 fs/orangefs/devorangefs-req.c | 14 ++++++++++--
 fs/orangefs/orangefs-trace.h  | 50 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)

Patch

diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index f4a1eff35e59..e33bfeac92e8 100644
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -11,6 +11,7 @@ 
 #include "orangefs-kernel.h"
 #include "orangefs-bufmap.h"
 #include "orangefs-debugfs.h"
+#include "orangefs-trace.h"
 
 #include <linux/debugfs.h>
 #include <linux/slab.h>
@@ -180,8 +181,10 @@  static ssize_t orangefs_devreq_read(struct file *file,
 	}
 
 	/* Check for an empty list before locking. */
-	if (list_empty(&orangefs_request_list))
+	if (list_empty(&orangefs_request_list)) {
+		trace_orangefs_devreq_read(0, 1, NULL);
 		return -EAGAIN;
+	}
 
 restart:
 	cur_op = NULL;
@@ -250,6 +253,7 @@  static ssize_t orangefs_devreq_read(struct file *file,
 	 */
 	if (!cur_op) {
 		spin_unlock(&orangefs_request_list_lock);
+		trace_orangefs_devreq_read(0, 0, NULL);
 		return -EAGAIN;
 	}
 
@@ -314,6 +318,7 @@  static ssize_t orangefs_devreq_read(struct file *file,
 	spin_unlock(&cur_op->lock);
 	spin_unlock(&orangefs_htable_ops_in_progress_lock);
 
+	trace_orangefs_devreq_read(1, 0, cur_op);
 	/* The client only asks to read one size buffer. */
 	return MAX_DEV_REQ_UPSIZE;
 error:
@@ -340,6 +345,7 @@  static ssize_t orangefs_devreq_read(struct file *file,
 		complete(&cur_op->waitq);
 	}
 	spin_unlock(&orangefs_request_list_lock);
+	trace_orangefs_devreq_read(0, 0, cur_op);
 	return -EFAULT;
 }
 
@@ -474,6 +480,7 @@  static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb,
 	}
 
 wakeup:
+	trace_orangefs_devreq_write_iter(op);
 	/*
 	 * Return to vfs waitqueue, and back to service_operation
 	 * through wait_for_matching_downcall. 
@@ -781,11 +788,14 @@  static __poll_t orangefs_devreq_poll(struct file *file,
 				      struct poll_table_struct *poll_table)
 {
 	__poll_t poll_revent_mask = 0;
+	int empty;
 
 	poll_wait(file, &orangefs_request_list_waitq, poll_table);
 
-	if (!list_empty(&orangefs_request_list))
+	empty = list_empty(&orangefs_request_list);
+	if (!empty)
 		poll_revent_mask |= EPOLLIN;
+	trace_orangefs_devreq_poll(empty);
 	return poll_revent_mask;
 }
 
diff --git a/fs/orangefs/orangefs-trace.h b/fs/orangefs/orangefs-trace.h
index 73feffc43d93..16e2b5a86071 100644
--- a/fs/orangefs/orangefs-trace.h
+++ b/fs/orangefs/orangefs-trace.h
@@ -13,6 +13,56 @@ 
 
 #define OP_NAME_LEN 64
 
+TRACE_EVENT(orangefs_devreq_poll,
+    TP_PROTO(int empty),
+    TP_ARGS(empty),
+    TP_STRUCT__entry(
+        __field(int, empty)
+    ),
+    TP_fast_assign(
+        __entry->empty = empty;
+    ),
+    TP_printk(
+        "empty=%d", __entry->empty
+    )
+);
+
+TRACE_EVENT(orangefs_devreq_read,
+    TP_PROTO(int success, int empty, struct orangefs_kernel_op_s *op),
+    TP_ARGS(success, empty, op),
+    TP_STRUCT__entry(
+        __field(int, success)
+        __field(int, empty)
+        __array(char, op_name, OP_NAME_LEN)
+    ),
+    TP_fast_assign(
+        __entry->success = success;
+        __entry->empty = empty;
+        if (op)
+            strlcpy(__entry->op_name, get_opname_string(op), OP_NAME_LEN);
+        else
+            __entry->op_name[0] = 0;
+    ),
+    TP_printk(
+        "success=%d empty=%d op_name=%s", __entry->success, __entry->empty,
+        __entry->op_name
+    )
+);
+
+TRACE_EVENT(orangefs_devreq_write_iter,
+    TP_PROTO(struct orangefs_kernel_op_s *op),
+    TP_ARGS(op),
+    TP_STRUCT__entry(
+        __array(char, op_name, OP_NAME_LEN)
+    ),
+    TP_fast_assign(
+        strlcpy(__entry->op_name, get_opname_string(op), OP_NAME_LEN);
+    ),
+    TP_printk(
+        "op_name=%s", __entry->op_name
+    )
+);
+
 TRACE_EVENT(orangefs_service_operation,
     TP_PROTO(struct orangefs_kernel_op_s *op, int flags),
     TP_ARGS(op, flags),