diff mbox series

[v3] scsi: sd_zbc: trace zone append emulation

Message ID 53f2e206d85b99e8e2f2519beefc3e67262af67a.1669791411.git.johannes.thumshirn@wdc.com (mailing list archive)
State Superseded
Headers show
Series [v3] scsi: sd_zbc: trace zone append emulation | expand

Commit Message

Johannes Thumshirn Nov. 30, 2022, 6:58 a.m. UTC 
Add tracepoints to the SCSI zone append emulation, in order to trace the
zone start to write-pointer aligned LBA translation and the corresponding
completion.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>

---
Changes to v2:
- Fix linking when SCSI is a module

Changes to v1:
- Fix style issues pointed out by Damien
---
 drivers/scsi/scsi_trace.c   |  1 +
 drivers/scsi/sd_zbc.c       |  8 +++++
 include/trace/events/scsi.h | 64 +++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+)

Comments

Christoph Hellwig Nov. 30, 2022, 7:13 a.m. UTC | #1 
On Tue, Nov 29, 2022 at 10:58:09PM -0800, Johannes Thumshirn wrote:
> +++ b/drivers/scsi/sd_zbc.c
> @@ -18,6 +18,11 @@
>  #include <scsi/scsi.h>
>  #include <scsi/scsi_cmnd.h>
>  
> +#if IS_MODULE(CONFIG_BLK_DEV_SD)
> +#define CREATE_TRACE_POINTS
> +#endif
> +#include <trace/events/scsi.h>

Urg, this will create duplicates of all the tracepoints if sd is
built modular.  Can't we just have a separate b/drivers/scsi/sd_trace.h
for sd-specific tracepoints?  If not, we'll just need
to EXPORT_TRACEPOINT_SYMBOL_GPL the tracepoints used in sd.
Johannes Thumshirn Nov. 30, 2022, 7:27 a.m. UTC | #2 
On 30.11.22 08:13, Christoph Hellwig wrote:
> On Tue, Nov 29, 2022 at 10:58:09PM -0800, Johannes Thumshirn wrote:
>> +++ b/drivers/scsi/sd_zbc.c
>> @@ -18,6 +18,11 @@
>>  #include <scsi/scsi.h>
>>  #include <scsi/scsi_cmnd.h>
>>  
>> +#if IS_MODULE(CONFIG_BLK_DEV_SD)
>> +#define CREATE_TRACE_POINTS
>> +#endif
>> +#include <trace/events/scsi.h>
> 
> Urg, this will create duplicates of all the tracepoints if sd is
> built modular.  Can't we just have a separate b/drivers/scsi/sd_trace.h
> for sd-specific tracepoints?  If not, we'll just need
> to EXPORT_TRACEPOINT_SYMBOL_GPL the tracepoints used in sd.
> 

Yeah, looks like a separate trace/events/sd.h is the least ugly thing.
Will send a new version shortly
diff mbox series

Patch

diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
index 41a950075913..224b38c0fb0f 100644
--- a/drivers/scsi/scsi_trace.c
+++ b/drivers/scsi/scsi_trace.c
@@ -389,3 +389,4 @@  scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
 		return scsi_trace_misc(p, cdb, len);
 	}
 }
+EXPORT_SYMBOL(scsi_trace_parse_cdb);
diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index bd15624c6322..7f4169829ff4 100644
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -18,6 +18,11 @@ 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 
+#if IS_MODULE(CONFIG_BLK_DEV_SD)
+#define CREATE_TRACE_POINTS
+#endif
+#include <trace/events/scsi.h>
+
 #include "sd.h"
 
 /**
@@ -450,6 +455,7 @@  blk_status_t sd_zbc_prepare_zone_append(struct scsi_cmnd *cmd, sector_t *lba,
 			break;
 		}
 
+		trace_scsi_prepare_zone_append(cmd, *lba, wp_offset);
 		*lba += wp_offset;
 	}
 	spin_unlock_irqrestore(&sdkp->zones_wp_offset_lock, flags);
@@ -558,6 +564,8 @@  static unsigned int sd_zbc_zone_wp_update(struct scsi_cmnd *cmd,
 
 	switch (op) {
 	case REQ_OP_ZONE_APPEND:
+		trace_scsi_zone_wp_update(cmd, rq->__sector,
+				  sdkp->zones_wp_offset[zno], good_bytes);
 		rq->__sector += sdkp->zones_wp_offset[zno];
 		fallthrough;
 	case REQ_OP_WRITE_ZEROES:
diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
index a2c7befd451a..851b89e1c811 100644
--- a/include/trace/events/scsi.h
+++ b/include/trace/events/scsi.h
@@ -327,6 +327,70 @@  TRACE_EVENT(scsi_eh_wakeup,
 	TP_printk("host_no=%u", __entry->host_no)
 );
 
+TRACE_EVENT(scsi_prepare_zone_append,
+
+	    TP_PROTO(struct scsi_cmnd *cmnd, sector_t lba,
+		     unsigned int wp_offset),
+
+	    TP_ARGS(cmnd, lba, wp_offset),
+
+	    TP_STRUCT__entry(
+		     __field( unsigned int, host_no )
+		     __field( unsigned int, channel )
+		     __field( unsigned int, id )
+		     __field( unsigned int, lun )
+		     __field( sector_t,     lba )
+		     __field( unsigned int, wp_offset )
+	    ),
+
+	    TP_fast_assign(
+		__entry->host_no	= cmnd->device->host->host_no;
+		__entry->channel	= cmnd->device->channel;
+		__entry->id		= cmnd->device->id;
+		__entry->lun		= cmnd->device->lun;
+		__entry->lba		= lba;
+		__entry->wp_offset	= wp_offset;
+	    ),
+
+	    TP_printk("host_no=%u, channel=%u id=%u lun=%u lba=%llu wp_offset=%u",
+		      __entry->host_no, __entry->channel, __entry->id,
+		      __entry->lun, __entry->lba, __entry->wp_offset)
+);
+
+TRACE_EVENT(scsi_zone_wp_update,
+
+	    TP_PROTO(struct scsi_cmnd *cmnd, sector_t rq_sector,
+		     unsigned int wp_offset, unsigned int good_bytes),
+
+	    TP_ARGS(cmnd, rq_sector, wp_offset, good_bytes),
+
+	    TP_STRUCT__entry(
+		     __field( unsigned int, host_no )
+		     __field( unsigned int, channel )
+		     __field( unsigned int, id )
+		     __field( unsigned int, lun )
+		     __field( sector_t,     rq_sector )
+		     __field( unsigned int, wp_offset )
+		     __field( unsigned int, good_bytes )
+	    ),
+
+	    TP_fast_assign(
+		__entry->host_no	= cmnd->device->host->host_no;
+		__entry->channel	= cmnd->device->channel;
+		__entry->id		= cmnd->device->id;
+		__entry->lun		= cmnd->device->lun;
+		__entry->rq_sector	= rq_sector;
+		__entry->wp_offset	= wp_offset;
+		__entry->good_bytes	= good_bytes;
+	    ),
+
+	    TP_printk("host_no=%u, channel=%u id=%u lun=%u rq_sector=%llu" \
+		      " wp_offset=%u good_bytes=%u",
+		      __entry->host_no, __entry->channel, __entry->id,
+		      __entry->lun, __entry->rq_sector, __entry->wp_offset,
+		      __entry->good_bytes)
+);
+
 #endif /*  _TRACE_SCSI_H */
 
 /* This part must be outside protection */