Commit 68185cb1 authored by Nicholas Bellinger's avatar Nicholas Bellinger Committed by Sasha Levin

iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race

[ Upstream commit 8f0dfb3d ]

There is a iscsi-target/tcp login race in LOGIN_FLAGS_READY
state assignment that can result in frequent errors during
iscsi discovery:

      "iSCSI Login negotiation failed."

To address this bug, move the initial LOGIN_FLAGS_READY
assignment ahead of iscsi_target_do_login() when handling
the initial iscsi_target_start_negotiation() request PDU
during connection login.

As iscsi_target_do_login_rx() work_struct callback is
clearing LOGIN_FLAGS_READ_ACTIVE after subsequent calls
to iscsi_target_do_login(), the early sk_data_ready
ahead of the first iscsi_target_do_login() expects
LOGIN_FLAGS_READY to also be set for the initial
login request PDU.

As reported by Maged, this was first obsered using an
MSFT initiator running across multiple VMWare host
virtual machines with iscsi-target/tcp.
Reported-by: default avatarMaged Mokhtar <mmokhtar@binarykinetics.com>
Tested-by: default avatarMaged Mokhtar <mmokhtar@binarykinetics.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 5df474e6
...@@ -1251,8 +1251,6 @@ int iscsi_target_start_negotiation( ...@@ -1251,8 +1251,6 @@ int iscsi_target_start_negotiation(
{ {
int ret; int ret;
ret = iscsi_target_do_login(conn, login);
if (!ret) {
if (conn->sock) { if (conn->sock) {
struct sock *sk = conn->sock->sk; struct sock *sk = conn->sock->sk;
...@@ -1260,7 +1258,9 @@ int iscsi_target_start_negotiation( ...@@ -1260,7 +1258,9 @@ int iscsi_target_start_negotiation(
set_bit(LOGIN_FLAGS_READY, &conn->login_flags); set_bit(LOGIN_FLAGS_READY, &conn->login_flags);
write_unlock_bh(&sk->sk_callback_lock); write_unlock_bh(&sk->sk_callback_lock);
} }
} else if (ret < 0) {
ret = iscsi_target_do_login(conn, login);
if (ret < 0) {
cancel_delayed_work_sync(&conn->login_work); cancel_delayed_work_sync(&conn->login_work);
cancel_delayed_work_sync(&conn->login_cleanup_work); cancel_delayed_work_sync(&conn->login_cleanup_work);
iscsi_target_restore_sock_callbacks(conn); iscsi_target_restore_sock_callbacks(conn);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment