ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: remove uses of SPDK_TRACE_DEBUG

Browse Source 
Replace SPDK_TRACE_DEBUG with component-specific flags.

Change-Id: Iee7eafab5e6ac8713f247323a18552b5afb0e86a
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/375834
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Daniel Verkamp 2017-08-25 14:22:46 -07:00 committed by Jim Harris
parent e3971c41ea
commit 932a186b4c
21 changed files with 185 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/bdev/bdev.c
View File

@ -138,7 +138,7 @@ spdk_bdev_first(void)
bdev = TAILQ_FIRST(&g_bdev_mgr.bdevs);
if (bdev) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Starting bdev iteration at %s\n", bdev->name);
SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Starting bdev iteration at %s\n", bdev->name);
}
return bdev;
@ -151,7 +151,7 @@ spdk_bdev_next(struct spdk_bdev *prev)
bdev = TAILQ_NEXT(prev, link);
if (bdev) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Continuing bdev iteration at %s\n", bdev->name);
SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Continuing bdev iteration at %s\n", bdev->name);
}
return bdev;
@ -179,7 +179,7 @@ spdk_bdev_first_leaf(void)
bdev = _bdev_next_leaf(TAILQ_FIRST(&g_bdev_mgr.bdevs));
if (bdev) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Starting bdev iteration at %s\n", bdev->name);
SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Starting bdev iteration at %s\n", bdev->name);
}
return bdev;
@ -193,7 +193,7 @@ spdk_bdev_next_leaf(struct spdk_bdev *prev)
bdev = _bdev_next_leaf(TAILQ_NEXT(prev, link));
if (bdev) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Continuing bdev iteration at %s\n", bdev->name);
SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Continuing bdev iteration at %s\n", bdev->name);
}
return bdev;
@ -1422,7 +1422,7 @@ _spdk_bdev_register(struct spdk_bdev *bdev)
sizeof(struct spdk_bdev_channel));
pthread_mutex_init(&bdev->mutex, NULL);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Inserting bdev %s into list\n", bdev->name);
SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Inserting bdev %s into list\n", bdev->name);
TAILQ_INSERT_TAIL(&g_bdev_mgr.bdevs, bdev, link);
TAILQ_FOREACH(module, &g_bdev_mgr.bdev_modules, tailq) {
@ -1459,7 +1459,7 @@ spdk_bdev_unregister(struct spdk_bdev *bdev)
int rc;
bool do_destruct = true;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Removing bdev %s from list\n", bdev->name);
SPDK_DEBUGLOG(SPDK_TRACE_BDEV, "Removing bdev %s from list\n", bdev->name);
pthread_mutex_lock(&bdev->mutex);
@ -1680,3 +1680,5 @@ spdk_bdev_module_list_add(struct spdk_bdev_module_if *bdev_module)
TAILQ_INSERT_TAIL(&g_bdev_mgr.bdev_modules, bdev_module, tailq);
}
}
SPDK_LOG_REGISTER_TRACE_FLAG("bdev", SPDK_TRACE_BDEV)

6
lib/bdev/malloc/bdev_malloc.c
View File

@ -174,7 +174,7 @@ bdev_malloc_readv(struct malloc_disk *mdisk, struct spdk_io_channel *ch,
return;
}
SPDK_DEBUGLOG(SPDK_TRACE_MALLOC, "read %lu bytes from offset %#lx\n",
SPDK_DEBUGLOG(SPDK_TRACE_BDEV_MALLOC, "read %lu bytes from offset %#lx\n",
len, offset);
task->status = SPDK_BDEV_IO_STATUS_SUCCESS;
@ -209,7 +209,7 @@ bdev_malloc_writev(struct malloc_disk *mdisk, struct spdk_io_channel *ch,
return;
}
SPDK_DEBUGLOG(SPDK_TRACE_MALLOC, "wrote %lu bytes to offset %#lx\n",
SPDK_DEBUGLOG(SPDK_TRACE_BDEV_MALLOC, "wrote %lu bytes to offset %#lx\n",
len, offset);
task->status = SPDK_BDEV_IO_STATUS_SUCCESS;
@ -517,4 +517,4 @@ bdev_malloc_get_spdk_running_config(FILE *fp)
}
}
SPDK_LOG_REGISTER_TRACE_FLAG("malloc", SPDK_TRACE_MALLOC)
SPDK_LOG_REGISTER_TRACE_FLAG("bdev_malloc", SPDK_TRACE_BDEV_MALLOC)

2
lib/bdev/malloc/bdev_malloc_rpc.c
View File

@ -58,7 +58,7 @@ spdk_rpc_construct_malloc_bdev(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_construct_malloc_decoders,
SPDK_COUNTOF(rpc_construct_malloc_decoders),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_BDEV_MALLOC, "spdk_json_decode_object failed\n");
goto invalid;
}

2
lib/bdev/null/bdev_null_rpc.c
View File

@ -62,7 +62,7 @@ spdk_rpc_construct_null_bdev(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_construct_null_decoders,
SPDK_COUNTOF(rpc_construct_null_decoders),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_BDEV_NULL, "spdk_json_decode_object failed\n");
goto invalid;
}

4
lib/bdev/rbd/bdev_rbd.c
View File

@ -41,13 +41,13 @@
#include "spdk/conf.h"
#include "spdk/env.h"
#include "spdk/log.h"
#include "spdk/bdev.h"
#include "spdk/io_channel.h"
#include "spdk/json.h"
#include "spdk/string.h"
#include "spdk_internal/bdev.h"
#include "spdk_internal/log.h"
#define SPDK_RBD_QUEUE_DEPTH 128
@ -617,3 +617,5 @@ bdev_rbd_library_init(void)
end:
return rc;
}
SPDK_LOG_REGISTER_TRACE_FLAG("bdev_rbd", SPDK_TRACE_BDEV_RBD)

2
lib/bdev/rbd/bdev_rbd_rpc.c
View File

@ -67,7 +67,7 @@ spdk_rpc_construct_rbd_bdev(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_construct_rbd_decoders,
SPDK_COUNTOF(rpc_construct_rbd_decoders),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_BDEV_RBD, "spdk_json_decode_object failed\n");
goto invalid;
}

4
lib/event/rpc/app_rpc.c
View File

@ -74,7 +74,7 @@ spdk_rpc_kill_instance(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_kill_instance_decoders,
SPDK_COUNTOF(rpc_kill_instance_decoders),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_REACTOR, "spdk_json_decode_object failed\n");
goto invalid;
}
@ -91,7 +91,7 @@ spdk_rpc_kill_instance(struct spdk_jsonrpc_request *request,
goto invalid;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "sending signal %d\n", signals[i].signal);
SPDK_DEBUGLOG(SPDK_TRACE_REACTOR, "sending signal %d\n", signals[i].signal);
kill(getpid(), signals[i].signal);
free_rpc_kill_instance(&req);

14
lib/iscsi/conn.c
View File

