From nobody Tue Feb 10 07:40:58 2026 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523035176728924.6920246982153; Fri, 6 Apr 2018 10:19:36 -0700 (PDT) Received: from localhost ([::1]:40794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4V1M-0005tC-OO for importer@patchew.org; Fri, 06 Apr 2018 13:19:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4Utr-0007wU-8S for qemu-devel@nongnu.org; Fri, 06 Apr 2018 13:11:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f4Utm-0007dy-Hb for qemu-devel@nongnu.org; Fri, 06 Apr 2018 13:11:43 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34937) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f4Utm-0007cs-AY for qemu-devel@nongnu.org; Fri, 06 Apr 2018 13:11:38 -0400 Received: by mail-wm0-x242.google.com with SMTP id r82so4637440wme.0 for ; Fri, 06 Apr 2018 10:11:38 -0700 (PDT) Received: from 640k.lan (94-36-194-48.adsl-ull.clienti.tiscali.it. [94.36.194.48]) by smtp.gmail.com with ESMTPSA id 24sm16286180wrt.60.2018.04.06.10.11.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Apr 2018 10:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=iZrJc8serSpUMER0hmSQ6+5Zxe8zbKqY9IV4LcYmpi0=; b=KQAA2RBo9PYK7PNAPBBYLK4itqHwuqm8uPajh5/6XTxySF/UWyOl6HP/XjLt8ge49l 6K64WmaGWVXe986fKiNBF9xEgUx+BUGuVRDdcjS44GkMxXswvQjCcmP5L7Hanbyit2+G ObC9E27UmLUr9VwqLZO26YtL6iTHc9u4j7v9WPbSPNNYQI957SYDiZPx0qpvto7Yr0GW S91SIx0Bn5BJeX/d4PRm6ez399B1qT0x/yelzjcJgimR/NcSsXZUeo3aePoLAOvHg2aC ETTL4jCEeho3WpU47CXc3KoYuibfgrEoFaTvnvxldAS+A3hj4sO9APwygBnJXZFN8i+f DwNQ== 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:cc:subject:date:message-id :in-reply-to:references; bh=iZrJc8serSpUMER0hmSQ6+5Zxe8zbKqY9IV4LcYmpi0=; b=A8S3fThZvjDlFfuz5GaNOJhPeC4MB1Qd3dWuCBw7l08qkNUNfGJJ2pBf6jByyV1N8f hH4u7qXRQadvdV4e+lBcF56Qg3KjsngX9kFjcnoCXmp2V5EyLAnzLz81Qkp6CcvlRN1O nwoQqmoY2L+rConSNDk72T6fJhHNJvBF8jEOFCaKAX17l+0wqSEcqFJev2Lspv73fvMc N9sr/YbG0JVChl6vP5cerqQh1UgXpJ0RvVQqhD+IUnvl3rSb3RTLMQEdE306gjCS+mHO 6SDFld+C0ozG6waE6t2MLbwizQ5yFcMrzg+s37/l50pFkwtJo5PlWbsk3eldZDye/FL1 Zl1Q== X-Gm-Message-State: AElRT7FhxYwV8+kKHEzJvH32vlTqHu4/9j2IIRd9HHRo6X2/Q0+FO8VU AbVqgP7qbOpRgDmwsZ8fI1bjVHyB X-Google-Smtp-Source: AIpwx486yF81K5CbTfLEq593t4JQVusCTOulImXYDtHtBpDjNv3x4XT+ebULc5bnEQ3YvpdnbH49ig== X-Received: by 10.28.69.68 with SMTP id s65mr12683727wma.25.1523034696988; Fri, 06 Apr 2018 10:11:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 6 Apr 2018 19:11:10 +0200 Message-Id: <1523034681-33787-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1523034681-33787-1-git-send-email-pbonzini@redhat.com> References: <1523034681-33787-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 09/20] scsi-disk: Don't enlarge min_io_size to max_io_size 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: , Cc: Fam Zheng 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" From: Fam Zheng Some backends report big max_io_sectors. Making min_io_size the same value in this case will make it impossible for guest to align memory, therefore the disk may not be usable at all. Do not enlarge them when they are zero. Reported-by: David Gibson Signed-off-by: Fam Zheng Message-Id: <20180327164141.19075-1-famz@redhat.com> Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index f5ab767..f8ed8cf 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -714,10 +714,12 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req= , uint8_t *outbuf) =20 /* min_io_size and opt_io_size can't be greater than * max_io_sectors */ - min_io_size =3D - MIN_NON_ZERO(min_io_size, max_io_sectors); - opt_io_size =3D - MIN_NON_ZERO(opt_io_size, max_io_sectors); + if (min_io_size) { + min_io_size =3D MIN(min_io_size, max_io_sectors); + } + if (opt_io_size) { + opt_io_size =3D MIN(opt_io_size, max_io_sectors); + } } /* required VPD size with unmap support */ buflen =3D 0x40; --=20 1.8.3.1