On 2/13/20 10:53 AM, Hannes Reinecke wrote:
> Add tracepoints for ATA error handling.
>
> Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
> ---
> drivers/ata/libata-eh.c | 10 +++++---
> include/trace/events/libata.h | 60 +++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 67 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
> index ef3576eb5874..a068b5370aac 100644
> --- a/drivers/ata/libata-eh.c
> +++ b/drivers/ata/libata-eh.c
> @@ -933,7 +933,7 @@ void ata_std_sched_eh(struct ata_port *ap)
> ata_eh_set_pending(ap, 1);
> scsi_schedule_eh(ap->scsi_host);
>
> - DPRINTK("port EH scheduled\n");
> + trace_ata_std_sched_eh(ap);
> }
> EXPORT_SYMBOL_GPL(ata_std_sched_eh);
>
> @@ -1060,7 +1060,7 @@ static void __ata_port_freeze(struct ata_port *ap)
>
> ap->pflags |= ATA_PFLAG_FROZEN;
>
> - DPRINTK("ata%u port frozen\n", ap->print_id);
> + trace_ata_port_freeze(ap);
> }
>
> /**
> @@ -1208,7 +1208,7 @@ void ata_eh_thaw_port(struct ata_port *ap)
>
> spin_unlock_irqrestore(ap->lock, flags);
>
> - DPRINTK("ata%u port thawed\n", ap->print_id);
> + trace_ata_port_thaw(ap);
> }
>
> static void ata_eh_scsidone(struct scsi_cmnd *scmd)
> @@ -1347,6 +1347,8 @@ void ata_eh_about_to_do(struct ata_link *link, struct ata_device *dev,
> struct ata_eh_context *ehc = &link->eh_context;
> unsigned long flags;
>
> + trace_ata_eh_about_to_do(link, dev ? dev->devno : 0, action);
> +
> spin_lock_irqsave(ap->lock, flags);
>
> ata_eh_clear_action(link, dev, ehi, action);
> @@ -1377,6 +1379,8 @@ void ata_eh_done(struct ata_link *link, struct ata_device *dev,
> {
> struct ata_eh_context *ehc = &link->eh_context;
>
> + trace_ata_eh_done(link, dev ? dev->devno : 0, action);
> +
> ata_eh_clear_action(link, dev, &ehc->i, action);
> }
>
> diff --git a/include/trace/events/libata.h b/include/trace/events/libata.h
> index bebde8a72b9c..35e84ff735b0 100644
> --- a/include/trace/events/libata.h
> +++ b/include/trace/events/libata.h
> @@ -454,6 +454,37 @@ TRACE_EVENT(ata_eh_link_autopsy_qc,
> __parse_eh_err_mask(__entry->eh_err_mask))
> );
>
> +DECLARE_EVENT_CLASS(ata_eh_action_template,
> +
> + TP_PROTO(struct ata_link *link, unsigned int devno, unsigned int eh_action),
> +
> + TP_ARGS(link, devno, eh_action),
> +
> + TP_STRUCT__entry(
> + __field( unsigned int, ata_port )
> + __field( unsigned int, ata_dev )
> + __field( unsigned int, eh_action )
> + ),
> +
> + TP_fast_assign(
> + __entry->ata_port = link->ap->print_id;
> + __entry->ata_dev = link->pmp + devno;
> + __entry->eh_action = eh_action;
> + ),
> +
> + TP_printk("ata_port=%u ata_dev=%u eh_action=%s",
> + __entry->ata_port, __entry->ata_dev,
> + __parse_eh_action(__entry->eh_action))
> +);
> +
> +DEFINE_EVENT(ata_eh_action_template, ata_eh_about_to_do,
> + TP_PROTO(struct ata_link *link, unsigned int devno, unsigned int eh_action),
> + TP_ARGS(link, devno, eh_action));
> +
> +DEFINE_EVENT(ata_eh_action_template, ata_eh_done,
> + TP_PROTO(struct ata_link *link, unsigned int devno, unsigned int eh_action),
> + TP_ARGS(link, devno, eh_action));
> +
> DECLARE_EVENT_CLASS(ata_link_reset_begin_template,
>
> TP_PROTO(struct ata_link *link, unsigned int *class, unsigned long deadline),
> @@ -534,6 +565,35 @@ DEFINE_EVENT(ata_link_reset_end_template, ata_slave_postreset,
> TP_PROTO(struct ata_link *link, unsigned int *class, int rc),
> TP_ARGS(link, class, rc));
>
> +DECLARE_EVENT_CLASS(ata_port_eh_begin_template,
> +
> + TP_PROTO(struct ata_port *ap),
> +
> + TP_ARGS(ap),
> +
> + TP_STRUCT__entry(
> + __field( unsigned int, ata_port )
> + ),
> +
> + TP_fast_assign(
> + __entry->ata_port = ap->print_id;
> + ),
> +
> + TP_printk("ata_port=%u", __entry->ata_port)
> +);
> +
> +DEFINE_EVENT(ata_port_eh_begin_template, ata_std_sched_eh,
> + TP_PROTO(struct ata_port *ap),
> + TP_ARGS(ap));
> +
> +DEFINE_EVENT(ata_port_eh_begin_template, ata_port_freeze,
> + TP_PROTO(struct ata_port *ap),
> + TP_ARGS(ap));
> +
> +DEFINE_EVENT(ata_port_eh_begin_template, ata_port_thaw,
> + TP_PROTO(struct ata_port *ap),
> + TP_ARGS(ap));
> +
> DECLARE_EVENT_CLASS(ata_sff_hsm_template,
>
> TP_PROTO(struct ata_queued_cmd *qc, unsigned char status),
>
