From nobody Tue May 21 15:07:27 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=1608227789; cv=none; d=zohomail.com; s=zohoarc; b=ahYXeaRy+Z6QLJ6RdzAlUFLL8IeuSVrIixUhLtRr8iQl5qfnnhmstDJqBwhSXRXCKqqSU0mKYWm2JRuPoMtlR0X0X7JeFdlTAPj+bDiMcyRxeWqbwCNem33TMNZpUl1bvWHdVRwgoeP9eUS3uHidmRQSjqtjG/QM3hLijvKAwHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608227789; 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=kZFEbwr1Avouyzp/6NUQgRq517wGVME+gmVK7SGUO+A=; b=MwZJQ6c3LAXNHUut2WzTRU0BGpRhGNqJwvsPfkcFHqijNaBF3Sr8j1uOUlVswpOevI357QWtM0/T509fxljKeXdh8EKrs1u0Z4xkuSRaMCBO+JiXH6I68ly8hkQb52BTbz5AnoeZe1D4OD3x5g31GaWBBInY6kKM7lbVj46dlqA= 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 1608227789164906.3534139024317; Thu, 17 Dec 2020 09:56:29 -0800 (PST) Received: from localhost ([::1]:48738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpwcU-0004cS-Tt for importer@patchew.org; Thu, 17 Dec 2020 11:59:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpwaB-0003Ap-VJ for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:56:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpwZs-0002zE-RB for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:56:48 -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-24-6Dj63fEfNSyNsrKKglUjXA-1; Thu, 17 Dec 2020 11:56:27 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95E9A101AFB0; Thu, 17 Dec 2020 16:56:25 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C1591F055; Thu, 17 Dec 2020 16:56:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608224191; 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=kZFEbwr1Avouyzp/6NUQgRq517wGVME+gmVK7SGUO+A=; b=JsXRunGsjtcJ/y5RR7JwEH2IpAOHuUGijUTLagrkjuWd2nYsQLUOSP6FigdWJzbssjL2wo VGdaI06X54kbAsEk+dTCcLr7F0QzR6pZz98FFziN16KvPzLXS0c7GzBp4EeHNPWh17kGG4 3AUxrZeFuxDvollc7GLEIh+Z+IBTP10= X-MC-Unique: 6Dj63fEfNSyNsrKKglUjXA-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v3 1/5] file-posix: split hdev_refresh_limits from raw_refresh_limits Date: Thu, 17 Dec 2020 18:56:08 +0200 Message-Id: <20201217165612.942849-2-mlevitsk@redhat.com> In-Reply-To: <20201217165612.942849-1-mlevitsk@redhat.com> References: <20201217165612.942849-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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, T_SPF_TEMPERROR=0.01 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: Kevin Wolf , Fam Zheng , 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 | 57 +++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 9804681d5c..cbf1271773 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1166,6 +1166,10 @@ static int sg_get_max_transfer_length(int fd) int max_bytes =3D 0; =20 if (ioctl(fd, BLKSECTGET, &max_bytes) =3D=3D 0) { + /* + * BLKSECTGET for /dev/sg* character devices incorrectly returns + * the max transfer size in bytes (rather than in blocks). + */ return max_bytes; } else { return -errno; @@ -1175,7 +1179,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 +1249,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); +} + +static void hdev_refresh_limits(BlockDriverState *bs, Error **errp) +{ + BDRVRawState *s =3D bs->opaque; + + int ret =3D bs->sg ? sg_get_max_transfer_length(s->fd) : + get_max_transfer_length(s->fd); =20 - if (ret > 0 && ret <=3D BDRV_REQUEST_MAX_BYTES) { - bs->bl.max_transfer =3D pow2floor(ret); - } + if (ret > 0 && ret <=3D BDRV_REQUEST_MAX_BYTES) { + bs->bl.max_transfer =3D pow2floor(ret); + } =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); - } + 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); } =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); + raw_refresh_limits(bs, errp); } =20 static int check_for_dasd(int fd) @@ -3600,7 +3625,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 +3749,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 Tue May 21 15:07:27 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=1608248081; cv=none; d=zohomail.com; s=zohoarc; b=cOi0h/wptb2sB18Xcdg7a3Lixm4kTd3FURf5HBSoTkkxWHDqrpy6kA5tmO2lFNtNq2rJFcYXbjvWw5QMi8UhGhGH3SfylYjeseLSp5RvH+KTpBu7UqAcaKUhHY1zQpsYmGlHzZiGsgCIEDD8Rw6I9LefTlKdYf990PUh5+7DYxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608248081; 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=E0hcK4vCU1fPXhHXgBWJoyzpnX6SOzIaa4nbZLEe7xM=; b=UVCwFXiyA7eUko4Q/Ew515AbaE5BxSIcBFEbQS3rcxspUTpnfDeKqgiETm7tlO0zS3i65+B7FCKPKCLcSI7FFEmZ3lFHTmu+EUExAOhSR5VKKAPYxS7PNm9wj+fZqktZ1ebAG1WI+Ys2n46Rnur0jhkB6qDSNNLqg493yaOGsuA= 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 1608248081047688.8686554140272; Thu, 17 Dec 2020 15:34:41 -0800 (PST) Received: from localhost ([::1]:57996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpwiq-0000Wv-WB for importer@patchew.org; Thu, 17 Dec 2020 12:05:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpwa8-0003AH-LY for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:56:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56210) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpwZw-00030B-Oq for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:56:48 -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-557-FR9k8o0sMHewwMrlXj_Lew-1; Thu, 17 Dec 2020 11:56:31 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9986A1052A1A; Thu, 17 Dec 2020 16:56:29 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 115D5E73C; Thu, 17 Dec 2020 16:56:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608224194; 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=E0hcK4vCU1fPXhHXgBWJoyzpnX6SOzIaa4nbZLEe7xM=; b=awrvcHj5Y0wPMMazRjokycqgT0pG5BaCGmIsHgMQxRPeRe5sPBvp19JLJ1CZ36ebWZMVTQ dcJcqHI70Lm0IZTO5OFjle1BUxt+9OWIpJ5klZmG8nAbNCI6+Cem4quVeDS+Q1+Wo6+24X sygnOjj6PR1brJZS04KbWLdxonQ4Twg= X-MC-Unique: FR9k8o0sMHewwMrlXj_Lew-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v3 2/5] file-posix: add sg_get_max_segments that actually works with sg Date: Thu, 17 Dec 2020 18:56:09 +0200 Message-Id: <20201217165612.942849-3-mlevitsk@redhat.com> In-Reply-To: <20201217165612.942849-1-mlevitsk@redhat.com> References: <20201217165612.942849-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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: Kevin Wolf , Fam Zheng , 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 cbf1271773..2bf4d095a7 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1179,6 +1179,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) @@ -1265,7 +1285,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 Tue May 21 15:07:27 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=1608248301; cv=none; d=zohomail.com; s=zohoarc; b=ReG1Ss/r/keSNjuW+MUksnG730iiCOMMG+Ih3gqRvSvrtB7D8wGmweTqzwUIa67qBdm+0x4geQVhy0HqTe+jRd0jgMxa6E/HQ3N1p2V63tW8iPkO/6ehFXrkYKEUFJILVB97t5v1ot58n61A9MEABivb4xCQWC9wqDTUqxF3zes= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608248301; 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=lAF4AMDHh0B6zN8Q97spxe57FkcIvd7Tu2zQJxqa9tc=; b=EtaMUVrmtP+LJXUb2XOMniB3xHL+2A04/9EwevsQZzFJWutsiQDZD9wDUWbNWiEgaeoXuJJC+ja5ovcE8uBk8AE8jx+lmlDtOT0X3xNjUVvOwceM+oXbcw/8JC2vaTmM8TpiiBuFDCnK5A38+/DmbVeYuSJT4Q6bA1o0X5eis08= 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 1608248301016960.8920754673817; Thu, 17 Dec 2020 15:38:21 -0800 (PST) Received: from localhost ([::1]:49724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpwdE-00051V-Sr for importer@patchew.org; Thu, 17 Dec 2020 12:00:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpwa8-0003A0-GO for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:56:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpwa0-00030H-Ko for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:56:48 -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-PFnpIJpBNrewaaVPoYQsmA-1; Thu, 17 Dec 2020 11:56:35 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7DB53101AFBA; Thu, 17 Dec 2020 16:56:33 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C7C41F055; Thu, 17 Dec 2020 16:56:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608224196; 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=lAF4AMDHh0B6zN8Q97spxe57FkcIvd7Tu2zQJxqa9tc=; b=ZkRuMCu2laEls51IGTGBFnZ1yCSf7jKFAb2z3yNzn02ZTx8kM7UIiepCkjSLETAoF93cd6 cGV6t8xFJhvA2IAy7LdIfts5deDS9H+E2Q6ohABN0TZmUgPHhue2uPOUYU1avGa6AKmjw0 1wWjBnwG8eAWU+d2yV8BIEgPioKQFHk= X-MC-Unique: PFnpIJpBNrewaaVPoYQsmA-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v3 3/5] block: add max_ioctl_transfer to BlockLimits Date: Thu, 17 Dec 2020 18:56:10 +0200 Message-Id: <20201217165612.942849-4-mlevitsk@redhat.com> In-Reply-To: <20201217165612.942849-1-mlevitsk@redhat.com> References: <20201217165612.942849-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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: Kevin Wolf , Fam Zheng , 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 24205f5168..ac5aea435e 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 1eeafc118c..c59b0aefc4 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -686,6 +686,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 Tue May 21 15:07:27 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=1608248427; cv=none; d=zohomail.com; s=zohoarc; b=WGilpcWUG9/9GcdET7VdT5ScLxfmibcaMjcl9kGQMER+lOsfI/8EkHkoI+faGncYKIJwibFEZ3eLQqq7quvZ0VUcHlGcAQ61lwuRM1Iy1oj3cQlt64+Vk11V9KPozPmmN3b3fHsjCwTjjRMlRoxlf26b48dBzlakgGdaX3aOexQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608248427; 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=SzLdw4z2MMLkod7pdJvuoblXJp2kmevzW8OACQlumaQ=; b=NfwcTgG7YlVGweSikBs4kgmEEe5WJel1G4AjMePHkYkZb333aQsJNbkskfcSvH11j9GMtI3LE2vvTMfSYM1k5zv22YrLh2NsEWFsV905sAOSe4D9IBZ9ZBjWq/FRwDCvKHLRZIAWEpT6JMNp7nHbD09XmKKGRV8TZMDNyyxw7BY= 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 1608248427993217.3282187184749; Thu, 17 Dec 2020 15:40:27 -0800 (PST) Received: from localhost ([::1]:36458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpwlW-0003wa-1n for importer@patchew.org; Thu, 17 Dec 2020 12:08:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpwaC-0003Dl-0K for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:56:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:55939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpwa8-00034e-6B for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:56:50 -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-232-V3ctU_teO9SSW6e7MeZ-wQ-1; Thu, 17 Dec 2020 11:56:42 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 660A2107ACE4; Thu, 17 Dec 2020 16:56:41 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1087DE734; Thu, 17 Dec 2020 16:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608224204; 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=SzLdw4z2MMLkod7pdJvuoblXJp2kmevzW8OACQlumaQ=; b=Yte7FJFuHzeuv0GUfRhG1grH6unzb521gal5jh8/ULA3LWwHR6RGdO+JJZ2RdOcl6tIT9Y n2+UNvv/8tdaKT0wLH1lgvAL5b0B0W0Qhuqzo3uuCN0b+Qq7S3xh9BHgdz8WDsMInVpHKb E+8YmBl3mrVasfbc+KdBhiELuGMzSkY= X-MC-Unique: V3ctU_teO9SSW6e7MeZ-wQ-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v3 4/5] block: use blk_get_max_ioctl_transfer for SCSI passthrough Date: Thu, 17 Dec 2020 18:56:11 +0200 Message-Id: <20201217165612.942849-5-mlevitsk@redhat.com> In-Reply-To: <20201217165612.942849-1-mlevitsk@redhat.com> References: <20201217165612.942849-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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: Kevin Wolf , Fam Zheng , 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 | 7 ++++--- block/iscsi.c | 1 + hw/scsi/scsi-generic.c | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 2bf4d095a7..c34a7a9599 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1282,13 +1282,14 @@ 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, - ret * qemu_real_host_page_size); + bs->bl.max_ioctl_transfer =3D + MIN_NON_ZERO(bs->bl.max_ioctl_transfer, + ret * qemu_real_host_page_size); } =20 raw_refresh_limits(bs, errp); diff --git a/block/iscsi.c b/block/iscsi.c index 7d4b3b56d5..b74fdf149d 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2063,6 +2063,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 Tue May 21 15:07:27 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=1608224728; cv=none; d=zohomail.com; s=zohoarc; b=SIQ8XMDM6pN2xDhogCLRGc5yZm+RIH9WRR5vxOlWRRTKRho1pQwCONutw0Z0dmemgPt4J6Y8fYmj2i2udtbfem7+kP/oqaji/aYb2cejEd/NbozqhybjBR32Kp+y9RNIPf/uhaTN7+mDlQ8HGbAiXech1x5YaV4FAtzyu7NUH+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608224728; 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=595zJLnzjD7+CDUTBj/Yg/a0T1xQ06mWxKOc8uzzRDY=; b=XI6CHhtakIHRQsrVH3N+M1e65hFJFipif4VqYrFHuh4NHnQv2VWqYfnAklfP/GFdnEegju4MCOomi+LW+wLUBo/tdK/c35sU/qu2f2Qgp8qku7Ekm/I6GQwc/HrnZF/MQXR/7z0jR341LIOUT/M9z0PJtCGds44OTIFawyjeiGU= 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 16082247284483.692878823732599; Thu, 17 Dec 2020 09:05:28 -0800 (PST) Received: from localhost ([::1]:56772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpwiT-0008QK-JC for importer@patchew.org; Thu, 17 Dec 2020 12:05:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpwaH-0003GO-J0 for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:56:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpwaC-00036k-FY for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:56:54 -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-541-7_9_vWBYMmqEHV-0WsVjXg-1; Thu, 17 Dec 2020 11:56:46 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6515610766BA; Thu, 17 Dec 2020 16:56:45 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B4A8E734; Thu, 17 Dec 2020 16:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608224210; 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=595zJLnzjD7+CDUTBj/Yg/a0T1xQ06mWxKOc8uzzRDY=; b=b1HojGH1MECcr/R+9ncEsn8PsJmNFvcLRtpU1TRDe01QJ1zKwV7U2fwCkZk+6gBK/el+RG YD/l8GLyMTJvj2CbDBO2eyPygVmI+2Ry+rApkAhOU/PtK1+O7HH/EgNPhM0yw37/oFrJ/I Gowr+M2MMoAPDiUgzSJxTDo4aGWtZ94= X-MC-Unique: 7_9_vWBYMmqEHV-0WsVjXg-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v3 5/5] block/scsi: correctly emulate the VPD block limits page Date: Thu, 17 Dec 2020 18:56:12 +0200 Message-Id: <20201217165612.942849-6-mlevitsk@redhat.com> In-Reply-To: <20201217165612.942849-1-mlevitsk@redhat.com> References: <20201217165612.942849-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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: Kevin Wolf , Fam Zheng , 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 Reviewed-by: Max Reitz --- hw/scsi/scsi-generic.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 6df67bf889..8f43979cbc 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,13 @@ 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 +321,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