From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VktV6-000251-GV for qemu-devel@nongnu.org; Mon, 25 Nov 2013 05:34:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VktV0-00022L-V4 for qemu-devel@nongnu.org; Mon, 25 Nov 2013 05:34:44 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:56727 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VktV0-00022F-Jp for qemu-devel@nongnu.org; Mon, 25 Nov 2013 05:34:38 -0500 Message-ID: <529327D2.6060303@kamp.de> Date: Mon, 25 Nov 2013 11:34:58 +0100 From: Peter Lieven MIME-Version: 1.0 References: <1385124001-3576-1-git-send-email-pbonzini@redhat.com> <1385124001-3576-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1385124001-3576-13-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 12/19] block/iscsi: check WRITE SAME support differently depending on MAY_UNMAP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, stefanha@redhat.com On 22.11.2013 13:39, Paolo Bonzini wrote: > The current check is right for MAY_UNMAP=1. For MAY_UNMAP=0, just > try and fall back to regular writes as soon as a WRITE SAME command > fails. > > Signed-off-by: Paolo Bonzini > --- > block/iscsi.c | 19 +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/block/iscsi.c b/block/iscsi.c > index 20f4f55..93fee6d 100644 > --- a/block/iscsi.c > +++ b/block/iscsi.c > @@ -55,6 +55,7 @@ typedef struct IscsiLun { > QEMUTimer *nop_timer; > uint8_t lbpme; > uint8_t lbprz; > + uint8_t has_write_same; > struct scsi_inquiry_logical_block_provisioning lbp; > struct scsi_inquiry_block_limits bl; > unsigned char *zeroblock; > @@ -976,8 +977,13 @@ coroutine_fn iscsi_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, > return -EINVAL; > } > > - if (!iscsilun->lbp.lbpws) { > - /* WRITE SAME is not supported by the target */ > + if (!(flags & BDRV_REQ_MAY_UNMAP) && !iscsilun->has_write_same) { > + /* WRITE SAME without UNMAP is not supported by the target */ > + return -ENOTSUP; > + } > + > + if ((flags & BDRV_REQ_MAY_UNMAP) && !iscsilun->lbp.lbpws) { > + /* WRITE SAME with UNMAP is not supported by the target */ > return -ENOTSUP; > } > > @@ -1012,6 +1018,14 @@ retry: > } > > if (iTask.status != SCSI_STATUS_GOOD) { > + if (iTask.status == SCSI_STATUS_CHECK_CONDITION && > + iTask.task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && > + iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { > + /* WRITE SAME is not supported by the target */ > + iscsilun->has_write_same = false; > + return -ENOTSUP; > + } > + > return -EIO; > } > > @@ -1375,6 +1389,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, > } > > iscsilun->type = inq->periperal_device_type; > + iscsilun->has_write_same = true; > > if ((ret = iscsi_readcapacity_sync(iscsilun)) != 0) { > goto out; Maybe the naming has_write_same is misleading. It might be better to call it try_write_same or has_write_same_failed with inverse logic. If you just change the naming: Reviewed-by: Peter Lieven Peter