@ -345,7 +345,7 @@ int spdk_initialize_iscsi_conns(void)
int conns_array_fd;
int i, rc;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_init\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_init\n");
rc = pthread_mutex_init(&g_conns_mutex, NULL);
if (rc != 0) {
@ -638,13 +638,13 @@ static void spdk_iscsi_remove_conn(struct spdk_iscsi_conn *conn)
if (sess->connections == 0) {
/* cleanup last connection */
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"cleanup last conn free sess\n");
spdk_free_sess(sess);
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "cleanup free conn\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "cleanup free conn\n");
spdk_iscsi_conn_free(conn);
}
@ -858,7 +858,7 @@ spdk_iscsi_drop_conns(struct spdk_iscsi_conn *conn, const char *conn_match,
const char *xconn_match;
int i, num;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_drop_conns\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_drop_conns\n");
num = 0;
pthread_mutex_lock(&g_conns_mutex);
@ -1229,7 +1229,7 @@ spdk_iscsi_conn_flush_pdus_internal(struct spdk_iscsi_conn *conn)
if ((conn->full_feature) &&
(conn->sess->ErrorRecoveryLevel >= 1) &&
spdk_iscsi_is_deferred_free_pdu(pdu)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "stat_sn=%d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "stat_sn=%d\n",
from_be32(&pdu->bhs.stat_sn));
TAILQ_INSERT_TAIL(&conn->snack_pdu_list, pdu,
tailq);
@ -1508,7 +1508,7 @@ void spdk_iscsi_conn_idle_do_work(void *arg)
spdk_net_framework_clear_socket_association(tconn->sock);
spdk_event_call(spdk_iscsi_conn_get_migrate_event(tconn, &lcore));
__sync_fetch_and_add(&g_num_connections[lcore], 1);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "add conn id = %d, cid = %d poller = %p to lcore = %d active\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "add conn id = %d, cid = %d poller = %p to lcore = %d active\n",
tconn->id, tconn->cid, &tconn->poller, lcore);
}
} /* for each conn in idle list */
@ -1533,7 +1533,7 @@ __add_idle_conn(void *arg1, void *arg2)
rc = add_idle_conn(conn);
if (rc == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "add conn id = %d, cid = %d poller = %p to idle\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "add conn id = %d, cid = %d poller = %p to idle\n",
conn->id, conn->cid, conn->poller);
conn->is_idle = 1;
STAILQ_INSERT_TAIL(&g_idle_conn_list_head, conn, link);

16
lib/iscsi/init_grp.c
View File

