Received: from [140.186.70.92] (port=47560 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLcK8-00076w-CX for qemu-devel@nongnu.org; Thu, 25 Nov 2010 08:57:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PLcK7-0001Pv-8o for qemu-devel@nongnu.org; Thu, 25 Nov 2010 08:57:20 -0500 Received: from verein.lst.de ([213.95.11.210]:56213) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PLcK6-0001PL-TG for qemu-devel@nongnu.org; Thu, 25 Nov 2010 08:57:19 -0500 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id oAPDvI88003065 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Thu, 25 Nov 2010 14:57:18 +0100 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id oAPDvIGr003064 for qemu-devel@nongnu.org; Thu, 25 Nov 2010 14:57:18 +0100 Date: Thu, 25 Nov 2010 14:57:18 +0100 From: Christoph Hellwig Message-ID: <20101125135717.GB3034@lst.de> References: <20101125135657.GA2814@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101125135657.GA2814@lst.de> Subject: [Qemu-devel] [PATCH 2/5] scsi-disk: support WRITE SAME (16) with unmap bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Support discards via the WRITE SAME command with the unmap bit set, and tell the initiator about the support for it via the block limit and the new thin provisioning EVPD pages. Also fix the comment which incorrectly describedthe block limits EVPD page. Signed-off-by: Christoph Hellwig Index: qemu/hw/scsi-disk.c =================================================================== --- qemu.orig/hw/scsi-disk.c 2010-11-23 14:14:27.259253110 +0100 +++ qemu/hw/scsi-disk.c 2010-11-23 14:31:41.190253529 +0100 @@ -444,8 +444,10 @@ static int scsi_disk_emulate_inquiry(SCS buflen += id_len; break; } - case 0xb0: /* block device characteristics */ + case 0xb0: /* block limits */ { + unsigned int unmap_sectors = + s->qdev.conf.discard_granularity / s->qdev.blocksize; unsigned int min_io_size = s->qdev.conf.min_io_size / s->qdev.blocksize; unsigned int opt_io_size = @@ -465,6 +467,21 @@ static int scsi_disk_emulate_inquiry(SCS outbuf[13] = (opt_io_size >> 16) & 0xff; outbuf[14] = (opt_io_size >> 8) & 0xff; outbuf[15] = opt_io_size & 0xff; + + /* optimal unmap granularity */ + outbuf[28] = (unmap_sectors >> 24) & 0xff; + outbuf[29] = (unmap_sectors >> 16) & 0xff; + outbuf[30] = (unmap_sectors >> 8) & 0xff; + outbuf[31] = unmap_sectors & 0xff; + break; + } + case 0xb2: /* thin provisioning */ + { + outbuf[3] = buflen = 8; + outbuf[4] = 0; + outbuf[5] = 0x40; /* write same with unmap supported */ + outbuf[6] = 0; + outbuf[7] = 0; break; } default: @@ -932,6 +949,11 @@ static int scsi_disk_emulate_command(SCS outbuf[11] = 0; outbuf[12] = 0; outbuf[13] = get_physical_block_exp(&s->qdev.conf); + + /* set TPE bit if the format supports discard */ + if (s->qdev.conf.discard_granularity) + outbuf[14] = 0x80; + /* Protection, exponent and lowest lba field left blank. */ buflen = req->cmd.xfer; break; @@ -1128,6 +1150,30 @@ static int32_t scsi_send_command(SCSIDev goto illegal_lba; } break; + case WRITE_SAME_16: + DPRINTF("WRITE SAME(16) (sector %" PRId64 ", count %d)\n", lba, len); + + if (lba > s->max_lba) { + goto illegal_lba; + } + + /* + * We only support WRITE SAME with the unmap bit set for now. + */ + if (!(buf[1] & 0x8)) { + goto fail; + } + + rc = bdrv_discard(s->bs, lba * s->cluster_size, len * s->cluster_size); + if (rc < 0) { + /* XXX: better error code ?*/ + goto fail; + } + + scsi_req_set_status(&r->req, GOOD, NO_SENSE); + scsi_req_complete(&r->req); + scsi_remove_request(r); + return 0; default: DPRINTF("Unknown SCSI command (%2.2x)\n", buf[0]); fail: Index: qemu/hw/scsi-defs.h =================================================================== --- qemu.orig/hw/scsi-defs.h 2010-11-23 14:14:27.267253040 +0100 +++ qemu/hw/scsi-defs.h 2010-11-23 14:23:37.995253808 +0100 @@ -84,6 +84,7 @@ #define MODE_SENSE_10 0x5a #define PERSISTENT_RESERVE_IN 0x5e #define PERSISTENT_RESERVE_OUT 0x5f +#define WRITE_SAME_16 0x93 #define MAINTENANCE_IN 0xa3 #define MAINTENANCE_OUT 0xa4 #define MOVE_MEDIUM 0xa5