zfcp: fix: use correct req_id in eh_abort_handler
Subsystems (3)
PATCH 3/6 zfcp: fix: use correct req_id in eh_abort_handler
zfcp: fix: use correct req_id in eh_abort_handler
zfcp's eh_abort_handler used the wrong request ID to identify the request to be aborted. The bug was introduced with commit fea9d6c7bcd8ff1d60ff74f27ba483b3820b18a3 for improved management of request IDs. The bug is fixed with this patch.
Signed-off-by Andreas Herrmann <[email protected]>
--- drivers/s390/scsi/zfcp_aux.c | 4 +++ drivers/s390/scsi/zfcp_dbf.c | 13 ++++---- drivers/s390/scsi/zfcp_ext.h | 2 + drivers/s390/scsi/zfcp_fsf.c | 9 +++--- drivers/s390/scsi/zfcp_scsi.c | 63 ++++++++++++++++++----------------------- 5 files changed, 42 insertions(+), 49 deletions(-)
drivers/s390/scsi/zfcp_aux.c +4 -0
@@ -189,6 +189,10 @@ struct zfcp_fsf_req *zfcp_reqlist_ismembstruct zfcp_fsf_req *request, *tmp;unsigned int i; +/* 0 is reserved as an invalid req_id */ +if (req_id ==0 ) +return NULL ; + i = req_id %REQUEST_LIST_SIZE ;list_for_each_entry_safe (request, tmp, &adapter->req_list[i], list)
drivers/s390/scsi/zfcp_dbf.c +6 -7
@@ -707,7 +707,7 @@ _zfcp_scsi_dbf_event_common(const char *struct zfcp_adapter *adapter, struct scsi_cmnd *scsi_cmnd, struct zfcp_fsf_req *fsf_req, - struct zfcp_fsf_req *old_fsf_req) + unsigned long old_req_id) { struct zfcp_scsi_dbf_record *rec = &adapter->scsi_dbf_buf;struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)rec;
@@ -768,8 +768,7 @@ _zfcp_scsi_dbf_event_common(const char * rec->fsf_seqno = fsf_req->seq_no; rec->fsf_issued = fsf_req->issued; } - rec->type.old_fsf_reqid = - (unsigned long ) old_fsf_req; + rec->type.old_fsf_reqid = old_req_id; }else {strncpy (dump->tag,"dump" ,ZFCP_DBF_TAG_SIZE ); dump->total_size = buflen;
@@ -794,17 +793,17 @@ zfcp_scsi_dbf_event_result(const char *t struct zfcp_fsf_req *fsf_req) {_zfcp_scsi_dbf_event_common ("rslt" , tag, level, - adapter, scsi_cmnd, fsf_req,NULL ); + adapter, scsi_cmnd, fsf_req,0 ); }inline void zfcp_scsi_dbf_event_abort (const char *tag,struct zfcp_adapter *adapter,struct scsi_cmnd *scsi_cmnd,struct zfcp_fsf_req *new_fsf_req, -struct zfcp_fsf_req *old_fsf_req) +unsigned long old_req_id) {_zfcp_scsi_dbf_event_common ("abrt" , tag,1 , - adapter, scsi_cmnd, new_fsf_req, old_fsf_req); + adapter, scsi_cmnd, new_fsf_req, old_req_id); } inline void
@@ -814,7 +813,7 @@ zfcp_scsi_dbf_event_devreset(const charstruct zfcp_adapter *adapter = unit->port->adapter;_zfcp_scsi_dbf_event_common (flag ==FCP_TARGET_RESET ?"trst" :"lrst" , - tag,1 , adapter, scsi_cmnd,NULL ,NULL ); + tag,1 , adapter, scsi_cmnd,NULL ,0 ); } static int
drivers/s390/scsi/zfcp_ext.h +1 -1
@@ -185,7 +185,7 @@ extern void zfcp_scsi_dbf_event_result(c struct zfcp_fsf_req *);extern void zfcp_scsi_dbf_event_abort (const char *,struct zfcp_adapter *,struct scsi_cmnd *,struct zfcp_fsf_req *, -struct zfcp_fsf_req *); +unsigned long );extern void zfcp_scsi_dbf_event_devreset (const char *,u8 ,struct zfcp_unit *,struct scsi_cmnd *);extern void zfcp_reqlist_add (struct zfcp_adapter *,struct zfcp_fsf_req *);
drivers/s390/scsi/zfcp_fsf.c +4 -5
@@ -3527,7 +3527,7 @@ zfcp_fsf_send_fcp_command_task(struct zf fsf_req->unit = unit;/* associate FSF request with SCSI request (for look up on abort) */ - scsi_cmnd->host_scribble = (char *) fsf_req; + scsi_cmnd->host_scribble = (unsigned char *) fsf_req->req_id;/* associate SCSI command with FSF request */ fsf_req->data = (unsigned long ) scsi_cmnd;
@@ -4667,7 +4667,6 @@ zfcp_fsf_req_create(struct zfcp_adapter {volatile struct qdio_buffer_element *sbale;struct zfcp_fsf_req *fsf_req =NULL ; -unsigned long flags;int ret =0 ;struct zfcp_qdio_queue *req_queue = &adapter->request_queue;
@@ -4684,10 +4683,10 @@ zfcp_fsf_req_create(struct zfcp_adapter fsf_req->fsf_command = fsf_cmd;INIT_LIST_HEAD (&fsf_req->list); -/* unique request id */ -spin_lock_irqsave (&adapter->req_list_lock, flags); +/* this is serialized (we are holding req_queue-lock of adapter */ +if (adapter->req_no ==0 ) + adapter->req_no++; fsf_req->req_id = adapter->req_no++; -spin_unlock_irqrestore (&adapter->req_list_lock, flags);zfcp_fsf_req_qtcb_init (fsf_req);
drivers/s390/scsi/zfcp_scsi.c +27 -36
98 lines not on this page · raw message
Signature · 1 line
1.4.2.1.g80823