Commit 32c30454 authored by Bhanu Prakash Gollapudi's avatar Bhanu Prakash Gollapudi Committed by James Bottomley
Browse files

[SCSI] bnx2fc: Handle SRR LS_ACC drop scenario 



When SRR LS_ACC is dropped, the driver was not issuing ABTS for SRR when it
times out. Since the target received SRR, it was able to send the XFER_RDY and
the the original IO request completed successfully. In this condition ABTS was
not sent during bnx2fc_srr_compl(). Fix this by first checking for ELS timeout
and issue ABTS before checking if original IO request is complete.

Signed-off-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 99cc600c

drivers/scsi/bnx2fc/bnx2fc_els.c

+12 −11
Original line number Diff line number Diff line
@@ -268,17 +268,6 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg) 


	orig_io_req = cb_arg->aborted_io_req;

	srr_req = cb_arg->io_req;

	if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags)) {

		BNX2FC_IO_DBG(srr_req, "srr_compl: xid - 0x%x completed",

			orig_io_req->xid);

		goto srr_compl_done;

	}

	if (test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {

		BNX2FC_IO_DBG(srr_req, "rec abts in prog "

		       "orig_io - 0x%x\n",

			orig_io_req->xid);

		goto srr_compl_done;

	}

	if (test_and_clear_bit(BNX2FC_FLAG_ELS_TIMEOUT, &srr_req->req_flags)) {

		/* SRR timedout */

		BNX2FC_IO_DBG(srr_req, "srr timed out, abort "
@@ -290,6 +279,12 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg) 
				"failed. issue cleanup\n");

			bnx2fc_initiate_cleanup(srr_req);

		}

		if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags) ||

		    test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {

			BNX2FC_IO_DBG(srr_req, "srr_compl:xid 0x%x flags = %lx",

				      orig_io_req->xid, orig_io_req->req_flags);

			goto srr_compl_done;

		}

		orig_io_req->srr_retry++;

		if (orig_io_req->srr_retry <= SRR_RETRY_COUNT) {

			struct bnx2fc_rport *tgt = orig_io_req->tgt;
@@ -311,6 +306,12 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg) 
		}

		goto srr_compl_done;

	}

	if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags) ||

	    test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {

		BNX2FC_IO_DBG(srr_req, "srr_compl:xid - 0x%x flags = %lx",

			      orig_io_req->xid, orig_io_req->req_flags);

		goto srr_compl_done;

	}

	mp_req = &(srr_req->mp_req);

	fc_hdr = &(mp_req->resp_fc_hdr);

	resp_len = mp_req->resp_len;

CRA Git | Maintained and supported by SUSTech CRA and CCSE