From 2c13f6b7e0f80edf9c00c8d8d0857a6fc6e8a223 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 27 Feb 2013 02:50:14 +0000 Subject: [PATCH] Logging cleanup: hide most verbose logs by default git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4772 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst_debug.h | 6 +++++- scst/src/scst_lib.c | 16 ++++++++-------- scst/src/scst_proc.c | 1 + scst/src/scst_sysfs.c | 1 + scst/src/scst_targ.c | 20 ++++++++++---------- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/scst/include/scst_debug.h b/scst/include/scst_debug.h index cad92f728..ee22b0b15 100644 --- a/scst/include/scst_debug.h +++ b/scst/include/scst_debug.h @@ -129,8 +129,9 @@ #define TRACE_SPECIAL 0x00002000 /* filtering debug, etc */ #define TRACE_FLOW_CONTROL 0x00004000 /* flow control in action */ #define TRACE_PRES 0x00008000 +#define TRACE_BLOCKING 0x00010000 #define TRACE_ALL 0xffffffff -/* Flags 0xXXXX0000 are local for users */ +/* Flags 0xXXXXXXXXXX000000 are local for users */ #define TRACE_MINOR_AND_MGMT_DBG (TRACE_MINOR|TRACE_MGMT_DEBUG) @@ -244,6 +245,8 @@ do { \ TRACE_DBG_FLAG(TRACE_MGMT_DEBUG|TRACE_SPECIAL, format, ## args) #define TRACE_PR(format, args...) \ TRACE_DBG_FLAG(TRACE_PRES, format, ## args) +#define TRACE_BLOCK(format, args...) \ + TRACE_DBG_FLAG(TRACE_BLOCKING, format, ## args) #define TRACE_BUFFER(message, buff, len) \ do { \ @@ -349,6 +352,7 @@ do { \ #define TRACE_MGMT_DBG(format, args...) do {} while (0) #define TRACE_MGMT_DBG_SPECIAL(format, args...) do {} while (0) #define TRACE_PR(format, args...) do {} while (0) +#define TRACE_BLOCK(format, args...) do {} while (0) #define TRACE_BUFFER(message, buff, len) do {} while (0) #define TRACE_BUFF_FLAG(flag, message, buff, len) do {} while (0) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 3244fa65b..eff5298fe 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -8099,7 +8099,7 @@ out: void scst_block_dev(struct scst_device *dev) { dev->block_count++; - TRACE_MGMT_DBG("Device BLOCK (new count %d), dev %s", dev->block_count, + TRACE_BLOCK("Device BLOCK (new count %d), dev %s", dev->block_count, dev->virt_name); } @@ -8121,19 +8121,19 @@ bool __scst_check_blocked_dev(struct scst_cmd *cmd) goto out; if (dev->block_count > 0) { - TRACE_MGMT_DBG("Delaying cmd %p due to blocking " + TRACE_BLOCK("Delaying cmd %p due to blocking " "(tag %llu, op %x, dev %s)", cmd, (long long unsigned int)cmd->tag, cmd->cdb[0], dev->virt_name); goto out_block; } else if ((cmd->op_flags & SCST_STRICTLY_SERIALIZED) == SCST_STRICTLY_SERIALIZED) { - TRACE_MGMT_DBG("cmd %p (tag %llu, op %x): blocking further " + TRACE_BLOCK("cmd %p (tag %llu, op %x): blocking further " "cmds on dev %s due to strict serialization", cmd, (long long unsigned int)cmd->tag, cmd->cdb[0], dev->virt_name); scst_block_dev(dev); if (dev->on_dev_cmd_count > 1) { - TRACE_MGMT_DBG("Delaying strictly serialized cmd %p " + TRACE_BLOCK("Delaying strictly serialized cmd %p " "(dev %s, on_dev_cmds to wait %d)", cmd, dev->virt_name, dev->on_dev_cmd_count-1); EXTRACHECKS_BUG_ON(dev->strictly_serialized_cmd_waiting); @@ -8143,7 +8143,7 @@ bool __scst_check_blocked_dev(struct scst_cmd *cmd) cmd->unblock_dev = 1; } else if ((dev->dev_double_ua_possible) || ((cmd->op_flags & SCST_SERIALIZED) != 0)) { - TRACE_MGMT_DBG("cmd %p (tag %llu, op %x): blocking further cmds " + TRACE_BLOCK("cmd %p (tag %llu, op %x): blocking further cmds " "on dev %s due to %s", cmd, (long long unsigned int)cmd->tag, cmd->cdb[0], dev->virt_name, dev->dev_double_ua_possible ? "possible double reset UA" : @@ -8151,7 +8151,7 @@ bool __scst_check_blocked_dev(struct scst_cmd *cmd) scst_block_dev(dev); cmd->unblock_dev = 1; } else - TRACE_MGMT_DBG("No blocks for device %s", dev->virt_name); + TRACE_BLOCK("No blocks for device %s", dev->virt_name); out: TRACE_EXIT_RES(res); @@ -8173,7 +8173,7 @@ void scst_unblock_dev(struct scst_device *dev) { TRACE_ENTRY(); - TRACE_MGMT_DBG("Device UNBLOCK(new %d), dev %s", + TRACE_BLOCK("Device UNBLOCK(new %d), dev %s", dev->block_count-1, dev->virt_name); if (--dev->block_count == 0) { @@ -8185,7 +8185,7 @@ void scst_unblock_dev(struct scst_device *dev) blocked_cmd_list_entry) { bool strictly_serialized; list_del(&cmd->blocked_cmd_list_entry); - TRACE_MGMT_DBG("Adding blocked cmd %p to active cmd " + TRACE_BLOCK("Adding blocked cmd %p to active cmd " "list", cmd); spin_lock(&cmd->cmd_threads->cmd_list_lock); if (cmd->queue_type == SCST_CMD_QUEUE_HEAD_OF_QUEUE) diff --git a/scst/src/scst_proc.c b/scst/src/scst_proc.c index 2135a6929..e9e2566b7 100644 --- a/scst/src/scst_proc.c +++ b/scst/src/scst_proc.c @@ -128,6 +128,7 @@ static struct scst_trace_log scst_proc_local_trace_tbl[] = { { TRACE_SCSI_SERIALIZING, "scsi_serializing" }, { TRACE_DATA_SEND, "data_send" }, { TRACE_DATA_RECEIVED, "data_received" }, + { TRACE_BLOCKING, "block" }, { 0, NULL } }; #endif diff --git a/scst/src/scst_sysfs.c b/scst/src/scst_sysfs.c index 05416b040..e0e92904a 100644 --- a/scst/src/scst_sysfs.c +++ b/scst/src/scst_sysfs.c @@ -91,6 +91,7 @@ static struct scst_trace_log scst_local_trace_tbl[] = { { TRACE_SCSI_SERIALIZING, "scsi_serializing" }, { TRACE_DATA_SEND, "data_send" }, { TRACE_DATA_RECEIVED, "data_received" }, + { TRACE_BLOCKING, "block" }, { 0, NULL } }; diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index a2ac0fc41..e3daa5bec 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -163,13 +163,13 @@ static void scst_check_unblock_dev(struct scst_cmd *cmd) scst_dec_pr_readers_count(cmd, true); if (unlikely(cmd->unblock_dev)) { - TRACE_MGMT_DBG("cmd %p (tag %llu): unblocking dev %s", cmd, + TRACE_BLOCK("cmd %p (tag %llu): unblocking dev %s", cmd, (long long unsigned int)cmd->tag, dev->virt_name); cmd->unblock_dev = 0; scst_unblock_dev(dev); } else if (unlikely(dev->strictly_serialized_cmd_waiting)) { if (dev->on_dev_cmd_count == 0) { - TRACE_MGMT_DBG("Strictly serialized cmd waiting: " + TRACE_BLOCK("Strictly serialized cmd waiting: " "unblocking dev %s", dev->virt_name); scst_unblock_dev(dev); } @@ -246,7 +246,7 @@ static int scst_init_cmd(struct scst_cmd *cmd, enum scst_exec_context *context) /* See the comment in scst_do_job_init() */ if (unlikely(!list_empty(&scst_init_cmd_list))) { - TRACE_MGMT_DBG("%s", "init cmd list busy"); + TRACE_DBG("%s", "init cmd list busy"); goto out_redirect; } /* @@ -307,7 +307,7 @@ out_redirect: } else { unsigned long flags; spin_lock_irqsave(&scst_init_lock, flags); - TRACE_MGMT_DBG("Adding cmd %p to init cmd list", cmd); + TRACE_DBG("Adding cmd %p to init cmd list", cmd); list_add_tail(&cmd->cmd_list_entry, &scst_init_cmd_list); if (test_bit(SCST_CMD_ABORTED, &cmd->cmd_flags)) scst_init_poll_cnt++; @@ -1808,7 +1808,7 @@ out_compl: ua->UA_valid_sense_len, SCST_SENSE_ALL_VALID, SCST_LOAD_SENSE(scst_sense_reported_luns_data_changed))) { - TRACE_MGMT_DBG("Freeing not needed " + TRACE_DBG("Freeing not needed " "REPORTED LUNS DATA CHANGED UA " "%p", ua); scst_tgt_dev_del_free_UA(tgt_dev, ua); @@ -2984,9 +2984,9 @@ static int scst_check_sense(struct scst_cmd *cmd) SCST_SENSE_ASC_VALID, 0, SCST_SENSE_ASC_UA_RESET, 0)) { if (cmd->double_ua_possible) { - TRACE_MGMT_DBG("Double UA " + TRACE_DBG("Double UA " "detected for device %p", dev); - TRACE_MGMT_DBG("Retrying cmd" + TRACE_DBG("Retrying cmd" " %p (tag %llu)", cmd, (long long unsigned)cmd->tag); @@ -3021,7 +3021,7 @@ static int scst_check_sense(struct scst_cmd *cmd) if (unlikely(cmd->double_ua_possible)) { if ((cmd->op_flags & SCST_SKIP_UA) == 0) { - TRACE_MGMT_DBG("Clearing dbl_ua_possible flag (dev %p, " + TRACE_DBG("Clearing dbl_ua_possible flag (dev %p, " "cmd %p)", dev, cmd); /* * Lock used to protect other flags in the bitfield @@ -4077,13 +4077,13 @@ restart: * same tgt_dev, but scst_cmd_init_done*() doesn't guarantee * the order in case of simultaneous such calls anyway. */ - TRACE_MGMT_DBG("Deleting cmd %p from init cmd list", cmd); + TRACE_DBG("Deleting cmd %p from init cmd list", cmd); smp_wmb(); /* enforce the required order */ list_del(&cmd->cmd_list_entry); spin_unlock(&scst_init_lock); spin_lock(&cmd->cmd_threads->cmd_list_lock); - TRACE_MGMT_DBG("Adding cmd %p to active cmd list", cmd); + TRACE_DBG("Adding cmd %p to active cmd list", cmd); if (unlikely(cmd->queue_type == SCST_CMD_QUEUE_HEAD_OF_QUEUE)) list_add(&cmd->cmd_list_entry, &cmd->cmd_threads->active_cmd_list);