@ -56,11 +56,11 @@ spdk_iscsi_init_grp_create_from_configfile(struct spdk_conf_section *sp)
char **initiators = NULL, **netmasks = NULL;
int tag = spdk_conf_section_get_num(sp);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "add initiator group %d\n", tag);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "add initiator group %d\n", tag);
val = spdk_conf_section_get_val(sp, "Comment");
if (val != NULL) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Comment %s\n", val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Comment %s\n", val);
}
/* counts number of definitions */
@ -105,7 +105,7 @@ spdk_iscsi_init_grp_create_from_configfile(struct spdk_conf_section *sp)
rc = -EINVAL;
goto cleanup;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "InitiatorName %s\n", val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "InitiatorName %s\n", val);
initiators[i] = strdup(val);
if (!initiators[i]) {
perror("initiator name copy");
@ -126,7 +126,7 @@ spdk_iscsi_init_grp_create_from_configfile(struct spdk_conf_section *sp)
rc = -EINVAL;
goto cleanup;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Netmask %s\n", val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Netmask %s\n", val);
netmasks[i] = strdup(val);
if (!netmasks[i]) {
perror("initiator netmask copy");
@ -196,7 +196,7 @@ spdk_iscsi_init_grp_create_from_initiator_list(int tag,
goto cleanup;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"add initiator group (from initiator list) tag=%d, #initiators=%d, #masks=%d\n",
tag, num_initiator_names, num_initiator_masks);
@ -215,12 +215,12 @@ spdk_iscsi_init_grp_create_from_initiator_list(int tag,
ig->nnetmasks = num_initiator_masks;
ig->initiators = initiator_names;
for (i = 0; i < num_initiator_names; i++)
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "InitiatorName %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "InitiatorName %s\n",
ig->initiators[i]);
ig->netmasks = initiator_masks;
for (i = 0; i < num_initiator_masks; i++)
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Netmask %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Netmask %s\n",
ig->netmasks[i]);
ig->state = GROUP_INIT;
@ -317,7 +317,7 @@ spdk_iscsi_init_grp_array_destroy(void)
{
struct spdk_iscsi_init_grp *ig, *tmp;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_init_grp_array_destroy\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_init_grp_array_destroy\n");
pthread_mutex_lock(&g_spdk_iscsi.mutex);
TAILQ_FOREACH_SAFE(ig, &g_spdk_iscsi.ig_head, tailq, tmp) {
ig->state = GROUP_DESTROY;

88
lib/iscsi/iscsi.c
View File

@ -671,7 +671,7 @@ spdk_iscsi_append_param(struct spdk_iscsi_conn *conn, const char *key,
if (param == NULL) {
param = spdk_iscsi_param_find(conn->sess->params, key);
if (param == NULL) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "no key %.64s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "no key %.64s\n",
key);
return data_len;
}
@ -732,7 +732,7 @@ spdk_iscsi_chap_get_authinfo(struct iscsi_chap_auth *auth, const char *authfile,
val = spdk_conf_section_get_val(sp, "Comment");
if (val != NULL) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"Comment %s\n", val);
}
for (i = 0; ; i++) {
@ -784,7 +784,7 @@ spdk_iscsi_get_authinfo(struct spdk_iscsi_conn *conn, const char *authuser)
ag_tag = g_spdk_iscsi.discovery_auth_group;
pthread_mutex_unlock(&g_spdk_iscsi.mutex);
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "ag_tag=%d\n", ag_tag);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "ag_tag=%d\n", ag_tag);
pthread_mutex_lock(&g_spdk_iscsi.mutex);
authfile = strdup(g_spdk_iscsi.authfile);
@ -870,7 +870,7 @@ spdk_iscsi_auth_params(struct spdk_iscsi_conn *conn,
goto error_return;
}
/* selected algorithm is 5 (MD5) */
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "got CHAP_A=%s\n", new_val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "got CHAP_A=%s\n", new_val);
total = spdk_iscsi_append_text(conn, "CHAP_A", new_val,
data, alloc_len, total);
@ -914,7 +914,7 @@ spdk_iscsi_auth_params(struct spdk_iscsi_conn *conn,
SPDK_ERRLOG("response format error\n");
goto error_return;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "got CHAP_N/CHAP_R\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "got CHAP_N/CHAP_R\n");
rc = spdk_iscsi_get_authinfo(conn, val);
if (rc < 0) {
@ -980,7 +980,7 @@ spdk_iscsi_auth_params(struct spdk_iscsi_conn *conn,
spdk_dump("MChallenge", conn->auth.chap_mchallenge,
conn->auth.chap_mchallenge_len);
#endif
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"got CHAP_I/CHAP_C\n");
if (conn->auth.muser == NULL || conn->auth.msecret == NULL) {
@ -1019,7 +1019,7 @@ spdk_iscsi_auth_params(struct spdk_iscsi_conn *conn,
conn->auth.chap_phase = ISCSI_CHAP_PHASE_END;
} else {
/* not found CHAP keys */
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "start CHAP\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "start CHAP\n");
conn->auth.chap_phase = ISCSI_CHAP_PHASE_WAIT_A;
}
@ -1058,7 +1058,7 @@ spdk_iscsi_reject(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu,
memset(data, 0, alloc_len);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Reject PDU reason=%d\n", reason);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Reject PDU reason=%d\n", reason);
if (conn->sess != NULL) {
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
@ -1102,7 +1102,7 @@ spdk_iscsi_reject(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu,
to_be32(&rsph->max_cmd_sn, 1);
}
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "PDU", (void *)&rsp_pdu->bhs, ISCSI_BHS_LEN);
SPDK_TRACEDUMP(SPDK_TRACE_ISCSI, "PDU", (void *)&rsp_pdu->bhs, ISCSI_BHS_LEN);
spdk_iscsi_write_pdu(conn, rsp_pdu);
@ -1173,8 +1173,8 @@ spdk_iscsi_op_login_response(struct spdk_iscsi_conn *conn,
to_be32(&rsph->max_cmd_sn, rsp_pdu->cmd_sn);
}
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "PDU", (uint8_t *)rsph, ISCSI_BHS_LEN);
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "DATA", rsp_pdu->data, rsp_pdu->data_segment_len);
SPDK_TRACEDUMP(SPDK_TRACE_ISCSI, "PDU", (uint8_t *)rsph, ISCSI_BHS_LEN);
SPDK_TRACEDUMP(SPDK_TRACE_ISCSI, "DATA", rsp_pdu->data, rsp_pdu->data_segment_len);
/* Set T/CSG/NSG to reserved if login error. */
if (rsph->status_class != 0) {
@ -1535,7 +1535,7 @@ spdk_iscsi_op_login_session_type(struct spdk_iscsi_conn *conn,
return SPDK_ISCSI_LOGIN_ERROR_RESPONSE;
}
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Session Type: %s\n", session_type_str);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Session Type: %s\n", session_type_str);
return 0;
}
@ -1571,9 +1571,9 @@ spdk_iscsi_op_login_initialize_port(struct spdk_iscsi_conn *conn,
"%s,i,0x%12.12" PRIx64, val, spdk_iscsi_get_isid(rsph->isid));
spdk_strlwr(conn->initiator_name);
spdk_strlwr(initiator_port_name);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Initiator name: %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Initiator name: %s\n",
conn->initiator_name);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Initiator port: %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Initiator port: %s\n",
initiator_port_name);
return 0;
@ -1858,9 +1858,9 @@ spdk_iscsi_op_login_rsp_init(struct spdk_iscsi_conn *conn,
if (rsph->tsih)
rsph->stat_sn = reqh->exp_stat_sn;
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "PDU", (uint8_t *)&pdu->bhs, ISCSI_BHS_LEN);
SPDK_TRACEDUMP(SPDK_TRACE_ISCSI, "PDU", (uint8_t *)&pdu->bhs, ISCSI_BHS_LEN);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"T=%d, C=%d, CSG=%d, NSG=%d, Min=%d, Max=%d, ITT=%x\n",
ISCSI_BHS_LOGIN_GET_TBIT(rsph->flags),
ISCSI_BHS_LOGIN_GET_CBIT(rsph->flags),
@ -1979,7 +1979,7 @@ spdk_iscsi_op_login_rsp_handle_csg_bit(struct spdk_iscsi_conn *conn,
}
}
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "Negotiated Auth Params",
SPDK_TRACEDUMP(SPDK_TRACE_ISCSI, "Negotiated Auth Params",
rsp_pdu->data, rsp_pdu->data_segment_len);
}
break;
@ -2158,7 +2158,7 @@ spdk_iscsi_op_login_rsp_handle(struct spdk_iscsi_conn *conn,
}
rsp_pdu->data_segment_len = rc;
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "Negotiated Params", rsp_pdu->data, rc);
SPDK_TRACEDUMP(SPDK_TRACE_ISCSI, "Negotiated Params", rsp_pdu->data, rc);
/* handle the CSG bit case */
rc = spdk_iscsi_op_login_rsp_handle_csg_bit(conn, rsp_pdu, *params,
@ -2263,7 +2263,7 @@ spdk_iscsi_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
pdu->cmd_sn = CmdSN;
ExpStatSN = from_be32(&reqh->exp_stat_sn);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "I=%d, F=%d, C=%d, ITT=%x, TTT=%x\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "I=%d, F=%d, C=%d, ITT=%x, TTT=%x\n",
reqh->immediate, F_bit, C_bit, task_tag, from_be32(&reqh->ttt));
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
@ -2369,7 +2369,7 @@ spdk_iscsi_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
}
}
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "Negotiated Params", data, data_len);
SPDK_TRACEDUMP(SPDK_TRACE_ISCSI, "Negotiated Params", data, data_len);
/* response PDU */
rsp_pdu = spdk_get_pdu();
@ -2454,7 +2454,7 @@ spdk_iscsi_op_logout(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
pdu->cmd_sn = CmdSN;
ExpStatSN = from_be32(&reqh->exp_stat_sn);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "reason=%d, ITT=%x, cid=%d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "reason=%d, ITT=%x, cid=%d\n",
reason, task_tag, cid);
if (reqh->reason != 0 && conn->sess->session_type == SESSION_TYPE_DISCOVERY) {
@ -2743,19 +2743,19 @@ spdk_iscsi_transfer_in(struct spdk_iscsi_conn *conn,
if (data_len < transfer_len) {
/* underflow */
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Underflow %u/%u\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Underflow %u/%u\n",
data_len, transfer_len);
residual_len = transfer_len - data_len;
transfer_len = data_len;
datain_flag |= ISCSI_DATAIN_UNDERFLOW;
} else if (data_len > transfer_len) {
/* overflow */
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Overflow %u/%u\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Overflow %u/%u\n",
data_len, transfer_len);
residual_len = data_len - transfer_len;
datain_flag |= ISCSI_DATAIN_OVERFLOW;
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Transfer %u\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Transfer %u\n",
transfer_len);
residual_len = 0;
}
@ -2800,7 +2800,7 @@ spdk_iscsi_transfer_in(struct spdk_iscsi_conn *conn,
datain_flag &= ~ISCSI_DATAIN_STATUS;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"Transfer=%d, Offset=%d, Len=%d\n",
sequence_end, offset, len);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
@ -2970,7 +2970,7 @@ spdk_iscsi_op_scsi(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
transfer_len = from_be32(&reqh->expected_data_xfer_len);
cdb = reqh->cdb;
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "CDB", cdb, 16);
SPDK_TRACEDUMP(SPDK_TRACE_ISCSI, "CDB", cdb, 16);
task = spdk_iscsi_task_get(conn, NULL, spdk_iscsi_task_cpl);
if (!task) {
@ -3171,18 +3171,18 @@ void spdk_iscsi_task_response(struct spdk_iscsi_conn *conn,
(task->scsi.status == SPDK_SCSI_STATUS_GOOD)) {
if (data_len < transfer_len) {
/* underflow */
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Underflow %zu/%u\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Underflow %zu/%u\n",
data_len, transfer_len);
residual_len = transfer_len - data_len;
U_bit = 1;
} else if (data_len > transfer_len) {
/* overflow */
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Overflow %zu/%u\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Overflow %zu/%u\n",
data_len, transfer_len);
residual_len = data_len - transfer_len;
O_bit = 1;
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Transfer %u\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Transfer %u\n",
transfer_len);
}
}
@ -3277,7 +3277,7 @@ spdk_iscsi_op_task(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
task_tag = from_be32(&reqh->itt);
ref_task_tag = from_be32(&reqh->ref_task_tag);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"I=%d, func=%d, ITT=%x, ref TT=%x, LUN=0x%16.16"PRIx64"\n",
reqh->immediate, function, task_tag, ref_task_tag, lun);
@ -3417,7 +3417,7 @@ spdk_iscsi_op_nopout(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
CmdSN = from_be32(&reqh->cmd_sn);
pdu->cmd_sn = CmdSN;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "I=%d, ITT=%x, TTT=%x\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "I=%d, ITT=%x, TTT=%x\n",
I_bit, task_tag, transfer_tag);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
@ -3443,7 +3443,7 @@ spdk_iscsi_op_nopout(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
if (task_tag == 0xffffffffU) {
if (I_bit == 1) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"got NOPOUT ITT=0xffffffff\n");
return SPDK_SUCCESS;
} else {
@ -3702,7 +3702,7 @@ spdk_iscsi_handle_recovery_datain(struct spdk_iscsi_conn *conn,
task = spdk_iscsi_task_get_primary(task);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_handle_recovery_datain\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_handle_recovery_datain\n");
if (beg_run < task->acked_data_sn) {
SPDK_ERRLOG("ITT: 0x%08x, DATA IN SNACK requests retransmission of"
@ -3760,7 +3760,7 @@ spdk_iscsi_handle_status_snack(struct spdk_iscsi_conn *conn,
beg_run = from_be32(&reqh->beg_run);
run_length = from_be32(&reqh->run_len);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "beg_run=%d, run_length=%d, conn->StatSN="
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "beg_run=%d, run_length=%d, conn->StatSN="
"%d, conn->exp_statsn=%d\n", beg_run, run_length,
conn->StatSN, conn->exp_statsn);
@ -3823,7 +3823,7 @@ spdk_iscsi_handle_data_ack(struct spdk_iscsi_conn *conn,
task = NULL;
datain_header = NULL;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "beg_run=%d,transfer_tag=%d,run_len=%d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "beg_run=%d,transfer_tag=%d,run_len=%d\n",
beg_run, transfer_tag, run_length);
task = spdk_get_scsi_task_from_ttt(conn, transfer_tag);
@ -3859,7 +3859,7 @@ spdk_iscsi_handle_data_ack(struct spdk_iscsi_conn *conn,
}
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Received Data ACK SNACK for TTT: 0x%08x,"
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Received Data ACK SNACK for TTT: 0x%08x,"
" updated acked DataSN to 0x%08x.\n", transfer_tag,
(task->acked_data_sn - 1));
@ -3919,7 +3919,7 @@ spdk_iscsi_send_r2t_recovery(struct spdk_iscsi_conn *conn,
/* remove the r2t pdu from the snack_list */
pdu = spdk_iscsi_remove_r2t_pdu_from_snack_list(conn, task, r2t_sn);
if (!pdu) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "No pdu is found\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "No pdu is found\n");
return -1;
}
@ -3981,7 +3981,7 @@ spdk_iscsi_op_snack(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
}
type = reqh->flags & ISCSI_FLAG_SNACK_TYPE_MASK;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "The value of type is %d\n", type);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "The value of type is %d\n", type);
switch (type) {
case 0:
@ -3990,7 +3990,7 @@ spdk_iscsi_op_snack(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
beg_run = from_be32(&reqh->beg_run);
run_length = from_be32(&reqh->run_len);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "beg_run=%d, run_length=%d, "
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "beg_run=%d, run_length=%d, "
"task_tag=%x, transfer_tag=%u\n", beg_run,
run_length, task_tag, from_be32(&reqh->ttt));
@ -4157,7 +4157,7 @@ static int spdk_iscsi_op_data(struct spdk_iscsi_conn *conn,
}
if (lun_dev == NULL) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "LUN %d is removed, complete the task immediately\n", lun_i);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "LUN %d is removed, complete the task immediately\n", lun_i);
subtask->scsi.transfer_len = subtask->scsi.length;
spdk_scsi_task_process_null_lun(&subtask->scsi);
spdk_iscsi_task_cpl(&subtask->scsi);
@ -4236,7 +4236,7 @@ int spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn)
return SPDK_SUCCESS;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"send NOPIN isid=%"PRIx64", tsih=%u, cid=%u\n",
conn->sess->isid, conn->sess->tsih, conn->cid);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
@ -4343,7 +4343,7 @@ spdk_iscsi_execute(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
pdu->cmd_sn, sess->ExpCmdSN, sess->MaxCmdSN);
if (sess->ErrorRecoveryLevel >= 1)
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Skip the error in"
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Skip the error in"
" ERL 1 and 2\n");
else
return SPDK_PDU_FATAL;
@ -4353,7 +4353,7 @@ spdk_iscsi_execute(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
SPDK_ERRLOG("CmdSN(%u) error ExpCmdSN=%u\n", pdu->cmd_sn, sess->ExpCmdSN);
if (sess->ErrorRecoveryLevel >= 1) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Skip the error in"
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Skip the error in"
" ERL 1 and 2\n");
} else if (opcode != ISCSI_OP_NOPOUT) {
/*
@ -4367,7 +4367,7 @@ spdk_iscsi_execute(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
ExpStatSN = from_be32(&reqh->exp_stat_sn);
if (SN32_GT(ExpStatSN, conn->StatSN)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "StatSN(%u) advanced\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "StatSN(%u) advanced\n",
ExpStatSN);
ExpStatSN = conn->StatSN;
}

50
lib/iscsi/iscsi_subsystem.c
View File

@ -563,7 +563,7 @@ spdk_iscsi_app_read_parameters(void)
unsigned long flush_timeout = 0;
/* Process parameters */
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_app_read_parameters\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_app_read_parameters\n");
sp = spdk_conf_find_section(NULL, "iSCSI");
if (sp == NULL) {
SPDK_ERRLOG("iSCSI config section not found.\n");
@ -572,7 +572,7 @@ spdk_iscsi_app_read_parameters(void)
val = spdk_conf_section_get_val(sp, "Comment");
if (val != NULL) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Comment %s\n", val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Comment %s\n", val);
}
val = spdk_conf_section_get_val(sp, "AuthFile");
@ -585,7 +585,7 @@ spdk_iscsi_app_read_parameters(void)
perror("authfile");
return -ENOMEM;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "AuthFile %s\n", g_spdk_iscsi.authfile);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "AuthFile %s\n", g_spdk_iscsi.authfile);
/* ISCSI Global */
val = spdk_conf_section_get_val(sp, "NodeBase");
@ -600,7 +600,7 @@ spdk_iscsi_app_read_parameters(void)
return -ENOMEM;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "NodeBase %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "NodeBase %s\n",
g_spdk_iscsi.nodebase);
MaxSessions = spdk_conf_section_get_intval(sp, "MaxSessions");
@ -612,7 +612,7 @@ spdk_iscsi_app_read_parameters(void)
return -1;
}
g_spdk_iscsi.MaxSessions = MaxSessions;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "MaxSessions %d\n", g_spdk_iscsi.MaxSessions);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "MaxSessions %d\n", g_spdk_iscsi.MaxSessions);
g_spdk_iscsi.session = spdk_dma_zmalloc(sizeof(void *) * g_spdk_iscsi.MaxSessions, 0, NULL);
if (!g_spdk_iscsi.session) {
@ -625,7 +625,7 @@ spdk_iscsi_app_read_parameters(void)
MaxConnectionsPerSession = DEFAULT_MAX_CONNECTIONS_PER_SESSION;
}
g_spdk_iscsi.MaxConnectionsPerSession = MaxConnectionsPerSession;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "MaxConnectionsPerSession %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "MaxConnectionsPerSession %d\n",
g_spdk_iscsi.MaxConnectionsPerSession);
if (MaxConnectionsPerSession > 0xffff) {
@ -646,7 +646,7 @@ spdk_iscsi_app_read_parameters(void)
DefaultTime2Wait = DEFAULT_DEFAULTTIME2WAIT;
}
g_spdk_iscsi.DefaultTime2Wait = DefaultTime2Wait;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "DefaultTime2Wait %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "DefaultTime2Wait %d\n",
g_spdk_iscsi.DefaultTime2Wait);
DefaultTime2Retain = spdk_conf_section_get_intval(sp, "DefaultTime2Retain");
@ -654,7 +654,7 @@ spdk_iscsi_app_read_parameters(void)
DefaultTime2Retain = DEFAULT_DEFAULTTIME2RETAIN;
}
g_spdk_iscsi.DefaultTime2Retain = DefaultTime2Retain;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "DefaultTime2Retain %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "DefaultTime2Retain %d\n",
g_spdk_iscsi.DefaultTime2Retain);
/* check size limit - RFC3720(12.15, 12.16, 12.17) */
@ -672,15 +672,15 @@ spdk_iscsi_app_read_parameters(void)
}
g_spdk_iscsi.FirstBurstLength = SPDK_ISCSI_FIRST_BURST_LENGTH;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "FirstBurstLength %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "FirstBurstLength %d\n",
g_spdk_iscsi.FirstBurstLength);
g_spdk_iscsi.MaxBurstLength = SPDK_ISCSI_MAX_BURST_LENGTH;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "MaxBurstLength %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "MaxBurstLength %d\n",
g_spdk_iscsi.MaxBurstLength);
g_spdk_iscsi.MaxRecvDataSegmentLength = SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "MaxRecvDataSegmentLength %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "MaxRecvDataSegmentLength %d\n",
g_spdk_iscsi.MaxRecvDataSegmentLength);
/* check size limit (up to 24bits - RFC3720(12.12)) */
@ -719,7 +719,7 @@ spdk_iscsi_app_read_parameters(void)
return -1;
}
g_spdk_iscsi.InitialR2T = InitialR2T;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "InitialR2T %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "InitialR2T %s\n",
g_spdk_iscsi.InitialR2T ? "Yes" : "No");
val = spdk_conf_section_get_val(sp, "ImmediateData");
@ -734,7 +734,7 @@ spdk_iscsi_app_read_parameters(void)
return -1;
}
g_spdk_iscsi.ImmediateData = ImmediateData;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "ImmediateData %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "ImmediateData %s\n",
g_spdk_iscsi.ImmediateData ? "Yes" : "No");
val = spdk_conf_section_get_val(sp, "DataPDUInOrder");
@ -754,7 +754,7 @@ spdk_iscsi_app_read_parameters(void)
return -1;
}
g_spdk_iscsi.DataPDUInOrder = DataPDUInOrder;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "DataPDUInOrder %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "DataPDUInOrder %s\n",
g_spdk_iscsi.DataPDUInOrder ? "Yes" : "No");
/* This option is only for test.
@ -773,7 +773,7 @@ spdk_iscsi_app_read_parameters(void)
return -1;
}
g_spdk_iscsi.AllowDuplicateIsid = AllowDuplicateIsid;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "AllowDuplicateIsid %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "AllowDuplicateIsid %s\n",
g_spdk_iscsi.AllowDuplicateIsid ? "Yes" : "No");
val = spdk_conf_section_get_val(sp, "DataSequenceInOrder");
@ -793,7 +793,7 @@ spdk_iscsi_app_read_parameters(void)
return -1;
}
g_spdk_iscsi.DataSequenceInOrder = DataSequenceInOrder;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "DataSequenceInOrder %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "DataSequenceInOrder %s\n",
g_spdk_iscsi.DataSequenceInOrder ? "Yes" : "No");
ErrorRecoveryLevel = spdk_conf_section_get_intval(sp, "ErrorRecoveryLevel");
@ -804,7 +804,7 @@ spdk_iscsi_app_read_parameters(void)
return -1;
}
g_spdk_iscsi.ErrorRecoveryLevel = ErrorRecoveryLevel;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "ErrorRecoveryLevel %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "ErrorRecoveryLevel %d\n",
g_spdk_iscsi.ErrorRecoveryLevel);
timeout = spdk_conf_section_get_intval(sp, "Timeout");
@ -812,7 +812,7 @@ spdk_iscsi_app_read_parameters(void)
timeout = DEFAULT_TIMEOUT;
}
g_spdk_iscsi.timeout = timeout;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Timeout %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Timeout %d\n",
g_spdk_iscsi.timeout);
val = spdk_conf_section_get_val(sp, "FlushTimeout");
@ -823,7 +823,7 @@ spdk_iscsi_app_read_parameters(void)
flush_timeout = DEFAULT_FLUSH_TIMEOUT;
}
g_spdk_iscsi.flush_timeout = flush_timeout * (spdk_get_ticks_hz() >> 20);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "FlushTimeout %"PRIu64"\n", g_spdk_iscsi.flush_timeout);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "FlushTimeout %"PRIu64"\n", g_spdk_iscsi.flush_timeout);
nopininterval = spdk_conf_section_get_intval(sp, "NopInInterval");
if (nopininterval < 0) {
@ -836,7 +836,7 @@ spdk_iscsi_app_read_parameters(void)
}
g_spdk_iscsi.nopininterval = nopininterval;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "NopInInterval %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "NopInInterval %d\n",
g_spdk_iscsi.nopininterval);
val = spdk_conf_section_get_val(sp, "DiscoveryAuthMethod");
@ -872,13 +872,13 @@ spdk_iscsi_app_read_parameters(void)
}
}
if (g_spdk_iscsi.no_discovery_auth != 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"DiscoveryAuthMethod None\n");
} else if (g_spdk_iscsi.req_discovery_auth == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"DiscoveryAuthMethod Auto\n");
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"DiscoveryAuthMethod %s %s\n",
g_spdk_iscsi.req_discovery_auth ? "CHAP" : "",
g_spdk_iscsi.req_discovery_auth_mutual ? "Mutual" : "");
@ -906,10 +906,10 @@ spdk_iscsi_app_read_parameters(void)
g_spdk_iscsi.discovery_auth_group = ag_tag_i;
}
if (g_spdk_iscsi.discovery_auth_group == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"DiscoveryAuthGroup None\n");
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"DiscoveryAuthGroup AuthGroup%d\n",
g_spdk_iscsi.discovery_auth_group);
}

40
lib/iscsi/param.c
View File

@ -101,7 +101,7 @@ spdk_iscsi_param_del(struct iscsi_param **params, const char *key)
{
struct iscsi_param *param, *prev_param = NULL;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "del %s\n", key);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "del %s\n", key);
if (params == NULL || key == NULL)
return 0;
for (param = *params; param != NULL; param = param->next) {
@ -127,7 +127,7 @@ spdk_iscsi_param_add(struct iscsi_param **params, const char *key,
{
struct iscsi_param *param, *last_param;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "add %s=%s, list=[%s], type=%d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "add %s=%s, list=[%s], type=%d\n",
key, val, list, type);
if (key == NULL)
return -1;
@ -168,7 +168,7 @@ spdk_iscsi_param_set(struct iscsi_param *params, const char *key,
{
struct iscsi_param *param;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "set %s=%s\n", key, val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "set %s=%s\n", key, val);
param = spdk_iscsi_param_find(params, key);
if (param == NULL) {
SPDK_ERRLOG("no key %s\n", key);
@ -188,7 +188,7 @@ spdk_iscsi_param_set_int(struct iscsi_param *params, const char *key, uint32_t v
char buf[MAX_TMPBUF];
struct iscsi_param *param;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "set %s=%d\n", key, val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "set %s=%d\n", key, val);
param = spdk_iscsi_param_find(params, key);
if (param == NULL) {
SPDK_ERRLOG("no key %s\n", key);
@ -640,7 +640,7 @@ static char *spdk_iscsi_negotiate_param_list(int *add_param_value,
*val_end = '\0';
}
if (strcasecmp(in_start, val_start) == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "match %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "match %s\n",
val_start);
flag = 1;
break;
@ -692,7 +692,7 @@ static char *spdk_iscsi_negotiate_param_numerical(int *add_param_value,
min_i = (min_val != NULL) ? (int)strtol(min_val, NULL, 10) : 0;
max_i = (max_val != NULL) ? (int)strtol(max_val, NULL, 10) : 0;
if (val_i < min_i || val_i > max_i) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "key %.64s reject\n", param->key);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "key %.64s reject\n", param->key);
new_val = NULL;
} else {
switch (param->type) {
@ -822,7 +822,7 @@ spdk_iscsi_negotiate_param_init(struct spdk_iscsi_conn *conn,
if ((strncasecmp(param->key, "X-", 2) == 0) ||
(strncasecmp(param->key, "X#", 2) == 0)) {
/* Extension Key */
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"extension key %.64s\n",
param->key);
} else {
@ -1073,7 +1073,7 @@ spdk_iscsi_copy_param2var(struct spdk_iscsi_conn *conn)
SPDK_ERRLOG("Getval MaxRecvDataSegmentLength failed\n");
return -1;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"copy MaxRecvDataSegmentLength=%s\n", val);
conn->MaxRecvDataSegmentLength = (int)strtol(val, NULL, 10);
if (conn->MaxRecvDataSegmentLength > SPDK_ISCSI_MAX_SEND_DATA_SEGMENT_LENGTH) {
@ -1086,10 +1086,10 @@ spdk_iscsi_copy_param2var(struct spdk_iscsi_conn *conn)
return -1;
}
if (strcasecmp(val, "CRC32C") == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "set HeaderDigest=1\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "set HeaderDigest=1\n");
conn->header_digest = 1;
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "set HeaderDigest=0\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "set HeaderDigest=0\n");
conn->header_digest = 0;
}
val = spdk_iscsi_param_get_val(conn->params, "DataDigest");
@ -1098,10 +1098,10 @@ spdk_iscsi_copy_param2var(struct spdk_iscsi_conn *conn)
return -1;
}
if (strcasecmp(val, "CRC32C") == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "set DataDigest=1\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "set DataDigest=1\n");
conn->data_digest = 1;
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "set DataDigest=0\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "set DataDigest=0\n");
conn->data_digest = 0;
}
@ -1110,28 +1110,28 @@ spdk_iscsi_copy_param2var(struct spdk_iscsi_conn *conn)
SPDK_ERRLOG("Getval MaxConnections failed\n");
return -1;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "copy MaxConnections=%s\n", val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "copy MaxConnections=%s\n", val);
conn->sess->MaxConnections = (uint32_t) strtol(val, NULL, 10);
val = spdk_iscsi_param_get_val(conn->sess->params, "MaxOutstandingR2T");
if (val == NULL) {
SPDK_ERRLOG("Getval MaxOutstandingR2T failed\n");
return -1;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "copy MaxOutstandingR2T=%s\n", val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "copy MaxOutstandingR2T=%s\n", val);
conn->sess->MaxOutstandingR2T = (uint32_t) strtol(val, NULL, 10);
val = spdk_iscsi_param_get_val(conn->sess->params, "FirstBurstLength");
if (val == NULL) {
SPDK_ERRLOG("Getval FirstBurstLength failed\n");
return -1;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "copy FirstBurstLength=%s\n", val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "copy FirstBurstLength=%s\n", val);
conn->sess->FirstBurstLength = (uint32_t) strtol(val, NULL, 10);
val = spdk_iscsi_param_get_val(conn->sess->params, "MaxBurstLength");
if (val == NULL) {
SPDK_ERRLOG("Getval MaxBurstLength failed\n");
return -1;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "copy MaxBurstLength=%s\n", val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "copy MaxBurstLength=%s\n", val);
conn->sess->MaxBurstLength = (uint32_t) strtol(val, NULL, 10);
val = spdk_iscsi_param_get_val(conn->sess->params, "InitialR2T");
if (val == NULL) {
@ -1139,10 +1139,10 @@ spdk_iscsi_copy_param2var(struct spdk_iscsi_conn *conn)
return -1;
}
if (strcasecmp(val, "Yes") == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "set InitialR2T=1\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "set InitialR2T=1\n");
conn->sess->InitialR2T = 1;
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "set InitialR2T=0\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "set InitialR2T=0\n");
conn->sess->InitialR2T = 0;
}
val = spdk_iscsi_param_get_val(conn->sess->params, "ImmediateData");
@ -1151,10 +1151,10 @@ spdk_iscsi_copy_param2var(struct spdk_iscsi_conn *conn)
return -1;
}
if (strcasecmp(val, "Yes") == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "set ImmediateData=1\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "set ImmediateData=1\n");
conn->sess->ImmediateData = 1;
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "set ImmediateData=0\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "set ImmediateData=0\n");
conn->sess->ImmediateData = 0;
}
return 0;

