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

iscsi: Always schedule discovery sessions on the acceptor thread

Browse Source 
Change-Id: I0b8aee43f8b4cc380c91a7bb69fb33b307edb412
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453019
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ben Walker 2019-04-30 13:53:24 -07:00 committed by Jim Harris
parent fc35f1ae3e
commit c6f43b89bc
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/iscsi/conn.c
View File

@ -1430,6 +1430,12 @@ spdk_iscsi_conn_schedule(struct spdk_iscsi_conn *conn)
lcore = SPDK_ENV_LCORE_ID_ANY; lcore = SPDK_ENV_LCORE_ID_ANY;
if (conn->sess->session_type != SESSION_TYPE_NORMAL) {
/* Leave all non-normal sessions on the acceptor
* thread. */
return;
}
for (i = 0; i < spdk_env_get_core_count(); i++) { for (i = 0; i < spdk_env_get_core_count(); i++) {
if (g_next_core > spdk_env_get_last_core()) { if (g_next_core > spdk_env_get_last_core()) {
g_next_core = spdk_env_get_first_core(); g_next_core = spdk_env_get_first_core();
@ -1450,28 +1456,26 @@ spdk_iscsi_conn_schedule(struct spdk_iscsi_conn *conn)
lcore = spdk_env_get_first_core(); lcore = spdk_env_get_first_core();
} }
if (conn->sess->session_type == SESSION_TYPE_NORMAL) { target = conn->sess->target;
target = conn->sess->target; pthread_mutex_lock(&target->mutex);
pthread_mutex_lock(&target->mutex); target->num_active_conns++;
target->num_active_conns++; if (target->num_active_conns == 1) {
if (target->num_active_conns == 1) { /**
/** * This is the only active connection for this target node.
* This is the only active connection for this target node. * Save the lcore in the target node so it can be used for
* Save the lcore in the target node so it can be used for * any other connections to this target node.
* any other connections to this target node. */
*/ target->lcore = lcore;
target->lcore = lcore; } else {
} else { /**
/** * There are other active connections for this target node.
* There are other active connections for this target node. * Ignore the lcore specified by the allocator and use the
* Ignore the lcore specified by the allocator and use the * the target node's lcore to ensure this connection runs on
* the target node's lcore to ensure this connection runs on * the same lcore as other connections for this target node.
* the same lcore as other connections for this target node. */
*/ lcore = target->lcore;
lcore = target->lcore;
}
pthread_mutex_unlock(&target->mutex);
} }
pthread_mutex_unlock(&target->mutex);
iscsi_poll_group_remove_conn(conn); iscsi_poll_group_remove_conn(conn);