From patchwork Wed Mar 4 06:47:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chauhan, Vijay" X-Patchwork-Id: 9812 Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n246nZWc007253 for ; Wed, 4 Mar 2009 06:49:36 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id C84E061A8CC; Wed, 4 Mar 2009 01:49:34 -0500 (EST) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n246nXkn025722 for ; Wed, 4 Mar 2009 01:49:33 -0500 Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n246nYI2009314 for ; Wed, 4 Mar 2009 01:49:34 -0500 Received: from exprod7og107.obsmtp.com (exprod7og107.obsmtp.com [64.18.2.167]) by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id n246mBgl032698 for ; Wed, 4 Mar 2009 01:48:11 -0500 Received: from source ([147.145.40.20]) by exprod7ob107.postini.com ([64.18.6.12]) with SMTP ID DSNKSa4kHzNIRL6gDd4ESttUWjDW2pmBcc1E@postini.com; Tue, 03 Mar 2009 22:48:11 PST Received: from milmhbs0.lsil.com (mhbs.lsil.com [147.145.1.30]) by mail0.lsil.com (8.12.11/8.12.11) with ESMTP id n246lwrK015806; Tue, 3 Mar 2009 22:47:58 -0800 (PST) Received: from inbmail01.lsi.com (inbmail01.in.lsil.com [172.28.140.213]) by milmhbs0.lsil.com (8.12.11/8.12.11) with ESMTP id n246m1gs016382; Tue, 3 Mar 2009 22:48:01 -0800 Received: from inbmail01.lsi.com ([172.28.140.213]) by inbmail01.lsi.com ([172.28.140.213]) with mapi; Wed, 4 Mar 2009 12:17:57 +0530 From: "Chauhan, Vijay" To: Hannes Reinecke , "sekharan@us.ibm.com" Date: Wed, 4 Mar 2009 12:17:54 +0530 Thread-Topic: [PATCH][RESUBMIT] scsi_dh_rdac: Retry mode select for NO_SENSE, ABORTED_COMMAND, UNIT_ATTENTION, NOT_READY(02/04/01) Thread-Index: AcmbTb677occH+c1SV+6TgcsFUwwrgBQFwww Message-ID: <0D1E8821739E724A86F4D16902CE275C140E25C59C@inbmail01.lsi.com> In-Reply-To: <49ABFEC7.7080509@suse.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32 X-Scanned-By: MIMEDefang 2.39 X-RedHat-Spam-Score: -4 X-MIME-Autoconverted: from quoted-printable to 8bit by listman.util.phx.redhat.com id n246nXkn025722 X-loop: dm-devel@redhat.com Cc: "dm-devel@redhat.com" , "linux-scsi@vger.kernel.org" Subject: [dm-devel] [PATCH][RESUBMIT] scsi_dh_rdac: Retry mode select for NO_SENSE, ABORTED_COMMAND, UNIT_ATTENTION, NOT_READY(02/04/01) X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com Hi Hannes, Thanks for your comment. I have modified the patch with correct indentation. Resubmitting this patch. For other ASC/ASQ codes (ie 04/04 - 04/09), I am currently working on it and will be adding it in future if needed. On Mon, March 02, 2009 9:14 PM Hannes Reinecke wrote: > > + err = SCSI_DH_RETRY; > Missing indentation. > > What about the other 'in progress' ASC/ASQ codes (ie 04/04 - 04/09) ? > Can they safely be ignored as the array will not issue them? > > > + break; > > + case ILLEGAL_REQUEST: > > + if (sense_hdr.asc == 0x91 && sense_hdr.ascq == 0x36) > > + /* > > + * Command Lock contention > > + */ > > err = SCSI_DH_RETRY; > Again, missing indentation. Thanks, Vijay Acked-by: Chandra Seetharaman --- This patch is to add retry for mode select if mode select command is returned with sense NO_SENSE, UNIT_ATTENTION, ABORTED_COMMAND, NOT_READY(02/04/01). This patch reorganise the sense keys from if-else to switch-case format for better maintainability. Signed-off-by: Vijay Chauhan --- -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel --- linux-2.6.29-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c.orig 2009-02-14 05:01:30.000000000 +0530 +++ linux-2.6.29-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c 2009-03-04 11:25:19.000000000 +0530 @@ -449,28 +449,40 @@ static int mode_select_handle_sense(stru unsigned char *sensebuf) { struct scsi_sense_hdr sense_hdr; - int sense, err = SCSI_DH_IO, ret; + int err = SCSI_DH_IO, ret; ret = scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE, &sense_hdr); if (!ret) goto done; err = SCSI_DH_OK; - sense = (sense_hdr.sense_key << 16) | (sense_hdr.asc << 8) | - sense_hdr.ascq; - /* If it is retryable failure, submit the c9 inquiry again */ - if (sense == 0x59136 || sense == 0x68b02 || sense == 0xb8b02 || - sense == 0x62900) { - /* 0x59136 - Command lock contention - * 0x[6b]8b02 - Quiesense in progress or achieved - * 0x62900 - Power On, Reset, or Bus Device Reset - */ - err = SCSI_DH_RETRY; - } - if (sense) + switch (sense_hdr.sense_key) { + case NO_SENSE: + case ABORTED_COMMAND: + case UNIT_ATTENTION: + err= SCSI_DH_RETRY; + break; + case NOT_READY: + if (sense_hdr.asc == 0x04 && sense_hdr.ascq == 0x01) + /* LUN Not Ready and is in the Process of Becoming + * Ready + */ + err = SCSI_DH_RETRY; + break; + case ILLEGAL_REQUEST: + if (sense_hdr.asc == 0x91 && sense_hdr.ascq == 0x36) + /* + * Command Lock contention + */ + err = SCSI_DH_RETRY; + break; + default: sdev_printk(KERN_INFO, sdev, - "MODE_SELECT failed with sense 0x%x.\n", sense); + "MODE_SELECT failed with sense %02x/%02x/%02x.\n",sense_hdr.sense_key, + sense_hdr.asc, sense_hdr.ascq ); + } + done: return err; }