26
lib/iscsi/portal_grp.c
View File

@ -77,7 +77,7 @@ spdk_iscsi_portal_destroy(struct spdk_iscsi_portal *p)
{
assert(p != NULL);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_portal_destroy\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_portal_destroy\n");
free(p->host);
free(p->port);
free(p);
@ -267,7 +267,7 @@ spdk_iscsi_portal_grp_destroy(struct spdk_iscsi_portal_grp *pg)
assert(pg != NULL);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_portal_grp_destroy\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_portal_grp_destroy\n");
while (!TAILQ_EMPTY(&pg->head)) {
p = TAILQ_FIRST(&pg->head);
TAILQ_REMOVE(&pg->head, p, tailq);
@ -299,7 +299,7 @@ spdk_iscsi_portal_grp_create_from_portal_list(int tag,
int i = 0, rc = 0, port;
struct spdk_iscsi_portal_grp *pg;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "add portal group (from portal list) %d\n", tag);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "add portal group (from portal list) %d\n", tag);
if (num_portals > MAX_PORTAL) {
SPDK_ERRLOG("%d > MAX_PORTAL\n", num_portals);
@ -315,7 +315,7 @@ spdk_iscsi_portal_grp_create_from_portal_list(int tag,
for (i = 0; i < num_portals; i++) {
struct spdk_iscsi_portal *p = portal_list[i];
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"RIndex=%d, Host=%s, Port=%s, Tag=%d\n",
i, p->host, p->port, tag);
@ -361,12 +361,12 @@ spdk_iscsi_portal_grp_create_from_configfile(struct spdk_conf_section *sp)
char *label, *portal;
int portals = 0, i = 0, rc = 0;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "add portal group (from config file) %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "add portal group (from config file) %d\n",
spdk_conf_section_get_num(sp));
val = spdk_conf_section_get_val(sp, "Comment");
if (val != NULL) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "Comment %s\n", val);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "Comment %s\n", val);
}
/* counts number of definitions */
@ -415,7 +415,7 @@ spdk_iscsi_portal_grp_create_from_configfile(struct spdk_conf_section *sp)
goto error_out;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"RIndex=%d, Host=%s, Port=%s, Tag=%d\n",
i, p->host, p->port, spdk_conf_section_get_num(sp));
@ -488,7 +488,7 @@ spdk_iscsi_portal_grp_array_destroy(void)
{
struct spdk_iscsi_portal_grp *pg, *tmp;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_portal_grp_array_destroy\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_portal_grp_array_destroy\n");
pthread_mutex_lock(&g_spdk_iscsi.mutex);
TAILQ_FOREACH_SAFE(pg, &g_spdk_iscsi.pg_head, tailq, tmp) {
pg->state = GROUP_DESTROY;
@ -507,7 +507,7 @@ spdk_iscsi_portal_grp_open(struct spdk_iscsi_portal_grp *pg)
TAILQ_FOREACH(p, &pg->head, tailq) {
if (p->sock < 0) {
SPDK_DEBUGLOG(SPDK_TRACE_NET, "open host %s, port %s, tag %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "open host %s, port %s, tag %d\n",
p->host, p->port, pg->tag);
port = (int)strtol(p->port, NULL, 0);
sock = spdk_sock_listen(p->host, port);
@ -527,7 +527,7 @@ spdk_iscsi_portal_grp_open_all(void)
struct spdk_iscsi_portal_grp *pg;
int rc;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_portal_grp_open_all\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_portal_grp_open_all\n");
pthread_mutex_lock(&g_spdk_iscsi.mutex);
TAILQ_FOREACH(pg, &g_spdk_iscsi.pg_head, tailq) {
rc = spdk_iscsi_portal_grp_open(pg);
@ -547,7 +547,7 @@ spdk_iscsi_portal_grp_close(struct spdk_iscsi_portal_grp *pg)
TAILQ_FOREACH(p, &pg->head, tailq) {
if (p->sock >= 0) {
SPDK_DEBUGLOG(SPDK_TRACE_NET, "close host %s, port %s, tag %d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "close host %s, port %s, tag %d\n",
p->host, p->port, pg->tag);
close(p->sock);
p->sock = -1;
@ -562,7 +562,7 @@ spdk_iscsi_portal_grp_close_all(void)
struct spdk_iscsi_portal_grp *pg;
int rc;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_portal_grp_close_all\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_portal_grp_close_all\n");
pthread_mutex_lock(&g_spdk_iscsi.mutex);
TAILQ_FOREACH(pg, &g_spdk_iscsi.pg_head, tailq) {
rc = spdk_iscsi_portal_grp_close(pg);
@ -631,5 +631,3 @@ spdk_iscsi_portal_grp_release(struct spdk_iscsi_portal_grp *pg)
spdk_iscsi_portal_grp_destroy(pg);
pthread_mutex_unlock(&g_spdk_iscsi.mutex);
}
SPDK_LOG_REGISTER_TRACE_FLAG("net", SPDK_TRACE_NET)

28
lib/iscsi/tgt_node.c
View File

@ -187,7 +187,7 @@ spdk_iscsi_tgt_node_access(struct spdk_iscsi_conn *conn,
return 0;
pg = conn->portal->group;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "pg=%d, iqn=%s, addr=%s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "pg=%d, iqn=%s, addr=%s\n",
pg->tag, iqn, addr);
for (i = 0; i < target->maxmap; i++) {
/* skip excluding self portal group tag */
@ -216,7 +216,7 @@ spdk_iscsi_tgt_node_access(struct spdk_iscsi_conn *conn,
return 1;
}
for (k = 0; k < igp->nnetmasks; k++) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"netmask=%s, addr=%s\n",
igp->netmasks[k], addr);
rc = spdk_iscsi_tgt_node_allow_netmask(igp->netmasks[k], addr);
@ -304,7 +304,7 @@ spdk_iscsi_portal_grp_is_visible(struct spdk_iscsi_tgt_node *target,
/* iqn is initiator group? */
igp = target->map[match_idx].ig;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "iqn=%s, pg=%d, ig=%d\n", iqn, pg_tag, igp->tag);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "iqn=%s, pg=%d, ig=%d\n", iqn, pg_tag, igp->tag);
for (j = 0; j < igp->ninitiators; j++) {
if (igp->initiators[j][0] == '!'
@ -388,7 +388,7 @@ spdk_iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn,
}
rc = spdk_iscsi_portal_grp_is_visible(target, iiqn, pg_tag);
if (rc == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"SKIP pg=%d, iqn=%s for %s from %s (%s)\n",
pg_tag, tiqn, target->name, iiqn, iaddr);
goto skip_pg_tag;
@ -427,7 +427,7 @@ spdk_iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn,
continue;
}
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG,
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI,
"TargetAddress=%s:%s,%d\n",
host, p->port, pg->tag);
len = snprintf((char *) data + total,
@ -779,7 +779,7 @@ spdk_cf_add_iscsi_tgt_node(struct spdk_conf_section *sp)
target_num = spdk_conf_section_get_num(sp);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "add unit %d\n", target_num);
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "add unit %d\n", target_num);
data_digest = 0;
header_digest = 0;
@ -866,11 +866,11 @@ spdk_cf_add_iscsi_tgt_node(struct spdk_conf_section *sp)
}
}
if (auth_chap_disabled == 1) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "AuthMethod None\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "AuthMethod None\n");
} else if (auth_chap_required == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "AuthMethod Auto\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "AuthMethod Auto\n");
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "AuthMethod CHAP %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "AuthMethod CHAP %s\n",
auth_chap_mutual ? "Mutual" : "");
}
@ -895,9 +895,9 @@ spdk_cf_add_iscsi_tgt_node(struct spdk_conf_section *sp)
}
}
if (auth_group == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "AuthGroup None\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "AuthGroup None\n");
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "AuthGroup AuthGroup%d\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "AuthGroup AuthGroup%d\n",
auth_group);
}
@ -921,9 +921,9 @@ spdk_cf_add_iscsi_tgt_node(struct spdk_conf_section *sp)
}
}
if (header_digest == 0 && data_digest == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "UseDigest Auto\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "UseDigest Auto\n");
} else {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "UseDigest %s %s\n",
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "UseDigest %s %s\n",
header_digest ? "Header" : "",
data_digest ? "Data" : "");
}
@ -976,7 +976,7 @@ int spdk_iscsi_init_tgt_nodes(void)
struct spdk_conf_section *sp;
int rc;
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_iscsi_init_tgt_nodes\n");
SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "spdk_iscsi_init_tgt_nodes\n");
sp = spdk_conf_first_section(NULL);
while (sp != NULL) {

2
lib/log/log.c
View File

@ -40,7 +40,7 @@ static TAILQ_HEAD(, spdk_trace_flag) g_trace_flags = TAILQ_HEAD_INITIALIZER(g_tr
static enum spdk_log_level g_spdk_log_level = SPDK_LOG_NOTICE;
static enum spdk_log_level g_spdk_log_print_level = SPDK_LOG_NOTICE;
SPDK_LOG_REGISTER_TRACE_FLAG("debug", SPDK_TRACE_DEBUG)
SPDK_LOG_REGISTER_TRACE_FLAG("log", SPDK_TRACE_LOG)
#define MAX_TMPBUF 1024

8
lib/log/rpc/log_rpc.c
View File

@ -59,12 +59,12 @@ spdk_rpc_set_trace_flag(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_trace_flag_decoders,
SPDK_COUNTOF(rpc_trace_flag_decoders), &req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_LOG, "spdk_json_decode_object failed\n");
goto invalid;
}
if (req.flag == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "flag was 0\n");
SPDK_DEBUGLOG(SPDK_TRACE_LOG, "flag was 0\n");
goto invalid;
}
@ -95,12 +95,12 @@ spdk_rpc_clear_trace_flag(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_trace_flag_decoders,
SPDK_COUNTOF(rpc_trace_flag_decoders), &req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_LOG, "spdk_json_decode_object failed\n");
goto invalid;
}
if (req.flag == 0) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "flag was 0\n");
SPDK_DEBUGLOG(SPDK_TRACE_LOG, "flag was 0\n");
goto invalid;
}

