leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: iscsi: Merge suspend fields

Browse Source 
Move the tx and rx suspend fields into one flags field.

Link: https://lore.kernel.org/r/20220408001314.5014-8-michael.christie@oracle.com
Tested-by: Manish Rangankar <mrangankar@marvell.com>
Reviewed-by: Lee Duncan <lduncan@suse.com>
Reviewed-by: Chris Leech <cleech@redhat.com>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Mike Christie 2022-04-07 19:13:11 -05:00 committed by Martin K. Petersen
parent 03690d8197
commit 5bd856256f
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/bnx2i/bnx2i_hwi.c
View File

@ -1977,7 +1977,7 @@ static int bnx2i_process_new_cqes(struct bnx2i_conn *bnx2i_conn)
if (nopin->cq_req_sn != qp->cqe_exp_seq_sn) if (nopin->cq_req_sn != qp->cqe_exp_seq_sn)
break; break;
if (unlikely(test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx))) { if (unlikely(test_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags))) {
if (nopin->op_code == ISCSI_OP_NOOP_IN && if (nopin->op_code == ISCSI_OP_NOOP_IN &&
nopin->itt == (u16) RESERVED_ITT) { nopin->itt == (u16) RESERVED_ITT) {
printk(KERN_ALERT "bnx2i: Unsolicited " printk(KERN_ALERT "bnx2i: Unsolicited "

2
drivers/scsi/bnx2i/bnx2i_iscsi.c
View File

@ -1721,7 +1721,7 @@ static int bnx2i_tear_down_conn(struct bnx2i_hba *hba,
struct iscsi_conn *conn = ep->conn->cls_conn->dd_data; struct iscsi_conn *conn = ep->conn->cls_conn->dd_data;
/* Must suspend all rx queue activity for this ep */ /* Must suspend all rx queue activity for this ep */
set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx); set_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags);
} }
/* CONN_DISCONNECT timeout may or may not be an issue depending /* CONN_DISCONNECT timeout may or may not be an issue depending
* on what transcribed in TCP layer, different targets behave * on what transcribed in TCP layer, different targets behave

6
drivers/scsi/cxgbi/libcxgbi.c
View File

@ -1634,11 +1634,11 @@ void cxgbi_conn_pdu_ready(struct cxgbi_sock *csk)
log_debug(1 << CXGBI_DBG_PDU_RX, log_debug(1 << CXGBI_DBG_PDU_RX,
"csk 0x%p, conn 0x%p.\n", csk, conn); "csk 0x%p, conn 0x%p.\n", csk, conn);
if (unlikely(!conn || conn->suspend_rx)) { if (unlikely(!conn || test_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags))) {
log_debug(1 << CXGBI_DBG_PDU_RX, log_debug(1 << CXGBI_DBG_PDU_RX,
"csk 0x%p, conn 0x%p, id %d, suspend_rx %lu!\n", "csk 0x%p, conn 0x%p, id %d, conn flags 0x%lx!\n",
csk, conn, conn ? conn->id : 0xFF, csk, conn, conn ? conn->id : 0xFF,
conn ? conn->suspend_rx : 0xFF); conn ? conn->flags : 0xFF);
return; return;
} }

20
drivers/scsi/libiscsi.c
View File

@ -1392,8 +1392,8 @@ static bool iscsi_set_conn_failed(struct iscsi_conn *conn)
if (conn->stop_stage == 0) if (conn->stop_stage == 0)
session->state = ISCSI_STATE_FAILED; session->state = ISCSI_STATE_FAILED;
set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx); set_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);
set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx); set_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags);
return true; return true;
} }
@ -1454,7 +1454,7 @@ static int iscsi_xmit_task(struct iscsi_conn *conn, struct iscsi_task *task,
* Do this after dropping the extra ref because if this was a requeue * Do this after dropping the extra ref because if this was a requeue
* it's removed from that list and cleanup_queued_task would miss it. * it's removed from that list and cleanup_queued_task would miss it.
*/ */
if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx)) { if (test_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags)) {
/* /*
* Save the task and ref in case we weren't cleaning up this * Save the task and ref in case we weren't cleaning up this
* task and get woken up again. * task and get woken up again.
@ -1532,7 +1532,7 @@ static int iscsi_data_xmit(struct iscsi_conn *conn)
int rc = 0; int rc = 0;
spin_lock_bh(&conn->session->frwd_lock); spin_lock_bh(&conn->session->frwd_lock);
if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx)) { if (test_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags)) {
ISCSI_DBG_SESSION(conn->session, "Tx suspended!\n"); ISCSI_DBG_SESSION(conn->session, "Tx suspended!\n");
spin_unlock_bh(&conn->session->frwd_lock); spin_unlock_bh(&conn->session->frwd_lock);
return -ENODATA; return -ENODATA;
@ -1746,7 +1746,7 @@ int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc)
goto fault; goto fault;
} }
if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx)) { if (test_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags)) {
reason = FAILURE_SESSION_IN_RECOVERY; reason = FAILURE_SESSION_IN_RECOVERY;
sc->result = DID_REQUEUE << 16; sc->result = DID_REQUEUE << 16;
goto fault; goto fault;
@ -1935,7 +1935,7 @@ static void fail_scsi_tasks(struct iscsi_conn *conn, u64 lun, int error)
void iscsi_suspend_queue(struct iscsi_conn *conn) void iscsi_suspend_queue(struct iscsi_conn *conn)
{ {
spin_lock_bh(&conn->session->frwd_lock); spin_lock_bh(&conn->session->frwd_lock);
set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx); set_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);
spin_unlock_bh(&conn->session->frwd_lock); spin_unlock_bh(&conn->session->frwd_lock);
} }
EXPORT_SYMBOL_GPL(iscsi_suspend_queue); EXPORT_SYMBOL_GPL(iscsi_suspend_queue);
@ -1953,7 +1953,7 @@ void iscsi_suspend_tx(struct iscsi_conn *conn)
struct Scsi_Host *shost = conn->session->host; struct Scsi_Host *shost = conn->session->host;
struct iscsi_host *ihost = shost_priv(shost); struct iscsi_host *ihost = shost_priv(shost);
set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx); set_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);
if (ihost->workq) if (ihost->workq)
flush_workqueue(ihost->workq); flush_workqueue(ihost->workq);
} }
@ -1961,7 +1961,7 @@ EXPORT_SYMBOL_GPL(iscsi_suspend_tx);
static void iscsi_start_tx(struct iscsi_conn *conn) static void iscsi_start_tx(struct iscsi_conn *conn)
{ {
clear_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx); clear_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);
iscsi_conn_queue_work(conn); iscsi_conn_queue_work(conn);
} }
@ -3329,8 +3329,8 @@ int iscsi_conn_bind(struct iscsi_cls_session *cls_session,
/* /*
* Unblock xmitworker(), Login Phase will pass through. * Unblock xmitworker(), Login Phase will pass through.
*/ */
clear_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx); clear_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags);
clear_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx); clear_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(iscsi_conn_bind); EXPORT_SYMBOL_GPL(iscsi_conn_bind);

