From patchwork Tue Sep 29 10:47:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 7285071 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BD618BEEA4 for ; Tue, 29 Sep 2015 10:48:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B59D206CC for ; Tue, 29 Sep 2015 10:48:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EE0F206D9 for ; Tue, 29 Sep 2015 10:48:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964795AbbI2KsX (ORCPT ); Tue, 29 Sep 2015 06:48:23 -0400 Received: from mx2.suse.de ([195.135.220.15]:42077 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934682AbbI2Kr6 (ORCPT ); Tue, 29 Sep 2015 06:47: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 mx2.suse.de (Postfix) with ESMTP id 948897502D; Tue, 29 Sep 2015 10:47:48 +0000 (UTC) From: Hannes Reinecke To: James Bottomley Cc: linux-scsi@vger.kernel.org, Christoph Hellwig , Bart van Assche , Ewan Milne , "Martin K. Petersen" , Hannes Reinecke Subject: [PATCH 20/36] scsi_dh_alua: allocate RTPG buffer separately Date: Tue, 29 Sep 2015 12:47:22 +0200 Message-Id: <1443523658-87622-21-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1443523658-87622-1-git-send-email-hare@suse.de> References: <1443523658-87622-1-git-send-email-hare@suse.de> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The RTPG buffer will only evaluated within alua_rtpg(), so we can allocate it locally there and avoid having to put it into the global structure. Reviewed-by: Ewan Milne Reviewed-by: Christoph Hellwig Signed-off-by: Hannes Reinecke --- drivers/scsi/device_handler/scsi_dh_alua.c | 56 +++++++++++------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index f3b455f..5908ef2 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c @@ -56,7 +56,7 @@ #define TPGS_MODE_IMPLICIT 0x1 #define TPGS_MODE_EXPLICIT 0x2 -#define ALUA_INQUIRY_SIZE 36 +#define ALUA_RTPG_SIZE 128 #define ALUA_FAILOVER_TIMEOUT 60 #define ALUA_FAILOVER_RETRIES 5 @@ -75,9 +75,6 @@ struct alua_port_group { int state; int pref; unsigned flags; /* used for optimizing STPG */ - unsigned char inq[ALUA_INQUIRY_SIZE]; - unsigned char *buff; - int bufflen; unsigned char transition_tmo; }; @@ -96,21 +93,6 @@ struct alua_dh_data { static char print_alua_state(int); static int alua_check_sense(struct scsi_device *, struct scsi_sense_hdr *); -static int realloc_buffer(struct alua_port_group *pg, unsigned len) -{ - if (pg->buff && pg->buff != pg->inq) - kfree(pg->buff); - - pg->buff = kmalloc(len, GFP_NOIO); - if (!pg->buff) { - pg->buff = pg->inq; - pg->bufflen = ALUA_INQUIRY_SIZE; - return 1; - } - pg->bufflen = len; - return 0; -} - static void release_port_group(struct kref *kref) { struct alua_port_group *pg; @@ -120,8 +102,6 @@ static void release_port_group(struct kref *kref) spin_lock(&port_group_lock); list_del(&pg->node); spin_unlock(&port_group_lock); - if (pg->buff && pg->inq != pg->buff) - kfree(pg->buff); kfree(pg); } @@ -206,8 +186,6 @@ struct alua_port_group *alua_get_pg(struct scsi_device *sdev, return NULL; } pg->group_id = group_id; - pg->buff = pg->inq; - pg->bufflen = ALUA_INQUIRY_SIZE; pg->tpgs = tpgs; pg->state = TPGS_STATE_OPTIMIZED; kref_init(&pg->kref); @@ -433,8 +411,8 @@ static int alua_check_sense(struct scsi_device *sdev, static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg, int wait_for_transition) { struct scsi_sense_hdr sense_hdr; - int len, k, off, valid_states = 0; - unsigned char *ucp; + int len, k, off, valid_states = 0, bufflen = ALUA_RTPG_SIZE; + unsigned char *ucp, *buff; unsigned err, retval; unsigned long expiry, interval = 0; unsigned int tpg_desc_tbl_off; @@ -445,15 +423,19 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg, int w else expiry = round_jiffies_up(jiffies + pg->transition_tmo * HZ); + buff = kzalloc(bufflen, GFP_KERNEL); + if (!buff) + return SCSI_DH_DEV_TEMP_BUSY; + retry: - retval = submit_rtpg(sdev, pg->buff, pg->bufflen, - &sense_hdr, pg->flags); + retval = submit_rtpg(sdev, buff, bufflen, &sense_hdr, pg->flags); if (retval) { if (!scsi_sense_valid(&sense_hdr)) { sdev_printk(KERN_INFO, sdev, "%s: rtpg failed, result %d\n", ALUA_DH_NAME, retval); + kfree(buff); if (driver_byte(retval) == DRIVER_ERROR) return SCSI_DH_DEV_TEMP_BUSY; return SCSI_DH_IO; @@ -484,14 +466,18 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg, int w sdev_printk(KERN_ERR, sdev, "%s: rtpg failed\n", ALUA_DH_NAME); scsi_print_sense_hdr(sdev, ALUA_DH_NAME, &sense_hdr); + kfree(buff); return SCSI_DH_IO; } - len = get_unaligned_be32(&pg->buff[0]) + 4; + len = get_unaligned_be32(&buff[0]) + 4; - if (len > pg->bufflen) { + if (len > bufflen) { /* Resubmit with the correct length */ - if (realloc_buffer(pg, len)) { + kfree(buff); + bufflen = len; + buff = kmalloc(bufflen, GFP_KERNEL); + if (!buff) { sdev_printk(KERN_WARNING, sdev, "%s: kmalloc buffer failed\n",__func__); /* Temporary failure, bypass */ @@ -501,9 +487,8 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg, int w } orig_transition_tmo = pg->transition_tmo; - if ((pg->buff[4] & RTPG_FMT_MASK) == RTPG_FMT_EXT_HDR && - pg->buff[5] != 0) - pg->transition_tmo = pg->buff[5]; + if ((buff[4] & RTPG_FMT_MASK) == RTPG_FMT_EXT_HDR && buff[5] != 0) + pg->transition_tmo = buff[5]; else pg->transition_tmo = ALUA_FAILOVER_TIMEOUT; @@ -515,12 +500,12 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg, int w expiry = jiffies + pg->transition_tmo * HZ; } - if ((pg->buff[4] & RTPG_FMT_MASK) == RTPG_FMT_EXT_HDR) + if ((buff[4] & RTPG_FMT_MASK) == RTPG_FMT_EXT_HDR) tpg_desc_tbl_off = 8; else tpg_desc_tbl_off = 4; - for (k = tpg_desc_tbl_off, ucp = pg->buff + tpg_desc_tbl_off; + for (k = tpg_desc_tbl_off, ucp = buff + tpg_desc_tbl_off; k < len; k += off, ucp += off) { @@ -570,6 +555,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg, int w err = SCSI_DH_OK; break; } + kfree(buff); return err; }