6
lib/net/net_rpc.c
View File

@ -65,7 +65,7 @@ spdk_rpc_add_ip_address(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_ip_address_decoders,
SPDK_COUNTOF(rpc_ip_address_decoders),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_NET, "spdk_json_decode_object failed\n");
goto invalid;
}
@ -100,7 +100,7 @@ spdk_rpc_delete_ip_address(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_ip_address_decoders,
SPDK_COUNTOF(rpc_ip_address_decoders),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_NET, "spdk_json_decode_object failed\n");
goto invalid;
}
@ -174,3 +174,5 @@ spdk_rpc_get_interfaces(struct spdk_jsonrpc_request *request,
spdk_jsonrpc_end_result(request, w);
}
SPDK_RPC_REGISTER("get_interfaces", spdk_rpc_get_interfaces)
SPDK_LOG_REGISTER_TRACE_FLAG("net", SPDK_TRACE_NET)

18
lib/nvme/nvme_rdma.c
View File

@ -228,7 +228,7 @@ nvme_rdma_qpair_init(struct nvme_rdma_qpair *rqpair)
#define nvme_rdma_trace_ibv_sge(sg_list) \
if (sg_list) { \
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "local addr %p length 0x%x lkey 0x%x\n", \
SPDK_DEBUGLOG(SPDK_TRACE_NVME, "local addr %p length 0x%x lkey 0x%x\n", \
(void *)(sg_list)->addr, (sg_list)->length, (sg_list)->lkey); \
}
@ -728,7 +728,7 @@ nvme_rdma_qpair_connect(struct nvme_rdma_qpair *rqpair)
memset(&sin, 0, sizeof(struct sockaddr_storage));
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "trsvcid is %s\n", ctrlr->trid.trsvcid);
SPDK_DEBUGLOG(SPDK_TRACE_NVME, "trsvcid is %s\n", ctrlr->trid.trsvcid);
rc = nvme_rdma_parse_addr(&sin, family, ctrlr->trid.traddr, ctrlr->trid.trsvcid);
if (rc != 0) {
SPDK_ERRLOG("nvme_rdma_parse_addr() failed\n");
@ -760,20 +760,20 @@ nvme_rdma_qpair_connect(struct nvme_rdma_qpair *rqpair)
}
rc = nvme_rdma_alloc_reqs(rqpair);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "rc =%d\n", rc);
SPDK_DEBUGLOG(SPDK_TRACE_NVME, "rc =%d\n", rc);
if (rc) {
SPDK_ERRLOG("Unable to allocate rqpair RDMA requests\n");
return -1;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "RDMA requests allocated\n");
SPDK_DEBUGLOG(SPDK_TRACE_NVME, "RDMA requests allocated\n");
rc = nvme_rdma_alloc_rsps(rqpair);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "rc =%d\n", rc);
SPDK_DEBUGLOG(SPDK_TRACE_NVME, "rc =%d\n", rc);
if (rc < 0) {
SPDK_ERRLOG("Unable to allocate rqpair RDMA responses\n");
return -1;
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "RDMA responses allocated\n");
SPDK_DEBUGLOG(SPDK_TRACE_NVME, "RDMA responses allocated\n");
rc = nvme_rdma_register_mem(rqpair);
if (rc < 0) {
@ -1145,7 +1145,7 @@ nvme_rdma_discovery_probe(struct spdk_nvmf_discovery_log_page_entry *entry,
SPDK_DEBUGLOG(SPDK_TRACE_NVME, "Trailing newlines removed from discovery TRSVCID\n");
}
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "subnqn=%s, trtype=%u, traddr=%s, trsvcid=%s\n",
SPDK_DEBUGLOG(SPDK_TRACE_NVME, "subnqn=%s, trtype=%u, traddr=%s, trsvcid=%s\n",
trid.subnqn, trid.trtype,
trid.traddr, trid.trsvcid);
@ -1297,7 +1297,7 @@ struct spdk_nvme_ctrlr *nvme_rdma_ctrlr_construct(const struct spdk_nvme_transpo
nvme_ctrlr_init_cap(&rctrlr->ctrlr, &cap);
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "succesully initialized the nvmf ctrlr\n");
SPDK_DEBUGLOG(SPDK_TRACE_NVME, "succesully initialized the nvmf ctrlr\n");
return &rctrlr->ctrlr;
}
@ -1473,7 +1473,7 @@ nvme_rdma_qpair_process_completions(struct spdk_nvme_qpair *qpair,
switch (wc[i].opcode) {
case IBV_WC_RECV:
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "CQ recv completion\n");
SPDK_DEBUGLOG(SPDK_TRACE_NVME, "CQ recv completion\n");
reaped++;

6
lib/scsi/scsi_bdev.c
View File

@ -1791,14 +1791,14 @@ spdk_bdev_scsi_process_primary(struct spdk_bdev *bdev,
break;
}
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "INQUIRY", data, data_len);
SPDK_TRACEDUMP(SPDK_TRACE_SCSI, "INQUIRY", data, data_len);
break;
case SPDK_SPC_REPORT_LUNS: {
int sel;
sel = cdb[2];
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "sel=%x\n", sel);
SPDK_DEBUGLOG(SPDK_TRACE_SCSI, "sel=%x\n", sel);
alloc_len = from_be32(&cdb[6]);
rc = spdk_bdev_scsi_check_len(task, alloc_len, 16);
@ -1819,7 +1819,7 @@ spdk_bdev_scsi_process_primary(struct spdk_bdev *bdev,
break;
}
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "REPORT LUNS", data, data_len);
SPDK_TRACEDUMP(SPDK_TRACE_SCSI, "REPORT LUNS", data, data_len);
break;
}

