From nobody Mon Feb 9 00:55:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604511841; cv=none; d=zohomail.com; s=zohoarc; b=LqSBCbycA57nEPm7qU+yec+u0KoEc/uZ51nGfqH8Eiz8H66JHDAQQZ95gFPW0h1Ph2vf6UksKTlY59HEgYOQw8gpC/btgKWk9yXIabimqVxe+YtxGlUkkKyD/OzAvTCIPFeg0H8xVdXLqGrlpwLZCyga8ny7/5CgPMZFO50FyIw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604511841; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JAkNKONqo76aMaOLMEJtdIGjE54M7qVDn/xgaYjJzws=; b=SIocP3h0sGqMQo/omqnSz64LCegLdx8BijkhBnflNkXeBwOa9avQDNU70tR8RE3GMHKETYjopSR6An7cfqCIhjKHScQ1oVbzTA9PvFQhqsXJwTpyUNRgCCmMo4p9f7I8ecWpPrDLSHFLeX4XPYGd/WeNihh+1LoeoLGnLH4WHpc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604511841774318.8063360234561; Wed, 4 Nov 2020 09:44:01 -0800 (PST) Received: from localhost ([::1]:43222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaMpE-0006jm-CH for importer@patchew.org; Wed, 04 Nov 2020 12:44:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaMeD-0002mR-Ig for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:32:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44483) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaMeA-0000dq-Qh for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:32:37 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-468-iVOoeJgpNtidOyQce_ZkpA-1; Wed, 04 Nov 2020 12:32:31 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7BFAA80476C; Wed, 4 Nov 2020 17:32:30 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.207.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2172075128; Wed, 4 Nov 2020 17:32:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604511153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JAkNKONqo76aMaOLMEJtdIGjE54M7qVDn/xgaYjJzws=; b=LBICOmu40rvISEEd+ku0EALAnSfGtcsuF7O1KRjX+yJL9I9soNS8SJo9fGV1EwtSDoKsDq 1aT7SoDmIb1cI9VHJQWogT4ZU33oQ1wWe30JgW8ktYV6mRn9qZXr+ofQ/3jVQJhEeXCnWj b1cGC1OmXWcpKPFmJkvL4/eD8OxBNjY= X-MC-Unique: iVOoeJgpNtidOyQce_ZkpA-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH 1/5] file-posix: split hdev_refresh_limits from raw_refresh_limits Date: Wed, 4 Nov 2020 19:32:13 +0200 Message-Id: <20201104173217.417538-2-mlevitsk@redhat.com> In-Reply-To: <20201104173217.417538-1-mlevitsk@redhat.com> References: <20201104173217.417538-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 22:09:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Ronnie Sahlberg , Paolo Bonzini , Maxim Levitsky , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Tom Yan We can and should get max transfer length and max segments for all host devices / cdroms (on Linux). Also use MIN_NON_ZERO instead when we clamp max transfer length against max segments. Signed-off-by: Tom Yan Signed-off-by: Maxim Levitsky --- block/file-posix.c | 61 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index c63926d592..6581f41b2b 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1162,6 +1162,12 @@ static void raw_reopen_abort(BDRVReopenState *state) =20 static int sg_get_max_transfer_length(int fd) { + /* + * BLKSECTGET for /dev/sg* character devices incorrectly returns + * the max transfer size in bytes (rather than in blocks). + * Also note that /dev/sg* doesn't support BLKSSZGET ioctl. + */ + #ifdef BLKSECTGET int max_bytes =3D 0; =20 @@ -1175,7 +1181,24 @@ static int sg_get_max_transfer_length(int fd) #endif } =20 -static int sg_get_max_segments(int fd) +static int get_max_transfer_length(int fd) +{ +#if defined(BLKSECTGET) && defined(BLKSSZGET) + int sect =3D 0; + int ssz =3D 0; + + if (ioctl(fd, BLKSECTGET, §) =3D=3D 0 && + ioctl(fd, BLKSSZGET, &ssz) =3D=3D 0) { + return sect * ssz; + } else { + return -errno; + } +#else + return -ENOSYS; +#endif +} + +static int get_max_segments(int fd) { #ifdef CONFIG_LINUX char buf[32]; @@ -1230,23 +1253,29 @@ static void raw_refresh_limits(BlockDriverState *bs= , Error **errp) { BDRVRawState *s =3D bs->opaque; =20 - if (bs->sg) { - int ret =3D sg_get_max_transfer_length(s->fd); + raw_probe_alignment(bs, s->fd, errp); + bs->bl.min_mem_alignment =3D s->buf_align; + bs->bl.opt_mem_alignment =3D MAX(s->buf_align, qemu_real_host_page_siz= e); +} =20 - if (ret > 0 && ret <=3D BDRV_REQUEST_MAX_BYTES) { - bs->bl.max_transfer =3D pow2floor(ret); - } +static void hdev_refresh_limits(BlockDriverState *bs, Error **errp) +{ + BDRVRawState *s =3D bs->opaque; =20 - ret =3D sg_get_max_segments(s->fd); - if (ret > 0) { - bs->bl.max_transfer =3D MIN(bs->bl.max_transfer, - ret * qemu_real_host_page_size); - } + int ret =3D bs->sg ? sg_get_max_transfer_length(s->fd) : + get_max_transfer_length(s->fd); + + if (ret > 0 && ret <=3D BDRV_REQUEST_MAX_BYTES) { + bs->bl.max_transfer =3D pow2floor(ret); } =20 - raw_probe_alignment(bs, s->fd, errp); - bs->bl.min_mem_alignment =3D s->buf_align; - bs->bl.opt_mem_alignment =3D MAX(s->buf_align, qemu_real_host_page_siz= e); + ret =3D get_max_segments(s->fd); + if (ret > 0) { + bs->bl.max_transfer =3D MIN_NON_ZERO(bs->bl.max_transfer, + ret * qemu_real_host_page_size); + } + + raw_refresh_limits(bs, errp); } =20 static int check_for_dasd(int fd) @@ -3600,7 +3629,7 @@ static BlockDriver bdrv_host_device =3D { .bdrv_co_pdiscard =3D hdev_co_pdiscard, .bdrv_co_copy_range_from =3D raw_co_copy_range_from, .bdrv_co_copy_range_to =3D raw_co_copy_range_to, - .bdrv_refresh_limits =3D raw_refresh_limits, + .bdrv_refresh_limits =3D hdev_refresh_limits, .bdrv_io_plug =3D raw_aio_plug, .bdrv_io_unplug =3D raw_aio_unplug, .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, @@ -3724,7 +3753,7 @@ static BlockDriver bdrv_host_cdrom =3D { .bdrv_co_preadv =3D raw_co_preadv, .bdrv_co_pwritev =3D raw_co_pwritev, .bdrv_co_flush_to_disk =3D raw_co_flush_to_disk, - .bdrv_refresh_limits =3D raw_refresh_limits, + .bdrv_refresh_limits =3D hdev_refresh_limits, .bdrv_io_plug =3D raw_aio_plug, .bdrv_io_unplug =3D raw_aio_unplug, .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, --=20 2.26.2 From nobody Mon Feb 9 00:55:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604511390; cv=none; d=zohomail.com; s=zohoarc; b=LEh+mkiTPfYSpj3iX+uUQXQ6EYQmd4gFpr4HDgq9bgaTA7NfqcDMC3toCpJkE2snWW0xa6RBM3wRT88xmRY5kngxrb66JSH9R3S6F8nvev81Tt6z+osBl2eTMtpfBdTjrTKpIDWTrzhFUWmnKunrG/TpBATNFQlW2flT+T2RpE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604511390; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HwFjO0iC2QO9Q3sXzEwRi6E1KuOJkKul953Lgsb1neM=; b=PXzaAVzPE1xI96xtABVtIfLR/IW06xEgGIC07c9GAuco1a7GuN36rjlk74MIaeY9IE/TQGKr69v2AB5eYVw7hx+qiJOb56sqDS9eUT0/rUxPSILnwoPobmMyB0YRh/sNWhjuYXaCPZ1K6wW9tIRO4cvToIvP31fI6Zh11+ul7RA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604511389999678.7944490571621; Wed, 4 Nov 2020 09:36:29 -0800 (PST) Received: from localhost ([::1]:52874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaMhw-00076g-Vt for importer@patchew.org; Wed, 04 Nov 2020 12:36:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaMeH-0002oz-Mx for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:32:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43340) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaMeF-0000eE-8j for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:32:41 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-278-vIvnZyeOMR2XIoRcmO0IMw-1; Wed, 04 Nov 2020 12:32:35 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C71D01084D70; Wed, 4 Nov 2020 17:32:33 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.207.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id E495675128; Wed, 4 Nov 2020 17:32:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604511158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HwFjO0iC2QO9Q3sXzEwRi6E1KuOJkKul953Lgsb1neM=; b=dxZiQMNzIbFkpcgBv1x2syXhirjiE/E+djdNSO21QlfDstmg7TF5wec9fEONGvWiwWvpS0 RzUA2A2cUs3sOxZIi/WPqE4KjxpkVvefmwhMAfNfMCkCkZSFpL0u7keGpEvZquCUDfzEP4 tlZiHD9IobyhJY3IxU23s32LaveE4Kk= X-MC-Unique: vIvnZyeOMR2XIoRcmO0IMw-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH 2/5] file-posix: add sg_get_max_segments that actually works with sg Date: Wed, 4 Nov 2020 19:32:14 +0200 Message-Id: <20201104173217.417538-3-mlevitsk@redhat.com> In-Reply-To: <20201104173217.417538-1-mlevitsk@redhat.com> References: <20201104173217.417538-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 22:09:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Ronnie Sahlberg , Paolo Bonzini , Maxim Levitsky , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Tom Yan sg devices have different major/minor than their corresponding block devices. Using sysfs to get max segments never really worked for them. Fortunately the sg driver provides an ioctl to get sg_tablesize, which is apparently equivalent to max segments. Signed-off-by: Tom Yan Signed-off-by: Maxim Levitsky --- block/file-posix.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/block/file-posix.c b/block/file-posix.c index 6581f41b2b..c4df757504 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1181,6 +1181,26 @@ static int sg_get_max_transfer_length(int fd) #endif } =20 +static int sg_get_max_segments(int fd) +{ + /* + * /dev/sg* character devices report 'max_segments' via + * SG_GET_SG_TABLESIZE ioctl + */ + +#ifdef SG_GET_SG_TABLESIZE + long max_segments =3D 0; + + if (ioctl(fd, SG_GET_SG_TABLESIZE, &max_segments) =3D=3D 0) { + return max_segments; + } else { + return -errno; + } +#else + return -ENOSYS; +#endif +} + static int get_max_transfer_length(int fd) { #if defined(BLKSECTGET) && defined(BLKSSZGET) @@ -1269,7 +1289,7 @@ static void hdev_refresh_limits(BlockDriverState *bs,= Error **errp) bs->bl.max_transfer =3D pow2floor(ret); } =20 - ret =3D get_max_segments(s->fd); + ret =3D bs->sg ? sg_get_max_segments(s->fd) : get_max_segments(s->fd); if (ret > 0) { bs->bl.max_transfer =3D MIN_NON_ZERO(bs->bl.max_transfer, ret * qemu_real_host_page_size); --=20 2.26.2 From nobody Mon Feb 9 00:55:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604511382; cv=none; d=zohomail.com; s=zohoarc; b=LnvlJ27DiFqBHIdVNe+GTXHYxBQs3xoupXlbg+2BRpPTRY/MjZOlwdrT/q8Q8zQXvmyz3DNByrqbu9pCIzwAu3rQGA+w879R495pOmrjORwsf6syrLKaACuQGr16he7sbURa5rcExPIqFWX8bLmv9e8kUOFD1LXGdiLUXxsHQ7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604511382; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2xSuC77k3yq5Xr0fSz+OMThLjn2jI/KvI5V3T68Sb1k=; b=R+Lh9MBkFJ60zJ+lY3XLYTIEH43VkTznxcWLdvjseKh8vsg8gXyFytpTFrSi6amDw40Kn5HSuJvi2rHGMGa5+RIxjzMrTBp7fNhI2ZBKHaLyHsUpuY8FyVq1tX1AhEUb9LE9tg1QDVl2i/A1Xf5k3GmpBawBaxcHaeK3MTvJncQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604511382681498.46878303893334; Wed, 4 Nov 2020 09:36:22 -0800 (PST) Received: from localhost ([::1]:52640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaMhp-00070H-IJ for importer@patchew.org; Wed, 04 Nov 2020 12:36:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaMeK-0002qs-DU for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:32:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaMeG-0000eT-Vo for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:32:44 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-456-2a84hTLmPgmk9RixxarJjw-1; Wed, 04 Nov 2020 12:32:38 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C4361009E23; Wed, 4 Nov 2020 17:32:37 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.207.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38FCA6266E; Wed, 4 Nov 2020 17:32:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604511160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2xSuC77k3yq5Xr0fSz+OMThLjn2jI/KvI5V3T68Sb1k=; b=N97TZwD0fpP4j14eFoPlot2Twkm8jAZJD9MHkwxi65dBK9Ewblq+JTl84EHPA6Gsvcf8uH TvKQXgpwVwIkMOtZJGEjSTFc7pSWRZwm+Bxhr0OIRZ8z0szkviNo81A9ndyxyxkSwXoItp eYYZzTE5tOL5ldClzaeHbPfuEcV+f3I= X-MC-Unique: 2a84hTLmPgmk9RixxarJjw-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH 3/5] block: add max_ioctl_transfer to BlockLimits Date: Wed, 4 Nov 2020 19:32:15 +0200 Message-Id: <20201104173217.417538-4-mlevitsk@redhat.com> In-Reply-To: <20201104173217.417538-1-mlevitsk@redhat.com> References: <20201104173217.417538-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 22:09:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Ronnie Sahlberg , Paolo Bonzini , Maxim Levitsky , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Maximum transfer size when accessing a kernel block device is only relevant when using SCSI passthrough (SG_IO ioctl) since only in this case the reque= sts are passed directly to underlying hardware with no pre-processing. Same is true when using /dev/sg* character devices (which only support SG_I= O) Therefore split the block driver's advertized max transfer size by the regular max transfer size, and the max transfer size for SCSI passthrou= gh (the new max_ioctl_transfer field) In the next patch, the qemu block drivers that support SCSI passthrough will set the max_ioctl_transfer field, and simultaneously, the block devices that implement scsi passthrough will switch to 'blk_get_max_ioctl_transfer'= to query and to pass it to the guest. Signed-off-by: Maxim Levitsky --- block/block-backend.c | 12 ++++++++++++ block/io.c | 2 ++ include/block/block_int.h | 4 ++++ include/sysemu/block-backend.h | 1 + 4 files changed, 19 insertions(+) diff --git a/block/block-backend.c b/block/block-backend.c index ce78d30794..c1d149a755 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1938,6 +1938,18 @@ uint32_t blk_get_max_transfer(BlockBackend *blk) return MIN_NON_ZERO(max, INT_MAX); } =20 +/* Returns the maximum transfer length, for SCSI passthrough */ +uint32_t blk_get_max_ioctl_transfer(BlockBackend *blk) +{ + BlockDriverState *bs =3D blk_bs(blk); + uint32_t max =3D 0; + + if (bs) { + max =3D bs->bl.max_ioctl_transfer; + } + return MIN_NON_ZERO(max, INT_MAX); +} + int blk_get_max_iov(BlockBackend *blk) { return blk->root->bs->bl.max_iov; diff --git a/block/io.c b/block/io.c index ec5e152bb7..3eae176992 100644 --- a/block/io.c +++ b/block/io.c @@ -126,6 +126,8 @@ static void bdrv_merge_limits(BlockLimits *dst, const B= lockLimits *src) { dst->opt_transfer =3D MAX(dst->opt_transfer, src->opt_transfer); dst->max_transfer =3D MIN_NON_ZERO(dst->max_transfer, src->max_transfe= r); + dst->max_ioctl_transfer =3D MIN_NON_ZERO(dst->max_ioctl_transfer, + src->max_ioctl_transfer); dst->opt_mem_alignment =3D MAX(dst->opt_mem_alignment, src->opt_mem_alignment); dst->min_mem_alignment =3D MAX(dst->min_mem_alignment, diff --git a/include/block/block_int.h b/include/block/block_int.h index 38cad9d15c..b198165114 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -678,6 +678,10 @@ typedef struct BlockLimits { * clamped down. */ uint32_t max_transfer; =20 + /* Maximal transfer length for SCSI passthrough (ioctl interface) */ + uint32_t max_ioctl_transfer; + + /* memory alignment, in bytes so that no bounce buffer is needed */ size_t min_mem_alignment; =20 diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 8203d7f6f9..b019a37b7a 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -203,6 +203,7 @@ void blk_eject(BlockBackend *blk, bool eject_flag); int blk_get_flags(BlockBackend *blk); uint32_t blk_get_request_alignment(BlockBackend *blk); uint32_t blk_get_max_transfer(BlockBackend *blk); +uint32_t blk_get_max_ioctl_transfer(BlockBackend *blk); int blk_get_max_iov(BlockBackend *blk); void blk_set_guest_block_size(BlockBackend *blk, int align); void *blk_try_blockalign(BlockBackend *blk, size_t size); --=20 2.26.2 From nobody Mon Feb 9 00:55:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604511527; cv=none; d=zohomail.com; s=zohoarc; b=mUA4xo6u/bFC1r9YJELQvW4kn3hRfp5ADhmkLtmyRgLSTvah8tXG/MPiNMglpgMk0jdE44yThm0lt1mki0UqAFthmYSGcGkA5ptjdG0l3kZBWZyY7hIowfYkL16lduvo8EOL8lJraeTjp+Y+wHE2eI5IO+tVZTFwVQj33oi2Vjk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604511527; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kmzalhOYW/+aODxJDcKwgHs2MN1Ur0r3UjionH1Soro=; b=H0yGA7UJOSGXis+DvuO0JdiKRh1Pai+TwtNOy0H/lGLpBfoh2tDqlyDCgUysQ6tnqZim23SPEY9gxA6J1G/t/GyPvTjSXFEJcQ06AhisSGCeh4drhbib5xY3F/zufIvkZvDMSNnZEzNDD4uWgPtUTTiYQEH2PwcdR7sScpMyxcE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604511527262548.8597688481988; Wed, 4 Nov 2020 09:38:47 -0800 (PST) Received: from localhost ([::1]:58624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaMkA-00018d-0u for importer@patchew.org; Wed, 04 Nov 2020 12:38:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaMeZ-00039j-RF for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:33:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35880) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaMeW-0000fp-Jg for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:32:59 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-515-o1VU5kk_MKC_MSAUWDelcw-1; Wed, 04 Nov 2020 12:32:52 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98BB218A072B; Wed, 4 Nov 2020 17:32:50 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.207.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85F4075127; Wed, 4 Nov 2020 17:32:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604511175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kmzalhOYW/+aODxJDcKwgHs2MN1Ur0r3UjionH1Soro=; b=dGlntfVlCFldKDY5MFx8VZLy2HPHVr7IaBs0/68L2PpqxnRMSlCdxM6gWFn7eVuhL2sEK6 0SKx+cT3QDX/VWOP8/p5SOaB87NpWpURSEwXWloHcMF3xacblCypb8B5w/OPJU5VfjxY8G TfxTcIgiEsvABppkI9anemHTk20q1k4= X-MC-Unique: o1VU5kk_MKC_MSAUWDelcw-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH 4/5] block: use blk_get_max_ioctl_transfer for SCSI passthrough Date: Wed, 4 Nov 2020 19:32:16 +0200 Message-Id: <20201104173217.417538-5-mlevitsk@redhat.com> In-Reply-To: <20201104173217.417538-1-mlevitsk@redhat.com> References: <20201104173217.417538-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 00:03:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Ronnie Sahlberg , Paolo Bonzini , Maxim Levitsky , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Switch file-posix to expose only the max_ioctl_transfer limit. Let the iscsi driver work as it did before since it is bound by the transfer limit in both regular read/write and in SCSI passthrough case. Switch the scsi-disk and scsi-block drivers to read the SG max transfer lim= its using the new blk_get_max_ioctl_transfer interface. Fixes: 867eccfed8 ("file-posix: Use max transfer length/segment count only = for SCSI passthrough") Signed-off-by: Maxim Levitsky --- block/file-posix.c | 4 ++-- block/iscsi.c | 1 + hw/scsi/scsi-generic.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index c4df757504..edba8fc86d 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1286,12 +1286,12 @@ static void hdev_refresh_limits(BlockDriverState *b= s, Error **errp) get_max_transfer_length(s->fd); =20 if (ret > 0 && ret <=3D BDRV_REQUEST_MAX_BYTES) { - bs->bl.max_transfer =3D pow2floor(ret); + bs->bl.max_ioctl_transfer =3D pow2floor(ret); } =20 ret =3D bs->sg ? sg_get_max_segments(s->fd) : get_max_segments(s->fd); if (ret > 0) { - bs->bl.max_transfer =3D MIN_NON_ZERO(bs->bl.max_transfer, + bs->bl.max_ioctl_transfer =3D MIN_NON_ZERO(bs->bl.max_ioctl_transf= er, ret * qemu_real_host_page_size); } =20 diff --git a/block/iscsi.c b/block/iscsi.c index e30a7e3606..3685da2971 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2065,6 +2065,7 @@ static void iscsi_refresh_limits(BlockDriverState *bs= , Error **errp) =20 if (max_xfer_len * block_size < INT_MAX) { bs->bl.max_transfer =3D max_xfer_len * iscsilun->block_size; + bs->bl.max_ioctl_transfer =3D bs->bl.max_transfer; } =20 if (iscsilun->lbp.lbpu) { diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 2cb23ca891..6df67bf889 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -167,7 +167,7 @@ static void scsi_handle_inquiry_reply(SCSIGenericReq *r= , SCSIDevice *s) page =3D r->req.cmd.buf[2]; if (page =3D=3D 0xb0) { uint32_t max_transfer =3D - blk_get_max_transfer(s->conf.blk) / s->blocksize; + blk_get_max_ioctl_transfer(s->conf.blk) / s->blocksize; =20 assert(max_transfer); stl_be_p(&r->buf[8], max_transfer); @@ -210,7 +210,7 @@ static int scsi_generic_emulate_block_limits(SCSIGeneri= cReq *r, SCSIDevice *s) uint8_t buf[64]; =20 SCSIBlockLimits bl =3D { - .max_io_sectors =3D blk_get_max_transfer(s->conf.blk) / s->blocksi= ze + .max_io_sectors =3D blk_get_max_ioctl_transfer(s->conf.blk) / s->b= locksize }; =20 memset(r->buf, 0, r->buflen); --=20 2.26.2 From nobody Mon Feb 9 00:55:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604511578; cv=none; d=zohomail.com; s=zohoarc; b=gFwl4U+TJSXCY8VYIEdZ5XMRnXM3UGi6A/6Fj/WSy6nqrt+r6EqwoNIzEmN+qW74NW29Wh8aIzzgxS4Dz3VWKMUpTJfkhR4RQVvLGsMyMseTzKALhVjWyDPflgdNPyGnqIcdEWmeRioG/Xxu4xR0j9yh2DzdocBr1WdjH2E9P2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604511578; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RQ52DGXPQuvl7eCGJZ9UeFOScVLeQApfOO2+jytMN1A=; b=TGJoS8273mi/fPfJhN4X2L++kYIArpx9H8XFwk+2cJe1y4Dnaf7GgC+Cjkbm5OfzZrqf1Jxsih9yjylSDRDiU4Zmd/3za89l/6wc78ztwRDXxjHcxCVdzvpg56HzaY/e82708VHwubeO7crEowrZMZ3bLl8WSCcB77nsOCRqEHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604511578736540.3564097555035; Wed, 4 Nov 2020 09:39:38 -0800 (PST) Received: from localhost ([::1]:59754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaMkz-0001g2-GY for importer@patchew.org; Wed, 04 Nov 2020 12:39:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaMei-0003IO-BH for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:33:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaMeg-0000gf-PB for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:33:08 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-27-p6120quWMvCRAdaseI_U9g-1; Wed, 04 Nov 2020 12:33:02 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4165EC7437; Wed, 4 Nov 2020 17:33:01 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.207.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3120875127; Wed, 4 Nov 2020 17:32:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604511186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RQ52DGXPQuvl7eCGJZ9UeFOScVLeQApfOO2+jytMN1A=; b=UmjaPKTPU0nVYQnai1+KMveEr5bai9ULtAIQmJJZAVTxU43wDajM+Nt9UR90gEAf87+mRC gdrHAHtxincOI7TB3eqSugL1+v9qGrkY0VLuc1PphvDZ/R4m109gbk/4hRX9Ceu5jmve5q kK0Ml2C/eIRtUWMvQ9FkNZwaWdr8jJA= X-MC-Unique: p6120quWMvCRAdaseI_U9g-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH 5/5] block/scsi: correctly emulate the VPD block limits page Date: Wed, 4 Nov 2020 19:32:17 +0200 Message-Id: <20201104173217.417538-6-mlevitsk@redhat.com> In-Reply-To: <20201104173217.417538-1-mlevitsk@redhat.com> References: <20201104173217.417538-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 00:03:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Ronnie Sahlberg , Paolo Bonzini , Maxim Levitsky , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When the device doesn't support the VPD block limits page, we emulate it ev= en for SCSI passthrough. As a part of the emulation we need to add it to the 'Supported VPD Pages' The code that does this adds it to the page, but it doesn't increase the le= ngth of the data to be copied to the guest, thus the guest never sees the VPD bl= ock limits page as supported. Bump the transfer size by 1 in this case. I also refactored the code a bit, and I hopefully didn't introduce another buffer overflow to this code... Signed-off-by: Maxim Levitsky --- hw/scsi/scsi-generic.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 6df67bf889..387d885aee 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -134,9 +134,9 @@ static int execute_command(BlockBackend *blk, return 0; } =20 -static void scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s) +static int scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s, int= len) { - uint8_t page, page_idx; + uint8_t page; =20 /* * EVPD set to zero returns the standard INQUIRY data. @@ -188,20 +188,26 @@ static void scsi_handle_inquiry_reply(SCSIGenericReq = *r, SCSIDevice *s) * right place with an in-place insert. When the while loop * begins the device response is at r[0] to r[page_idx - 1]. */ - page_idx =3D lduw_be_p(r->buf + 2) + 4; - page_idx =3D MIN(page_idx, r->buflen); + uint16_t page_len =3D lduw_be_p(r->buf + 2) + 4; + + /* pointer to first byte after the page that device gave us */ + uint16_t page_idx =3D page_len; + + if (page_idx >=3D r->buflen) + return len; + while (page_idx > 4 && r->buf[page_idx - 1] >=3D 0xb0) { - if (page_idx < r->buflen) { - r->buf[page_idx] =3D r->buf[page_idx - 1]; - } + r->buf[page_idx] =3D r->buf[page_idx - 1]; page_idx--; } - if (page_idx < r->buflen) { - r->buf[page_idx] =3D 0xb0; - } + r->buf[page_idx] =3D 0xb0; + + /* increase the page len field */ stw_be_p(r->buf + 2, lduw_be_p(r->buf + 2) + 1); + len++; } } + return len; } =20 static int scsi_generic_emulate_block_limits(SCSIGenericReq *r, SCSIDevice= *s) @@ -316,7 +322,7 @@ static void scsi_read_complete(void * opaque, int ret) } } if (r->req.cmd.buf[0] =3D=3D INQUIRY) { - scsi_handle_inquiry_reply(r, s); + len =3D scsi_handle_inquiry_reply(r, s, len); } =20 req_complete: --=20 2.26.2