Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp4627115ybc; Tue, 26 Nov 2019 11:56:46 -0800 (PST) X-Google-Smtp-Source: APXvYqxB9sa/qia/P553Pv2+JAM3qIg0oQsyiZL/Esd0HxYckhsrLGaVrkjDXhr87zMarU8BAG9g X-Received: by 2002:aa7:d3da:: with SMTP id o26mr28177345edr.302.1574798206733; Tue, 26 Nov 2019 11:56:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574798206; cv=none; d=google.com; s=arc-20160816; b=LS/a/+832BeZN1NIFqd+UhpJgam1P23rVSrtqs2nfxeiX1dNrn5clhUr5jvgOnrurR c4DkOESkmI5GaEV+NuAOHDFLR5FA+JKcAABExIRnAy6vjnBK4WiAbboreua9lPPqcto6 iaQlcUHLpRnbTAaUn2R9DidwbC+GQH1y73B/5Q49xsvQsYIG19+Ndlj+qch/U7Dg3CVw kMuRKbzGjm2SlTuq3QvS6cp9dQJlC0XDgdM9qaPX4ksA4czmGftcFT2lhTZY+8uWJhK4 0lLBy/KMg+yKJO2SWh3JO8tnAcEbFrXAHas+bZVXy0aHOVSNtLu2XNlXxdkhAInbuEwg 5Ylw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=q1vNdRy0irU+HIJ501yiahmWPu13Re9XrgZJ6gp2SLQ=; b=NjunCj+gzc1eLxYpH/ZDZlXH+wbJ1s/Mncrsfi5T09/ykCdVfj27+n2JFx3iwwKJEb eV9K5wVwH0WT16JIojx/RvgNBKQ505TR5GyDWTZX9UDNaBscrdjsacWY6LxAvDQpzVC8 BiDeleqIAQ2N3w5+SfhNiMmLI/5iEV5tucACEEW/rpLypic0ZuzxcfC1z9IATh/ucl8n jLSa0l+lRtxPYAez8dQ3G2y8nZo9bhXORiGuvQtCxzGtkR/SBHfAcGWxTHP1rhgKr66J 7g5x/KsmdOkS9PGJy8xgJVtF1Ed+o/dGKjfCM4PHuEm+0hKnwMsYNSyn4hHuXGE27qj6 wbPQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d9si7827021ejw.65.2019.11.26.11.56.22; Tue, 26 Nov 2019 11:56:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727239AbfKZTzH (ORCPT + 99 others); Tue, 26 Nov 2019 14:55:07 -0500 Received: from mx2.suse.de ([195.135.220.15]:40276 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727109AbfKZTys (ORCPT ); Tue, 26 Nov 2019 14:54:48 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 4B0E6B166; Tue, 26 Nov 2019 19:54:46 +0000 (UTC) From: Michal Suchanek To: linux-scsi@vger.kernel.org, linux-block@vger.kernel.org Cc: Michal Suchanek , Jonathan Corbet , Jens Axboe , "James E.J. Bottomley" , "Martin K. Petersen" , Alexander Viro , Eric Biggers , "J. Bruce Fields" , Mauro Carvalho Chehab , Benjamin Coddington , Ming Lei , Chaitanya Kulkarni , Bart Van Assche , Damien Le Moal , Hou Tao , Pavel Begunkov , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Jan Kara , Hannes Reinecke , "Ewan D. Milne" , Christoph Hellwig , Matthew Wilcox Subject: [PATCH v4 rebase 09/10] scsi: blacklist: add VMware ESXi cdrom - broken tray emulation Date: Tue, 26 Nov 2019 20:54:28 +0100 Message-Id: <1d01db2460f0e75bbe5d2b87f6335a0add7a954d.1574797504.git.msuchanek@suse.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The WMware ESXi cdrom identifies itself as: sr 0:0:0:0: [sr0] scsi3-mmc drive: vendor: "NECVMWarVMware SATA CD001.00" model: "VMware SATA CD001.00" with the following get_capabilities print in sr.c: sr_printk(KERN_INFO, cd, "scsi3-mmc drive: vendor: \"%s\" model: \"%s\"\n", cd->device->vendor, cd->device->model); The model looks like reliable identification while vendor does not. The drive claims to have a tray and claims to be able to close it. However, the UI has no notion of a tray - when medium is ejected it is dropped in the floor and the user must select a medium again before the drive can be re-loaded. On the kernel side the tray_move call to close the tray succeeds but the drive state does not change as a result of the call. The drive does not in fact emulate the tray state. There are two ways to get the medium state. One is the SCSI status: Physical drive: Fixed format, current; Sense key: Not Ready Additional sense: Medium not present - tray open Raw sense data (in hex): 70 00 02 00 00 00 00 0a 00 00 00 00 3a 02 00 00 00 00 Fixed format, current; Sense key: Not Ready Additional sense: Medium not present - tray closed Raw sense data (in hex): 70 00 02 00 00 00 00 0a 00 00 00 00 3a 01 00 00 00 00 VMware ESXi: Fixed format, current; Sense key: Not Ready Additional sense: Medium not present Info fld=0x0 [0] Raw sense data (in hex): f0 00 02 00 00 00 00 0a 00 00 00 00 3a 00 00 00 00 00 So the tray state is not reported here. Other is medium status which the kernel prefers if available. Adding a print here gives: cdrom: get_media_event success: code = 0, door_open = 1, medium_present = 0 door_open is interpreted as open tray. This is fine so long as tray_move would close the tray when requested or report an error which never happens on VMware ESXi servers (5.5 and 6.5 tested). This is a popular virtualization platform so a workaround is worthwhile. Signed-off-by: Michal Suchanek --- v2: new patch v3: change into a blacklist flag v4: fix vendor match condition --- drivers/scsi/scsi_devinfo.c | 15 +++++++++------ drivers/scsi/sr.c | 6 ++++++ include/scsi/scsi_devinfo.h | 7 ++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index df14597752ec..923f54b88d24 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -252,6 +252,7 @@ static struct { {"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM}, {"Traxdata", "CDR4120", NULL, BLIST_NOLUN}, /* locks up */ {"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36}, + {"VMware", "VMware", NULL, BLIST_NO_MATCH_VENDOR | BLIST_NO_TRAY}, {"WangDAT", "Model 2600", "01.7", BLIST_SELECT_NO_ATN}, {"WangDAT", "Model 3200", "02.2", BLIST_SELECT_NO_ATN}, {"WangDAT", "Model 1300", "02.4", BLIST_SELECT_NO_ATN}, @@ -454,10 +455,11 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor, /* * vendor strings must be an exact match */ - if (vmax != strnlen(devinfo->vendor, - sizeof(devinfo->vendor)) || - memcmp(devinfo->vendor, vskip, vmax)) - continue; + if (!(devinfo->flags & BLIST_NO_MATCH_VENDOR)) + if (vmax != strnlen(devinfo->vendor, + sizeof(devinfo->vendor)) || + memcmp(devinfo->vendor, vskip, vmax)) + continue; /* * @model specifies the full string, and @@ -468,8 +470,9 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor, continue; return devinfo; } else { - if (!memcmp(devinfo->vendor, vendor, - sizeof(devinfo->vendor)) && + if ((!memcmp(devinfo->vendor, vendor, + sizeof(devinfo->vendor)) + || (devinfo->flags & BLIST_NO_MATCH_VENDOR)) && !memcmp(devinfo->model, model, sizeof(devinfo->model))) return devinfo; diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 4664fdf75c0f..07c319494bf4 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -58,6 +58,7 @@ #include #include #include /* For the door lock/unlock commands */ +#include #include "scsi_logging.h" #include "sr.h" @@ -922,6 +923,11 @@ static void get_capabilities(struct scsi_cd *cd) buffer[n + 4] & 0x20 ? "xa/form2 " : "", /* can read xa/from2 */ buffer[n + 5] & 0x01 ? "cdda " : "", /* can read audio data */ loadmech[buffer[n + 6] >> 5]); + if (cd->device->sdev_bflags & BLIST_NO_TRAY) { + buffer[n + 6] &= ~(0xff << 5); + sr_printk(KERN_INFO, cd, + "Tray emulation bug workaround: tray -> caddy\n"); + } if ((buffer[n + 6] >> 5) == 0) /* caddy drives can't close tray... */ cd->cdi.mask |= CDC_CLOSE_TRAY; diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h index 3fdb322d4c4b..17ea96936cc6 100644 --- a/include/scsi/scsi_devinfo.h +++ b/include/scsi/scsi_devinfo.h @@ -67,8 +67,13 @@ #define BLIST_RETRY_ITF ((__force blist_flags_t)(1ULL << 32)) /* Always retry ABORTED_COMMAND with ASC 0xc1 */ #define BLIST_RETRY_ASC_C1 ((__force blist_flags_t)(1ULL << 33)) +/* Device reports to have a tray but it cannot be operated reliably */ +#define BLIST_NO_TRAY ((__force blist_flags_t)(1ULL << 34)) +/* Vendor string is bogus */ +#define BLIST_NO_MATCH_VENDOR ((__force blist_flags_t)(1ULL << 35)) -#define __BLIST_LAST_USED BLIST_RETRY_ASC_C1 + +#define __BLIST_LAST_USED BLIST_NO_MATCH_VENDOR #define __BLIST_HIGH_UNUSED (~(__BLIST_LAST_USED | \ (__force blist_flags_t) \ -- 2.23.0