2
drivers/scsi/libiscsi_tcp.c
View File

@ -927,7 +927,7 @@ int iscsi_tcp_recv_skb(struct iscsi_conn *conn, struct sk_buff *skb,
*/ */
conn->last_recv = jiffies; conn->last_recv = jiffies;
if (unlikely(conn->suspend_rx)) { if (unlikely(test_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags))) {
ISCSI_DBG_TCP(conn, "Rx suspended!\n"); ISCSI_DBG_TCP(conn, "Rx suspended!\n");
*status = ISCSI_TCP_SUSPENDED; *status = ISCSI_TCP_SUSPENDED;
return 0; return 0;

9
include/scsi/libiscsi.h
View File

@ -53,8 +53,10 @@ enum {
#define ISID_SIZE 6 #define ISID_SIZE 6
/* Connection suspend "bit" */ /* Connection flags */
#define ISCSI_SUSPEND_BIT 1 #define ISCSI_CONN_FLAG_SUSPEND_TX BIT(0)
#define ISCSI_CONN_FLAG_SUSPEND_RX BIT(1)
#define ISCSI_ITT_MASK 0x1fff #define ISCSI_ITT_MASK 0x1fff
#define ISCSI_TOTAL_CMDS_MAX 4096 #define ISCSI_TOTAL_CMDS_MAX 4096
@ -211,8 +213,7 @@ struct iscsi_conn {
struct list_head cmdqueue; /* data-path cmd queue */ struct list_head cmdqueue; /* data-path cmd queue */
struct list_head requeue; /* tasks needing another run */ struct list_head requeue; /* tasks needing another run */
struct work_struct xmitwork; /* per-conn. xmit workqueue */ struct work_struct xmitwork; /* per-conn. xmit workqueue */
unsigned long suspend_tx; /* suspend Tx */ unsigned long flags; /* ISCSI_CONN_FLAGs */
unsigned long suspend_rx; /* suspend Rx */
/* negotiated params */ /* negotiated params */
unsigned max_recv_dlength; /* initiator_max_recv_dsl*/ unsigned max_recv_dlength; /* initiator_max_recv_dsl*/