From nobody Fri Jun 21 20:09: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; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585753511548150.34561487781343; Wed, 1 Apr 2020 08:05:11 -0700 (PDT) Received: from localhost ([::1]:33362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJevW-0002WX-6Q for importer@patchew.org; Wed, 01 Apr 2020 11:05:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38944) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJes3-0006NK-Gn for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJery-0004Ab-HY for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:35 -0400 Received: from mail-eopbgr10096.outbound.protection.outlook.com ([40.107.1.96]:31205 helo=EUR02-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJerv-00046o-JP; Wed, 01 Apr 2020 11:01:27 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.15; Wed, 1 Apr 2020 15:01:26 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf%8]) with mapi id 15.20.2878.014; Wed, 1 Apr 2020 15:01:26 +0000 Received: from kvm.sw.ru (185.215.60.23) by AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20 via Frontend Transport; Wed, 1 Apr 2020 15:01:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AyahS227jSK11y6c4KQSS5f9tSZayp5u5LU17MBljF2lSocCMOkR3riArvpSw+oH8iZoV/PDCvk1j1nd6L48aPRnsWbBywKk6aVlaj1Zf4bl28wNwMYJXqu1ErwzjQJkQvDLgqoUD/YNzmoB8fRIzRP5IVVdhuueeDRumhDw1jqOGIE3Ep+lqMGjJnZzWqDZEvxTJeY0dMD26w+V312pmcaRbi6hHNO2iuaVbjFCSwhnR37BDyE99SQ6dAIfwUBLMtwOL/kg0dOFq4y6NfbrBJqibNZM88YO56PKJlwdjPfhIBaoreFs6fzd1wWkBVtK1HQM+k4vI1nJvmDsTklMSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H/P6o6jba9HFn9+qZXwVrBFiVJZ4lFKlpvW7nPlhnsE=; b=hKKS3cjoHEYFqN484k/tk3oKdLYnbg2AO4yAc+nhf4aaqFPjsrqOX6jPfcazuFCdO6CttM5h++JUXlY7ma3pNFm9TbaxL+FPFjXORsqccWXAsuRCZBERpU7Wu81hcZ7T604vF4zJ+mxVwqgIs06vhqWYPEFxk3lBnMoNDaUtW7Y97XTGcn6tTsmEB2NNapgbnMsjJtCRluOimpLmm4K290c1jW/445IKuZDI82+6tM5cQT3JXpnMCGY1Ep1dYVujOKZ2pGPbqcia87Jzz3TJhMTIebQVnsQQCpke4zfGGkzXRdQgkpRDpe6gVLZfnyoy//kBxRlo/xqA441D3nks6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H/P6o6jba9HFn9+qZXwVrBFiVJZ4lFKlpvW7nPlhnsE=; b=BfDIA2GpatcDcTUeKFJ2ThAG8upXBaE+nBbVe8RqixJRyciqFfxLSdLQ/DwaNIa2gBzbJ963yKQfs2anIZIHAwEAaT4rXnbX/54zTSSa/SADg9Lc1s1ZpzJ89msDGY+qHO3ULwXD9nsAWja0bh2m3HVMC+PnOAHyiSsrbZQ08X4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 1/6] block/nbd-client: drop max_block restriction from block_status Date: Wed, 1 Apr 2020 18:01:07 +0300 Message-ID: <20200401150112.9557-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200401150112.9557-1-vsementsov@virtuozzo.com> References: <20200401150112.9557-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.23] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93e891b2-3b65-466d-4f77-08d7d64d8d38 X-MS-TrafficTypeDiagnostic: AM7PR08MB5494: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:79; X-Forefront-PRVS: 03607C04F0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10019020)(4636009)(376002)(136003)(346002)(396003)(39840400004)(366004)(66946007)(66556008)(52116002)(6486002)(86362001)(186003)(107886003)(478600001)(6506007)(4326008)(2906002)(6916009)(16526019)(26005)(5660300002)(6666004)(316002)(66476007)(1076003)(81166006)(36756003)(4744005)(2616005)(81156014)(8676002)(8936002)(956004)(6512007); DIR:OUT; SFP:1102; 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: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0+IqOd2mo1Se1yaCtMx5+TOwjScnZcPZX7B7WUjSBOETOnjAfk485lp/56QgXpdrMx7fyS5NBILodCeOp+4zXlvKwamDlzPtGRur93JpMyZPx6cVkvRq1SQ9RFpo4GEhvFd+blQiitAOGiVqWrMMw6vDZQ0Hlw47OaOKzitWCBJLkVcyPkidzAgN1eCs3S6eDD+wsmPsKzqtd8ys3dgcnG6JGuL6w6bmrb8usVL5RkZiVRvvnACeTzVpPC3nr3K2Cj9Z1qWo6KyoFlls9RocCEwcjYh8kgAMc3vsXBgkgV9yg+vLXEqwCIybNbI9c3tCI5LiLqp/aUrZDzu44+s27vKv1maY/QnHGdSkvQsg4cyT0tD2B/LLtGD6wXy2AcOCNQfR7ITpjq3GSdlIOUon7DqO+AuhJNVFTgB+msz5SpoCAMmA57QBtFwg9pjyojrk X-MS-Exchange-AntiSpam-MessageData: 4Xm21SDh9lVAlvZeJSCo9mgEZA4scKfrYc0fXHb4k8lK2/um3+07gNYAVBYoiGM80UryD5vnUVIyGWUaWXZzMpvgprJ7XJttPGq2NLGnBgH7TLUb7xQhYlSRQ8QgJsQ+zCRj6eCCSy6Ay5yWEwTo/w== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93e891b2-3b65-466d-4f77-08d7d64d8d38 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2020 15:01:26.8050 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ffYuczaGFhTNXmxGyFDvoikPUMpAAeOxDHp9e2jcTeKfl7eJf+uzdjnfI6MUs6bw4z7FaUY9+b1UxnwLliGaFNv5sEEyfiwtucxostGZDZQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5494 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.1.96 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: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) Content-Type: text/plain; charset="utf-8" NBD spec is updated, so that max_block doesn't relate to NBD_CMD_BLOCK_STATUS. So, drop the restriction. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 2160859f64..d4d518a780 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1320,9 +1320,7 @@ static int coroutine_fn nbd_client_co_block_status( NBDRequest request =3D { .type =3D NBD_CMD_BLOCK_STATUS, .from =3D offset, - .len =3D MIN(MIN_NON_ZERO(QEMU_ALIGN_DOWN(INT_MAX, - bs->bl.request_alignment), - s->info.max_block), + .len =3D MIN(QEMU_ALIGN_DOWN(INT_MAX, bs->bl.request_alignment), MIN(bytes, s->info.size - offset)), .flags =3D NBD_CMD_FLAG_REQ_ONE, }; --=20 2.21.0 From nobody Fri Jun 21 20:09: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; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158575360609889.63462749385405; Wed, 1 Apr 2020 08:06:46 -0700 (PDT) Received: from localhost ([::1]:33388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJex2-0004Li-RI for importer@patchew.org; Wed, 01 Apr 2020 11:06:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38970) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJes4-0006RD-VJ for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJes0-0004Bp-2x for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:36 -0400 Received: from mail-eopbgr10093.outbound.protection.outlook.com ([40.107.1.93]:29790 helo=EUR02-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJerx-000494-IE; Wed, 01 Apr 2020 11:01:29 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.15; Wed, 1 Apr 2020 15:01:27 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf%8]) with mapi id 15.20.2878.014; Wed, 1 Apr 2020 15:01:27 +0000 Received: from kvm.sw.ru (185.215.60.23) by AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20 via Frontend Transport; Wed, 1 Apr 2020 15:01:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kCKsS3xQ6vtQ9XH7xDo7C8Gznr9a1l076spbKUiIr1eyU0P3U2ObduRTRvhbGT/NnuncoJPOkIuQk63k2YnmsYEkeAOVc7/3jja4omGpaHWGFdEvBwS02s70+YMasl2YSitEtUfyK9Sjyqe4l/+fxtvCFEMgTuvaAvg13hOXYlGmB+O5lLEN3TwGzlq1o+vDKwRs1BIloZQ/HQvXa3o11lS6PwJR80R9Njya9iYw76SRJzFgRqDqVfl8/eKD/fzlXKUp3KkV5RwHfxkMBY+sKRA8F2yGtKubtVExRF1pfn8BmFvKkRymlEweWvkZVcpJLMCfz3b046BnLe8QM5CX6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Sprp88RYjDByino1ILE6cOMplx/yinMuFwvuYp/nAu8=; b=hjAvAVAndbHwNWTLLRrWG2SnEcMnVUuYNHy9k58gOAjSznSr9Pff1FepzPsxGyC7jxMCCMJ2rPBHFrfkBKNOhYrVFgQWypim6to7wrnTfFjGG2WN9nP0ya0X8vRjfKiyE4Hl9Ro8Y1WzT+naqYAPfZBe5p78j0Tr3bDcwijygvfTfAQTSzCbC/JE9FgBGbQHDmlSDYKM4fCnqny/AYLvZOt3KL1p0IIZlYy2g/lkAH9LBfmx38Us9Zq7b5Z7/G4IJrwLyjAbqmVIU4OPZ6SROoR/LzPPqXy4YuakAKVeJgGTuN5KW5m7wxE21jWuT5tgZBDaKO/E/p8+jNmfX+vLmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Sprp88RYjDByino1ILE6cOMplx/yinMuFwvuYp/nAu8=; b=SZk+bAffZxkVlkAyoxYPTw2tzntX8DXOOkxJ8NcKwuGqD7iBDxnR9vWWvrO2yNRdGezL5Q8HFOsxVUYumYpDMWAG0QGe7gLmhrMur5OoRDicgYSN2wQxIsc65brC8NPK9HZ7dyGr4EpW/NXBE44efU1leDOos/PezThcqRLMN10= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 2/6] block/nbd-client: drop max_block restriction from discard Date: Wed, 1 Apr 2020 18:01:08 +0300 Message-ID: <20200401150112.9557-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200401150112.9557-1-vsementsov@virtuozzo.com> References: <20200401150112.9557-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.23] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a91d175-7147-45d9-2c26-08d7d64d8db0 X-MS-TrafficTypeDiagnostic: AM7PR08MB5494: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:309; X-Forefront-PRVS: 03607C04F0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10019020)(4636009)(376002)(136003)(346002)(396003)(39840400004)(366004)(66946007)(66556008)(52116002)(6486002)(86362001)(186003)(107886003)(478600001)(6506007)(4326008)(2906002)(6916009)(16526019)(26005)(5660300002)(6666004)(316002)(66476007)(1076003)(81166006)(36756003)(4744005)(2616005)(81156014)(8676002)(8936002)(956004)(6512007); DIR:OUT; SFP:1102; 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: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WaddosziBLbV4scSHxjenu4UhAuTKln4rZkOsIBhvYCfKBIc4YB7iZl9OAkfPjDD0slbrsqBJthuvlPk3XDkGgeI8/cc4J8TRKTW1MYMVgShHfVA1GrlGYcy7lmIOWIXRVH2ni1mSargiLXGLt1NGJG7NMc63S21RRIHwat0Qz/L0rwPAzbQDWdIg1Ks69oJKUXiy8ya/sM03sIY7qK/2XV7Xx8QaevPFJPF9wsOVk0SSTL57QXTJt1qnN1uquEDpyGLS4m4jbQq1owkrJmhtm5ZS2BQUrgpoi5HLn16hNzYYiI7Qd5cslQvInYlIpBZu0rCbB8cbfDa5EfTQxHl2lNM8nCk8dkNnhoVbF6LnRHNU1TF4828sN0RjCxeqx7xDFJNjH0V7BC/ixy11962WcHJKDZzzeQmeWHA7Rc2MPNHYi/nCbiar9/pZ8t78SmZ X-MS-Exchange-AntiSpam-MessageData: 0L26QLe5L76Ow/xQe409Ap2rguK0T8aKtDKHSt0thnCLhzgegn7XI56aU6MSmyIlfWu7SOCt4W6tpK/i3LM8pBb7pjHdjXB7DuVZ0ZYjg33LjkBtcQLUq8do5yAMFRGWDYZAhBKJr7Z9ZEvMhdaL7w== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a91d175-7147-45d9-2c26-08d7d64d8db0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2020 15:01:27.5955 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Vn0bCVG78kd2iu/bREvC0d7/mrS6nSrySK6XW56FTihHqAYUOvswa/EsOyPkLx6hsPZAYIGG7yAUKGVb22A4XxPNBQID+OuKjybFTuEaosI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5494 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.1.93 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: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) Content-Type: text/plain; charset="utf-8" NBD spec is updated, so that max_block doesn't relate to NBD_CMD_TRIM. So, drop the restriction. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/nbd.c b/block/nbd.c index d4d518a780..4ac23c8f62 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1955,7 +1955,7 @@ static void nbd_refresh_limits(BlockDriverState *bs, = Error **errp) } =20 bs->bl.request_alignment =3D min; - bs->bl.max_pdiscard =3D max; + bs->bl.max_pdiscard =3D QEMU_ALIGN_DOWN(INT_MAX, min); bs->bl.max_pwrite_zeroes =3D max; bs->bl.max_transfer =3D max; =20 --=20 2.21.0 From nobody Fri Jun 21 20:09: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; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585753694147818.77472500083; Wed, 1 Apr 2020 08:08:14 -0700 (PDT) Received: from localhost ([::1]:33410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJeyS-0006pS-Uw for importer@patchew.org; Wed, 01 Apr 2020 11:08:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38996) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJesA-0006cq-2u for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJes5-0004F3-0r for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:41 -0400 Received: from mail-eopbgr10093.outbound.protection.outlook.com ([40.107.1.93]:29790 helo=EUR02-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJery-000494-4g; Wed, 01 Apr 2020 11:01:30 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.15; Wed, 1 Apr 2020 15:01:28 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf%8]) with mapi id 15.20.2878.014; Wed, 1 Apr 2020 15:01:28 +0000 Received: from kvm.sw.ru (185.215.60.23) by AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20 via Frontend Transport; Wed, 1 Apr 2020 15:01:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mGAE9zky8WW1Qo2P63tw39Cukji+NqdNiJpLoJApfS43ON7gvgmtUmdYHc2m8nBVRrlDb3h6TZh9CBMyJuWXxqfoipXlugfBtSSepNa1UCO1trcti57e5u/4lUFMPAOeRn48A7FHPEQhAFEwPmTlahZ1oBjyDDhgeo4iozCOjj8a44l2FjI6tmgttOf7X4pcxT1lJE1VE4qVreAhORo04Ih45Fdx+gFx/LkRN2Cvg/bNdMBaGfMKk5lwXNjm/ztzJsj/YbRJecxaF39yHzKbb61pxdhc+odhFhzu69Tis45KBOUncGS436slwItXVu2LaPrnMa9j1gUgh1822tQ3DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z3WoCCv4H2YnJxqmhYPQHq97h5gTbEbEb+hVB6Wu7bo=; b=ISx7r//xWwSkJKMmL0BdOJW43Zi2LP/ZqeeBjymf1bz0FEeJV672KoAvIgPQQyc2PKT/toHUB29XD0JgJDhf1594IYBFQbmN20aPRaJ7ft6v9ehLnUqKrj6wmhCaWVlAPYSg2lYoTFhNL8PGqN8vzenfyzkoDChBvflCPdZzuJwwzwpYUE6xA0OosydcWTe01pV3VpQeHo2IEeitBhm464S4yHySQH6ZEdwSyxwFEEBLdY8GQZLKhOoFv9lWK0pwK9RwfHtDlyuYTyxB0QX+oTfNJLGQlipqqqvsSzkbBHLKFF2m5xep1/u+eTzM8P8B3EFrqSiThen9069yt3JvCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z3WoCCv4H2YnJxqmhYPQHq97h5gTbEbEb+hVB6Wu7bo=; b=OibTwkShr/7hQrmZlkTzxyFUzBHYqg0Wxc1kCd+9LJc2vVbDU+klOFi1JLd3+yvWA+Lcd+oenjR6/o3/RTu9VDAWnRZUBlRUmR4GWs9ii9e5UXJ4Pqj//MWD5/wuQ213XObmkR3ZnYGN+c6fdGR1sDQvqi7dC36OC7nNP7Ejayc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 3/6] block: add max_pwrite_zeroes_fast to BlockLimits Date: Wed, 1 Apr 2020 18:01:09 +0300 Message-ID: <20200401150112.9557-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200401150112.9557-1-vsementsov@virtuozzo.com> References: <20200401150112.9557-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.23] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d61ded40-b62f-4875-6076-08d7d64d8e2b X-MS-TrafficTypeDiagnostic: AM7PR08MB5494: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:538; X-Forefront-PRVS: 03607C04F0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10019020)(4636009)(376002)(136003)(346002)(396003)(39840400004)(366004)(66946007)(66556008)(52116002)(6486002)(86362001)(186003)(107886003)(478600001)(6506007)(4326008)(2906002)(6916009)(16526019)(26005)(5660300002)(6666004)(316002)(66476007)(1076003)(81166006)(36756003)(2616005)(81156014)(8676002)(8936002)(956004)(6512007); DIR:OUT; SFP:1102; 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: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ntJp2fcjjRNfE4Qjs2yEDiCPQEPAJTxB7OfWcKfCogKAExZwriBuGvAMGIcJTGyZ4Xi50BcOc3FwRbJ2XdJRbj6ZqEwm1evZhzY0xjaw0P7N4eGRR6sHKddfiscd05FqRwyR1AwwC4S5mxX7up4Y/83PXALq83oVQdFVkpKq4VJKCc+RBO8KBiIjNxYKZwEulZ18ahSB2uLw1Pv9AdD415hzvkP3HGPoSx4H/01Cqw0DHoI33OdAfmEZRZbdMl1P/rjug6fhrKHERLe9Vc1qJsyCw71MSkSZu8gnfYw54StwtjYKckdzxqMx08r8Or1bDUPkMwjYy7vrPtGUJdLUVNI6k2DiRlzwB+dZ1rq+ceYZM6x13SVy7JqzaWtGUD1sA0vNjbVwHYerhuKo1bC1KphJ2AVFGnXo0/noCPiEP13qyGkUmmN+BbxUwEQBIkv0 X-MS-Exchange-AntiSpam-MessageData: RYRVOPXLnx6uvc7MNHSazu5dc1j+i7VzMYQ1CrBoHzSL9sbIp+5DLN+ORRrDdchUpSNBLvDFJPKzmHEIYylFSDHsSQvbElhPEGqssLlIJ8XrPXSRlbG7bRy42/lYcQkpzL9c1esgJbfN9nEV2SxCJw== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d61ded40-b62f-4875-6076-08d7d64d8e2b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2020 15:01:28.3960 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BYLjYK0RpSF2tY5tKDSdE5sFfMTHgWCx6Npd/C8HVWZ258ML4YVQUQ9/2Ohs0kXA9oLCJvMQfwamGLSUHYQs9klGOVgCnMiQCvgCfET+uxA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5494 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.1.93 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: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) Content-Type: text/plain; charset="utf-8" The NBD spec was recently updated to clarify that max_block doesn't relate to NBD_CMD_WRITE_ZEROES with NBD_CMD_FLAG_FAST_ZERO (which mirrors Qemu flag BDRV_REQ_NO_FALLBACK). To drop the restriction we need new max_pwrite_zeroes_fast. Default value of new max_pwrite_zeroes_fast is zero and it means use max_pwrite_zeroes. So this commit semantically changes nothing. Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/block/block_int.h | 8 ++++++++ block/io.c | 17 ++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index 4c3587ea19..ea1018d598 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -624,6 +624,14 @@ typedef struct BlockLimits { * pwrite_zeroes_alignment. May be 0 if no inherent 32-bit limit */ int32_t max_pwrite_zeroes; =20 + /* + * Maximum number of bytes that can zeroed at once if flag + * BDRV_REQ_NO_FALLBACK specified. Must be multiple of + * pwrite_zeroes_alignment. + * If 0, max_pwrite_zeroes is used for no-fallback case. + */ + int64_t max_pwrite_zeroes_fast; + /* Optimal alignment for write zeroes requests in bytes. A power * of 2 is best but not mandatory. Must be a multiple of * bl.request_alignment, and must be less than max_pwrite_zeroes diff --git a/block/io.c b/block/io.c index aba67f66b9..07270524a9 100644 --- a/block/io.c +++ b/block/io.c @@ -1751,12 +1751,13 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(Bl= ockDriverState *bs, bool need_flush =3D false; int head =3D 0; int tail =3D 0; - - int max_write_zeroes =3D MIN_NON_ZERO(bs->bl.max_pwrite_zeroes, INT_MA= X); + int max_write_zeroes; int alignment =3D MAX(bs->bl.pwrite_zeroes_alignment, bs->bl.request_alignment); int max_transfer =3D MIN_NON_ZERO(bs->bl.max_transfer, MAX_BOUNCE_BUFF= ER); =20 + assert(alignment % bs->bl.request_alignment =3D=3D 0); + if (!drv) { return -ENOMEDIUM; } @@ -1765,12 +1766,18 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(Bl= ockDriverState *bs, return -ENOTSUP; } =20 - assert(alignment % bs->bl.request_alignment =3D=3D 0); - head =3D offset % alignment; - tail =3D (offset + bytes) % alignment; + if ((flags & BDRV_REQ_NO_FALLBACK) && bs->bl.max_pwrite_zeroes_fast) { + max_write_zeroes =3D bs->bl.max_pwrite_zeroes_fast; + } else { + max_write_zeroes =3D bs->bl.max_pwrite_zeroes; + } + max_write_zeroes =3D MIN_NON_ZERO(max_write_zeroes, INT_MAX); max_write_zeroes =3D QEMU_ALIGN_DOWN(max_write_zeroes, alignment); assert(max_write_zeroes >=3D bs->bl.request_alignment); =20 + head =3D offset % alignment; + tail =3D (offset + bytes) % alignment; + while (bytes > 0 && !ret) { int num =3D bytes; =20 --=20 2.21.0 From nobody Fri Jun 21 20:09: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; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585753392758619.5899799877209; Wed, 1 Apr 2020 08:03:12 -0700 (PDT) Received: from localhost ([::1]:33338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJetb-0008Qz-5H for importer@patchew.org; Wed, 01 Apr 2020 11:03:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38932) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJes2-0006MI-Ss for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJes1-0004Ci-Hr for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:34 -0400 Received: from mail-eopbgr10093.outbound.protection.outlook.com ([40.107.1.93]:29790 helo=EUR02-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJery-000494-Nv; Wed, 01 Apr 2020 11:01:30 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.15; Wed, 1 Apr 2020 15:01:29 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf%8]) with mapi id 15.20.2878.014; Wed, 1 Apr 2020 15:01:29 +0000 Received: from kvm.sw.ru (185.215.60.23) by AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20 via Frontend Transport; Wed, 1 Apr 2020 15:01:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nuW8+ng/Gv1Y48MGlm7bnUv+yjS9FS39senbg7AnqtKFl1H5G3GIyyHAkDZrnUiyknTuiH5PPo+Oakw2JrTjVvG1JNrxiNCHuxM4NMd2kBKzvUaWE47aENQ09YmWd742gZkmeRlL76y17i7nZ4Ha3CvADs0wDwLrh2ip/JhSH/nG/87auXdPYjbP++Cgczee3WdVhRj1qmKPNvsnNpY1yewSbzY91JXNOF5yjosETrSomNAFIWWi58J8EZm2hALDzzStl9mZFghbFCQ6fKcX1X/KnpQh88Ea0AkrIaLOQeiKOmlr86Z1LoDIUllbiakohPHRzIC88dYYhNpjvUcorw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O0xrQeysTFjb+GCyru1t/kK/l7QxTARdCZVDvohnjes=; b=IFTWHeXWdm8rP1BZBqxpmCIFIcrtfHn+QW+f4P/WjAZWHbAWJSebOWONxURn+oVcYwuuTh12NB6hO0SRE3xiZ4iN6g6NA+gBSfoxFhfYBQ13k8kkFNfeB7UbxZm2Qi13/rrfeZtdC8Bqw7igo28Io9oPI+3EyiB640Qt8ef8YiiztRR//t2KpQANCkaL/RYtrsvGr28HXoiRLxIzq6BT+ps+c2g/43+t9SLE8nFiF8UsyU7SYY/VghBYcZ5+hxX+RDlys2F2ocqLLp2H295eaauV9XGXXte4sEpXl8OnlEVrl9qxpWuypXBao5BCe6/nZzryezeJ816p6LnoXQIDUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O0xrQeysTFjb+GCyru1t/kK/l7QxTARdCZVDvohnjes=; b=Y3mjdVlsw7mLoFddnw+0Cwb7mb3IggHKYXs5xi6gVvxWDrCkEz6zhO8DEpnuHvzukNFxxxRdYePRkCvU9CQMkoCoVnfGSmzFfCMAxtrYFXVX9lxe2o19TVJh4RPqqpa/NSqduDkdV5Za81AqwfoKqxtaoMIyjq6DyhFfeoKK1sU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 4/6] block/nbd: define new max_write_zero_fast limit Date: Wed, 1 Apr 2020 18:01:10 +0300 Message-ID: <20200401150112.9557-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200401150112.9557-1-vsementsov@virtuozzo.com> References: <20200401150112.9557-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.23] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bddc4564-0071-4096-0fd9-08d7d64d8ea5 X-MS-TrafficTypeDiagnostic: AM7PR08MB5494: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:206; X-Forefront-PRVS: 03607C04F0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10019020)(4636009)(376002)(136003)(346002)(396003)(39840400004)(366004)(66946007)(66556008)(52116002)(6486002)(86362001)(186003)(107886003)(478600001)(6506007)(4326008)(2906002)(6916009)(16526019)(26005)(5660300002)(6666004)(316002)(66476007)(1076003)(81166006)(36756003)(4744005)(2616005)(81156014)(8676002)(8936002)(956004)(6512007); DIR:OUT; SFP:1102; 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: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WkpQqhxqehoUuFyXWhX57k+MfQ3gMgVqywnmeyZmbi231jGSRv4slJ2lpdmkcpG231up9SswujaD9wURzVN4Vgojnm2qkJBT5Jh70zcwJKzsXLcLc7X70qLNeD0IYb1tEu9yEj3Ql2JUrg0wnTmzYKPUHD2ueZSQo7UNi5UQf782S4qN4xJj7Y8VuSQt4R0wf8pHzO5vwc03iXN9kVPthYWq4SyOhChfTLPRpL/oakAyrbuK7PYaYRoSq1WJqifoFLdiAAdG1x/bbqYDb21b2ssz1Eo08nd7foDZnV5JhcHZRebIlzZi1d5foz0dQFYA195+a7RiWYoTXVpK8XH5x5PaI0TSqBcp45C69EbH3eqqOWsQUUNrFFAteJUMgGrZzwYJgNyfmRwzSf/DX7jvfu3m51njk4nEtA24z6YXJyQXbO5t1QkhrQ8KTjoZuV33 X-MS-Exchange-AntiSpam-MessageData: N1Yqaq7ZOGKxvx8QpAS5trW14cmN7bS0fcrTWBakn+6cMl2fA1kEA+LdjgoCasDeyb/Ezhw0pKiqFZqcdeT6qZPFVllf5INIT+ZD2P7Fkh6e5z53upWrVFAQIejeXT6k7CMxS1VZeEvBu+kNIagFZg== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: bddc4564-0071-4096-0fd9-08d7d64d8ea5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2020 15:01:29.2213 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: F52dtSPNthMWW+Ph3DLuPiIb8ckZAdjTAjpeMyPx8GLSL8RZyRhTDmq573gYMZezgnCnW+bYkCM6P+P0zEzDBBeoRjcllPTniO0W6l5isyY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5494 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.1.93 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: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) Content-Type: text/plain; charset="utf-8" The NBD spec was recently updated to clarify that max_block doesn't relate to NBD_CMD_WRITE_ZEROES with NBD_CMD_FLAG_FAST_ZERO (which mirrors Qemu flag BDRV_REQ_NO_FALLBACK). bs->bl.max_write_zero_fast is zero by default which means using max_pwrite_zeroes. Update nbd driver to allow larger requests with BDRV_REQ_NO_FALLBACK. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/nbd.c b/block/nbd.c index 4ac23c8f62..b0584cf68d 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1956,6 +1956,7 @@ static void nbd_refresh_limits(BlockDriverState *bs, = Error **errp) =20 bs->bl.request_alignment =3D min; bs->bl.max_pdiscard =3D QEMU_ALIGN_DOWN(INT_MAX, min); + bs->bl.max_pwrite_zeroes_fast =3D bs->bl.max_pdiscard; bs->bl.max_pwrite_zeroes =3D max; bs->bl.max_transfer =3D max; =20 --=20 2.21.0 From nobody Fri Jun 21 20:09: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; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585753522607879.8995303613066; Wed, 1 Apr 2020 08:05:22 -0700 (PDT) Received: from localhost ([::1]:33364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJevh-0002fQ-Bu for importer@patchew.org; Wed, 01 Apr 2020 11:05:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38968) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJes4-0006R6-Sz for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJes3-0004EG-ON for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:36 -0400 Received: from mail-eopbgr70115.outbound.protection.outlook.com ([40.107.7.115]:27679 helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJes0-0004BA-Mm; Wed, 01 Apr 2020 11:01:32 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5397.eurprd08.prod.outlook.com (10.141.175.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.18; Wed, 1 Apr 2020 15:01:30 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf%8]) with mapi id 15.20.2878.014; Wed, 1 Apr 2020 15:01:30 +0000 Received: from kvm.sw.ru (185.215.60.23) by AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20 via Frontend Transport; Wed, 1 Apr 2020 15:01:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S3iyAaV+d00aknbvJ227mUbuK2/mjHhqdWTEE4kdYoXaEd0Yopq7zz180DNyWdQDuoiI9casLjbLlN2SI8Qa5MHtXdQEfaWll1omRBE5P9BDqfx9P7/9f7c5BXaXcxKsR5PKA3tlJi8zUkL0nIzdP+joKTvx6fGfAaA0UegzmnMfNUjVhPMNJVsoYtRLQGBHQKzE1epxEbFspHEk6Z8MMWKfk/zwU8vogrze3736H3VSHr2i5xv16gnPaZq9jtPUucHYUcfsWRh3t7tRt2C9zsvTzsPBTrZ1TsdmetPpkELXCF9hD0lI5+jnC3d/tga5nFjJMbaWIAWCMopztsnc4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oI8YcHYTFbOh/wdeoiu6XxoyqQlvAWJAPWDyr2+uGwo=; b=V5qc+n+vSSCMwJdJTTh8IEJHFeWoPtQISwotO3yGfgxLoylGgon6NcFztoEbv+aSGvArbV2dg+ScppCSThJuqAdorLDGiAeaIFIpOn6PJbIayB/2MfbX200SsE1kT1WrwNB+Ri4KrN2O5OiakgGL/IaozYxsOKrG3quKWk9Jg4ePbSwZ6d9uwF++qMSqGqggS7FrjUbrpniPyd8eXlhXOMi1T7V0vCD21Jd+N/TfVrl1zDpVsrdaqt/aK65tyfd3UhRCP+Uhi7W0tsx/aa3djpFA6hTsISb8YIVigCKIO5jZJjIDhqfk3AziEzHu+Xw2b+A12lzIDNKm1djrDtxXgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oI8YcHYTFbOh/wdeoiu6XxoyqQlvAWJAPWDyr2+uGwo=; b=JHpoP/LXeq4hAuUBPwGtjAY9ord/XLiSDxLnaCs984t/HZx0uV5vXxM0jmwgFvHz+f+h1tR/lZx8S+77bSM5Lw867QMObVID4Ew1tsi6xMZOuxge2tMO/oHY8/LfBgjh0+NJHsZxdN54QeeaaMSIy3ekY99d9wRyDm33/oKWsl8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 5/6] block/io: refactor bdrv_co_do_pwrite_zeroes head calculation Date: Wed, 1 Apr 2020 18:01:11 +0300 Message-ID: <20200401150112.9557-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200401150112.9557-1-vsementsov@virtuozzo.com> References: <20200401150112.9557-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.23] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eb5bc4cd-c6a1-4508-d5e2-08d7d64d8f1d X-MS-TrafficTypeDiagnostic: AM7PR08MB5397: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-Forefront-PRVS: 03607C04F0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10019020)(4636009)(396003)(366004)(136003)(39840400004)(346002)(376002)(956004)(2616005)(81156014)(6916009)(6666004)(478600001)(5660300002)(86362001)(66946007)(186003)(4326008)(6512007)(16526019)(6486002)(66556008)(6506007)(81166006)(26005)(36756003)(52116002)(66476007)(2906002)(8676002)(8936002)(1076003)(107886003)(316002); DIR:OUT; SFP:1102; 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: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FtnNMc+UKyz0q/NtFgLs1SwCuQmM/HaO7YaHiYq2tIe076lury+/8UwFA1Lt5YD2BGz9l7OANHD+CW1aveBv3dtPhXd35XDbJER/Qqg9pLaI5gyu9Rw5nx0EuS/fOrN4GZJ1QjLCfVofb5Ey7W3fy70Znf9G8n40m7LtvDGFBqhYYWLEVtLSw2foi9MG6AyN2FA57Ojwk8QyW6yJrK6Xmqu9/i06AWTBNQA1vPzGZBfvOvDEQ7gPY46IaJ9R/TxDppnngs36lu4WliLzePA0KCVJxdL1voOXHo0ys0WPpBx15Adn3qfYbyMiYQpPt+EA2UeS8DG09C/x1rjjAsweViulpAfHzm0yxdJj+OY6SpM81oNzTBNB+6Jj4qpZIiPcWxTqfq7oVwQPya81th6BI2VD1k+7/OFujJgL4PulSIkwVlMp9yThXoL7rDEddRzb X-MS-Exchange-AntiSpam-MessageData: AsgShFutaPdff6rokjz3LDY8xOnIAu1k9KtXA0hJrK05PIOWevs1SotnYrt1odBocHuslF+gzwNWjcds4Z9IOyctZI1knJetnNGFurDAlVeS1+IzE0+T4pcePVrvQXDOq6Lx6/++Iq+Dz/0X6sRBAA== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb5bc4cd-c6a1-4508-d5e2-08d7d64d8f1d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2020 15:01:29.9949 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GQnoih7ctVH72aUtuYqUwYA4/qYH1SWr9JzzDW85ljbCttbxapc+4VGqc/67XkSXLyqrEWhzzH9VQjwInNv3/QjpzjzObJIJH8yHT4Daydg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5397 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.7.115 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: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) Content-Type: text/plain; charset="utf-8" It's wrong to update head using num in this place, as num may be reduced during the iteration (seems it doesn't, but it's not obvious), and we'll have wrong head value on next iteration. Instead update head at iteration end. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/io.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/io.c b/block/io.c index 07270524a9..f8335e7212 100644 --- a/block/io.c +++ b/block/io.c @@ -1790,7 +1790,6 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(Bloc= kDriverState *bs, * convenience, limit this request to max_transfer even if * we don't need to fall back to writes. */ num =3D MIN(MIN(bytes, max_transfer), alignment - head); - head =3D (head + num) % alignment; assert(num < max_write_zeroes); } else if (tail && num > alignment) { /* Shorten the request to the last aligned sector. */ @@ -1849,6 +1848,9 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(Bloc= kDriverState *bs, =20 offset +=3D num; bytes -=3D num; + if (head) { + head =3D offset % alignment; + } } =20 fail: --=20 2.21.0 From nobody Fri Jun 21 20:09: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; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585753613482539.2883230946145; Wed, 1 Apr 2020 08:06:53 -0700 (PDT) Received: from localhost ([::1]:33390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJexA-0004WJ-AH for importer@patchew.org; Wed, 01 Apr 2020 11:06:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38992) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJes9-0006ca-VN for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJes4-0004Em-Pu for qemu-devel@nongnu.org; Wed, 01 Apr 2020 11:01:41 -0400 Received: from mail-eopbgr70115.outbound.protection.outlook.com ([40.107.7.115]:27679 helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJes1-0004BA-Kz; Wed, 01 Apr 2020 11:01:33 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5397.eurprd08.prod.outlook.com (10.141.175.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.18; Wed, 1 Apr 2020 15:01:30 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::3944:477e:1562:cfcf%8]) with mapi id 15.20.2878.014; Wed, 1 Apr 2020 15:01:30 +0000 Received: from kvm.sw.ru (185.215.60.23) by AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20 via Frontend Transport; Wed, 1 Apr 2020 15:01:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nyiyzipJ6xQdl2Fha6DZ2lPVoLYeP1mO5uU7rUbN+U2Ef6/zKBnH1Wo9cu40yRNl6cvT38w4AukikX7PtiyWkybCBy5jEDjqj91wb/LlAhHAaeP+3A0RxJmHb5pDi03u3vKcwI97auNJyGE8usCE22Ywi6vtEbfJgJfQujvF37Lmnid1W3yrH/NrMFoCg6tpaHdw28c5Po7jOkO8ntmJ02geovz1U1EeUa9GGaJhxcwtReitVh1jvgqPg3cwpOebhQQQc+3Ekm73klT7opB5w6/F2pVDZyUTpzrsf+i/bbAKnh4IzXyWlzFz2MMMXdVlbB0pJnm/ySEqjpOXEJJwUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E4vPecfMUyhEoG30258jqBVf60UprGH5VzrhO5ZBM64=; b=bEdLYBBLcazrJePsCQ+0a37xVtMvOERE35niwALnEfDunOWkIEtmONDaONzG+QKSeJpDgPjqFZRIVpePNcnWzz2TyUD7BrtTwmvq+8B08a6Yx5X/p0ZBh4iGHodQ5VIWahKUPx7t6XsMKzO/SCPnORQNL/1/C0gQS6wJeL3YaWqVdkZKFllvtaxcsbGMLo44SLIF+UV+xUYnDFxNZtZ+u2UNeciK+skRol88HeDgnT7LpQAHCDxM7jhf2Qr+2k3LECp8IFoAbplps5kRQSVDe5jq0ePTdnloI3cugv4knT9WA4Ezs8/wVv7QHseBR8Q6McxqZpXOVh7mljicG5flMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E4vPecfMUyhEoG30258jqBVf60UprGH5VzrhO5ZBM64=; b=nrxs55ocefnhIZccTrfue1sH80aGwuUcPJlIr0VCYBXtmimqD764BA+AJqNqiw9aQPKOeWP5wV+d9Hsfcx1n9xNqgAaT6r50Y9jPtp/wBpSLFlYXaXlyDEbfMVUyqOqr+1+qq0CBbMCAl/SZozZ/43qLCih1G99QcKGYhdN3W70= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 6/6] block/io: auto-no-fallback for write-zeroes Date: Wed, 1 Apr 2020 18:01:12 +0300 Message-ID: <20200401150112.9557-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200401150112.9557-1-vsementsov@virtuozzo.com> References: <20200401150112.9557-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM4P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::22) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.23] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ffa17d9-234d-44d4-a261-08d7d64d8f94 X-MS-TrafficTypeDiagnostic: AM7PR08MB5397: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:381; X-Forefront-PRVS: 03607C04F0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10019020)(4636009)(396003)(366004)(136003)(39840400004)(346002)(376002)(956004)(2616005)(81156014)(6916009)(6666004)(478600001)(5660300002)(86362001)(66946007)(186003)(4326008)(6512007)(16526019)(6486002)(66556008)(6506007)(81166006)(26005)(36756003)(52116002)(66476007)(2906002)(8676002)(8936002)(1076003)(107886003)(316002); DIR:OUT; SFP:1102; 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: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gmUaylRB7TfZOJA+aMStz5/0fFrB7vkLLpPC5uB6ED8t9JJr/qAKpoSfVFKIwY/bve9mTv8fbtufvzCD2fTI1Jfbzo1bCGQjQ4/FB/1hrPaBJy51FHQFUgM9GsxCuy9vDXC7jlnkJ1MWttZWMAoYof5J9EyX7Dmy1cvNB1msD8PC9Yb4YulldGFsNWN3nC6LNbdPTSCY6YpITpOzun3/umWoGJr+o8sefdtuf8qEFZKvihqyfoQ5wuBltVRhoogavPu6YZTusG4XTcVL8Zceu0V98pN7pxr2TAxi/+BleEYdjFWRRIfgFtHCuyb0bovHo4TP7nCA8GhmCn2tnPt52yikrZN4Iwexd6NeRLbyD6gDlv4Q5v4uUj+KynnN+KeRNA1ZASpjVuXVWWSGkaep2Ig2CKT02Ihdp5YteQ1wKCPwlVdC59Bw+uGc5H+4NbeZ X-MS-Exchange-AntiSpam-MessageData: LZ21QJlFsIP9P1g6lrnn4TqZBpIpAOjVp2dD5ZxtStAqpBR6ZNnxUFUNBm0sqCH4GkunwADhJg2/ysKeEOJ51wBT/0DStaCDuSARo50q4QIlcS/O58955H94Rn1+hTsRK2J1Xl4+alOFSvsDSa/vMA== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ffa17d9-234d-44d4-a261-08d7d64d8f94 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2020 15:01:30.7545 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 78T60hqTfjadlbM5dxY6uGPxNBmFgrMkKA+6xA5UPbakAoxeo3lmqauHUCNstch1B1SxuDhOZiMMmJ4yp4uC/8xvF7zD0xR5mXS0GxBvvMo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5397 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.7.115 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: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) Content-Type: text/plain; charset="utf-8" When BDRV_REQ_NO_FALLBACK is supported, the NBD driver supports a larger request size. Add code to try large zero requests with a NO_FALLBACK request prior to having to split a request into chunks according to max_pwrite_zeroes. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/io.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/block/io.c b/block/io.c index f8335e7212..425314a221 100644 --- a/block/io.c +++ b/block/io.c @@ -1755,6 +1755,7 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(Bloc= kDriverState *bs, int alignment =3D MAX(bs->bl.pwrite_zeroes_alignment, bs->bl.request_alignment); int max_transfer =3D MIN_NON_ZERO(bs->bl.max_transfer, MAX_BOUNCE_BUFF= ER); + bool auto_no_fallback; =20 assert(alignment % bs->bl.request_alignment =3D=3D 0); =20 @@ -1762,6 +1763,16 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(Blo= ckDriverState *bs, return -ENOMEDIUM; } =20 + if (!(flags & BDRV_REQ_NO_FALLBACK) && + (bs->supported_zero_flags & BDRV_REQ_NO_FALLBACK) && + bs->bl.max_pwrite_zeroes && bs->bl.max_pwrite_zeroes < bytes && + bs->bl.max_pwrite_zeroes < bs->bl.max_pwrite_zeroes_fast) + { + assert(drv->bdrv_co_pwrite_zeroes); + flags |=3D BDRV_REQ_NO_FALLBACK; + auto_no_fallback =3D true; + } + if ((flags & ~bs->supported_zero_flags) & BDRV_REQ_NO_FALLBACK) { return -ENOTSUP; } @@ -1806,6 +1817,13 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(Blo= ckDriverState *bs, if (drv->bdrv_co_pwrite_zeroes) { ret =3D drv->bdrv_co_pwrite_zeroes(bs, offset, num, flags & bs->supported_zero_fl= ags); + if (ret =3D=3D -ENOTSUP && auto_no_fallback) { + flags &=3D ~BDRV_REQ_NO_FALLBACK; + max_write_zeroes =3D + QEMU_ALIGN_DOWN(MIN_NON_ZERO(bs->bl.max_pwrite_zeroes, + INT_MAX), alignment); + continue; + } if (ret !=3D -ENOTSUP && (flags & BDRV_REQ_FUA) && !(bs->supported_zero_flags & BDRV_REQ_FUA)) { need_flush =3D true; --=20 2.21.0