From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758921AbcAUGf2 (ORCPT ); Thu, 21 Jan 2016 01:35:28 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:34822 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758709AbcAUGfX (ORCPT ); Thu, 21 Jan 2016 01:35:23 -0500 Subject: [PATCH 1/2] scsi: Do not attach VPD to devices that don't support it From: Alexander Duyck To: jbottomley@odin.com, hare@suse.de, linux-scsi@vger.kernel.org Cc: alexander.duyck@gmail.com, martin.petersen@oracle.com, linux-kernel@vger.kernel.org, shane.seymour@hpe.com, jthumshirn@suse.de Date: Wed, 20 Jan 2016 22:35:22 -0800 Message-ID: <20160121063522.3803.23150.stgit@localhost.localdomain> In-Reply-To: <20160121063039.3803.66.stgit@localhost.localdomain> References: <20160121063039.3803.66.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch "scsi: rescan VPD attributes" introduced a regression in which devices that don't support VPD were being scanned for VPD attributes anyway. This could cause issues for this parts and should be avoided so the check for scsi_level has been moved out of scsi_add_lun and into scsi_attach_vpd so that all callers will not scan VPD for devices that don't support it. Fixes: 09e2b0b14690 ("scsi: rescan VPD attributes") Signed-off-by: Alexander Duyck --- drivers/scsi/scsi.c | 3 +++ drivers/scsi/scsi_scan.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index b1bf42b93fcc..ed085e78c893 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -784,6 +784,9 @@ void scsi_attach_vpd(struct scsi_device *sdev) int pg83_supported = 0; unsigned char __rcu *vpd_buf, *orig_vpd_buf = NULL; + if (sdev->scsi_level < SCSI_3) + return; + if (sdev->skip_vpd_pages) return; retry_pg0: diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 6a820668d442..1b16c89e0cf9 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -986,8 +986,7 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, } } - if (sdev->scsi_level >= SCSI_3) - scsi_attach_vpd(sdev); + scsi_attach_vpd(sdev); sdev->max_queue_depth = sdev->queue_depth;