From: Ewan Milne <emilne@redhat.com>
To: Hannes Reinecke <hare@suse.de>
Cc: James Bottomley <jbottomley@parallels.com>,
Christoph Hellwig <hch@infradead.org>,
linux-scsi@vger.kernel.org, Robert Elliott <elliott@hp.com>
Subject: Re: [PATCH 22/24] scsi: fixup logging messages in scsi_error.c
Date: Thu, 02 Oct 2014 15:02:19 -0400 [thread overview]
Message-ID: <1412276539.5241.84.camel@localhost.localdomain> (raw)
In-Reply-To: <1412144580-72880-23-git-send-email-hare@suse.de>
On Wed, 2014-10-01 at 08:22 +0200, Hannes Reinecke wrote:
> Use the matching scope for logging messages to allow for
> better command tracing.
>
> Suggested-by: Robert Elliott <elliott@hp.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> Signed-off-by: Hannes Reinecke <hare@suse.de>
> ---
> drivers/scsi/hosts.c | 4 +--
> drivers/scsi/scsi_error.c | 82 +++++++++++++++++++++++++----------------------
> 2 files changed, 45 insertions(+), 41 deletions(-)
See below. I think there is another line that needs to be changed.
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
>
> diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
> index 6de80e3..06030e1 100644
> --- a/drivers/scsi/hosts.c
> +++ b/drivers/scsi/hosts.c
> @@ -485,8 +485,8 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
> WQ_UNBOUND | WQ_MEM_RECLAIM,
> 1, shost->host_no);
> if (!shost->tmf_work_q) {
> - printk(KERN_WARNING "scsi%d: failed to create tmf workq\n",
> - shost->host_no);
> + shost_printk(KERN_WARNING, shost,
> + "failed to create tmf workq\n");
> goto fail_kthread;
> }
> scsi_proc_hostdir_add(shost->hostt);
> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
> index 554f885..7e1e190 100644
> --- a/drivers/scsi/scsi_error.c
> +++ b/drivers/scsi/scsi_error.c
> @@ -1156,9 +1156,10 @@ int scsi_eh_get_sense(struct list_head *work_q,
> shost = scmd->device->host;
> if (scsi_host_eh_past_deadline(shost)) {
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, shost,
> - "skip %s, past eh deadline\n",
> - __func__));
> + scmd_printk(KERN_INFO, scmd,
> + "%s: skip request sense, "
> + "past eh deadline\n",
> + current->comm));
> break;
> }
> if (status_byte(scmd->result) != CHECK_CONDITION)
> @@ -1265,9 +1266,10 @@ static int scsi_eh_test_devices(struct list_head *cmd_list,
> /* Push items back onto work_q */
> list_splice_init(cmd_list, work_q);
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, sdev->host,
> - "skip %s, past eh deadline",
> - __func__));
> + sdev_printk(KERN_INFO, sdev,
> + "%s: skip test device, "
> + "past eh deadline",
> + current->comm));
> break;
> }
> }
> @@ -1318,21 +1320,22 @@ static int scsi_eh_abort_cmds(struct list_head *work_q,
> if (scsi_host_eh_past_deadline(shost)) {
> list_splice_init(&check_list, work_q);
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, shost,
> - "skip %s, past eh deadline\n",
> - __func__));
> + scmd_printk(KERN_INFO, scmd,
> + "%s: skip aborting cmd, "
> + "past eh deadline\n",
> + current->comm));
> return list_empty(work_q);
> }
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, shost,
> - "%s: aborting cmd: 0x%p\n",
> + scmd_printk(KERN_INFO, scmd,
> + "%s: aborting cmd\n",
> current->comm, scmd));
I got a compile error on this, I think you need to change the above line
to be " current->comm));", removing scmd
> rtn = scsi_try_to_abort_cmd(shost->hostt, scmd);
> if (rtn == FAILED) {
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, shost,
> - "%s: aborting cmd failed: 0x%p\n",
> - current->comm, scmd));
> + scmd_printk(KERN_INFO, scmd,
> + "%s: aborting cmd failed\n",
> + current->comm));
> list_splice_init(&check_list, work_q);
> return list_empty(work_q);
> }
> @@ -1390,9 +1393,10 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
> shost_for_each_device(sdev, shost) {
> if (scsi_host_eh_past_deadline(shost)) {
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, shost,
> - "skip %s, past eh deadline\n",
> - __func__));
> + sdev_printk(KERN_INFO, sdev,
> + "%s: skip START_UNIT, "
> + "past eh deadline\n",
> + current->comm));
> break;
> }
> stu_scmd = NULL;
> @@ -1407,9 +1411,9 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
> continue;
>
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, shost,
> - "%s: Sending START_UNIT to sdev: 0x%p\n",
> - current->comm, sdev));
> + sdev_printk(KERN_INFO, sdev,
> + "%s: Sending START_UNIT\n",
> + current->comm));
>
> if (!scsi_eh_try_stu(stu_scmd)) {
> if (!scsi_device_online(sdev) ||
> @@ -1423,9 +1427,9 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
> }
> } else {
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, shost,
> - "%s: START_UNIT failed to sdev:"
> - " 0x%p\n", current->comm, sdev));
> + sdev_printk(KERN_INFO, sdev,
> + "%s: START_UNIT failed\n",
> + current->comm));
> }
> }
>
> @@ -1456,9 +1460,9 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
> shost_for_each_device(sdev, shost) {
> if (scsi_host_eh_past_deadline(shost)) {
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, shost,
> - "skip %s, past eh deadline\n",
> - __func__));
> + sdev_printk(KERN_INFO, sdev,
> + "%s: skip BDR, past eh deadline\n",
> + current->comm));
> break;
> }
> bdr_scmd = NULL;
> @@ -1472,9 +1476,8 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
> continue;
>
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, shost,
> - "%s: Sending BDR sdev: 0x%p\n",
> - current->comm, sdev));
> + sdev_printk(KERN_INFO, sdev,
> + "%s: Sending BDR\n", current->comm));
> rtn = scsi_try_bus_device_reset(bdr_scmd);
> if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
> if (!scsi_device_online(sdev) ||
> @@ -1490,9 +1493,8 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
> }
> } else {
> SCSI_LOG_ERROR_RECOVERY(3,
> - shost_printk(KERN_INFO, shost,
> - "%s: BDR failed sdev: 0x%p\n",
> - current->comm, sdev));
> + sdev_printk(KERN_INFO, sdev,
> + "%s: BDR failed\n", current->comm));
> }
> }
>
> @@ -1528,8 +1530,9 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
> list_splice_init(&tmp_list, work_q);
> SCSI_LOG_ERROR_RECOVERY(3,
> shost_printk(KERN_INFO, shost,
> - "skip %s, past eh deadline\n",
> - __func__));
> + "%s: Skip target reset, "
> + "past eh deadline\n",
> + current->comm));
> return list_empty(work_q);
> }
>
> @@ -1591,8 +1594,8 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
> list_splice_init(&check_list, work_q);
> SCSI_LOG_ERROR_RECOVERY(3,
> shost_printk(KERN_INFO, shost,
> - "skip %s, past eh deadline\n",
> - __func__));
> + "%s: skip BRST, past eh deadline\n",
> + current->comm));
> return list_empty(work_q);
> }
>
> @@ -2191,9 +2194,10 @@ int scsi_error_handler(void *data)
> */
> if (!shost->eh_noresume && scsi_autopm_get_host(shost) != 0) {
> SCSI_LOG_ERROR_RECOVERY(1,
> - printk(KERN_ERR "Error handler scsi_eh_%d "
> - "unable to autoresume\n",
> - shost->host_no));
> + shost_printk(KERN_ERR, shost,
> + "scsi_eh_%d: "
> + "unable to autoresume\n",
> + shost->host_no));
> continue;
> }
>
next prev parent reply other threads:[~2014-10-02 19:02 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-01 6:22 [PATCHv5 00/24] scsi logging update (the boring part) Hannes Reinecke
2014-10-01 6:22 ` [PATCH 01/24] Remove scsi_cmd_print_sense_hdr() Hannes Reinecke
2014-10-01 6:22 ` [PATCH 02/24] sd: Remove scsi_print_sense() in sd_done() Hannes Reinecke
2014-10-01 6:22 ` [PATCH 03/24] aha152x: Debug output update and whitespace cleanup Hannes Reinecke
2014-10-03 0:01 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 04/24] scsi: introduce sdev_prefix_printk() Hannes Reinecke
2014-10-02 18:37 ` Elliott, Robert (Server Storage)
2014-10-03 16:31 ` Ewan Milne
2014-10-06 6:00 ` Hannes Reinecke
2014-10-01 6:22 ` [PATCH 05/24] scsi: Use sdev as argument for sense code printing Hannes Reinecke
2014-10-03 0:32 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 06/24] acornscsi: use scsi_print_command() Hannes Reinecke
2014-10-01 6:22 ` [PATCH 07/24] fas216: Return DID_ERROR for incomplete data transfer Hannes Reinecke
2014-10-01 7:58 ` Christoph Hellwig
2014-10-01 6:22 ` [PATCH 08/24] fas216: Update logging messages Hannes Reinecke
2014-10-03 0:43 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 09/24] 53c700: remove scsi_print_sense() usage Hannes Reinecke
2014-10-01 6:22 ` [PATCH 10/24] scsi: stop decoding if scsi_normalize_sense() fails Hannes Reinecke
2014-10-01 6:22 ` [PATCH 11/24] scsi: do not decode sense extras Hannes Reinecke
2014-10-01 6:22 ` [PATCH 12/24] scsi: use 'bool' as return value for scsi_normalize_sense() Hannes Reinecke
2014-10-03 1:15 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 13/24] scsi: remove scsi_print_status() Hannes Reinecke
2014-10-01 6:22 ` [PATCH 14/24] Implement scsi_opcode_sa_name Hannes Reinecke
2014-10-03 1:26 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 15/24] scsi: merge print_opcode_name() Hannes Reinecke
2014-10-03 1:37 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 16/24] scsi: consolidate opcode lookup in scsi_opcode_sa_name() Hannes Reinecke
2014-10-03 1:44 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 17/24] scsi: remove last argument from print_opcode_name() Hannes Reinecke
2014-10-03 2:02 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 18/24] scsi: Remove scsi_print_command when calling abort Hannes Reinecke
2014-10-03 2:11 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 19/24] scsi: separate out scsi_(host|driver)byte_string() Hannes Reinecke
2014-10-01 6:22 ` [PATCH 20/24] sd: Cleanup logging Hannes Reinecke
2014-10-02 23:20 ` Elliott, Robert (Server Storage)
2014-10-03 2:23 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 21/24] scsi: simplify scsi_log_(send|completion) Hannes Reinecke
2014-10-03 2:32 ` Elliott, Robert (Server Storage)
2014-10-06 6:40 ` Hannes Reinecke
2014-10-01 6:22 ` [PATCH 22/24] scsi: fixup logging messages in scsi_error.c Hannes Reinecke
2014-10-02 19:02 ` Ewan Milne [this message]
2014-10-03 2:39 ` Elliott, Robert (Server Storage)
2014-10-01 6:22 ` [PATCH 23/24] scsi: use shost argument in scsi_eh_prt_fail_stats Hannes Reinecke
2014-10-01 6:23 ` [PATCH 24/24] scsi_error: document scsi_try_to_abort_cmd Hannes Reinecke
2014-10-01 7:59 ` Christoph Hellwig
2014-10-03 2:54 ` Elliott, Robert (Server Storage)
2014-10-02 18:53 ` [PATCHv5 00/24] scsi logging update (the boring part) Elliott, Robert (Server Storage)
2014-10-03 7:08 ` Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1412276539.5241.84.camel@localhost.localdomain \
--to=emilne@redhat.com \
--cc=elliott@hp.com \
--cc=hare@suse.de \
--cc=hch@infradead.org \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox