From patchwork Mon Feb 8 17:02:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8252511 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E93999F319 for ; Mon, 8 Feb 2016 17:09:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F0A2F203E3 for ; Mon, 8 Feb 2016 17:09:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ADF86203B8 for ; Mon, 8 Feb 2016 17:09:37 +0000 (UTC) Received: from localhost ([::1]:46891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSpJg-0005Ha-VE for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Feb 2016 12:09:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSpDn-00035k-5F for qemu-devel@nongnu.org; Mon, 08 Feb 2016 12:03:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSpDm-0006fi-2v for qemu-devel@nongnu.org; Mon, 08 Feb 2016 12:03:31 -0500 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:36114) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSpDl-0006fW-P2 for qemu-devel@nongnu.org; Mon, 08 Feb 2016 12:03:30 -0500 Received: by mail-wm0-x232.google.com with SMTP id p63so123130608wmp.1 for ; Mon, 08 Feb 2016 09:03:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Fua3/G5n77zpXgbvIsy56b7LAtwBijBVY4/v9+hhRSc=; b=ziIBg7iqgw8MRTj1+zDQeqBzQyeIbtY0J6xIIF84hDpOh0w/UYCNCXaxH2HYEJFXiF ijzz5uyT3tdIFQR98Z8wKbjV7oPO1MSo35xIqTim5y+Ai0iLBIU6FFSL4tYXTaqxol/l evP2g0ku5jSU5NBlgIKzGFCvRMmzVlV+MbEuh3T+4f4nEEkoT6ZyWNZYVUl8Au/wCM9E XR3ozF6GlGNyegPFwhbWYw8P1wiDXfA7D/IeCRr3+2QPJaoPD7bpmp+5aWFF7cAyvgP1 AonoxATzWvHxGepOh+zfnzHI9p4ok8yec1i8uYLCNyrCFN/2DukengjTVwUOS/LVofVI UPeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Fua3/G5n77zpXgbvIsy56b7LAtwBijBVY4/v9+hhRSc=; b=Cqs2WAlTNyJHfFelscc5bQrLa9ZGTm1u9eOgH/SVMbHwxeshiIUSwgK1PJ+0BL94YV I4gQq+u90+iUlz+i83ysauGgScm8z61PmXLFMft7zMjFLYLu0P2YF9gOtNXdmswxmsFS 54yLnyHHMAtRb4n17f6SI3SoVfw0G3sKBHFP2699yv/FoHjz66+CQhX/EnqgJo/2Q59B ZOYMmKPiKxTbkQFczQErZ/+BzBv5UYIbfI7Y0sp539jvJucReojbt6o9BvMSzS2dmeBD eONVuU3lMtLAMPOilpW/8SFDY9Pv7BXlByd0YKJa/YxHC4EdYDMh/SJju5rFbXl9a6jn msYw== X-Gm-Message-State: AG10YOQwLMz4UAT0kxt5+S8AmY6k+akpArTSiCj4fkHd+xWHIEBavM29bgvMJPSggFfFgg== X-Received: by 10.195.11.226 with SMTP id el2mr34838911wjd.112.1454951009092; Mon, 08 Feb 2016 09:03:29 -0800 (PST) Received: from 640k.lan (94-39-141-130.adsl-ull.clienti.tiscali.it. [94.39.141.130]) by smtp.gmail.com with ESMTPSA id b1sm30651442wjy.0.2016.02.08.09.03.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Feb 2016 09:03:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 8 Feb 2016 18:02:58 +0100 Message-Id: <1454950999-64128-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1454950999-64128-1-git-send-email-pbonzini@redhat.com> References: <1454950999-64128-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::232 Subject: [Qemu-devel] [PULL 07/28] scsi-generic: grab device and port SAS addresses from backend X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 This lets a SAS adapter expose them through its own configuration mechanism. Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 1 + hw/scsi/scsi-generic.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/scsi/scsi.h | 1 + 3 files changed, 94 insertions(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index fd12fbb..469aec2 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2573,6 +2573,7 @@ static void scsi_block_realize(SCSIDevice *dev, Error **errp) s->features |= (1 << SCSI_DISK_F_NO_REMOVABLE_DEVOPS); scsi_realize(&s->qdev, errp); + scsi_generic_read_device_identification(&s->qdev); } static bool scsi_block_is_passthrough(SCSIDiskState *s, uint8_t *buf) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 75a4127..f8a1ff2 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -355,6 +355,96 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd) } } +static int read_naa_id(const uint8_t *p, uint64_t *p_wwn) +{ + int i; + + if ((p[1] & 0xF) == 3) { + /* NAA designator type */ + if (p[3] != 8) { + return -EINVAL; + } + *p_wwn = ldq_be_p(p + 4); + return 0; + } + + if ((p[1] & 0xF) == 8) { + /* SCSI name string designator type */ + if (p[3] < 20 || memcmp(&p[4], "naa.", 4)) { + return -EINVAL; + } + if (p[3] > 20 && p[24] != ',') { + return -EINVAL; + } + *p_wwn = 0; + for (i = 8; i < 24; i++) { + char c = toupper(p[i]); + c -= (c >= '0' && c <= '9' ? '0' : 'A' - 10); + *p_wwn = (*p_wwn << 4) | c; + } + return 0; + } + + return -EINVAL; +} + +void scsi_generic_read_device_identification(SCSIDevice *s) +{ + uint8_t cmd[6]; + uint8_t buf[250]; + uint8_t sensebuf[8]; + sg_io_hdr_t io_header; + int ret; + int i, len; + + memset(cmd, 0, sizeof(cmd)); + memset(buf, 0, sizeof(buf)); + cmd[0] = INQUIRY; + cmd[1] = 1; + cmd[2] = 0x83; + cmd[4] = sizeof(buf); + + memset(&io_header, 0, sizeof(io_header)); + io_header.interface_id = 'S'; + io_header.dxfer_direction = SG_DXFER_FROM_DEV; + io_header.dxfer_len = sizeof(buf); + io_header.dxferp = buf; + io_header.cmdp = cmd; + io_header.cmd_len = sizeof(cmd); + io_header.mx_sb_len = sizeof(sensebuf); + io_header.sbp = sensebuf; + io_header.timeout = 6000; /* XXX */ + + ret = blk_ioctl(s->conf.blk, SG_IO, &io_header); + if (ret < 0 || io_header.driver_status || io_header.host_status) { + return; + } + + len = MIN((buf[2] << 8) | buf[3], sizeof(buf) - 4); + for (i = 0; i + 3 <= len; ) { + const uint8_t *p = &buf[i + 4]; + uint64_t wwn; + + if (i + (p[3] + 4) > len) { + break; + } + + if ((p[1] & 0x10) == 0) { + /* Associated with the logical unit */ + if (read_naa_id(p, &wwn) == 0) { + s->wwn = wwn; + } + } else if ((p[1] & 0x10) == 0x10) { + /* Associated with the target port */ + if (read_naa_id(p, &wwn) == 0) { + s->port_wwn = wwn; + } + } + + i += p[3] + 4; + } +} + static int get_stream_blocksize(BlockBackend *blk) { uint8_t cmd[6]; @@ -458,6 +548,8 @@ static void scsi_generic_realize(SCSIDevice *s, Error **errp) } DPRINTF("block size %d\n", s->blocksize); + + scsi_generic_read_device_identification(s); } const SCSIReqOps scsi_generic_req_ops = { diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index bbabba2..29052f8 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -273,6 +273,7 @@ void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense); void scsi_device_set_ua(SCSIDevice *sdev, SCSISense sense); void scsi_device_report_change(SCSIDevice *dev, SCSISense sense); void scsi_device_unit_attention_reported(SCSIDevice *dev); +void scsi_generic_read_device_identification(SCSIDevice *dev); int scsi_device_get_sense(SCSIDevice *dev, uint8_t *buf, int len, bool fixed); SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int target, int lun);