Re: [PATCH] iscsi: Capture iscsi debug messages using tracepoints

2018-12-20 Thread Martin K. Petersen


Fred,

> This commit enhances iscsi initiator modules to capture iscsi debug
> messages using linux kernel tracepoint facility:

Applied to 4.21/scsi-queue, thanks!

-- 
Martin K. Petersen  Oracle Linux Engineering

-- 
You received this message because you are subscribed to the Google Groups 
"open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to open-iscsi+unsubscr...@googlegroups.com.
To post to this group, send email to open-iscsi@googlegroups.com.
Visit this group at https://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/d/optout.


Re: [PATCH] iscsi: Capture iscsi debug messages using tracepoints

2018-12-20 Thread Douglas Gilbert

On 2018-12-20 4:45 p.m., Fred Herard wrote:

ping(Doug);

Thanks,
Fred

On 12/9/2018 5:01 PM, Fred Herard wrote:

Gentle reminder...

Reviewed-by: Rajan Shanmugavelu 
Reviewed-by: Lee Duncan 

  Reviewed-by: Douglas Gilbert 

Thanks.

Doug Gilbert


On 12/2/2018 1:47 AM, Fred Herard wrote:

Hi Doug,

Here's an updated patch with removal of the misplaced semicolons:

 From da1f3c2ff78881c439d53820f3b82d4c54ac5cf9 Mon Sep 17 00:00:00 2001
From: Fred Herard 
Date: Fri, 12 Oct 2018 15:45:47 -0700
Subject: [PATCH] iscsi: Capture iscsi debug messages using tracepoints

This commit enhances iscsi initiator modules to capture iscsi debug messages
using linux kernel tracepoint facility:

https://www.kernel.org/doc/Documentation/trace/tracepoints.txt

The following tracepoint events have been created under the iscsi tracepoint
event group:

iscsi_dbg_conn - to capture connection debug messages (libiscsi module)
iscsi_dbg_session - to capture session debug messages (libiscsi module)
iscsi_dbg_eh - to capture error handling debug messages (libiscsi module)
iscsi_dbg_tcp - to capture iscsi tcp debug messages (libiscsi_tcp module)
iscsi_dbg_sw_tcp - to capture iscsi sw tcp debug messages (iscsi_tcp module)
iscsi_dbg_trans_session - to cpature iscsi trasnsport sess debug messages
(scsi_transport_iscsi module)
iscsi_dbg_trans_conn - to capture iscsi tansport conn debug messages
(scsi_transport_iscsi module)

Signed-off-by: Fred Herard 
Reviewed-by: Rajan Shanmugavelu 
---
  drivers/scsi/iscsi_tcp.c|   6 +-
  drivers/scsi/libiscsi.c |  16 +-
  drivers/scsi/libiscsi_tcp.c |   6 +-
  drivers/scsi/scsi_transport_iscsi.c |  38 -
  include/trace/events/iscsi.h| 107 
  5 files changed, 165 insertions(+), 8 deletions(-)
  create mode 100644 include/trace/events/iscsi.h

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index e11eff6..33bfb0a 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -44,6 +44,7 @@
  #include 
  #include 
  #include 
+#include 
  
  #include "iscsi_tcp.h"
  
@@ -72,7 +73,10 @@