14
lib/vhost/vhost_rpc.c
View File

@ -72,7 +72,7 @@ spdk_rpc_construct_vhost_scsi_controller(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_construct_vhost_ctrlr,
SPDK_COUNTOF(rpc_construct_vhost_ctrlr),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_VHOST_RPC, "spdk_json_decode_object failed\n");
rc = -EINVAL;
goto invalid;
}
@ -127,7 +127,7 @@ spdk_rpc_remove_vhost_scsi_controller(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_remove_vhost_ctrlr,
SPDK_COUNTOF(rpc_remove_vhost_ctrlr),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_VHOST_RPC, "spdk_json_decode_object failed\n");
rc = -EINVAL;
goto invalid;
}
@ -192,7 +192,7 @@ spdk_rpc_add_vhost_scsi_lun(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_vhost_add_lun,
SPDK_COUNTOF(rpc_vhost_add_lun),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_VHOST_RPC, "spdk_json_decode_object failed\n");
rc = -EINVAL;
goto invalid;
}
@ -249,7 +249,7 @@ spdk_rpc_remove_vhost_scsi_dev(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_vhost_remove_dev,
SPDK_COUNTOF(rpc_vhost_remove_dev),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_VHOST_RPC, "spdk_json_decode_object failed\n");
rc = -EINVAL;
goto invalid;
}
@ -316,7 +316,7 @@ spdk_rpc_construct_vhost_blk_controller(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_construct_vhost_blk_ctrlr,
SPDK_COUNTOF(rpc_construct_vhost_blk_ctrlr),
&req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_VHOST_RPC, "spdk_json_decode_object failed\n");
rc = -EINVAL;
goto invalid;
}
@ -372,7 +372,7 @@ spdk_rpc_remove_vhost_blk_controller(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_remove_vhost_blk_ctrlr,
SPDK_COUNTOF(rpc_remove_vhost_blk_ctrlr), &req)) {
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
SPDK_DEBUGLOG(SPDK_TRACE_VHOST_RPC, "spdk_json_decode_object failed\n");
rc = -EINVAL;
goto invalid;
}
@ -448,3 +448,5 @@ spdk_rpc_get_vhost_controllers(struct spdk_jsonrpc_request *request,
spdk_jsonrpc_end_result(request, w);
}
SPDK_RPC_REGISTER("get_vhost_controllers", spdk_rpc_get_vhost_controllers)
SPDK_LOG_REGISTER_TRACE_FLAG("vhost_rpc", SPDK_TRACE_VHOST_RPC)

