From owner-svn-src-all@FreeBSD.ORG Sun Jan 12 22:15:18 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B9AD1F2; Sun, 12 Jan 2014 22:15:18 +0000 (UTC) Received: from smtpauth3.wiscmail.wisc.edu (wmauth3.doit.wisc.edu [144.92.197.226]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 687E415E1; Sun, 12 Jan 2014 22:15:17 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII Received: from avs-daemon.smtpauth3.wiscmail.wisc.edu by smtpauth3.wiscmail.wisc.edu (Oracle Communications Messaging Server 7u4-27.01(7.0.4.27.0) 64bit (built Aug 30 2012)) id <0MZB00C006ENE900@smtpauth3.wiscmail.wisc.edu>; Sun, 12 Jan 2014 16:15:16 -0600 (CST) X-Spam-PmxInfo: Server=avs-3, Version=6.0.3.2322014, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.1.12.220616, SenderIP=0.0.0.0 X-Spam-Report: AuthenticatedSender=yes, SenderIP=0.0.0.0 Received: from wanderer.tachypleus.net (pool-72-66-107-173.washdc.fios.verizon.net [72.66.107.173]) by smtpauth3.wiscmail.wisc.edu (Oracle Communications Messaging Server 7u4-27.01(7.0.4.27.0) 64bit (built Aug 30 2012)) with ESMTPSA id <0MZB00K4G75D9E20@smtpauth3.wiscmail.wisc.edu>; Sun, 12 Jan 2014 16:15:16 -0600 (CST) Message-id: <52D313F1.9010005@freebsd.org> Date: Sun, 12 Jan 2014 17:15:13 -0500 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 To: Bryan Venteicher , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r260566 - head/sys/dev/virtio/scsi References: <201401121740.s0CHelGk032373@svn.freebsd.org> In-reply-to: <201401121740.s0CHelGk032373@svn.freebsd.org> X-Enigmail-Version: 1.6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 22:15:18 -0000 This looks like it is uses a two-level set of hierarchical LUNs. Does REPORT_LUNS not work? The new extended LUN support in CAM should be able to handle this kind of thing now without virtio knowing anything about it. -Nathan On 01/12/14 12:40, Bryan Venteicher wrote: > Author: bryanv > Date: Sun Jan 12 17:40:47 2014 > New Revision: 260566 > URL: http://svnweb.freebsd.org/changeset/base/260566 > > Log: > Remove incorrect bit shift when assigning the LUN request field > > This caused duplicate targets appearing on Google Compute Engine > instances. > > PR: kern/185626 > Submitted by: Venkatesh Srinivas > MFC after: 3 days > > Modified: > head/sys/dev/virtio/scsi/virtio_scsi.c > > Modified: head/sys/dev/virtio/scsi/virtio_scsi.c > ============================================================================== > --- head/sys/dev/virtio/scsi/virtio_scsi.c Sun Jan 12 15:35:03 2014 (r260565) > +++ head/sys/dev/virtio/scsi/virtio_scsi.c Sun Jan 12 17:40:47 2014 (r260566) > @@ -1539,7 +1539,7 @@ vtscsi_set_request_lun(struct ccb_hdr *c > lun[0] = 1; > lun[1] = ccbh->target_id; > lun[2] = 0x40 | ((ccbh->target_lun >> 8) & 0x3F); > - lun[3] = (ccbh->target_lun >> 8) & 0xFF; > + lun[3] = ccbh->target_lun & 0xFF; > } > > static void