be2iscsi: Modification of iscsi_eh_target_reset
Subsystems (6)
PATCH 1/7 be2iscsi: Modification of iscsi_eh_target_reset
The iscsi_eh_target_reset has been mdified to attemt
target reset only. If it fails, then iscsi_eh_session_reset will be called.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- drivers/scsi/be2iscsi/be_main.c | 2 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 2 +- drivers/scsi/iscsi_tcp.c | 2 +- drivers/scsi/libiscsi.c | 24 +++++++++++++++++++----- include/scsi/libiscsi.h | 2 ++ 7 files changed, 26 insertions(+), 10 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +1 -1
@@ -596,7 +596,7 @@ static struct scsi_host_template iscsi_iser_sht = { .cmd_per_lun = ISER_DEF_CMD_PER_LUN, .eh_abort_handler = iscsi_eh_abort, .eh_device_reset_handler= iscsi_eh_device_reset, - .eh_target_reset_handler= iscsi_eh_target_reset, + .eh_target_reset_handler= iscsi_eh_recover_target, .target_alloc = iscsi_target_alloc, .use_clustering = DISABLE_CLUSTERING, .proc_name = "iscsi_iser",
drivers/scsi/be2iscsi/be_main.c +1 -1
@@ -79,7 +79,7 @@ static struct scsi_host_template beiscsi_sht = { .slave_configure = beiscsi_slave_configure, .target_alloc = iscsi_target_alloc, .eh_device_reset_handler = iscsi_eh_device_reset, - .eh_target_reset_handler = iscsi_eh_target_reset, + .eh_target_reset_handler = iscsi_eh_session_reset, .sg_tablesize = BEISCSI_SGLIST_ELEMENTS, .can_queue = BE2_IO_DEPTH, .this_id = -1,
drivers/scsi/bnx2i/bnx2i_iscsi.c +1 -1
@@ -1989,7 +1989,7 @@ static struct scsi_host_template bnx2i_host_template = { .queuecommand = iscsi_queuecommand, .eh_abort_handler = iscsi_eh_abort, .eh_device_reset_handler = iscsi_eh_device_reset, - .eh_target_reset_handler = iscsi_eh_target_reset, + .eh_target_reset_handler = iscsi_eh_recover_target, .change_queue_depth = iscsi_change_queue_depth, .can_queue = 1024, .max_sectors = 127,
drivers/scsi/cxgb3i/cxgb3i_iscsi.c +1 -1
@@ -915,7 +915,7 @@ static struct scsi_host_template cxgb3i_host_template = { .cmd_per_lun = ISCSI_DEF_CMD_PER_LUN, .eh_abort_handler = iscsi_eh_abort, .eh_device_reset_handler = iscsi_eh_device_reset, - .eh_target_reset_handler = iscsi_eh_target_reset, + .eh_target_reset_handler = iscsi_eh_recover_target, .target_alloc = iscsi_target_alloc, .use_clustering = DISABLE_CLUSTERING, .this_id = -1,
drivers/scsi/iscsi_tcp.c +1 -1
@@ -874,7 +874,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = { .cmd_per_lun = ISCSI_DEF_CMD_PER_LUN, .eh_abort_handler = iscsi_eh_abort, .eh_device_reset_handler= iscsi_eh_device_reset, - .eh_target_reset_handler= iscsi_eh_target_reset, + .eh_target_reset_handler= iscsi_eh_recover_target, .use_clustering = DISABLE_CLUSTERING, .slave_alloc = iscsi_sw_tcp_slave_alloc, .slave_configure = iscsi_sw_tcp_slave_configure,
drivers/scsi/libiscsi.c +19 -5
@@ -2338,7 +2338,7 @@ EXPORT_SYMBOL_GPL(iscsi_session_recovery_timedout);* This function will wait for a relogin, session termination from * userspace, or a recovery/replacement timeout. */ -static int iscsi_eh_session_reset (struct scsi_cmnd *sc) +int iscsi_eh_session_reset (struct scsi_cmnd *sc) {struct iscsi_cls_session *cls_session;struct iscsi_session *session;
@@ -2389,6 +2389,7 @@ failed:mutex_unlock (&session->eh_mutex);return SUCCESS ; } +EXPORT_SYMBOL_GPL (iscsi_eh_session_reset);static void iscsi_prep_tgt_reset_pdu (struct scsi_cmnd *sc,struct iscsi_tm *hdr) {
@@ -2403,8 +2404,7 @@ static void iscsi_prep_tgt_reset_pdu(struct scsi_cmnd *sc, struct iscsi_tm *hdr)* iscsi_eh_target_reset - reset target * @sc: scsi command * -* This will attempt to send a warm target reset. If that fails -* then we will drop the session and attempt ERL0 recovery. +* This will attempt to send a warm target reset. */ int iscsi_eh_target_reset (struct scsi_cmnd *sc) {
@@ -2449,7 +2449,6 @@ int iscsi_eh_target_reset(struct scsi_cmnd *sc)break ;case TMF_TIMEDOUT :spin_unlock_bh (&session->lock); -iscsi_conn_failure (conn,ISCSI_ERR_CONN_FAILED ); goto done;default : conn->tmf_state =TMF_INITIAL ;
@@ -2476,12 +2475,27 @@ done:ISCSI_DBG_EH (session,"tgt %s reset result = %s\n" , session->targetname, rc ==SUCCESS ?"SUCCESS" :"FAILED" );mutex_unlock (&session->eh_mutex); +return rc; +} +EXPORT_SYMBOL_GPL (iscsi_eh_target_reset); + +/** +* iscsi_eh_recover_target - reset target and possibly the session +* @sc: scsi command +* +* This will attempt to send a warm target reset. If that fails, +* we will escalate to ERL0 session recovery. +*/ +int iscsi_eh_recover_target (struct scsi_cmnd *sc) +{ +int rc; + rc =iscsi_eh_target_reset (sc);if (rc ==FAILED ) rc =iscsi_eh_session_reset (sc);return rc; } -EXPORT_SYMBOL_GPL (iscsi_eh_target_reset); +EXPORT_SYMBOL_GPL (iscsi_eh_recover_target);/* * Pre-allocate a pool of @max items of @item_size. By default, the pool
include/scsi/libiscsi.h +2 -0
@@ -338,6 +338,8 @@ struct iscsi_host {extern int iscsi_change_queue_depth (struct scsi_device *sdev,int depth,int reason);extern int iscsi_eh_abort (struct scsi_cmnd *sc); +extern int iscsi_eh_recover_target (struct scsi_cmnd *sc); +extern int iscsi_eh_session_reset (struct scsi_cmnd *sc);extern int iscsi_eh_target_reset (struct scsi_cmnd *sc);extern int iscsi_eh_device_reset (struct scsi_cmnd *sc); extern int iscsi_queuecommand(struct scsi_cmnd *sc,
Signature · 1 line
1.6.4
drivers/scsi/libiscsi.c int iscsi_eh_target_reset(struct scsi_cmnd *sc) · line 2452
Quoted 5 lines · Jayamohan Kallickal
drivers/scsi/libiscsi.c +0
-1@@ -2449,7 +2449,6 @@ int iscsi_eh_target_reset(struct scsi_cmnd *sc)break ;case TMF_TIMEDOUT :spin_unlock_bh (&session->lock); -iscsi_conn_failure (conn,ISCSI_ERR_CONN_FAILED );
It is harmless to keep this, right? Just keep it for now so the reset handler code behaves the same for all TMF_TIMEDOUT cases.
drivers/scsi/libiscsi.c done: · line 2481
Quoted 11 lines
drivers/scsi/libiscsi.c +4
-0goto done;default : conn->tmf_state =TMF_INITIAL ;@@ -2476,12 +2475,27 @@ done:ISCSI_DBG_EH (session,"tgt %s reset result = %s\n" , session->targetname, rc ==SUCCESS ?"SUCCESS" :"FAILED" );mutex_unlock (&session->eh_mutex); +return rc; +} +EXPORT_SYMBOL_GPL (iscsi_eh_target_reset); +
You can remove the export symbol since no one is using it now, and remove the libiscsi.h iscsi_eh_target_reset code too.
drivers/scsi/libiscsi.c done: · line 2493
Quoted 12 lines
drivers/scsi/libiscsi.c +11
-0+/** +* iscsi_eh_recover_target - reset target and possibly the session +* @sc: scsi command +* +* This will attempt to send a warm target reset. If that fails, +* we will escalate to ERL0 session recovery. +*/ +int iscsi_eh_recover_target (struct scsi_cmnd *sc) +{ +int rc; + rc =iscsi_eh_target_reset (sc);
Some extra whitespace at the end of that line. You can do a git am --wihtespace=fix on your patches before you send and that will fix them up for you (just remember to respit the new ones out and send them).