From nobody Tue Dec 16 07:06:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520982002734171.6576133541763; Tue, 13 Mar 2018 16:00:02 -0700 (PDT) Received: from localhost ([::1]:43340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evstl-0007VZ-U9 for importer@patchew.org; Tue, 13 Mar 2018 19:00:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evshx-0005e4-3r for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsht-00037J-Fo for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:49 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:39238) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsht-000368-8O for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:45 -0400 Received: by mail-wr0-x242.google.com with SMTP id k3so2529725wrg.6 for ; Tue, 13 Mar 2018 15:47:45 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.47.42 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=x86Ja8yEM2QxMMge7ZPIBHrD6nEN+Zl8NJZJjNgl4N8=; b=ZCDFAYELvCozGcGmMAVRMlbxvKPZO8qOraHRF39vXiANHCGvEk4rlwS1aoBr5Fn0+o p63KUkMCUfwdS8NEBEEqMJSJHz/LiueMWzUUfuI4YSKC7wh1Ix1GOjW8fKM0vY9dXpWM SroahQ3/z0cNAD9k+wVqkwJQjTLAxjX9rbPDCJLXPNE+IHgDoixAG77J95mi/EoLPOk2 6Qb0PxfRWoZPJiqlGtHfgdO3+c5SYN7VANE0TCmdXuEWCEoHW8Bwr6PHYxe7hqAi60kp W3BOV0AxsTpiV+qxc9psPnrwH+vIXWjnv6Zz/ez6SnwRfEAY3upCKi1QbUvBnvymbtqj Z+eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=x86Ja8yEM2QxMMge7ZPIBHrD6nEN+Zl8NJZJjNgl4N8=; b=O99OGyS4Zp9uAgFvid2BByz/PsW/bli/6mpYtmTA+SntxOyYPFvN7wMS4928sBS/KI TvCeGMzzuLduXY6fHUQVk0su48+DQj39mJcKJnp96zed6uG9SW9hMkU9ISD1BsIe9PMv zFjY2qCXBSkq+2cAj/qOnfjdSvMrXuVmpfEQ7V0Nf71mtMbZf2NQAEH1exveZ+IFaA7+ IsZ4JSsu+JHz/yp/+GnKBzwTO0utL8iYAKApDODSAEx58rzhxt8X1x+WUrtwCIFl4Poi x2LB+/yjqTABOXQxmpGERZGuK9alOPuCFmU4FNLnfOKngQ4hAtYcXpXqCrPW+z2Zaw9E nzrg== X-Gm-Message-State: AElRT7H0L+vw04c6a87HSRq7BY0CSxFgNimzaDfySgehM94eWnec+07a VA8Pi0PTVgtOVtC5Fdq7eRHzlJY/ X-Google-Smtp-Source: AG47ELuFGhpHkKsjJw8twAZvnvhi9IRxSZhcwmS6wT7drJqvcMORu42hzUe4jfYEftoTWnqZGemueA== X-Received: by 10.223.142.244 with SMTP id q107mr1989985wrb.64.1520981263804; Tue, 13 Mar 2018 15:47:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:28 +0100 Message-Id: <20180313224719.4954-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 18/69] scsi: support NDOB (no data-out buffer) for WRITE SAME commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" A NDOB bit set to one specifies that the disk shall not transfer data from the data-out buffer and shall process the command as if the data-out buffer contained user data set to all zeroes. Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-bus.c | 2 +- hw/scsi/scsi-disk.c | 2 +- tests/virtio-scsi-test.c | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 1eaeffc830..9646743a7d 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -944,7 +944,7 @@ static int scsi_req_xfer(SCSICommand *cmd, SCSIDevice *= dev, uint8_t *buf) break; case WRITE_SAME_10: case WRITE_SAME_16: - cmd->xfer =3D dev->blocksize; + cmd->xfer =3D buf[1] & 1 ? 0 : dev->blocksize; break; case READ_CAPACITY_10: cmd->xfer =3D 8; diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index c65c1ce56d..5b7a48f5a5 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1807,7 +1807,7 @@ static void scsi_disk_emulate_write_same(SCSIDiskReq = *r, uint8_t *inbuf) return; } =20 - if (buffer_is_zero(inbuf, s->qdev.blocksize)) { + if ((req->cmd.buf[1] & 0x1) || buffer_is_zero(inbuf, s->qdev.blocksize= )) { int flags =3D (req->cmd.buf[1] & 0x8) ? BDRV_REQ_MAY_UNMAP : 0; =20 /* The request is used as the AIO opaque value, so add a ref. */ diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c index 7393d69bb2..037872bb98 100644 --- a/tests/virtio-scsi-test.c +++ b/tests/virtio-scsi-test.c @@ -216,6 +216,9 @@ static void test_unaligned_write_same(void) const uint8_t write_same_cdb_2[VIRTIO_SCSI_CDB_SIZE] =3D { 0x41, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x33, 0x00, 0x00 }; + const uint8_t write_same_cdb_ndob[VIRTIO_SCSI_CDB_SIZE] =3D { + 0x41, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x33, 0x00, 0x00 + }; =20 vs =3D qvirtio_scsi_pci_init(PCI_SLOT); =20 @@ -225,6 +228,9 @@ static void test_unaligned_write_same(void) g_assert_cmphex(0, =3D=3D, virtio_scsi_do_command(vs, write_same_cdb_2, NULL, 0, buf2, 512, N= ULL)); =20 + g_assert_cmphex(0, =3D=3D, + virtio_scsi_do_command(vs, write_same_cdb_ndob, NULL, 0, NULL, 0, = NULL)); + qvirtio_scsi_pci_free(vs); } =20 --=20 2.14.3