Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp3437444ybg; Fri, 25 Oct 2019 04:14:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxjz7ify4gs9jnh0KN/t+7RoRiz2/i3ahJyRmjI1qKNhmlmA9/UstwnENrhiD1lnZcVNnRc X-Received: by 2002:a17:902:9b83:: with SMTP id y3mr3172378plp.179.1572002077851; Fri, 25 Oct 2019 04:14:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572002077; cv=none; d=google.com; s=arc-20160816; b=cKLGsN9QgRZxD4DOfNMf5RTzMgJP+fuwaQ7f5nxultvRQH221aj7ucYGJCofgrGVIV lzKfzadrKW6dlrqSgvCCDu1a/ztnLkWiudLIjNM882zDCF6VLgA26z9hQ8aenDTWlcvg Rn2h1uWowwjySifue9vUkdxH/+fv1HHFcRkMi6mfmVlp7VcdFmpgBQ8MJ5tFY+N+ZnAr hnQf7tgKHcWixMH4no6J33dSfUOhvC4p0c8stJ4r8BQQ3fF8v8wbD1Of1ZOPDi7HWXQR byVxib4g7Ctyl3QR6Kx4e1kFJAxadbwCBcgCU69GAWLKTXj/c1y0fm71712pcmL5NLsi vFgw== 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=ziyNyP5mNqy/BOIxrGGPl2K3Zp0av1ir703QwhVwGBk=; b=QUccTqiA9pCuJ6Y/nuuPst4OBkEgY9lYopYZD9oS9K3ivVuYnGdIhny+UwJ+hIHMwg CK4K6ySw9JanbZssqGtQdlj6x64hTSFBEsDgkwMajoMCljkc477Q1QnZbv2ab2K8UDGb edrzCtylLR/PmqUQGwoG/rdABwLUb0bFuQG3uRucThPdrGrnc6Umepd6fkPSSeRx0kHi JkeQcMzJC+RV+J+DB8NI1dxTTEm+1F/qUpA7Ag+tDMnmNgAuENVN1Skjfg5F77L8e6A0 1dG0oSr1/PtMe853e49zFBXdHGzG36iuuQ6vI3PD81NtobdHz6oBRogtsYJHQE/yQV2N QQrQ== 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 t15si2055221pgg.530.2019.10.25.04.13.56; Fri, 25 Oct 2019 04:14:37 -0700 (PDT) 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 S2439207AbfJXLqy (ORCPT + 99 others); Thu, 24 Oct 2019 07:46:54 -0400 Received: from mx2.suse.de ([195.135.220.15]:48888 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726389AbfJXLqy (ORCPT ); Thu, 24 Oct 2019 07:46:54 -0400 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 DDB76AD2C; Thu, 24 Oct 2019 11:46:51 +0000 (UTC) From: Michal Suchanek To: Hannes Reinecke Cc: Michal Suchanek , "James E.J. Bottomley" , "Martin K. Petersen" , Jens Axboe , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RFC] scsi: blacklist: add VMware ESXi cdrom - broken tray emulation. Date: Thu, 24 Oct 2019 13:45:35 +0200 Message-Id: <20191024114535.1559-1-msuchanek@suse.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: <15c972ea-5b3a-487f-7be5-a62d780896da@suse.de> References: <15c972ea-5b3a-487f-7be5-a62d780896da@suse.de> 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 --- 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..8c1cb38f862b 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_MATCH_VENDOR | BLIST_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_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_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..c5468829be34 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_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..dbaf07888c16 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 opearted reliably */ +#define BLIST_TRAY ((__force blist_flags_t)(1ULL << 34)) +/* Vendor string is bogus */ +#define BLIST_MATCH_VENDOR ((__force blist_flags_t)(1ULL << 35)) -#define __BLIST_LAST_USED BLIST_RETRY_ASC_C1 + +#define __BLIST_LAST_USED BLIST_MATCH_VENDOR #define __BLIST_HIGH_UNUSED (~(__BLIST_LAST_USED | \ (__force blist_flags_t) \ -- 2.23.0