From nobody Wed May 22 02:31:00 2024 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=1607522240; cv=none; d=zohomail.com; s=zohoarc; b=ie6DHOlj2IjyaKfkbJN2FiQR9mJr/wZ80hNCHGlqHramZjDE+603lqVzFbZGKUgWw843qW9wvZ1zOxiRx1CtBr98BxqupSzp+UCtTokf2sAEjz6/oDrb4K1tSRMzxGaQIxIKlgmmv9bVVlDGYGH3m4ZvrPMueNW28Gcl/wV8Xjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607522240; 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=fdwYVjRqdKizfc8DtOVnC5TDMD4OfkjNQSdQqNXN9ZI=; b=FcFH9H0ikMG73hT/MYMa0lNYAeCu0TT8rK8aARh0gbv0f0KJDI1FAfRYWWCnudtkwsycuJqgemB5aMsGJBs1Br4F75Ii2U7sCN/1BHptzRDP6tgSx+7CyzEqkDT+FXWPV8scOEL7tHM1+NnnPmTeXT28lQFpaC3iiyi8zPULQSo= 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 1607522240640534.3028957813194; Wed, 9 Dec 2020 05:57:20 -0800 (PST) Received: from localhost ([::1]:42076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmzy3-0000r6-Ig for importer@patchew.org; Wed, 09 Dec 2020 08:57:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmzv6-0006k3-K5 for qemu-devel@nongnu.org; Wed, 09 Dec 2020 08:54:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22612) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmzv3-0000KI-Bv for qemu-devel@nongnu.org; Wed, 09 Dec 2020 08:54:16 -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-499-X_5kVbUaM7yWJDHTEDU10w-1; Wed, 09 Dec 2020 08:54:08 -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 10E4F8144ED; Wed, 9 Dec 2020 13:54:07 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 084455D6BA; Wed, 9 Dec 2020 13:54:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607522052; 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=fdwYVjRqdKizfc8DtOVnC5TDMD4OfkjNQSdQqNXN9ZI=; b=MuoM9eb2LU0PLq3XSuhjVgE+TtvUNsg2RL9nXF96BkJI3+VvwmDcUpA8od6V9rBcFcpg+f Kn5jHh2ZE5pCJwBBu2ct9cMl+APXKzGVFA0CU85bdIftSlqtRNGJ8NNxc5DAsNE79/YWmK KDQ/jOsxY3ELejhEMr+H4s8EsDShemY= X-MC-Unique: X_5kVbUaM7yWJDHTEDU10w-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 1/5] file-posix: split hdev_refresh_limits from raw_refresh_limits Date: Wed, 9 Dec 2020 15:53:51 +0200 Message-Id: <20201209135355.561745-2-mlevitsk@redhat.com> In-Reply-To: <20201209135355.561745-1-mlevitsk@redhat.com> References: <20201209135355.561745-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-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_H3=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 , Ronnie Sahlberg , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Stefan Hajnoczi , 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 | 59 +++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index d5fd1dbcd2..226ddbbdad 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,22 @@ 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) + int sect =3D 0; + + if (ioctl(fd, BLKSECTGET, §) =3D=3D 0) { + return sect << 9; + } else { + return -errno; + } +#else + return -ENOSYS; +#endif +} + +static int get_max_segments(int fd) { #ifdef CONFIG_LINUX char buf[32]; @@ -1230,23 +1251,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) @@ -3601,7 +3628,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, @@ -3725,7 +3752,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 Wed May 22 02:31:00 2024 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=1607522191; cv=none; d=zohomail.com; s=zohoarc; b=FS4Nj8qEA/AgqAeF2/ImpOXRelcqBTo0DjwzQxOA316b0ZpnAFbarpVFZWYPXWBSgRlYRgIuJMApYNyI19zVEmnuSnToxMiauOSsE8pDicF5UM2Kd2jBAz763ENv0gr0XdGuXO6n896VCBreXXD6VIOR4xyukF4zSRMsoez4nPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607522191; 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=TTBlu82JM07TJK0WUoOslvbjwE7Y4wK55SOnPYWc4sc=; b=j+XBXbSlUWZoVcNPgFm1osUmCMHIG/cpw5/ZQCUW7jGeFjk78liqOAQXZaAeXO8ppfCaeum4L1kfvLG9pv13WIuaDEUHCJv65ayJB+GHnN/Fv/LI1ANeF1MNxHAJDbcnD78Zybjy5DXvD09eNcDQiXmjNHDXcw5ndJMC06JNVSc= 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 1607522191292561.0835710104403; Wed, 9 Dec 2020 05:56:31 -0800 (PST) Received: from localhost ([::1]:40082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmzxE-0008Pd-6W for importer@patchew.org; Wed, 09 Dec 2020 08:56:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmzv7-0006lG-8G for qemu-devel@nongnu.org; Wed, 09 Dec 2020 08:54:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmzv5-0000Kd-Kp for qemu-devel@nongnu.org; Wed, 09 Dec 2020 08:54:17 -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-178-tpeZ6fFbNkKC4iu842aSrg-1; Wed, 09 Dec 2020 08:54:12 -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 547CA1005E4A; Wed, 9 Dec 2020 13:54:11 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A0955D6BA; Wed, 9 Dec 2020 13:54:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607522054; 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=TTBlu82JM07TJK0WUoOslvbjwE7Y4wK55SOnPYWc4sc=; b=Rtt40Zg/ZDhl/Pubu5BH17W1P2nSj0TfjzUVJT8NjMFhMiC98e4QBdUGyiOmmIF/wca4YH rSStlb8H0OioBVb677EnzS+H+vfAkDXT9X5PPzFlWbtj7G83pC8ce0pvm8WmSeYDmx8ET1 toNmyIHvN+AfzFM4SWLsjvHU+Bd8qZ4= X-MC-Unique: tpeZ6fFbNkKC4iu842aSrg-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 2/5] file-posix: add sg_get_max_segments that actually works with sg Date: Wed, 9 Dec 2020 15:53:52 +0200 Message-Id: <20201209135355.561745-3-mlevitsk@redhat.com> In-Reply-To: <20201209135355.561745-1-mlevitsk@redhat.com> References: <20201209135355.561745-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-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=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 , Ronnie Sahlberg , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Stefan Hajnoczi , 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 226ddbbdad..10ebc4c5b7 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) @@ -1267,7 +1287,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 Wed May 22 02:31:00 2024 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=1607522229; cv=none; d=zohomail.com; s=zohoarc; b=FpEZSUDSAQq/37zifSTmW0KsYhA5ggPGNTpN6oWhjFpC3xjnK8B6UCB8sRoNnCmJh0P01+Jqyk+5A6zPFM2X74LMFqNLstfSkrO0iQgn10RJ1QkucJEylHsPMfLFOqil5pka26AnYNwCNzy6uo9QAp+aqqwVoBJn4bsY+POnJYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607522229; 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=yTJNC0SKQjyTNqpQTrn0F27wRHeZjMnZWDswWFng3NM=; b=g91ubLsRzCI90xLms25cePSbygsqQ8Z5n099ulBmHsgBM03QKecbCh9Vpqo/Lwx1j6OUtlEbjetiOuIX2zbwgB3kVfFcIXgt49Mau0ngXwDl5xpXKxqIsroEELC6Ql9vWfj1rtp1B1lWTNKnqTQ2QasAhoW7gKDpUQE9m3nhXaE= 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 160752222937056.3120981160115; Wed, 9 Dec 2020 05:57:09 -0800 (PST) Received: from localhost ([::1]:41168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmzxs-0000TC-7W for importer@patchew.org; Wed, 09 Dec 2020 08:57:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmzvG-00074m-Ja for qemu-devel@nongnu.org; Wed, 09 Dec 2020 08:54:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmzvE-0000O8-9A for qemu-devel@nongnu.org; Wed, 09 Dec 2020 08:54:26 -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-257-jKNPCI6HO_iOOtfnV1Rz-Q-1; Wed, 09 Dec 2020 08:54:20 -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 9632A107ACE3; Wed, 9 Dec 2020 13:54:18 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id E49B55D6BA; Wed, 9 Dec 2020 13:54:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607522063; 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=yTJNC0SKQjyTNqpQTrn0F27wRHeZjMnZWDswWFng3NM=; b=GsPVeR+yBeuje6o2a7ybjir5UDVv2sIWFqtY6Djg0hI2Zl28KLMaeVftfHip5EZ0drhGCB ehJmFxyhbkvG5JxLxUiiymvy29Hirk3H6RhAcSJOv66Tqo43a4gecVRfr0LfAu2aYtQfbp cymWViqxAvf0iexBL4p6YLJJ6ycQkeA= X-MC-Unique: jKNPCI6HO_iOOtfnV1Rz-Q-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 3/5] block: add max_ioctl_transfer to BlockLimits Date: Wed, 9 Dec 2020 15:53:53 +0200 Message-Id: <20201209135355.561745-4-mlevitsk@redhat.com> In-Reply-To: <20201209135355.561745-1-mlevitsk@redhat.com> References: <20201209135355.561745-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-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_H3=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 , Ronnie Sahlberg , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Stefan Hajnoczi , 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 95d9333be1..e9874c8c23 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 Wed May 22 02:31:00 2024 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=1607522381; cv=none; d=zohomail.com; s=zohoarc; b=ioJgIn7aCEzE5mh7Njw4Azm3ghPUSHTWHjDd82cYtqQlpzyDIZUkXAKsBcRLF6j7Xwm6IruqAf0iX3alVW0RLz/BHwJ9PdgulNtolOK2idTa2TJcLOxquR23VKmhfbsBrunH6nQcIPaIikVTbEsJwPwMjMV8RGXamb0P4wP4psc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607522381; 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=zFdr45lZbh4a0j9aZwe8o/S6u+IWfguN1aBwlZZFVPY=; b=XY2seHO3uJmgUxdxfVgKDoLX7L7uop03Z0EaoNoTdycMhepV7Hf6arHVDPgl2265I38H1lUlpaz4vZzdaT8rYDXnj5HqlWYQbwp/Id/siUAI1fKC8W26R+Cv+lv+IDgsZb7tAZeYQtNaKn7xqv5cYxEFfG5anLJo2IcgPuM5ywU= 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 1607522381116859.6916231698019; Wed, 9 Dec 2020 05:59:41 -0800 (PST) Received: from localhost ([::1]:48032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn00I-0003Hx-Od for importer@patchew.org; Wed, 09 Dec 2020 08:59:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmzvu-00081m-Q7 for qemu-devel@nongnu.org; Wed, 09 Dec 2020 08:55:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25251) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmzvs-0000bK-74 for qemu-devel@nongnu.org; Wed, 09 Dec 2020 08:55:06 -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-330-aSYS8QC5NJGI7Lit2UgOQQ-1; Wed, 09 Dec 2020 08:55: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 970FC803654; Wed, 9 Dec 2020 13:54:51 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 309185D6BA; Wed, 9 Dec 2020 13:54:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607522103; 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=zFdr45lZbh4a0j9aZwe8o/S6u+IWfguN1aBwlZZFVPY=; b=hMs64EpchKqEi5iwJrfMkEdRkTFg6UoVRW+Dgh3C0MiUgf9mwn+IKVxjfZ2y93m5oZidg5 q03rhOyAVjdmONs3myREk1M3H0hwWjvrOKnFiYkHoJ47YyOnTAq9QlocmfUmG8+R11KhFj ADR/w+nvWLwTzPLVnz5FAaYnKTmWz6I= X-MC-Unique: aSYS8QC5NJGI7Lit2UgOQQ-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 4/5] block: use blk_get_max_ioctl_transfer for SCSI passthrough Date: Wed, 9 Dec 2020 15:53:54 +0200 Message-Id: <20201209135355.561745-5-mlevitsk@redhat.com> In-Reply-To: <20201209135355.561745-1-mlevitsk@redhat.com> References: <20201209135355.561745-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-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 , Ronnie Sahlberg , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Stefan Hajnoczi , 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 10ebc4c5b7..0a94211847 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1284,12 +1284,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 Wed May 22 02:31:00 2024 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=1607522383; cv=none; d=zohomail.com; s=zohoarc; b=M2LoFgDul3adN03zrbMUC9G6U2PeW14MsEA01STIaC4uFm+voCHyR9iwbyllTGbaLU2jQNZTw76MqayvywSpwYeYbjP6LpXtdKjbnVb7cZxU/kzI82txUd4Zmn2ZsaxzW5zr2ReKnkPKlhGf8FETtRmUFmnFHZgrWde1duWlD3o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607522383; 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=J46+PPyCTK2yhjp28m0CSBLVIgBZJPKkIaKnWxzYYp0=; b=UHamG/iQQEpuqJlYlpIBPVAOEEKNszQNZ/HoqjVYOYRNm1+O5Odfgd8OWK35kYsuZLicgeH5Wt7uGtbh1jY23DIHF34QPQjdztXG49qk6FqSPtHtRNv1GgjosOLtWr4zOcvqvv+GgHftOrugLYnLGvFVOKQZgvzA82/3TzA7yZ4= 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 1607522383439462.911491670611; Wed, 9 Dec 2020 05:59:43 -0800 (PST) Received: from localhost ([::1]:48248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn00M-0003OV-48 for importer@patchew.org; Wed, 09 Dec 2020 08:59:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmzw8-0008Js-Jm for qemu-devel@nongnu.org; Wed, 09 Dec 2020 08:55:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39555) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmzw6-0000jf-VE for qemu-devel@nongnu.org; Wed, 09 Dec 2020 08:55:20 -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-378-SPYUiWCdMJ-st3EhLcEZiQ-1; Wed, 09 Dec 2020 08:55:16 -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 CFC6D180DE11; Wed, 9 Dec 2020 13:54:55 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDA9A5D74C; Wed, 9 Dec 2020 13:54:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607522118; 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=J46+PPyCTK2yhjp28m0CSBLVIgBZJPKkIaKnWxzYYp0=; b=XV3krnR5H1PszdfaUdhBQ3T811j0p+rI9Iwl89rZKtgVvyh3/a18jsoCeyLckmlfKGBiK8 sD7rH9TMd+XpvpFBP691qEnKlfSNdt70dH6qLwookAkhcXB+9e3KEkbxWJsVEYWqzIjvf5 YT7L6uwKmiu80/VqyV+Bsp5P/j2UTqA= X-MC-Unique: SPYUiWCdMJ-st3EhLcEZiQ-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 5/5] block/scsi: correctly emulate the VPD block limits page Date: Wed, 9 Dec 2020 15:53:55 +0200 Message-Id: <20201209135355.561745-6-mlevitsk@redhat.com> In-Reply-To: <20201209135355.561745-1-mlevitsk@redhat.com> References: <20201209135355.561745-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-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=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 , Ronnie Sahlberg , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Stefan Hajnoczi , 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. Signed-off-by: Maxim Levitsky --- hw/scsi/scsi-generic.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 6df67bf889..4354469841 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -134,7 +134,7 @@ 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; =20 @@ -200,8 +200,12 @@ static void scsi_handle_inquiry_reply(SCSIGenericReq *= r, SCSIDevice *s) r->buf[page_idx] =3D 0xb0; } stw_be_p(r->buf + 2, lduw_be_p(r->buf + 2) + 1); + + if (len < r->buflen) + len++; } } + return len; } =20 static int scsi_generic_emulate_block_limits(SCSIGenericReq *r, SCSIDevice= *s) @@ -316,7 +320,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