From patchwork Fri Apr 28 13:06:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 9704639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0201360225 for ; Fri, 28 Apr 2017 13:07:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E886928678 for ; Fri, 28 Apr 2017 13:07:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD47B28687; Fri, 28 Apr 2017 13:07:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7ED0828678 for ; Fri, 28 Apr 2017 13:07:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162734AbdD1NHA (ORCPT ); Fri, 28 Apr 2017 09:07:00 -0400 Received: from mx2.suse.de ([195.135.220.15]:46146 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755476AbdD1NG6 (ORCPT ); Fri, 28 Apr 2017 09:06:58 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id C21A7AD1E; Fri, 28 Apr 2017 13:06:56 +0000 (UTC) From: Martin Wilck To: "Martin K. Petersen" , Hannes Reinecke Cc: Bart Van Assche , Mauricio Faria de Oliveira , linux-scsi@vger.kernel.org Subject: [PATCH 2/3] scsi_dh_alua: Do not retry for unmapped device Date: Fri, 28 Apr 2017 15:06:25 +0200 Message-Id: <20170428130626.32162-3-mwilck@suse.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170428130626.32162-1-mwilck@suse.com> References: <20170428130626.32162-1-mwilck@suse.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hannes Reinecke If a device becomes unmapped on the target we should be returning SCSI_DH_DEV_OFFLINED. Signed-off-by: Hannes Reinecke Reviewed-by: Martin Wilck --- drivers/scsi/device_handler/scsi_dh_alua.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index b90a5dec199f..501855bde633 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c @@ -522,7 +522,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) struct alua_port_group *tmp_pg; int len, k, off, valid_states = 0, bufflen = ALUA_RTPG_SIZE; unsigned char *desc, *buff; - unsigned err, retval; + unsigned err = SCSI_DH_OK, retval; unsigned int tpg_desc_tbl_off; unsigned char orig_transition_tmo; unsigned long flags; @@ -541,7 +541,6 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) return SCSI_DH_DEV_TEMP_BUSY; retry: - err = 0; retval = submit_rtpg(sdev, buff, bufflen, &sense_hdr, pg->flags); if (retval) { @@ -569,6 +568,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) pg->flags |= ALUA_RTPG_EXT_HDR_UNSUPP; goto retry; } + err = SCSI_DH_IO; /* * Retry on ALUA state transition or if any * UNIT ATTENTION occurred. @@ -576,6 +576,9 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) if (sense_hdr.sense_key == NOT_READY && sense_hdr.asc == 0x04 && sense_hdr.ascq == 0x0a) err = SCSI_DH_RETRY; + if (sense_hdr.sense_key == ILLEGAL_REQUEST && + sense_hdr.asc == 0x25 && sense_hdr.ascq == 0x00) + err = SCSI_DH_DEV_OFFLINED; else if (sense_hdr.sense_key == UNIT_ATTENTION) err = SCSI_DH_RETRY; if (err == SCSI_DH_RETRY && @@ -591,7 +594,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) scsi_print_sense_hdr(sdev, ALUA_DH_NAME, &sense_hdr); kfree(buff); pg->expiry = 0; - return SCSI_DH_IO; + return err; } len = get_unaligned_be32(&buff[0]) + 4;