iscsi_conn_printk(KERN_INFO, _conn, \
 "%s " dbg_fmt,   \
 __func__, ##arg);  \
-   } while (0);
+   iscsi_dbg_trace(trace_iscsi_dbg_sw_tcp, \
+   &(_conn)->cls_conn->dev,  \
+   "%s " dbg_fmt, __func__, ##arg);\
+   } while (0)
  
  
  /**

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index cf8a15e..3a7e3e7 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -40,6 +40,7 @@
  #include 
  #include 
  #include 
+#include 
  
  static int iscsi_dbg_lib_conn;

  module_param_named(debug_libiscsi_conn, iscsi_dbg_lib_conn, int,
@@ -68,7 +69,10 @@
iscsi_conn_printk(KERN_INFO, _conn, \
 "%s " dbg_fmt,   \
 __func__, ##arg);  \
-   } while (0);
+   iscsi_dbg_trace(trace_iscsi_dbg_conn,   \
+   &(_conn)->cls_conn->dev,  \
+   "%s " dbg_fmt, __func__, ##arg);\
+   } while (0)
  
  #define ISCSI_DBG_SESSION(_session, dbg_fmt, arg...)			\

do {\
@@ -76,7 +80,10 @@
iscsi_session_printk(KERN_INFO, _session,   \
 "%s " dbg_fmt,   \
 __func__, ##arg);  \
-   } while (0);
+   iscsi_dbg_trace(trace_iscsi_dbg_session,\
+   &(_session)->cls_session->dev,\
+   "%s " dbg_fmt, __func__, ##arg);  \
+   } while (0)
  
  #define ISCSI_DBG_EH(_session, dbg_fmt, arg...)\

do {\
@@ -84,7 +91,10 @@
iscsi_session_printk(KERN_INFO, _session,   \
 "%s " dbg_fmt,   \
 __func__, ##arg);  \
-   } while (0);
+   iscsi_dbg_trace(trace_iscsi_dbg_eh, \
+   &(_session)->cls_session->dev,\
+   "%s " dbg_fmt, __func__, ##arg);  \
+   } while (0)
  
  inline void iscsi_conn_queue_work(struct iscsi_conn *conn)

  {
diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
index 63a1d69..75426b1 100644
--- a/drivers/scsi/libiscsi_tcp.c
+++ b/drivers/scsi/libiscsi_tcp.c
@@ -43,6 +43,7 @@
  #include 
  #include 
  #include 
+#include 
  
  #include "iscsi_tcp.h"
  
@@ -

Re: [PATCH] iscsi: Capture iscsi debug messages using tracepoints

2018-12-20 Thread Fred Herard
ping(Doug);

Thanks,
Fred

On 12/9/2018 5:01 PM, Fred Herard wrote:
> Gentle reminder...
> 
> Reviewed-by: Rajan Shanmugavelu 
> Reviewed-by: Lee Duncan 
> 
> Thanks,
> Fred
> 
> On 12/2/2018 1:47 AM, Fred Herard wrote:
>> Hi Doug,
>>
>> Here's an updated patch with removal of the misplaced semicolons:
>>
>> From da1f3c2ff78881c439d53820f3b82d4c54ac5cf9 Mon Sep 17 00:00:00 2001
>> From: Fred Herard 
>> Date: Fri, 12 Oct 2018 15:45:47 -0700
>> Subject: [PATCH] iscsi: Capture iscsi debug messages using tracepoints
>>
>> This commit enhances iscsi initiator modules to capture iscsi debug messages
>> using linux kernel tracepoint facility:
>>
>> https://www.kernel.org/doc/Documentation/trace/tracepoints.txt
>>
>> The following tracepoint events have been created under the iscsi tracepoint
>> event group:
>>
>> iscsi_dbg_conn - to capture connection debug messages (libiscsi module)
>> iscsi_dbg_session - to capture session debug messages (libiscsi module)
>> iscsi_dbg_eh - to capture error handling debug messages (libiscsi module)
>> iscsi_dbg_tcp - to capture iscsi tcp debug messages (libiscsi_tcp module)
>> iscsi_dbg_sw_tcp - to capture iscsi sw tcp debug messages (iscsi_tcp module)
>> iscsi_dbg_trans_session - to cpature iscsi trasnsport sess debug messages
>>  (scsi_transport_iscsi module)
>> iscsi_dbg_trans_conn - to capture iscsi tansport conn debug messages
>>  (scsi_transport_iscsi module)
>>
>> Signed-off-by: Fred Herard 
>> Reviewed-by: Rajan Shanmugavelu 
>> ---
>>  drivers/scsi/iscsi_tcp.c|   6 +-
>>  drivers/scsi/libiscsi.c |  16 +-
>>  drivers/scsi/libiscsi_tcp.c |   6 +-
>>  drivers/scsi/scsi_transport_iscsi.c |  38 -
>>  include/trace/events/iscsi.h| 107 
>> 
>>  5 files changed, 165 insertions(+), 8 deletions(-)
>>  create mode 100644 include/trace/events/iscsi.h
>>
>> diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
>> index e11eff6..33bfb0a 100644
>> --- a/drivers/scsi/iscsi_tcp.c
>> +++ b/drivers/scsi/iscsi_tcp.c
>> @@ -44,6 +44,7 @@
>>  #include 
>>  #include 
>>  #include 
>> +#include 
>>  
>>  #include "iscsi_tcp.h"
>>  
>> @@ -72,7 +73,10 @@
>>  iscsi_conn_printk(KERN_INFO, _conn, \
>>   "%s " dbg_fmt, \
>>   __func__, ##arg);  \
>> -} while (0);
>> +iscsi_dbg_trace(trace_iscsi_dbg_sw_tcp, \
>> +&(_conn)->cls_conn->dev,\
>> +"%s " dbg_fmt, __func__, ##arg);\
>> +} while (0)
>>  
>>  
>>  /**
>> diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
>> index cf8a15e..3a7e3e7 100644
>> --- a/drivers/scsi/libiscsi.c
>> +++ b/drivers/scsi/libiscsi.c
>> @@ -40,6 +40,7 @@
>>  #include 
>>  #include 
>>  #include 
>> +#include 
>>  
>>  static int iscsi_dbg_lib_conn;
>>  module_param_named(debug_libiscsi_conn, iscsi_dbg_lib_conn, int,
>> @@ -68,7 +69,10 @@
>>  iscsi_conn_printk(KERN_INFO, _conn, \
>>   "%s " dbg_fmt, \
>>   __func__, ##arg);  \
>> -} while (0);
>> +iscsi_dbg_trace(trace_iscsi_dbg_conn,   \
>> +&(_conn)->cls_conn->dev,\
>> +"%s " dbg_fmt, __func__, ##arg);\
>> +} while (0)
>>  
>>  #define ISCSI_DBG_SESSION(_session, dbg_fmt, arg...)
>> \
>>  do {\
>> @@ -76,7 +80,10 @@
>>  iscsi_session_printk(KERN_INFO, _session,   \
>>   "%s " dbg_fmt, \
>>   __func__, ##arg);  \
>> -} while (0);
>> +iscsi_dbg_trace(trace_iscsi_dbg_session,\
>> +&(_session)->cls_session->dev,  \
>> +"%s " dbg_fmt, __func__, ##arg);\
>> +} while (0)
>>  
>>  #define ISCSI_DBG_EH(_session, dbg_fmt, arg...) 
>> \
>>  do {\
>> @@ -84,7 +91,10 @@
>>  iscsi_session_printk(KERN_INFO, _session,   \
>>   "%s " dbg_fmt, \
>>   __func__, ##arg);  \
>> -} while (0);
>> +iscsi_dbg_trace(trace_iscsi_dbg_eh, \
>> +&(_session)->cls_session->dev,  \
>> +"%s " dbg_fmt, __func__, ##arg);\
>> +} while (0)
>>  
>>  inline void iscsi_conn_queue_work(struct iscsi_conn *conn)
>>  {
>> diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
>> index 63a1d69..75426b1 10