14
test/unit/lib/log/log.c/log_ut.c
View File

@ -53,20 +53,20 @@ log_test(void)
CU_ASSERT_EQUAL(spdk_log_get_level(), SPDK_LOG_DEBUG);
#ifdef DEBUG
CU_ASSERT(spdk_log_get_trace_flag("debug") == false);
CU_ASSERT(spdk_log_get_trace_flag("log") == false);
spdk_log_set_trace_flag("debug");
CU_ASSERT(spdk_log_get_trace_flag("debug") == true);
spdk_log_set_trace_flag("log");
CU_ASSERT(spdk_log_get_trace_flag("log") == true);
spdk_log_clear_trace_flag("debug");
CU_ASSERT(spdk_log_get_trace_flag("debug") == false);
spdk_log_clear_trace_flag("log");
CU_ASSERT(spdk_log_get_trace_flag("log") == false);
#endif
spdk_log_open();
spdk_log_set_trace_flag("debug");
SPDK_WARNLOG("log warning unit test\n");
SPDK_DEBUGLOG(SPDK_TRACE_DEBUG, "log trace test\n");
SPDK_TRACEDUMP(SPDK_TRACE_DEBUG, "log trace dump test:", "trace dump", 10);
SPDK_DEBUGLOG(SPDK_TRACE_LOG, "log trace test\n");
SPDK_TRACEDUMP(SPDK_TRACE_LOG, "log trace dump test:", "trace dump", 10);
spdk_trace_dump("spdk dump test:", "spdk dump", 9);
spdk_log_close();