From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633526401; cv=pass; d=zohomail.com; s=zohoarc; b=QuAPWrF5M1Ov3nsSsxJFxdNfuCaLRK5KMo5uBX7nBteQ20qUImkfd819uxetkiKSDD4IN4WgHfKg8pIJ7DGggTNx7B054vCmiYpF+s2cyyrXVPF4sT5cWaOubzc1CTphGVCMtHpDxFmmCYfaaV/FWAuaHpk2jDhdUQ0gg9SbSJk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633526401; 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=JgF5mv0hRlaUzAf/93fFHgtcIH3OqJwxJUgquLAk6aE=; b=HjwgWzqTSljwxxEk9uOLzoKRizBv7sxV5pP2qMoOjnrnp7VlF913AS8CY1rJxraz89ukWWdylRHhUNVJ7VONUEalBUtIDYFJouhW7a3noH+73TYfsOIIJLN3NqlIHnIotEw1mHRVQwZYJiA/lYhtGAQGuz/ZYGfIFpGqTUhmkuk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163352640103132.08250106972446; Wed, 6 Oct 2021 06:20:01 -0700 (PDT) Received: from localhost ([::1]:46124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6pz-0007cv-Jt for importer@patchew.org; Wed, 06 Oct 2021 09:19:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nq-0004mY-N5; Wed, 06 Oct 2021 09:17:46 -0400 Received: from mail-eopbgr40136.outbound.protection.outlook.com ([40.107.4.136]:14496 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nl-0004IV-Om; Wed, 06 Oct 2021 09:17:46 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB2981.eurprd08.prod.outlook.com (2603:10a6:209:44::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 13:17:33 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:33 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d5lCTDbmfeDGi7bl1p0f1sCCMkZTCxPX5dV3SZYBSkgu/2pEcsqu7KGvfjxWVgQeB8A0LeGgwmdSvEPfLTVAwAR4lez/Gr6RzZhE67x5m+IAQmN9k+sShSs5ZOp8/KGrCCIyI2hge43WM7DwFqbPVGhfBk5tgnSQKR7ShZJWZcPVMWbxIe5otsSVofxa9Q7FYlFPSER1asjTx8GNQqKBZH+HD15FsU0JRZSR0NoQgPYkNCFddqyuTYuuOl5QTY5zOa3P3l8F+Qh3GmApn1U6Z0CB6Gfkc7VMztlsmApF56pMnBVNgPVt/8Kaf37DXl1W8WMeN8EsIroLz7XZudeHtg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JgF5mv0hRlaUzAf/93fFHgtcIH3OqJwxJUgquLAk6aE=; b=KvCpbcxp6un0G+LnhnO9y2pdWJ6FdXJ3yvqpPANJ/KNMTPcvE8QfLKZreaGTZOZ3JL9Pds/1OmOv3Rp4o0jS6L3OCXL2bhwLsulfv2McZOOwx4Mk51/TqqMtomKltksVHqIQJmaD0NT4do5yqj3+3dtjlrEsvuOQy7OyQfLS26fFHhSdT8QsXcamX1cNktR6iBhzTIDG1Wo75snufC1reCKxPx3EpEq2Jj6nDhIKPlw615TvTk/uDtSjlatouo76aguHOhO9vYKe82Q4AYxRW++QBmJx11781+WPdEKSlMb/6v0iO4E6OtFLNikAoNHalcH1BARUXaQtEAwPUdfg5g== 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=JgF5mv0hRlaUzAf/93fFHgtcIH3OqJwxJUgquLAk6aE=; b=ZiOqi5NThXh0hkVxMYa3hmODR7MbFXrGrcXSI5IxrI1OICGDWZosXIJSWijhZMo25ICo7gMEciqvEZ2SEWh6HlktxJ8XJjmpNziMAslzXARAYC1BVEculeP2tLKlAD+13MMCEt+GstW2CyHkqfOnkyb3j7Kwgf97tqZM2wrZpR4= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 01/12] block-backend: blk_check_byte_request(): int64_t bytes Date: Wed, 6 Oct 2021 15:17:07 +0200 Message-Id: <20211006131718.214235-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3dd35e13-3586-4284-fd73-08d988cba7c9 X-MS-TrafficTypeDiagnostic: AM6PR08MB2981: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2qPEwpumZp7W41vot436xhfOpNzw7+wYJH9IvyPz1mFi1aGGsKy/m2G/HBJDpGdCNttBW14V2WIZyN/MQCuzo/2pNZHtLa6rbhKxRCwqV64x1azli642LpE3pwI5jJRdjIcI5EqUu7JGLlpnVm1LSO4zWoRkgcH8rnzjFpcCW/IapgtWUOGqShJvV0Nq2K66n03x4bx89PCSYPDH6f8R9flUiqNJda2Cx373+TLU2PhZ/pM5h3Vme1Cyn0qpEb1R8ELcYaoOy8s9wHoBdTprpLI4VQcjCPrj/DGWg8Aa8iS7V81q6IeuHv3kUdBvrdyJJVG+L2g2AP2m2FDGZSLuveDplAe8nRj6C1IXWxYDUPTGx1/qoArVzRCZkd8Yj/AcWXq8gv5vlT/e3XovemjVlANZLIqfkKSi5qf439KBgLW4A8zz5FHTNEXiQv+ap3P9hu3HebOdZnGhNviKac8pSoA+4VhhS44ZuSNTKOfnQW6Wg2jMGjV4nrhbejI148HWa6/Js5j6Rbx7A09D9v+eUv41VXh7BYKlrsTdVOtiyXtYAvhr2sHBWUZ6X7iDu/hl/5p+VY8g3wMsgMHeg8QHcXMfe4aiw1RS1pAGyjsRxUuI8mMyIiTcbN8g8qh3tHUySpR+m1o1/CimlXURDblsEkbuWFurfGMHuirweBXsa2TPEotI2M3NURyMBQm5zgK9 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; SFS:(4636009)(366004)(4326008)(2906002)(36756003)(6512007)(6666004)(83380400001)(38100700002)(38350700002)(1076003)(6486002)(508600001)(316002)(86362001)(6506007)(6916009)(26005)(52116002)(66556008)(66476007)(66946007)(5660300002)(186003)(8676002)(956004)(8936002)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pez94vBXlisOZF0hWgsRIlN0TxE1l5XBuYz0TTSfiVyX6SrVd3uhwD0v+xNMLKIHkOC08OJ9ypnkHwMi3o935xPDeyIKQgWawpg2nFiE15JLg+W+MaVB3TY6L6VGRbb1ffTFaNJHuSJZRPFMoYQMRyHOyZhTUgRRrZ30W4TLJXgY5WMh+86TWF4ntzgON2n7E9H2XeJPGOiHlN3zc6CNQGzd3gNrgCg/Nv6SRqTAyRzeKrWatrMfmoyBk+CqEjAdet+YImGr2lNVWcX0ApHC8qofLIEmwgpsvd5zgCqRc3qnFhY+nm74tjOYEYXh1jujQf5Xh8O5p43wnOT32fBb756kD7imyOCfALQdFTMakUaCjas17s/76+CGbgoDDs1R2RfF3gzu7scapJppsAYhC0dkCwAK/lNlbEStTdBxHqaRMWv8ylT9r+TLhJVx+bcmZn+qeXHORwF/ZFbWp5i3DO+FGNq2IK59N/9MsDH+VC29PMH4+R5cLU8Mqfph/BODQ/OcOdPUiFpFF2f6Y64boNU30h7G1p//MLQpU6VwSYKlK3cpDyd1euLn3+TZTXFlnc29x7/bmZWFdq+i46EHynVzg0UiQw/T3Biww3PAX+HPoE1cRK+2SO63wIg2Q7jaW9aO0luRxBGQZ68trETYHtVCfTKNnRaJ0Gd6XqUaGlP/ocVAmojJUV5YfRjBuVR1N+fcf7B/m0ZN6MtPmzP2bNnDrlp49wdK1xqXwTgWFxlPauBbF3ho3a0Xybwyk9NK X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3dd35e13-3586-4284-fd73-08d988cba7c9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:32.6766 (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: pkxRUGNXcXsFBxSv5o/YahmZd/byD8/JNlAtPrCawDHxtiqHFCjEsyL45W3gQzM/9KPuUiNKj6V57XQDb9CvM7LGF1W3qs6NCSDfIZQdq8c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2981 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=40.107.4.136; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633526403675100001 Content-Type: text/plain; charset="utf-8" Rename size and make it int64_t to correspond to modern block layer, which always uses int64_t for offset and bytes (not in blk layer yet, which is a task for following commits). All callers pass int or unsigned int. So, for bytes in [0, INT_MAX] nothing is changed, for negative bytes we now fail on "bytes < 0" check instead of "bytes > INT_MAX" check. Note, that blk_check_byte_request() still doesn't allow requests exceeding INT_MAX. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/block-backend.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 6140d133e2..d121ca3868 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1161,11 +1161,11 @@ void blk_set_disable_request_queuing(BlockBackend *= blk, bool disable) } =20 static int blk_check_byte_request(BlockBackend *blk, int64_t offset, - size_t size) + int64_t bytes) { int64_t len; =20 - if (size > INT_MAX) { + if (bytes < 0 || bytes > INT_MAX) { return -EIO; } =20 @@ -1183,7 +1183,7 @@ static int blk_check_byte_request(BlockBackend *blk, = int64_t offset, return len; } =20 - if (offset > len || len - offset < size) { + if (offset > len || len - offset < bytes) { return -EIO; } } --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633526589; cv=pass; d=zohomail.com; s=zohoarc; b=nZ9Mtj+G3vRzUf8DyZtjRP8RmxkMBjach72t8LmXuggOKme91BZFkMKG06LeFxFI3dckT6CYayMW8UW+LmfRl062Zqeul9dve/uk5ZjsAEDHqApUtm4MGiBZk8jG1RucyfIiW19mje3OC0/2IdDDRMJW1T7QAgCPpTsp8IWL5W0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633526589; 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=Gtdcjl4L9AZonwEVh51UCnTwzZRxZrPN0x4LhA7gw7s=; b=XghYiDQLCFMS3SL9IM/lnw/rhcUZgQ9a2lIzFh7Rfgwj9sqPxOkpiBSlr/qSfIkOJlnZrDrY+3mSa/4hC6UBKNGodml+ZiDGxh1svNjrqok/XH3UGFPc8WyqCl5G4kRrE9Dr2UiiCo0xwPa2rfQrlETf7gr+tAOLBK69PNZ28mE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633526589913258.71199734824756; Wed, 6 Oct 2021 06:23:09 -0700 (PDT) Received: from localhost ([::1]:55254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6t2-0005Iv-VV for importer@patchew.org; Wed, 06 Oct 2021 09:23:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nu-0004v0-Ka; Wed, 06 Oct 2021 09:17:50 -0400 Received: from mail-eopbgr50102.outbound.protection.outlook.com ([40.107.5.102]:17182 helo=EUR03-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nr-0004EY-9c; Wed, 06 Oct 2021 09:17:50 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB2981.eurprd08.prod.outlook.com (2603:10a6:209:44::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 13:17:33 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:33 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LKcNiS22NdR1hg8vzNZ6ON3vFmlo6UVqZvCAt3Pv+QT7KTg06CgFUPE5OVTETi4PTzRBxO0BzJBoFODV56hn6GK/WkU47nqi61cy8iRufPd1yQGOyuo/2CdSMe8qRwU2OQpLxf+J4pu8abVcY2S1oTGnO40BaYPKcB+fn8GIMQ/SG8EaJnlm5Xw6fEuDSe2R0YVcdkfGiq4GuWRijvaDV3FWISd9IcROKp8IWl3O/s80CjBLtAYAQp9AN9HS5BmwCOVtIBxbv8RUOqyT9xfjUbn7cGd4M3bzP6vu0shRQEqr6GqdF6SLXY+R3rXTn08o4tqH6ATaV3bfzPhVlL7TOA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Gtdcjl4L9AZonwEVh51UCnTwzZRxZrPN0x4LhA7gw7s=; b=meV8vBpkQ/4O8h6O8Vcljh7hsExVqL+AFX0AMCtG0pQ9CAa3y0/P6rU+rqZULAFeihq8f2ChI1vGTKDO/Jgj+uLBBMWmRSbxuseV1j0WngVN0BUjkP9LCnZSy6FHXzoi9mm5vIWNQFtk/CbgvQxQBUCBjZ6WE1GzGCmcGzAyQj4GuABXbP1sNyKxPcGm8oQ/qngdK0G1PiX0d9XlkXYmlpGJ8r1uiPhp/LpmzHCZcVLOIqry10v3NBmgtH/2vu/BW5k4fZSYn7u52xPFFfNKz0DIAcib7jUifTajXs/EAQMKBRKJUzaNj6U3crMNfwTyv30m6cvNXM9DvJG5tszXOA== 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=Gtdcjl4L9AZonwEVh51UCnTwzZRxZrPN0x4LhA7gw7s=; b=JQXn+z1BILejiuKKJEG4ZE/eA3YOiVTAszclb4yUw2BT8KVZYfmyylBxdqGArL1oGtdrXvqrIMN2d9gHZ4hMxM96ErDuWnrHcbdY5OgF4Xt2DZLk5M0mVai52+6eLmjBdDIeoXBUskdKxjQhq4nPCzuJNALCVgOfu1bhVKDhxIA= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 02/12] block-backend: make blk_co_preadv() 64bit Date: Wed, 6 Oct 2021 15:17:08 +0200 Message-Id: <20211006131718.214235-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 68b4e4c0-8cf4-495c-dd9b-08d988cba82e X-MS-TrafficTypeDiagnostic: AM6PR08MB2981: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:161; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QPVPWQ6uI2YsghyIq9OMpo2gZl2xdMmMxGyqlly3uIWDtZGjgv2r/frnCcg9uL5j6iuvG60Om7tNkVNrnS8hoWkjMv3tBFfirrOpzqOuzSCnL2C+6HevKliRIwXEwHKzCfxCy/2tHjjqB3CyyqVzrcvq+Zhqk5l56FRYZDmBF9ldgh2tjoAOHD8vjgKyO1shqQxuOug4r3l/P+qH/4lTopRWlKUb8hPJSc8vknZ2MNxACFhp4dGn+4fNrE9Deng5NlXd9EwhP6TYKFpddV9R6OpeBHp7tCzDjmIuR15BOCcxO/GlWtD09jHRBI5juJJmLI1Sk2ZB/Ge5xprtN6VtIIkZzOswG6bH8ZcpNb5261GroywNJEoRlQOrg9pBP1RiAwj60MiE4uOwMG2SPRAG1+GE2TGzmWSdXYR8LldimpK91WpY+74PQEqpMrgXbKziF+rmBQ+64jlKzbNZwAqpCXKLydA1XyWeK8w9HKd6Dd3YDFTOKXPhu593qIyIlnu2IzivgT3mjpdohaE1bRqmS2+toZtVnF/dhPxRDSHgdnI7ywaGFvWFt3kiuI57WESJzhOp1ckEi/Lbh4doemTUwIkFjBgewAemXBBCBHpgLa51pjchPvFNKdIAPX+EJXZcGkNQR6V/YU4Pz78HfeihkSpEWX8pzYKZmQYRc/K6red2G/PMVcknNtbcYXYRdZ551vberpQ/EiGLSGSS4Q/TIw== 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; SFS:(4636009)(366004)(4326008)(2906002)(36756003)(6512007)(6666004)(83380400001)(38100700002)(38350700002)(1076003)(6486002)(508600001)(316002)(86362001)(6506007)(6916009)(26005)(52116002)(66556008)(66476007)(66946007)(5660300002)(186003)(8676002)(956004)(8936002)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 459LrXmES3JGni0uAvtTpHsFd+gnZU/cIYIkPmZio65/1AS5hl/cu1GhsXqt1iE5P01DfTsjPHQiQlrO39JSFbbxenbunDRmRjzsQMrnFahqDSeGBlojwGfE5qUycZPiP8zdreGQJpejvgrLrUzIvY+kuDBPlAO/YJy4wXhIJIP13LiEAr1FXev93kpu3Ugqat828uKfJ6XJFJjWkhiQAFCruRkL7DHkfoX/39VXJUZEXNS4gHVV4CYFEw2rREOI2s9dTeJBu5vZ4PzKBsedHnnH2hsT07RTo2/PAXgyrCBSwctIMYfC2i7sXwdcwi1JCb7jC6+XYWUCrU7iXznXTyZN0r8tpRJyx8av/YLanKYf5vnONzC8qK5XhgRSwbCwT0oV+aNOQtbJ3RXW29/N1Mn41q+IUnK0q9V2m952jAbiOa4NKcfglPpdEV6iQAjWl+H82AyLxxv1hIRuCL9q3Smp81VQ00Moxyn+0bSp2HMD/3e740deNn2/PNxjn8epIhx+wjrl6GsQGB+Lcpzk1p5FnFgMpeg8c9AvlwCoxKXjNMlQqYOk3jWIgEz6UtFs/56EkKNQTyNKpPKLybCyiQDSXMT5TsbIySU/V8BXNWdUCqYAtjsV0OWS4C9GB9O4HIZks3ipLDB9JUzkw0OpjBGFJKC9sHNalCiC9JxP3IK3J/LWIVv32OSghAGxHeiLMDF7ZLMgmYQd+m2kx4uvnMzpiJoYXkIoLtIGyUcx2p4SmxgjHMOPe4f79gyD68q+ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68b4e4c0-8cf4-495c-dd9b-08d988cba82e X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:33.4283 (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: u8AC1QOprNbejFZ5iuT50PJmHM3y/rWcaTys827k5YBn56s48YH2spEb9YiI7cu7Xmld3NvS7fychzi0X43SCAtN8LfyzGhoXXitAID5Vr8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2981 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=40.107.5.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-VE1-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633526590815100001 Content-Type: text/plain; charset="utf-8" For both updated functions type of bytes becomes wider, so all callers should be OK with it. blk_co_preadv() only pass its arguments to blk_do_preadv(). blk_do_preadv() pass bytes to: - trace_blk_co_preadv, which is updated too - blk_check_byte_request, throttle_group_co_io_limits_intercept, bdrv_co_preadv, which are already int64_t. Note that requests exceeding INT_MAX are still restricted by blk_check_byte_request(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/sysemu/block-backend.h | 2 +- block/block-backend.c | 4 ++-- block/trace-events | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 29d4fdbf63..32a88878bb 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -126,7 +126,7 @@ BlockBackend *blk_by_dev(void *dev); BlockBackend *blk_by_qdev_id(const char *id, Error **errp); void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops, void *opaq= ue); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset, - unsigned int bytes, QEMUIOVector *qiov, + int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags); int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset, unsigned int bytes, diff --git a/block/block-backend.c b/block/block-backend.c index d121ca3868..be5a7fb5fb 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1205,7 +1205,7 @@ static void coroutine_fn blk_wait_while_drained(Block= Backend *blk) =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ static int coroutine_fn -blk_do_preadv(BlockBackend *blk, int64_t offset, unsigned int bytes, +blk_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags) { int ret; @@ -1236,7 +1236,7 @@ blk_do_preadv(BlockBackend *blk, int64_t offset, unsi= gned int bytes, } =20 int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset, - unsigned int bytes, QEMUIOVector *qiov, + int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags) { int ret; diff --git a/block/trace-events b/block/trace-events index f2d0a9b62a..ff397ffff4 100644 --- a/block/trace-events +++ b/block/trace-events @@ -5,7 +5,7 @@ bdrv_open_common(void *bs, const char *filename, int flags,= const char *format_n bdrv_lock_medium(void *bs, bool locked) "bs %p locked %d" =20 # block-backend.c -blk_co_preadv(void *blk, void *bs, int64_t offset, unsigned int bytes, int= flags) "blk %p bs %p offset %"PRId64" bytes %u flags 0x%x" +blk_co_preadv(void *blk, void *bs, int64_t offset, int64_t bytes, int flag= s) "blk %p bs %p offset %"PRId64" bytes %" PRId64 " flags 0x%x" blk_co_pwritev(void *blk, void *bs, int64_t offset, unsigned int bytes, in= t flags) "blk %p bs %p offset %"PRId64" bytes %u flags 0x%x" blk_root_attach(void *child, void *blk, void *bs) "child %p blk %p bs %p" blk_root_detach(void *child, void *blk, void *bs) "child %p blk %p bs %p" --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633526772; cv=pass; d=zohomail.com; s=zohoarc; b=TXU/aiqQc6QhGl4XHH6LAVLE2HZbvR/MnkWnqPs0lQKhXKHe9rPK55VYYECSEZVNan1ddaXvPGkC8fmICYsqGcK6RqwtdDV0cpi2fLd260Xeh4i2JqBDyi2maYF0nG9DEsulVv5neOE65Mu7HtQO7lI/xezbAL7ZEByv2wNeAP8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633526772; 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=e9OFZEVPJ46HmehMuoHo3VAQ3lpLRXKsnVu4S5oZMbY=; b=Cy3RZyNWG16y16S5OmjklN9LeVKwRKl9thayxSJSiv9upgMWrkvOLE3hY70AsOb8ByzSkERGlaKjsXM5b/F/iCXXz/k8P38TaASnH9RjhlWIXF93+afitcmUEn67wW8miXRDgkfS5f0Ccb+MO8Fy6cnXrbGmB+SmHt4r7dwBNEg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633526772311111.9210010421649; Wed, 6 Oct 2021 06:26:12 -0700 (PDT) Received: from localhost ([::1]:35378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6vz-0002RZ-1P for importer@patchew.org; Wed, 06 Oct 2021 09:26:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nu-0004t3-1s; Wed, 06 Oct 2021 09:17:50 -0400 Received: from mail-eopbgr40136.outbound.protection.outlook.com ([40.107.4.136]:14496 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nr-0004IV-BF; Wed, 06 Oct 2021 09:17:49 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB2981.eurprd08.prod.outlook.com (2603:10a6:209:44::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 13:17:33 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:33 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ix7OWPAgRXkB3F1tWD5ERTWoFkLPcYt0Na6QJQc9tJlmurc+OdKNzOPUlLrtbWk+HDLuAEe+gq5fRJ0czzwkN5l3Rd1tghcrnu+fZMk0DDTljSY6IlmXusr0dM0zR6z7gpVgMUd1lFqQtc9c/+JKnlnSXnaaqYdfXG4dsAxIu9tF3dY4mcRXsGy8qj2GERJHKKSaco4AVCFTFEmuzsQOsXtGxYK93IziISzut7v9ZUhY/9LnqykqIDMN9B6o2+wH6+h+iM/scHPTWuuIsdbK1Mmrjl3RyVjWtZqpVsyllq6meWYAZsvO62iKzEQktZXc6AiH+oxSn6EiDxRgECeEtg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e9OFZEVPJ46HmehMuoHo3VAQ3lpLRXKsnVu4S5oZMbY=; b=aCnbBf170stM75vGFWHQ3J9QfTzlQtaSavU65f2FLdgmrSQbGZ4OT5VdG3L+smRVqaEozKZlMwVGlF5KDbm1MshuxNa7ySu67ZxtJkAP7vDeqMQo++CHY1LnWQ1ZyNhLsiINxG75b9hl+4v26fUAuZtm9fQjHs7kfQX98kB6g/tUhS/gmoFZTXmmxBuYUo7SSEnAqnvA6mdGFUpNhgH7G6S59W3sIi2YDHfunQUsQEUsNBAJ98Y0EZGL95GKPmVAV7KU3OxAWb2mjRnjxIuQn7tKSmJRZ78Bvy8heemGYq/OxZBjubHkJbw3O5tr0dPReZvX0gJYkPIBt0oLOgUDIA== 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=e9OFZEVPJ46HmehMuoHo3VAQ3lpLRXKsnVu4S5oZMbY=; b=iHQbW8GyqfaO2e7U9rKd35sRpJQxJhc5SFDjitRtRpE5xQj97c0Wz7j93zEj3oWWVAXCx+xJ8R1NxKcpYmDJcWvRK8kImiPoPA0QKIVhx/vWw7q+7VkVaORs19h93gSNKv9Bo4euVvcSIrp/1QLTvG6JFpsg5zcTOPJ3FQFXHSE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 03/12] block-backend: convert blk_co_pwritev_part to int64_t bytes Date: Wed, 6 Oct 2021 15:17:09 +0200 Message-Id: <20211006131718.214235-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 838a6584-2bdf-4134-aa86-08d988cba899 X-MS-TrafficTypeDiagnostic: AM6PR08MB2981: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:217; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8C9Rm+6DDdxFNuYRZWsYjz8wDgm/G7mvff+xe0W4I32/6RKJla/HYpmVo4Wl5Ubye4kkOucCVN8Q0T2pz2ucBrUTVwKO/Z+GbIE6oFrRYwK3tzFAHGvEUW1dP9GOBVDMTKi1ieI4uYcfPzbaiUTZxwWli46gLZA3dKw3YRDBvwIab4vCEwmHgNdQ17Rx0cVumF7bIdGuVMPGHVWWjBtnQ2we9ykyItZkw7lrz1d6cNb8XA5v9LS0wB8nmRwQmy/iT95vSPZdNpYbRXhZipU5ZsMV450UQYrbfMeEC4cauhsILO4LpLVlorE9yBdx4kOlkGZfQ71WfIM/42P83/Xn/2qrCvcx3STArCVApaadpzKgynObcH6WwmueCIQ+0uuP/a6mcazHzeea4VCNP5V+ZWfAfMpJFxpTdfG17nnzgXAJJ6pA81adYV+1xT8w/SqpsU7DSMvh1qBpktxgfvVCtKV5NWsBz3QhR+Cnssw8FBvs9OLi73kwom6WScHVXVeZDdywG5fOeXw6ktVjOhphpQQbYQJ6YtKPmbSD2FJ4EaeUnnoQDGBGFPL+a1I8oZZXVRFDXDeit8/CZMnBpduUriSowHN0a7e5zeKfroGR69TqqXWTOrVKx2YGeqixsnmSy+vttNT6j3yiNJcOHoGODHyI+/XAAG3ZSKJj6pAFPEvso+jTM9eT2X9+zixBuY+ocJ1YkCOJHx3l+Fsjw8gHhA== 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; SFS:(4636009)(366004)(4326008)(2906002)(36756003)(6512007)(6666004)(83380400001)(38100700002)(38350700002)(1076003)(6486002)(508600001)(316002)(86362001)(6506007)(6916009)(26005)(52116002)(66556008)(66476007)(66946007)(5660300002)(186003)(8676002)(956004)(8936002)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oe7JI4vQah3k7zxwPAKrjkNaRXVo1LN5Z2K4FnOlgNQYW4UVAT5SlLts1Ewba57zlT8KIT07xswMlG0EtVHolUvCJXF3hsidJOeZVeBj/LWZgSOasG+2ZKXhNHhgQ9+0GxRxvMA1DCyWWPvO1nkq87co8IiSkvKsNjoCJMm2wW1QVtIS9BqBLZOVurxcT70C18Ng+cGKhWuH/nQRvBnY2iyBnjVx6rd0J/rZVYyGkBDm2aSj+/8nJbFdJBDeWWNaxf3wmI5yQTWGWIkRMS7aNk56rnQ4ue4wyzo78HVxcQPN9lLmCD+0drZVW7QzM7TBp/eWLuRJZ7C636LvKpRMac133/7RbxNmetYC2YSCYohVmMJWQtuXWpuCWvNW1LzJqC9nQjcwEFzZGqtrF/1uD6cilNsz2Pv786iv9Nu5I5JbBZADOkbmBqihdKZZoCQCdgawRu4FWZQjkDrLuz5PuhvqVkVV0LQrZjkGgUS/sbYK64zeF9dssVZpyEvuVc/G0XaaSxSzc1f2sHDHpdB3l0DxwfuFVFRFEZ5jmAq8AQW5sdZouCMb2nXJJZ9nEEG6M0hCum3WDzhhAFWQdLit5zNcmF5JLpcWjbymNcAUZpom8Dqhnv8SAoMhbcrBaqAMPSaxBJT697HIzoNtQQyid+zUtfcVznbRs+6TRbFE/+0piVFUzaQeGOhkjWYSq9ni9SKCypUE2hzosg75ohU4AANPVblcPhJiQIwhyHd0WBn2YwS9N1xpAl+EzbMXgn4M X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 838a6584-2bdf-4134-aa86-08d988cba899 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:33.9301 (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: wC2aJo4gpE8iJdcCkI9tcainRFNAdYQkZNy1ydaAL1LSDflEG3beBjluZo0xicVxgHx/5Vjzn9lErIaxmm723rQbtDyv54gETJUtLu0PqLE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2981 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=40.107.4.136; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633526774135100003 Content-Type: text/plain; charset="utf-8" We convert blk_do_pwritev_part() and some wrappers: blk_co_pwritev_part(), blk_co_pwritev(), blk_co_pwrite_zeroes(). All functions are converted so that parameter type becomes wider, so all callers should be OK with it. Look at blk_do_pwritev_part() body: bytes is passed to: - trace_blk_co_pwritev (we update it here) - blk_check_byte_request, throttle_group_co_io_limits_intercept, bdrv_co_pwritev_part - all already has int64_t argument. Note that requests exceeding INT_MAX are still restricted by blk_check_byte_request(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/sysemu/block-backend.h | 6 +++--- block/block-backend.c | 8 ++++---- block/trace-events | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 32a88878bb..844bb039c5 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -129,11 +129,11 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int= 64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags); int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset, - unsigned int bytes, + int64_t bytes, QEMUIOVector *qiov, size_t qiov_offse= t, BdrvRequestFlags flags); int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset, - unsigned int bytes, QEMUIOVector *qiov, + int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags); =20 static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t off= set, @@ -242,7 +242,7 @@ int blk_get_open_flags_from_root_state(BlockBackend *bl= k); void *blk_aio_get(const AIOCBInfo *aiocb_info, BlockBackend *blk, BlockCompletionFunc *cb, void *opaque); int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, - int bytes, BdrvRequestFlags flags); + int64_t bytes, BdrvRequestFlags flag= s); int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *b= uf, int bytes); int blk_truncate(BlockBackend *blk, int64_t offset, bool exact, diff --git a/block/block-backend.c b/block/block-backend.c index be5a7fb5fb..b09ec5a7c7 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1250,7 +1250,7 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int= 64_t offset, =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ static int coroutine_fn -blk_do_pwritev_part(BlockBackend *blk, int64_t offset, unsigned int bytes, +blk_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset, BdrvRequestFlags flags) { @@ -1286,7 +1286,7 @@ blk_do_pwritev_part(BlockBackend *blk, int64_t offset= , unsigned int bytes, } =20 int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset, - unsigned int bytes, + int64_t bytes, QEMUIOVector *qiov, size_t qiov_offse= t, BdrvRequestFlags flags) { @@ -1300,7 +1300,7 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *bl= k, int64_t offset, } =20 int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset, - unsigned int bytes, QEMUIOVector *qiov, + int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags) { return blk_co_pwritev_part(blk, offset, bytes, qiov, 0, flags); @@ -2208,7 +2208,7 @@ void *blk_aio_get(const AIOCBInfo *aiocb_info, BlockB= ackend *blk, } =20 int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, - int bytes, BdrvRequestFlags flags) + int64_t bytes, BdrvRequestFlags flag= s) { return blk_co_pwritev(blk, offset, bytes, NULL, flags | BDRV_REQ_ZERO_WRITE); diff --git a/block/trace-events b/block/trace-events index ff397ffff4..ab56edacb4 100644 --- a/block/trace-events +++ b/block/trace-events @@ -6,7 +6,7 @@ bdrv_lock_medium(void *bs, bool locked) "bs %p locked %d" =20 # block-backend.c blk_co_preadv(void *blk, void *bs, int64_t offset, int64_t bytes, int flag= s) "blk %p bs %p offset %"PRId64" bytes %" PRId64 " flags 0x%x" -blk_co_pwritev(void *blk, void *bs, int64_t offset, unsigned int bytes, in= t flags) "blk %p bs %p offset %"PRId64" bytes %u flags 0x%x" +blk_co_pwritev(void *blk, void *bs, int64_t offset, int64_t bytes, int fla= gs) "blk %p bs %p offset %"PRId64" bytes %" PRId64 " flags 0x%x" blk_root_attach(void *child, void *blk, void *bs) "child %p blk %p bs %p" blk_root_detach(void *child, void *blk, void *bs) "child %p blk %p bs %p" =20 --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633526539; cv=pass; d=zohomail.com; s=zohoarc; b=jymo5Rji49dZzm9iPsl+oV3/hi30Wfn5TX7hgwn/JqLM4LWgqiGkzwHRKfJjeGPYXDXCUA3NW4LQUuSuAazI4Z4ja6aQSNiBU7+TRrMOql3ttjVar5ZGT0CuojX8UKI8LgUnlk/FvpOmBs1IYTYvTUWCR84FghTktar8KxLXRzU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633526539; 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=zH7HLOHLgAEtQ0IXR3l6CCx44sEWn+ky1V6mtu3YXnM=; b=G0kbfY8xvqxn4WWHxOsXB11x3RDsCyNqquWhuGDbdh4vqo/qv00X9Lgwe+6Ib149XGIf2mDcvQteicRp33A5lpQyRjyOBEBPGHwwo8RKAviLhRc5e8lbtQHvUW/aPb85ZbFwqXaslevdTT7Vb+D8JLDuQzVG70pua/enCWQsH5E= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163352653954351.74115459296593; Wed, 6 Oct 2021 06:22:19 -0700 (PDT) Received: from localhost ([::1]:52286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6sE-0003MR-Az for importer@patchew.org; Wed, 06 Oct 2021 09:22:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nz-0004wt-4L; Wed, 06 Oct 2021 09:17:55 -0400 Received: from mail-eopbgr40136.outbound.protection.outlook.com ([40.107.4.136]:14496 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nu-0004IV-O0; Wed, 06 Oct 2021 09:17:54 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB2981.eurprd08.prod.outlook.com (2603:10a6:209:44::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 13:17:34 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:34 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZMg0y2jqvjUqHn9nND8KaIqQvurFFkRAX8ynC3bysRcGuMYQypP/LSzL6neRE5qCdKCTFrNbSeYFmBGpIM7LG4ZqY1WTjqlaa7RxxxnHV1Eu0oFWPzgnVnlkS+pW7Scfar4PJrmvN9JyH7bpcSXZAyXMDXIEGSACeuhm8eNONWiCFqbmNWIOchmLKTCJW+fCaJxGbmAdzZQHXbam1P3bDU6r9REMOR4HGPJEuoaWMZCugDVUzdk8tDhOVgB4t0SEOVV82rNFqRzHgvbaYLKyv/xZQhLsBHCfT8Ns3gpUT2CvbVheC+5a/Wt6pt3DbetPzAPGnof5tlMF01b3VutsSg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zH7HLOHLgAEtQ0IXR3l6CCx44sEWn+ky1V6mtu3YXnM=; b=M0+c/+nnTmFqkZ5i7muPECdXgs+Jlh6xlERAtrs1qU3VguZ6GwcCfRf6WGrU/rEVCPQbs2bC91JwB1BUrfaRGsMFHCRVu/Y5BwKaFu31AVvi36n7lsfb3kv0q2URxxtZ7H4Z4NJjOYlil20y1Ci2ijr0naVT1lfVJDAU+5BM9NKpsdMo0eJhl3yzRN9KecTJNIAsQkFLw/7GaEcZDnUy0YI03Z2bFoGq0NlhK24RFAsbY/e71ltFZtWJ9ucghdn674DZfKjEbRXr/t0LFRS9q+KJ071OpodYAEdVfQ9MGqES9F/yC2UxmKbz6nZR/EQN/cj5gAa3bHKN02stoZfaKA== 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=zH7HLOHLgAEtQ0IXR3l6CCx44sEWn+ky1V6mtu3YXnM=; b=pZioHcqlt9IUkeBeTN/UM6P+F0BfLj1XPYnat2oRTp2tGp7kDTZf6TX8v/e5NX/abbYyJhsyKQzHWQKa8DQL/QnBvojogLGQHZp5xjrGNJwm7hhivOT+hZhCtXm7Z/gWD2hY6YpM4kq/UEoMcj8z0O3lv6+XWc/U4l6KYfsJLEg= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 04/12] block-backend: convert blk_co_pdiscard to int64_t bytes Date: Wed, 6 Oct 2021 15:17:10 +0200 Message-Id: <20211006131718.214235-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5d591b3-b9e2-41b0-3bf3-08d988cba8e6 X-MS-TrafficTypeDiagnostic: AM6PR08MB2981: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:232; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SzQtTCdafUhD8KHaFdbopIf+CbYzMBlf1x2SJXOgQZoansgnv8YglkqApUTRm/UIcvC+pN2VcbLKnUJFxGTK9K68ub1XXKntrcU+eE4s6DYz9PVCGfkOEuKLHn5dMoN9Y6cLvSmNJgtUzWReFb7prRyZPa+EQrWXhvwyRzmVQqEjYqyH2XQBv+NPdSu+gpd8cUsbzBsO8RKBeTM8hDFgTA34VVpcqFYBwxVeNRIJodKByvgMB836pYl6oeoZ9b8zRBxNolqRQAeMN9z6D0JKlN6dX28eMh9JgwhfTCOhBpAtabIwIC01oXS+LrgqKvgzhvEhX6eBGVOn+uzXv3Pt7N964gPP6PqmKYD/CvfJuwC6PFJBR0BDzZ691Rd8LPO7AWObwyQpCEK6W5cL4+sYx8gZ6iguXnHVGBuS5hwdPCtBEibzZjrTU+LlMuxi8tdvS8EtEP73jIh/GnXoJcxjuM4ff4xwEjY4KVEa9OXI/pF9CrUvjxzNTgf1d+VstN5P1p8OAF/L0ijCDHVAOpC9YMgQ83pcRYRg88EhnyCHlnbuwmbdE8SVx7nH9yF05NcQZJJY3M0M4ZE3zA9bXLekVYgbfc6jzOpMVBkhzW0mIXiADGI5aQSruxrFkIAlGRZpeSsESWPVYMBzV9d/6BMmFFWBWrYXetQoAxg7Bo8BrJEE+5/Xz2OTv/mSNFEj2xX3CJaaerMVE1kl3HL5mczQJg== 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; SFS:(4636009)(366004)(4326008)(2906002)(36756003)(6512007)(6666004)(83380400001)(38100700002)(38350700002)(1076003)(6486002)(508600001)(316002)(86362001)(6506007)(6916009)(26005)(52116002)(66556008)(66476007)(66946007)(5660300002)(186003)(8676002)(956004)(8936002)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EuHgu4T3Q92VQKW62+81dqhdK8uWzOS176ZwRBV7AKoMli6P3jjySsixVs0GlBC0grOFOhroPxIwOcI+K1z3utT4NkOjLa19RPM8fEzM8qd+26klcgdy1O47JeOH3fk5lmRztbc/WhH/QseTrwjS+LbYMYtnYNtfROPyXFUNS1xYJtwUwVwfVsiVJ3b0IJaQ2mEce4Bx7+IsetQvvLxM+Wskuce49AHblvZqx+s+SKiGZN20l/F8DgNt/+I+GbuAptlX0S514Zjk0iC8hMaiJiJDkssf+dT8vB022/uSvEGuczBwwkKqNY0N6KxNHR3pvMeDwnPSVMHw2JOg1Hs4BidAzWTCX+4m7oJziLOCbLTmWBfF7k7vfEdcy/uKmc6OLTZ39jkC7gbHZGdy2MSlWQw1L2So98QnXMY5z59BQ48OHQI1sQPx0Z1uahBTgCNZGb33EensA2OH4QzyPP2dDjUelKW118aIMgywdTpg9TFfXk7UW3aljtuDTDIWtvQNNL69oKQFMWOydKidKUDAi3j60YwPmpnzIp6NHGYh1jww514MsIB9eU15iOfdwyDRBkFMHEWlQ4PBmfUP4HJRnaVNFjN90IdRm3K/zQ6wajSTAlBmrhftitea0ddEif4jR3NrSgCFUBb5wPOX9zisIJ0fAQMCvGVLweBQiG1s8OZPxDbIgOpkGTalJW/6k1wTHTD3yz1NWrZBIIDecysdFNO+L/qL+8a6H/toQVFfrhC2p9hlulc8Kp41kxafeCOZ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5d591b3-b9e2-41b0-3bf3-08d988cba8e6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:34.4608 (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: /A5LVB1aNtoOpWAv4fxfNaxfPNMPRgO38dsIs32zGc+KzXCE/KuWBs2zS/bkA5wQtvcpqFn33z3lonH4ID2XfHKO+oAIJvoVttrqG8GnfxA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2981 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=40.107.4.136; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633526540552100001 Content-Type: text/plain; charset="utf-8" We updated blk_do_pdiscard() and its wrapper blk_co_pdiscard(). Both functions are updated so that parameter type becomes wider, so all callers should be OK with it. Look at blk_do_pdiscard(): bytes passed only to blk_check_byte_request() and bdrv_co_pdiscard(), which already has int64_t bytes parameter, so we are OK. Note that requests exceeding INT_MAX are still restricted by blk_check_byte_request(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/sysemu/block-backend.h | 3 ++- block/block-backend.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 844bb039c5..398e7abb02 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -181,7 +181,8 @@ void blk_aio_cancel_async(BlockAIOCB *acb); int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf); BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned long int req, void *= buf, BlockCompletionFunc *cb, void *opaque); -int blk_co_pdiscard(BlockBackend *blk, int64_t offset, int bytes); +int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset, + int64_t bytes); int blk_co_flush(BlockBackend *blk); int blk_flush(BlockBackend *blk); int blk_commit_all(void); diff --git a/block/block-backend.c b/block/block-backend.c index b09ec5a7c7..e408893985 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1626,7 +1626,7 @@ BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned= long int req, void *buf, =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ static int coroutine_fn -blk_do_pdiscard(BlockBackend *blk, int64_t offset, int bytes) +blk_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes) { int ret; =20 @@ -1657,7 +1657,8 @@ BlockAIOCB *blk_aio_pdiscard(BlockBackend *blk, cb, opaque); } =20 -int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset, int by= tes) +int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset, + int64_t bytes) { int ret; =20 --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633526937; cv=pass; d=zohomail.com; s=zohoarc; b=bHpZCoOuWBMYKQ7p4Ulhq+NwkRC4+4diVFVaXvdH/fsZao5lrCt/8tOlcvMvpxsz8jPPh6um1JQHnA5KOCntbAFpJsjE6GjkX/vYT9WmGsyEQCl1pfJjKlqeSLjh7xoRETqCPAU+vh/JlCBzkBNKVAitQgKEW9n0Ad1F2e4B/L4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633526937; 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=NQSEtqKUI3OSCkEw9uGEWsVgKq+9/d6HH7FR8F4bKW0=; b=Ps3H/7VQ3qEqqMiFR8st4KF6LEyQLRrSYIrwlvxBYhP6rUz5EsW7i4zWtzn+Whj6nPBg0WKGk1GdHhBiJvMVWRKmdVQ84cd5AGxBej4KCEJIknGqWAjhPn9Fv9jZ0pBcZY2CTlOgr0suQRTBBtQYQr5lMUr7ZKt8ATBKaEDO0a8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633526937632556.0106642426563; Wed, 6 Oct 2021 06:28:57 -0700 (PDT) Received: from localhost ([::1]:41114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6ye-0006R5-ED for importer@patchew.org; Wed, 06 Oct 2021 09:28:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6o3-00053B-2p; Wed, 06 Oct 2021 09:18:00 -0400 Received: from mail-eopbgr50102.outbound.protection.outlook.com ([40.107.5.102]:17182 helo=EUR03-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nz-0004EY-BG; Wed, 06 Oct 2021 09:17:58 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB2981.eurprd08.prod.outlook.com (2603:10a6:209:44::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 13:17:35 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:35 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gerULXRv/FCWPvTlBYWfavQJ7EFSsZnEn8101HvoQjtT4PR17OlgFABpW98bx8stLjD3ihK2U2RpdnTLJ5n1uEB3QWaGgi75Sn6MhvRbYlCnfmmJWose4gktP0svJd01Yem/QQ0IjIwV4wNhMKkDGNrIZvI1y0Hdl5t2JevfIuKWumiBJoqZGuGSXkgVIlkf0CajVJvbDK7c+tm293uMzYnhVHk1sgYIUi3jSoEpy3hKz5ZwpliDq+D3kwR+WFopATYb4jARfxjjRTCMC2iLODBPNzQ+ZOz2TLHE+dRuOxBARJTXUb0rQJ8oQl0iO+shvql/T+iiQ0YEN7BKlCuBQg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NQSEtqKUI3OSCkEw9uGEWsVgKq+9/d6HH7FR8F4bKW0=; b=DgDEc0V6bhQiDgushxLNb8jY2tL7yg3rrsq3vnOOlid7E7L51hxwUKhgngrt4bKUbOUyDmjmvcPBS+cNrnlI+EP4lB7xR8c2W1hKb2zQorBE9meHRHwOXONjgoQ6wOwn7TFdqx5GYjPqpp1cA/YpB090k94wjj20ApSiWy1yRBkXiSjGDFYpxjjQzhy5QU3hN8i5MUP0IjT4OUKQB8TdAY11A6G3oYcGPdBk2qw20xDsf462aUzyQqm0fYF3ACrIHY2waOu1kDOAyb8hnlu6USl1tRo/7MMS8cAAgki9RqmYfqIHIGsyr+3FwehHsGTjaenRh9w6AgWBRqfxDDCtrg== 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=NQSEtqKUI3OSCkEw9uGEWsVgKq+9/d6HH7FR8F4bKW0=; b=nZfL0xfIwu1nxbGPcezoeXfmXAMB/P4e8boboepJs3L5xMNyVE9CDvFvj/lJKumtn5JOn25YqETLX5cgtnPR1K4YuxpMCJR8LN8jsP9wnZsCnWehu66zOM82gfCc2ccNLaZzrXAlzWNEV+M9dqz66FV01xs5wJn4dFaWV04SqtM= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 05/12] block-backend: rename _do_ helper functions to _co_do_ Date: Wed, 6 Oct 2021 15:17:11 +0200 Message-Id: <20211006131718.214235-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ab28fbc-ee7a-4021-a710-08d988cba93e X-MS-TrafficTypeDiagnostic: AM6PR08MB2981: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:336; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l1iQtH50SkQJe++MYVKWA4ZspHaM/TGPuTpwCFW+c+ITT3ywlOqR2J1/cMEmTMVEAcDxnI/N3JXrWf7jrkE/jFGrb7aTzspjzN3VgkbbHDXHQW0OHpZIqawG26maA+8Q1yFzHjY+A5dFrN7TvWrKVvCgnLPuLC+c/Vf6ddD+P3JY6er/dbUFHXn35ES9aVViZXFtULhw5au8VEo4poWj7FdUmpuwGsrDslCJko/OJiKQbTniw2pU8WSqBF4u7wx0Tj9M+d/ey3f5cXclLRCZYaSyVufH/oWF+AA24ZHqEIfcB/yRBZjrx9IuWBYbZKw6UbMwX7/qpSZwZ+UFe6hxJESfJ8Ie4qd0WABry5JBT3nO1UMOyYctRxBuVYRDkicOFPZ1YWzuUbf+7ND46HuQTGevSeke6HKLnSOVJ4+i30b0SbVe04UQQrAgBhwIAhgQzZQlTH12e+xgp/5LA3MQ9wAb16+1q6jxHzCXAlmDS61EQkg5SNj8bRTwVktxrnQ/6FhASAFZS+A6HDAjHrUkGR2co68rFdl/foLk0KVfrfmZH7r+VZEmASWMpqfsLZpIG+K60hSQT76eYHfYClHDqXHmxyQJdiFqVzZLMeNch+LVDyuGuv6frBlyrARn5OWa7rrdD9/1UhTuQfuL54fRjn6yJmNqnjUlBKN6BteoXGhGwe3Yw1YwKR+xONYj3dhhNIri6LcZzV8dcmPoCrfyCQ== 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; SFS:(4636009)(366004)(4326008)(2906002)(36756003)(6512007)(6666004)(83380400001)(38100700002)(38350700002)(1076003)(6486002)(508600001)(316002)(86362001)(6506007)(6916009)(26005)(52116002)(66556008)(66476007)(66946007)(5660300002)(186003)(8676002)(956004)(8936002)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zVrvo0wiH4uWDb/q3y5YBWEhZWB00i63Aekj3AECsYFgkYjztt0LBc62Dk9YLWa0FJlbapA/KI3J0ovkiBG6zZH8NoKRFqOmtR3x1EK5H19PIMfNL2NMjJG9WcgyFIsT1vEGEMYsXQTYesJ0Z13ev5+iq6302/cg71nF/jV1OGE8xDm6HQlupy7Cb6+FVkk92X6BPZsiJ5ElZ8mZ0ze/m1Xbb4IkDsTdm6orAntdOYEx5u8lbHJfEo5DQ3uI9ExHs7szIpvYl8EHMBLtp8J/zLXbjqc1amqTdjEh/HT5701ML4n1xJmfQUyTb2AvmKHDuXYolbVVAyHr/NxkYWI6PZEb1O/BKQKGONnB+NDQMMvJo4eqWeQfx6wsYe2NxzYFpHwgjKOkoW9gRSO0/jslC+kBOJU6ouHlJn+/vbvH4WC2mPXbricEVebIyl7565SDnC439avPqsldd4QlS3nVc26XUMk9AsIo9XIZRrmEBcYvcjTRRHy4ZvdNneTR6+KswFRxWgh91DnQNDck+o067ZOIvhjukD2gynTf3l+CY3j3F8DTmSMpTv0KIXK1aH58wxBkzt1cbQTf4/bxKrP2AkMkW+38gw9F+rLB4COpDiyqiqsq5hQxIsJN882eF8kA7KsnR5K3Lll2ggk/lc6WgF1AWNydJy3Mky0Is+7Kxf99jQeyphGKhRJuSl/JfyfRmtwVv+9GQGDvfdHgkKvvSeqocdoL0krpqBd8wd6gw2kv0lz5yfTQ+ZCWLsb6DWhU X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ab28fbc-ee7a-4021-a710-08d988cba93e X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:35.2832 (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: XZAR/MBWJOZjCveDsPZmbH/wpODDtvi8bY6LoEb+FoBe9uFBxi1PNVvI9b8+1ayNPSCJe5qtSJB4Asg5ZeehnJOkeX2eCyAIXThNn95tIrk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2981 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=40.107.5.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-VE1-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633526940462100001 Content-Type: text/plain; charset="utf-8" This is a preparation to the following commit, to use automatic coroutine wrapper generation. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/block-backend.c | 52 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index e408893985..8100d65b43 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1205,8 +1205,8 @@ static void coroutine_fn blk_wait_while_drained(Block= Backend *blk) =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ static int coroutine_fn -blk_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, - QEMUIOVector *qiov, BdrvRequestFlags flags) +blk_co_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, + QEMUIOVector *qiov, BdrvRequestFlags flags) { int ret; BlockDriverState *bs; @@ -1242,7 +1242,7 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int= 64_t offset, int ret; =20 blk_inc_in_flight(blk); - ret =3D blk_do_preadv(blk, offset, bytes, qiov, flags); + ret =3D blk_co_do_preadv(blk, offset, bytes, qiov, flags); blk_dec_in_flight(blk); =20 return ret; @@ -1250,9 +1250,9 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int= 64_t offset, =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ static int coroutine_fn -blk_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, - QEMUIOVector *qiov, size_t qiov_offset, - BdrvRequestFlags flags) +blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, + QEMUIOVector *qiov, size_t qiov_offset, + BdrvRequestFlags flags) { int ret; BlockDriverState *bs; @@ -1293,7 +1293,7 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *bl= k, int64_t offset, int ret; =20 blk_inc_in_flight(blk); - ret =3D blk_do_pwritev_part(blk, offset, bytes, qiov, qiov_offset, fla= gs); + ret =3D blk_co_do_pwritev_part(blk, offset, bytes, qiov, qiov_offset, = flags); blk_dec_in_flight(blk); =20 return ret; @@ -1319,8 +1319,8 @@ static void blk_read_entry(void *opaque) BlkRwCo *rwco =3D opaque; QEMUIOVector *qiov =3D rwco->iobuf; =20 - rwco->ret =3D blk_do_preadv(rwco->blk, rwco->offset, qiov->size, - qiov, rwco->flags); + rwco->ret =3D blk_co_do_preadv(rwco->blk, rwco->offset, qiov->size, + qiov, rwco->flags); aio_wait_kick(); } =20 @@ -1329,8 +1329,8 @@ static void blk_write_entry(void *opaque) BlkRwCo *rwco =3D opaque; QEMUIOVector *qiov =3D rwco->iobuf; =20 - rwco->ret =3D blk_do_pwritev_part(rwco->blk, rwco->offset, qiov->size, - qiov, 0, rwco->flags); + rwco->ret =3D blk_co_do_pwritev_part(rwco->blk, rwco->offset, qiov->si= ze, + qiov, 0, rwco->flags); aio_wait_kick(); } =20 @@ -1483,8 +1483,8 @@ static void blk_aio_read_entry(void *opaque) QEMUIOVector *qiov =3D rwco->iobuf; =20 assert(qiov->size =3D=3D acb->bytes); - rwco->ret =3D blk_do_preadv(rwco->blk, rwco->offset, acb->bytes, - qiov, rwco->flags); + rwco->ret =3D blk_co_do_preadv(rwco->blk, rwco->offset, acb->bytes, + qiov, rwco->flags); blk_aio_complete(acb); } =20 @@ -1495,8 +1495,8 @@ static void blk_aio_write_entry(void *opaque) QEMUIOVector *qiov =3D rwco->iobuf; =20 assert(!qiov || qiov->size =3D=3D acb->bytes); - rwco->ret =3D blk_do_pwritev_part(rwco->blk, rwco->offset, acb->bytes, - qiov, 0, rwco->flags); + rwco->ret =3D blk_co_do_pwritev_part(rwco->blk, rwco->offset, acb->byt= es, + qiov, 0, rwco->flags); blk_aio_complete(acb); } =20 @@ -1583,7 +1583,7 @@ void blk_aio_cancel_async(BlockAIOCB *acb) =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ static int coroutine_fn -blk_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf) +blk_co_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf) { blk_wait_while_drained(blk); =20 @@ -1599,7 +1599,7 @@ static void blk_ioctl_entry(void *opaque) BlkRwCo *rwco =3D opaque; QEMUIOVector *qiov =3D rwco->iobuf; =20 - rwco->ret =3D blk_do_ioctl(rwco->blk, rwco->offset, qiov->iov[0].iov_b= ase); + rwco->ret =3D blk_co_do_ioctl(rwco->blk, rwco->offset, qiov->iov[0].io= v_base); aio_wait_kick(); } =20 @@ -1613,7 +1613,7 @@ static void blk_aio_ioctl_entry(void *opaque) BlkAioEmAIOCB *acb =3D opaque; BlkRwCo *rwco =3D &acb->rwco; =20 - rwco->ret =3D blk_do_ioctl(rwco->blk, rwco->offset, rwco->iobuf); + rwco->ret =3D blk_co_do_ioctl(rwco->blk, rwco->offset, rwco->iobuf); =20 blk_aio_complete(acb); } @@ -1626,7 +1626,7 @@ BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned= long int req, void *buf, =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ static int coroutine_fn -blk_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes) +blk_co_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes) { int ret; =20 @@ -1645,7 +1645,7 @@ static void blk_aio_pdiscard_entry(void *opaque) BlkAioEmAIOCB *acb =3D opaque; BlkRwCo *rwco =3D &acb->rwco; =20 - rwco->ret =3D blk_do_pdiscard(rwco->blk, rwco->offset, acb->bytes); + rwco->ret =3D blk_co_do_pdiscard(rwco->blk, rwco->offset, acb->bytes); blk_aio_complete(acb); } =20 @@ -1663,7 +1663,7 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk, i= nt64_t offset, int ret; =20 blk_inc_in_flight(blk); - ret =3D blk_do_pdiscard(blk, offset, bytes); + ret =3D blk_co_do_pdiscard(blk, offset, bytes); blk_dec_in_flight(blk); =20 return ret; @@ -1674,7 +1674,7 @@ static void blk_pdiscard_entry(void *opaque) BlkRwCo *rwco =3D opaque; QEMUIOVector *qiov =3D rwco->iobuf; =20 - rwco->ret =3D blk_do_pdiscard(rwco->blk, rwco->offset, qiov->size); + rwco->ret =3D blk_co_do_pdiscard(rwco->blk, rwco->offset, qiov->size); aio_wait_kick(); } =20 @@ -1684,7 +1684,7 @@ int blk_pdiscard(BlockBackend *blk, int64_t offset, i= nt bytes) } =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ -static int coroutine_fn blk_do_flush(BlockBackend *blk) +static int coroutine_fn blk_co_do_flush(BlockBackend *blk) { blk_wait_while_drained(blk); =20 @@ -1700,7 +1700,7 @@ static void blk_aio_flush_entry(void *opaque) BlkAioEmAIOCB *acb =3D opaque; BlkRwCo *rwco =3D &acb->rwco; =20 - rwco->ret =3D blk_do_flush(rwco->blk); + rwco->ret =3D blk_co_do_flush(rwco->blk); blk_aio_complete(acb); } =20 @@ -1715,7 +1715,7 @@ int coroutine_fn blk_co_flush(BlockBackend *blk) int ret; =20 blk_inc_in_flight(blk); - ret =3D blk_do_flush(blk); + ret =3D blk_co_do_flush(blk); blk_dec_in_flight(blk); =20 return ret; @@ -1724,7 +1724,7 @@ int coroutine_fn blk_co_flush(BlockBackend *blk) static void blk_flush_entry(void *opaque) { BlkRwCo *rwco =3D opaque; - rwco->ret =3D blk_do_flush(rwco->blk); + rwco->ret =3D blk_co_do_flush(rwco->blk); aio_wait_kick(); } =20 --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633526748; cv=pass; d=zohomail.com; s=zohoarc; b=f/vkF5QPZWsypeRfERTHI/YST37ob6FNeYvSYJCc6Mq93RQC0RFsoGw1ek2KEJYHiHvW/IZwO9/vqS8NaMe26EvArLJlQdofQIshi3sgErVksPQGjtyTl0P51XEL/wrTTtrl2P+qsxoFGkCfo5ltGjues3UnHDNi0u3fRP0ZYo0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633526748; 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=bAnZaQ7L1S/w7KDM93nxKwGap85/mRYpCalKtiUxP+s=; b=OVsTv0rlTeyWM1rZ9zrJJlOdO9FciXYApCfjshmj8kgtxRlZF03DU49J5/F2dIbYESDzBmp7dzTLnQO+MWKzrkWpQdkSN5ozAyF+ci36dmPEjUmsuEfxyLK5W5epgqVE8xFJd1FbPNqy1vvB+wlZwewZcnMyfrUftVn8jKXH61A= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633526748122137.04865313237417; Wed, 6 Oct 2021 06:25:48 -0700 (PDT) Received: from localhost ([::1]:34968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6vZ-0002Ae-Na for importer@patchew.org; Wed, 06 Oct 2021 09:25:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6o4-00053y-BZ; Wed, 06 Oct 2021 09:18:00 -0400 Received: from mail-eopbgr40136.outbound.protection.outlook.com ([40.107.4.136]:14496 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nz-0004IV-OG; Wed, 06 Oct 2021 09:18:00 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB2981.eurprd08.prod.outlook.com (2603:10a6:209:44::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 13:17:35 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:35 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z/rMskjGi03w/Dw4pyxvLfCNHjmx72RTVYVMRE4UCIVXjjPhmwAb3u8cEah02aD/zzVIpu1j5KnNyz/WHU6tNXg03x9H30mJhrCgBuE6vTfp+mZ4I57dxs/VkrAZRxy4l4mbIUO0ooIwQtmtplGiAnkLXE62DoajZ/JtgNRc8jjNIdPX/ixXs5B1XsHZvQpzncZ4+Cy8l30S7kLQSCFfVDQ5siOMHnFkI5UDjLGy/jgT8BbnfYlCcW8C+dvo+LPfDGkJyKPm0O3ys4o4A6fhIh1k+qZTKSpERBWFG5y+nBy+HC1Aky0nJdd6G+zHsxQRyuh68x3OwfqWd94VrKDBtw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bAnZaQ7L1S/w7KDM93nxKwGap85/mRYpCalKtiUxP+s=; b=nQwyIJ4BmKGCpcpHXODxX1aPPA+F9iZcpf1htdc6m8dXt/bFN0m1myjNw2rBIpwzDkZrEoeP6qAXZ8ze4Zke+UFxuIAcBMt6AN0UCOzc4aZzNfFV6DouTwvo9dQNqAGkgM8UuA0JH5aisptWQHMFjtpuwWwZOwXk6Dah2A3cI05WaP6UoyjAGV4vZDXK3Mt9EhW3858mDXtB/74olvBx8hbR9nLvxbVYEwSf1myPQG9YRt4jLOZc1GZ15uv2crmRpJJE+fuQUGHCJrY+TTf/33Kyu+HapVqxCdWmeapb4hx9bRECoPBjSCBZYb7XRKl3oLt4Tt/nKnIi+O7JZpwFBg== 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=bAnZaQ7L1S/w7KDM93nxKwGap85/mRYpCalKtiUxP+s=; b=SXr7Y6l/rNRq4gL61+i3EvCdCDnGRwfDBq0LR7lfqZxpL4BUz4cIfJiyHpIE1JmESjWaEpSMAytw8ylTQ0J9cgGJUOwgVLDCCZ/OB/iNrZ4FdMsI4cweulugNmrZqJyF1QHuf48z0/2WDezx6cXeqz7JfI0xFKCCV2caRJAI9Zw= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 06/12] block-coroutine-wrapper.py: support BlockBackend first argument Date: Wed, 6 Oct 2021 15:17:12 +0200 Message-Id: <20211006131718.214235-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c27cd70f-f4c9-4fa3-3309-08d988cba9a5 X-MS-TrafficTypeDiagnostic: AM6PR08MB2981: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o6yBySv0NRzSNDgjd+bkCt29OE+nsYwkHKsw/qjSNpQFUHREdu2APnJ7N5qSCx+D/rIlEolaH+zjkF8L1VERvpy0zXS4ezquVyNfpP7D4UBVctE0dOiaFNPmx6N343ANQW5y+wtzT4PrgMaf9PdaHo6UmaCfeuo3pUDEYVY37gOTJiv2vGvvuSVjct3M7DHkIpjXuMEueDsRRVAiDFkasoEg9sq7MNJIYmGbknMSxADy6BmXLfHCwcqCMywrbjYIK55UZdnFgX9T6fDwDNQs2b16J/Km7L2dKVxXWmSMSdtpitfAE3MTc65UH30oEIVjpZ6Aesvg1uZsE6H6/t8t6Q+Jbi0i3YZa6OZAscP7uMqoRoG9aGIUmJk1vbpMJOcaJ3s8TapyjH0eldixbef8GRYi/UkMgBYKE6bkB82M97/kGpXaNq+m1k+KZ2UlmBnkkKL9EXfpJ8yqdvZjoe37uMEgvPcD+nKy0jqmFToo7OnoJ2fHEBKBWvJtSsoVU8ESI0h+vna05XIADYNRXIKtEBmmknEiKAuVRgd1pRKN+niVzyWyQyxY+kQRilGzfoZT/IhjaDfrf+LgkaqhJEEGkWE+l2tLId5qGS4sCXyYn+XLPwj+2dyBNLEHJjBn+dbUph2j8EtXZM6sk9ZiM2WW/2CG6YsGPv/NmO5pPRTeLUpdvDgEwtPZWeqjHkt9a6J3 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; SFS:(4636009)(366004)(4326008)(2906002)(36756003)(6512007)(6666004)(83380400001)(38100700002)(38350700002)(1076003)(6486002)(508600001)(316002)(86362001)(6506007)(6916009)(26005)(52116002)(66556008)(66476007)(66946007)(5660300002)(186003)(8676002)(956004)(8936002)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: f9+U8m9J3hf3sAK3Ro62DNRkgdhz1vcBa2g4Kkampc3xTSOBosotIcAeL23RNmVl4lMrDz067kiu7d/UDVvMy3Av1wv8G3enKShYCDy7WcxSoYVVphDX7Z0jC1LpWdxTeZt1aVJfGrLgW2MAW3vMKvFdzHMsDDI1BW10hgA+qpOWFuE5pTa9W3AKeveUgJkmTsnrgVzf6AkkZp4ovwISrV0STlqnnwa7UWqBzvO4HCglUofgZjmtns2aEIKmSymSAJO4FRc2dxsSTk23xv/RgBHafTSHTwl89FjUwng4wxtDyjXgFTXZK9pAJstXVDJJuib3sGd/YEV/5vUgsGMR05pGRg/bFXGYGTDi5AtoyPTPR27rwr8b5bvbIo32G9Q5XMYGpwpwhWfSgSbVPDt6rqtMlw9s45MOCVSzEbtdwzd1WpsVAnB8vkXfkvXldNvjMl51nA6FjNbZMTWbKyQlz4pOqgkDc+/ycS7VqIbrNrU7Ix7J8niAKzAXxFOolrWl8SYXCZV+oGJILI5oO/Bjg+Gk2kwoYPoQXz7OzCnyhKfyxmKw9TR8Hyz+uM2qqp5SJ49sGcPDSXYA2GghLwKvvHdLteIJ8tUoPf5AAzv5J32xp79AeRN2+wBQ0XQI1y5RFIbG3jg1cOB1jKBd274g0/ujnYhErJA1bbaKPaWSf8Ww/ADK+SWoanCDud0BgmDkI5wWcTMnNOgCJE9FZeKNy7sw48zLwfJSuKEhl0iEuwjz3+qWeUKnNCkX5keaPNiU X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c27cd70f-f4c9-4fa3-3309-08d988cba9a5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:35.8298 (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: MFEqQXYdh6dAD3TdFptmDUvNn47cguQHsMZt+oNcpGus8SGRxE/N3TH/bLeQBKRvdE1adM7FbZQF/jwTPlJheioMJ4LS3Nxp59wzGQbgO0c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2981 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=40.107.4.136; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633526749111100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/coroutines.h | 3 +++ scripts/block-coroutine-wrapper.py | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/block/coroutines.h b/block/coroutines.h index 514d169d23..35a6c49857 100644 --- a/block/coroutines.h +++ b/block/coroutines.h @@ -27,6 +27,9 @@ =20 #include "block/block_int.h" =20 +/* For blk_bs() in generated block/block-gen.c */ +#include "sysemu/block-backend.h" + int coroutine_fn bdrv_co_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix); int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **er= rp); diff --git a/scripts/block-coroutine-wrapper.py b/scripts/block-coroutine-w= rapper.py index 85dbeb9ecf..08be813407 100644 --- a/scripts/block-coroutine-wrapper.py +++ b/scripts/block-coroutine-wrapper.py @@ -100,12 +100,20 @@ def snake_to_camel(func_name: str) -> str: def gen_wrapper(func: FuncDecl) -> str: assert not '_co_' in func.name assert func.return_type =3D=3D 'int' - assert func.args[0].type in ['BlockDriverState *', 'BdrvChild *'] + assert func.args[0].type in ['BlockDriverState *', 'BdrvChild *', + 'BlockBackend *'] =20 subsystem, subname =3D func.name.split('_', 1) =20 name =3D f'{subsystem}_co_{subname}' - bs =3D 'bs' if func.args[0].type =3D=3D 'BlockDriverState *' else 'chi= ld->bs' + + t =3D func.args[0].type + if t =3D=3D 'BlockDriverState *': + bs =3D 'bs' + elif t =3D=3D 'BdrvChild *': + bs =3D 'child->bs' + else: + bs =3D 'blk_bs(blk)' struct_name =3D snake_to_camel(name) =20 return f"""\ --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633527009; cv=pass; d=zohomail.com; s=zohoarc; b=jnm2Uq2naOppszvfLafXnUqOfCqTc4yRt8374uPlZO9jq56uQVdiGgLpvRTpFlnMQcqxz4b0Y5Wbkn1gcW9AcqWDzWIMk6fHLB4UsttIETRexahJndmfAa3tN/iwY/C8i2Zkpxs7ZggcP/zpAkJvwxISR88oOb9So/3Se0KBZxE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633527009; 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=7yMGPrKpfcEKPCeNoWjgcR8Eo0AlXE489gBQrg0NCiw=; b=gQ8aPhC4U/GMdaer6KF/W+JPg7LzaQv565NgAYzjqK2/H/Em+9mgZ3m9bdZZTOjHGx68e5/14goMi9Wbx7Ir5dvxMmQ9WnFp3kvAqv0XThvtfrBiPYV7YLhJOtrpao2vsMdgSTLrc0C+pdR3JZCV1aZ02L2qyqvaj2BbjvO4o4g= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633527009008971.620229693288; Wed, 6 Oct 2021 06:30:09 -0700 (PDT) Received: from localhost ([::1]:43688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6zn-0008Bv-Vl for importer@patchew.org; Wed, 06 Oct 2021 09:30:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6o5-000580-Qd; Wed, 06 Oct 2021 09:18:02 -0400 Received: from mail-eopbgr50102.outbound.protection.outlook.com ([40.107.5.102]:17182 helo=EUR03-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6o3-0004EY-IX; Wed, 06 Oct 2021 09:18:01 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB2981.eurprd08.prod.outlook.com (2603:10a6:209:44::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 13:17:36 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:36 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ExA0PBOdsrS6au0vu8pE0eA1Sg4eHTT0VenCKwJyvWLClZnYlKEpVthtID9VtS56j9X9ocv9PQcYLoUQswyT0FbbR2kxZbMffL5V1jSNPbToEBzgDLW860W2J7syDzsXVRBwpjvgboYI0IYsXmiqqR0u2A/dKO/BnZQSTGEB+fovlVY+qESGffpfJKwlp1oEu3Jy1vOTP5oFghynuH5ut+fdCf30uDv+eonQ7z0oCqMJw0CJJFOpYli1LfKKe8DTG3bzV2jmgCGcTmomlQDgUucYhu6hLA+AGhSvhTJYks9yyz+gTaGoFHENCPPrXoQHK5gvx+/5ktnSS+qd+SjQdw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7yMGPrKpfcEKPCeNoWjgcR8Eo0AlXE489gBQrg0NCiw=; b=nlvrVKyytPgZWWQCa4BljXEZVEF1bmAsoqdBbOQVsE1NbCADklweUE5caWWfb6wdLFSSs1E5PJAEAnnfLth1lMHd+YXDo0VZABGFsll1W0IDYX8EBdNb2sdgMewW+2rpVk1RBGfaOfkgXkFef4iHyRFlmuT3Hp44bFxf0hVj3hOW1vvJJwYAZg6x6zOYWEnWff0loAkvHkEJXXNMjA62M8ii4omPGqadyvzOGdGj0sA+3cH/Ge1UC9K9GUofUoAFAQzpFKkLGLKVaMZsICHq0uxqZ42gUV3RApgCfhlo+3Wv0ds7wJKsjNXzFifOt5CBnTgToHL/paenKfGXNMnZZA== 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=7yMGPrKpfcEKPCeNoWjgcR8Eo0AlXE489gBQrg0NCiw=; b=uhcggESxzBdgxfHN05j35rwZ3fGMRgOQwm8E9U/jW4FDzLYFJOTHpix/flS/iJrbUkMQ8p0mIFNPLYtjL+lBEMYpZ/jLmnJDy7Wkc6qN5LJWUn1uIdYVxV1MKqzR2OpM0BASjhHBaoj2bLOy+GkXUX5rJhY5O6QVCfbO6jD7DoY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 07/12] block-backend: drop blk_prw, use block-coroutine-wrapper Date: Wed, 6 Oct 2021 15:17:13 +0200 Message-Id: <20211006131718.214235-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 184c0d98-f9c7-4711-49cd-08d988cba9ff X-MS-TrafficTypeDiagnostic: AM6PR08MB2981: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1468; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7qsaJ4/NhM2KGvHL5IPpAu2JThw3/mEFKGRTVa1c0GwjMp2151f+wD4lpfT0cNUXVtCaojmX143aC5VWoD01FV/aoCE1IFk6ne2L0/9oWscY5jKoEKuTQBExtcLukJ/9nYs6fItP/WrioBQlpK5nbGj+8cNWxPgOJNSASRRl9eZV53D6FCNmyS76TkruvwzIQ/cSD1Vl0E+/YoQXtlfU/ldOmAEk/5p4lyLSIhEfLNJtBqmZzVIWoGYcKsxzPV1SJ0ZUc4CuVonHYWPrF5tE6i6+JQLbo65PhQb9RT3vHbAKxPfeBPFdysDNUzsbbyMaCRFIBl21j5UIyoesBfwALaQe0xVCQtUP8okWowx0dVLfWzBpNLmgdjo5TN9XGQ71SKe71/X2jev5bB8IOsCZn0GTeCqQPKstbW5GOen+tJr0Tb14pbbtbpOuhfELf2jl4pI91aipUSFRF5sUlpE4Ds3FQuFYEp7jyN/IWOZImMQIlakP7vqYC1nsdX0JVichkG0dnyrO6l8bPOfB92Z9+Q4WEqnddnzHFoepyHKZ2Rb+rJvBVzulBYbkb1knV3ia2a0PkMDkqd9IuJB3//dCfB/55PTPEGnRg/40ntOj6pVNLWcz76wSIv+YcC7vVDA3fQhcixntbSmY2mAbPu0G2pzdFO51g/KEM7rPcKU28naxpUP7vlyIBnxvvaxHtpfYKC1PiBr8UpvdlvzwsIcwxQ== 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; SFS:(4636009)(366004)(4326008)(2906002)(36756003)(6512007)(6666004)(83380400001)(38100700002)(38350700002)(1076003)(6486002)(508600001)(316002)(86362001)(6506007)(6916009)(26005)(52116002)(66556008)(66476007)(66946007)(5660300002)(186003)(8676002)(956004)(8936002)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QjUm3u3MWdWACB+sVj6iFx0OBT+2FSrNxomU5OrSQ/ALFwEwoIbPjjzS6xnOCcyXe03/ez5oYSWnTau0Qv2VVz5uB/gI0mSAY211gHBlNkg+gHr4/77PiGgsaquEwv+5J06ww1uL/TqSrkH8zkOW9h2Jxn3SDruUr6hvJLszKRyPnKlPFmHqaO+9Q6nFNsXzUxTEbb0VWs6Dcr82qzQkWkCo4uGW1aXkzkrzXyyKDcpfypXhW2MkiF2Ty2JKPu/zfFwabSwzXvDkcY3dIKFofiFkJWs0ceSDZBeaIKnRxHTTzEUgDllmO459diXLyHeJQ4Hj5tDCMXdlJp/hVRkGQvPFBFUbKP/6JZXrQrfs6u2EPdastW4MqF6H1DgxXtZmiOAD76qb3l79FkD+VHgnUDfp2N4C2eSPjdvstX0kYW8plxsZxqABFrQdB8IjcH6GzhFNCtbK3RtLmNvHmHpvEyOUgVnJMbFp4Y3gWY4eNlRboUBoq8afQX4TwGLBtLqabLy4TtgvuPXrUaYhVgFD7ofmf9+D3IKSRnCvPCHkDnF0krlapug4WmytS93inXB7uTd9sQliOCVnUnpioDjeIRJqEha9I8XoMZpoBuJJQXFDMmd50jbUeucGgqPT9OhuBT8OTdwfq0pGxBM7o4MoeIu+s53RIKnxNs3MrUnuaf6ZH+2DFzS1gkOBxuSQuhk+Xs0gg3AuOGgzPWsWXxaetVzV+T5YwxydPGIoPJab7LqWZgMc6ku2D0lfeL84v0+t X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 184c0d98-f9c7-4711-49cd-08d988cba9ff X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:36.3485 (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: HxfuUy+/8cp4KvpK4JDhZcNp1zbx1IlYvEyAfknZOR77mdcTTNX+rhiE0Itq12NjknCOuF6s1OPldVUo5jdHqfuPkajmi81k1QJ195fsNjA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2981 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=40.107.5.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-VE1-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633527010708100001 Content-Type: text/plain; charset="utf-8" Let's drop hand maid coroutine wrappers and use coroutine wrapper generation like in block/io.c. Now, blk_foo() functions are written in same way as blk_co_foo() ones, but wrap blk_do_foo() instead of blk_co_do_foo(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/coroutines.h | 30 ++++++++ block/block-backend.c | 155 ++++++++++++++++-------------------------- 2 files changed, 90 insertions(+), 95 deletions(-) diff --git a/block/coroutines.h b/block/coroutines.h index 35a6c49857..c8c14a29c8 100644 --- a/block/coroutines.h +++ b/block/coroutines.h @@ -75,4 +75,34 @@ int coroutine_fn nbd_co_do_establish_connection(BlockDriverState *bs, Error **errp); =20 =20 +int generated_co_wrapper +blk_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, + QEMUIOVector *qiov, BdrvRequestFlags flags); +int coroutine_fn +blk_co_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, + QEMUIOVector *qiov, BdrvRequestFlags flags); + + +int generated_co_wrapper +blk_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, + QEMUIOVector *qiov, size_t qiov_offset, + BdrvRequestFlags flags); +int coroutine_fn +blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, + QEMUIOVector *qiov, size_t qiov_offset, + BdrvRequestFlags flags); + +int generated_co_wrapper +blk_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf); +int coroutine_fn +blk_co_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf); + +int generated_co_wrapper +blk_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes); +int coroutine_fn +blk_co_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes); + +int generated_co_wrapper blk_do_flush(BlockBackend *blk); +int coroutine_fn blk_co_do_flush(BlockBackend *blk); + #endif /* BLOCK_COROUTINES_INT_H */ diff --git a/block/block-backend.c b/block/block-backend.c index 8100d65b43..403cecea98 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -14,6 +14,7 @@ #include "sysemu/block-backend.h" #include "block/block_int.h" #include "block/blockjob.h" +#include "block/coroutines.h" #include "block/throttle-groups.h" #include "hw/qdev-core.h" #include "sysemu/blockdev.h" @@ -1204,7 +1205,7 @@ static void coroutine_fn blk_wait_while_drained(Block= Backend *blk) } =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ -static int coroutine_fn +int coroutine_fn blk_co_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags) { @@ -1249,7 +1250,7 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int= 64_t offset, } =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ -static int coroutine_fn +int coroutine_fn blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset, BdrvRequestFlags flags) @@ -1306,6 +1307,20 @@ int coroutine_fn blk_co_pwritev(BlockBackend *blk, i= nt64_t offset, return blk_co_pwritev_part(blk, offset, bytes, qiov, 0, flags); } =20 +static int coroutine_fn blk_pwritev_part(BlockBackend *blk, int64_t offset, + int64_t bytes, + QEMUIOVector *qiov, size_t qiov_o= ffset, + BdrvRequestFlags flags) +{ + int ret; + + blk_inc_in_flight(blk); + ret =3D blk_do_pwritev_part(blk, offset, bytes, qiov, qiov_offset, fla= gs); + blk_dec_in_flight(blk); + + return ret; +} + typedef struct BlkRwCo { BlockBackend *blk; int64_t offset; @@ -1314,58 +1329,11 @@ typedef struct BlkRwCo { BdrvRequestFlags flags; } BlkRwCo; =20 -static void blk_read_entry(void *opaque) -{ - BlkRwCo *rwco =3D opaque; - QEMUIOVector *qiov =3D rwco->iobuf; - - rwco->ret =3D blk_co_do_preadv(rwco->blk, rwco->offset, qiov->size, - qiov, rwco->flags); - aio_wait_kick(); -} - -static void blk_write_entry(void *opaque) -{ - BlkRwCo *rwco =3D opaque; - QEMUIOVector *qiov =3D rwco->iobuf; - - rwco->ret =3D blk_co_do_pwritev_part(rwco->blk, rwco->offset, qiov->si= ze, - qiov, 0, rwco->flags); - aio_wait_kick(); -} - -static int blk_prw(BlockBackend *blk, int64_t offset, uint8_t *buf, - int64_t bytes, CoroutineEntry co_entry, - BdrvRequestFlags flags) -{ - QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); - BlkRwCo rwco =3D { - .blk =3D blk, - .offset =3D offset, - .iobuf =3D &qiov, - .flags =3D flags, - .ret =3D NOT_DONE, - }; - - blk_inc_in_flight(blk); - if (qemu_in_coroutine()) { - /* Fast-path if already in coroutine context */ - co_entry(&rwco); - } else { - Coroutine *co =3D qemu_coroutine_create(co_entry, &rwco); - bdrv_coroutine_enter(blk_bs(blk), co); - BDRV_POLL_WHILE(blk_bs(blk), rwco.ret =3D=3D NOT_DONE); - } - blk_dec_in_flight(blk); - - return rwco.ret; -} - int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, int bytes, BdrvRequestFlags flags) { - return blk_prw(blk, offset, NULL, bytes, blk_write_entry, - flags | BDRV_REQ_ZERO_WRITE); + return blk_pwritev_part(blk, offset, bytes, NULL, 0, + flags | BDRV_REQ_ZERO_WRITE); } =20 int blk_make_zero(BlockBackend *blk, BdrvRequestFlags flags) @@ -1510,22 +1478,25 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk= , int64_t offset, =20 int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int count) { - int ret =3D blk_prw(blk, offset, buf, count, blk_read_entry, 0); - if (ret < 0) { - return ret; - } - return count; + int ret; + QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, count); + + blk_inc_in_flight(blk); + ret =3D blk_do_preadv(blk, offset, count, &qiov, 0); + blk_dec_in_flight(blk); + + return ret < 0 ? ret : count; } =20 int blk_pwrite(BlockBackend *blk, int64_t offset, const void *buf, int cou= nt, BdrvRequestFlags flags) { - int ret =3D blk_prw(blk, offset, (void *) buf, count, blk_write_entry, - flags); - if (ret < 0) { - return ret; - } - return count; + int ret; + QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, count); + + ret =3D blk_pwritev_part(blk, offset, count, &qiov, 0, flags); + + return ret < 0 ? ret : count; } =20 int64_t blk_getlength(BlockBackend *blk) @@ -1582,7 +1553,7 @@ void blk_aio_cancel_async(BlockAIOCB *acb) } =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ -static int coroutine_fn +int coroutine_fn blk_co_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf) { blk_wait_while_drained(blk); @@ -1594,18 +1565,15 @@ blk_co_do_ioctl(BlockBackend *blk, unsigned long in= t req, void *buf) return bdrv_co_ioctl(blk_bs(blk), req, buf); } =20 -static void blk_ioctl_entry(void *opaque) -{ - BlkRwCo *rwco =3D opaque; - QEMUIOVector *qiov =3D rwco->iobuf; - - rwco->ret =3D blk_co_do_ioctl(rwco->blk, rwco->offset, qiov->iov[0].io= v_base); - aio_wait_kick(); -} - int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf) { - return blk_prw(blk, req, buf, 0, blk_ioctl_entry, 0); + int ret; + + blk_inc_in_flight(blk); + ret =3D blk_do_ioctl(blk, req, buf); + blk_dec_in_flight(blk); + + return ret; } =20 static void blk_aio_ioctl_entry(void *opaque) @@ -1625,7 +1593,7 @@ BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned= long int req, void *buf, } =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ -static int coroutine_fn +int coroutine_fn blk_co_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes) { int ret; @@ -1669,22 +1637,19 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk,= int64_t offset, return ret; } =20 -static void blk_pdiscard_entry(void *opaque) -{ - BlkRwCo *rwco =3D opaque; - QEMUIOVector *qiov =3D rwco->iobuf; - - rwco->ret =3D blk_co_do_pdiscard(rwco->blk, rwco->offset, qiov->size); - aio_wait_kick(); -} - int blk_pdiscard(BlockBackend *blk, int64_t offset, int bytes) { - return blk_prw(blk, offset, NULL, bytes, blk_pdiscard_entry, 0); + int ret; + + blk_inc_in_flight(blk); + ret =3D blk_do_pdiscard(blk, offset, bytes); + blk_dec_in_flight(blk); + + return ret; } =20 /* To be called between exactly one pair of blk_inc/dec_in_flight() */ -static int coroutine_fn blk_co_do_flush(BlockBackend *blk) +int coroutine_fn blk_co_do_flush(BlockBackend *blk) { blk_wait_while_drained(blk); =20 @@ -1721,16 +1686,15 @@ int coroutine_fn blk_co_flush(BlockBackend *blk) return ret; } =20 -static void blk_flush_entry(void *opaque) -{ - BlkRwCo *rwco =3D opaque; - rwco->ret =3D blk_co_do_flush(rwco->blk); - aio_wait_kick(); -} - int blk_flush(BlockBackend *blk) { - return blk_prw(blk, 0, NULL, 0, blk_flush_entry, 0); + int ret; + + blk_inc_in_flight(blk); + ret =3D blk_do_flush(blk); + blk_dec_in_flight(blk); + + return ret; } =20 void blk_drain(BlockBackend *blk) @@ -2218,8 +2182,9 @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *b= lk, int64_t offset, int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *b= uf, int count) { - return blk_prw(blk, offset, (void *) buf, count, blk_write_entry, - BDRV_REQ_WRITE_COMPRESSED); + QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, count); + return blk_pwritev_part(blk, offset, count, &qiov, 0, + BDRV_REQ_WRITE_COMPRESSED); } =20 int blk_truncate(BlockBackend *blk, int64_t offset, bool exact, --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633527147; cv=pass; d=zohomail.com; s=zohoarc; b=eOV/k2CULrHNCgJCZaGKuCen4t3wTnuUA5KquN28hNm9G09JxCzN/9n6jVwhY0nSRSKC2/M3mC3XxVqmExB5JnM6C7D0JWnBgXgTuiOuMWRbDDEAojnee/R/4UD1pfPO8aFS1JpJMJ/c3FLilkUzfQ1NTDYlmBFr/5a6Is441+0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633527147; 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=PqtPIlK9mznWtFNucBwQjG1NAD/msFn66fYW0QKgrFQ=; b=TTZ1bAYQ/ig1Pyi0ALtVutL95Kcu51fASY5Il9wdjuXqs3XHjaGqb6txJloYoVHolZ/jO/GeBex/jQEVeB+/p/25t9yUpHSzkju9EZ70Jjreih69VhlgBjvck/FtTl1KQ+FklPmVeSHbP9RAFM1l9MzcX7qhFbLtdz62r5Up9bo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633527147684659.1089752281968; Wed, 6 Oct 2021 06:32:27 -0700 (PDT) Received: from localhost ([::1]:46888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY722-00026e-93 for importer@patchew.org; Wed, 06 Oct 2021 09:32:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6oA-0005A3-Dv; Wed, 06 Oct 2021 09:18:06 -0400 Received: from mail-eopbgr40136.outbound.protection.outlook.com ([40.107.4.136]:14496 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6o5-0004IV-0y; Wed, 06 Oct 2021 09:18:02 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB2981.eurprd08.prod.outlook.com (2603:10a6:209:44::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 13:17:37 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:37 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VNGa02Lmb71V7CZBWNtV6jgC5w07ac752Au8eFvQsaatLBUZuq+6XD+8/9ba4DLdWKIdMttP/h5LeLJfwLpv2xJk6QUKCKJRn+xcKKAQKVQAI9W7Trh8dxVPmIklmGfw8gf4iMyfqcdu/CVo9z7+ovlMDx5yjKO9OyBUrQvTRJJ8MqSNVWFjHK699iDNpvmtk0UPtHG04d113wK6eeveMjfKGwt7JD9t3XWYqFu5Jnk1iewmMiwpyUBDIIjHv/7XbgMKFW+H614dqCLhSvXZha70q9iyDoJYXJoRUiZAz4Ca6I0SUKb5qAgd9QqXjznOjqFSo2nn0nxSTB3wiuus7g== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PqtPIlK9mznWtFNucBwQjG1NAD/msFn66fYW0QKgrFQ=; b=bLVK975eU42wHFejdMufEQosDN2O3iDtXViJqRk+19ItpNXeBxjv2sPzjjfvYQrvU9MUxHFZldkI2+IrKT4HJMgV+UuYB6V+cBA1GX+EsD+VSgM3oSKyfOxW0T/XIhv7U6at3jdQUBZHdPsLTwRGzYyyGo0OSmot/E7CcEi+hrbHSeyr9+dcWXwLBoaZJsOa8ehSNFajo0ybqzQf91EKPWRzITRKJLFMidfrUdjLUpGKrlN+FAfZi4FVTozA/RgbE6KFqKsQnsJzqzRWbisV6Im06tcUfXlYoyfLTUtJhNJqYptRJaUNUsy4r0P+kkKl1MsvNNh6u8BdkS3Qf7Uhkw== 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=PqtPIlK9mznWtFNucBwQjG1NAD/msFn66fYW0QKgrFQ=; b=s8WGRuSwm3rLt5fBQQQawsCIsWjKX9yPKYgReHG81969cQ0viKyD/LfK6BGx90kKOt8FsdOAGs51ZAWM34GWMoQLYe3fEUaRfhPGJZwW/plcU69hnFvMmal+cDpDZPzHKCoS/kTADw1zvsFPyWpT5GuSCJDvwSlsE7CoQoVos7E= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 08/12] block-backend: convert blk_foo wrappers to use int64_t bytes parameter Date: Wed, 6 Oct 2021 15:17:14 +0200 Message-Id: <20211006131718.214235-9-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 465b33f6-24fd-4878-476b-08d988cbaa6d X-MS-TrafficTypeDiagnostic: AM6PR08MB2981: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZUqZSsgRaDrUFHJ+bwSDjsuih1R+qp1BML8d+yEHhEJT9fXtExb+iOHsYy0bsLT1Kt3LT4zlIl54b0WLjoJBWJsmOqkSBgH6ExWBCgP1TsgtJjGo5LUo6/R/Vy56/WM2uWLqyHSjS+i3ifIUgUpBeHRQwN3GF+lKWvB8rwkDtJDINh1YlOeE2s3Np3Xs2tE0i1Pxvz5kGwDpXO9L30mj8wTlgflvlEnDJd48Cu8cU8f7AgXQrmiXzTHJzj0A9rtza6Jp3M8df+L+c/t+TISbRwAqL/iZRzgYZ163PEngp5zwZNQC+XQt55/jAbKQFhJZWN7HeE5mb7w6H/A3WSJYnQhEbb1MmGA+FWWVywsOQT1f012P02SKsbmDlhv51tTZGicKvLgvwCEEUiyz/IxrB4DfEJVOhaKjoKaZ+6iWj+aXsacJJcfR86VRMQW0+6TvEC9DWv2HuV5LugXf2eHHkmS50zIJF/CG6qvgo6MlUr3yGNgu5Z3F9Ox+0X7DadZOXCd4wMrSxXooEjICR/lglkbsuQAXP6rsPTgfeeDfEMAFksOy7UmqSm6Vxwq+ATNueEgqCKKwdPqV1U7NV37Zuk4CEZOKXLf7yNhrjP8Eri+IGxFvBNgP9SQwM2tjONodti+bEFKzEyuFDY/ssT5R3qLOqoTEdJqZIIkb+rJ8Lsn/O8ie0MrTleErcgJ3hx7YeW2CAKBEQZ0A+C417BjaSQ== 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; SFS:(4636009)(366004)(4326008)(2906002)(36756003)(6512007)(6666004)(83380400001)(38100700002)(38350700002)(1076003)(6486002)(508600001)(316002)(86362001)(6506007)(6916009)(26005)(52116002)(66556008)(66476007)(66946007)(5660300002)(186003)(8676002)(956004)(8936002)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hQdoNOzkH4sYdohx4C9c74jo2+AG5xDMG/qCnS3MB3+GN1nys3a/v9KxFH4ymBmCFNpXRNFd+UPFzfTcxLtzGzLoooCB+BOVqgqWZmn/DmaqlWZGKX88oxvnQa/0cPrHW9DkY8vcqBp4PpohMvrT4gS6AFzrBmj6Zz5pk9hv7KnPZDnkLSUOYrQv+rQban5tDDAGhbw10QzvKfYlXMOg08K5Fk3Kv8OCMiCe4P8Fn11z/Fb+XWl4UZTVEY43v/UND7YCUsPgzQ6BLebDWrjQAJHn73lsWDXRqW6RP9fXEtMA3Vumm8UMqAA/m7Fj+YRBOUsKJxGIzhBESKAwwHD0PUovnQSrJt5sU2EcbsmmfR04JZINmLfbpbC2j3sw4e85ouvyDzArClsmIh2bUx8vNKm/mS9I5UuJh5YJGV+JdlQVPaJ/cq9EBGTrd7ytRkbep4iWC6fe4T/6P6weWdMmupdZ/h1YSefLyXE+vOwChDWtcnICuIb20s2Kh+Zpeguy8hfmotNq7gE46OmVxIMMsU4hZ9hzjrcn7Cnv22Z7uPGgDLwVQyX0giiIBv2iuALyvD7DvAfGm5LwTFh4Is7Pape2kI8KBdqO4En3nTXQEg7GpmznD4gMmEkLXkvVpDM5C48pdX2AqR/uOmrq7D9xIiFrntaT8bskuXhdU2j4XqEKuTC7quY40t4YPlmx9ppknx7irsEIHHTZ/18nBIoMgUzUCqQQbpqhD4Fhf77Hhrc4mFjV9LWgEp784WPlRMA7 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 465b33f6-24fd-4878-476b-08d988cbaa6d X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:36.9997 (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: ms/HmfnHx0wBfil44t9T2AaptnEkdD1rIdQKZqni0dEfORYYqx4m47wsRXZTVqmubDa2UqpYSiTsS1ocNQ+uN8QwVHAUou6EgsoMEhy6cZs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2981 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=40.107.4.136; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633527149669100001 Content-Type: text/plain; charset="utf-8" Convert blk_pdiscard, blk_pwrite_compressed, blk_pwrite_zeroes. These are just wrappers for functions with int64_t argument, so allow passing int64_t as well. Parameter type becomes wider so all callers should be OK with it. Note that requests exceeding INT_MAX are still restricted by blk_check_byte_request(). Note also that we don't (and are not going to) convert blk_pwrite and blk_pread: these functions returns number of bytes on success, so to update them, we should change return type to int64_t as well, which will lead to investigating and updating all callers which is too much. So, blk_pread and blk_pwrite remain unchanged. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/sysemu/block-backend.h | 6 +++--- block/block-backend.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 398e7abb02..69f5cfb1c5 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -155,7 +155,7 @@ static inline int coroutine_fn blk_co_pwrite(BlockBacke= nd *blk, int64_t offset, } =20 int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, - int bytes, BdrvRequestFlags flags); + int64_t bytes, BdrvRequestFlags flags); BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, int bytes, BdrvRequestFlags flags, BlockCompletionFunc *cb, void *opaque); @@ -245,10 +245,10 @@ void *blk_aio_get(const AIOCBInfo *aiocb_info, BlockB= ackend *blk, int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, int64_t bytes, BdrvRequestFlags flag= s); int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *b= uf, - int bytes); + int64_t bytes); int blk_truncate(BlockBackend *blk, int64_t offset, bool exact, PreallocMode prealloc, BdrvRequestFlags flags, Error **er= rp); -int blk_pdiscard(BlockBackend *blk, int64_t offset, int bytes); +int blk_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes); int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf, int64_t pos, int size); int blk_load_vmstate(BlockBackend *blk, uint8_t *buf, int64_t pos, int siz= e); diff --git a/block/block-backend.c b/block/block-backend.c index 403cecea98..018684a203 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1330,7 +1330,7 @@ typedef struct BlkRwCo { } BlkRwCo; =20 int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, - int bytes, BdrvRequestFlags flags) + int64_t bytes, BdrvRequestFlags flags) { return blk_pwritev_part(blk, offset, bytes, NULL, 0, flags | BDRV_REQ_ZERO_WRITE); @@ -1637,7 +1637,7 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk, i= nt64_t offset, return ret; } =20 -int blk_pdiscard(BlockBackend *blk, int64_t offset, int bytes) +int blk_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes) { int ret; =20 @@ -2180,10 +2180,10 @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend = *blk, int64_t offset, } =20 int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *b= uf, - int count) + int64_t bytes) { - QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, count); - return blk_pwritev_part(blk, offset, count, &qiov, 0, + QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); + return blk_pwritev_part(blk, offset, bytes, &qiov, 0, BDRV_REQ_WRITE_COMPRESSED); } =20 --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633526771; cv=pass; d=zohomail.com; s=zohoarc; b=Hq3HyrY8/UxjGlkT4EPdener1F2xxNgW4C6lZX7S6n3Zltk5BBbtq8kiDVkCPZ8+10YEx3mHoq6fdgA7DdsWcWV76zXMBl3VPhRB3t7+qWo3kO9QOiGshiekVX/IHSa2UUZa1u2QSWkWTBcl8IVzOftHREKK/rlaiVJxWSZ+P7A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633526771; 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=MpgzPHTXn0GiFIB34lWgQF/+mJ+ruAc4SKaSh3QDUa8=; b=S0VdEg5TGJZN2hmBQexGGnGNEzLKbhJxBzU8TG3YYnEIHJbz1g2Y6rTNEDMhoS/YA3oZGcVXJkessMnLfRsoDCxKJRzWgl+T/1hqzeMAQWKiTWQe65QaaKMbr4ZpjhJc4Q880OFEiHIHCrk08OcvrD/YhpRet9j4VI7V3vWeJxk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633526771336295.7354907546487; Wed, 6 Oct 2021 06:26:11 -0700 (PDT) Received: from localhost ([::1]:35296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6vx-0002O8-1G for importer@patchew.org; Wed, 06 Oct 2021 09:26:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6oG-0005O6-0h; Wed, 06 Oct 2021 09:18:12 -0400 Received: from mail-eopbgr50102.outbound.protection.outlook.com ([40.107.5.102]:17182 helo=EUR03-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6oB-0004EY-3Z; Wed, 06 Oct 2021 09:18:11 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB2981.eurprd08.prod.outlook.com (2603:10a6:209:44::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 13:17:37 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:37 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i/3oAsrjuB5n3F6G7JAXGzRR/pgmJKDX0ZkxgTvlt+u48ZpGIYeKer+rB8uJg5f32YAqAigeSKRbaous1HvxbuURhXNMV3LmHzPOLJM0eFqHXp8I7L/Mez93prEOhMkm7jClQv0wLQ1lkMXlUAF5BwNjG1Es8KmdSOJLCT1tn9t7pgK0S6g4aA9Z7FTuJ7ggHqWTCuUD9ONZLoCShVu7Dtj3i8Bh943oGDEU/OxP4tgk5qyVFaMjuYZ3YPNMom63DLPYrm+RcJc3IsXTjvWnAzy8YxSuGq5Hv+/YJqQAyc76qmMlw+Y0iPDLJxNSJT/efTLc2rgZ4iPbaFX0/xylGw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MpgzPHTXn0GiFIB34lWgQF/+mJ+ruAc4SKaSh3QDUa8=; b=ihyKtopF3xOc5zy20h+nTdqGIE2cBq4H5Ulp8HffxQxjeNjJBuTT3esBUwpWi+G1OwLRp6CzJK4J5DpIWsRkEi61yR/qKgMOSv0Ofn7ULMaFhEGvEOsG935xcGg3XLlBODT75dSdOxQgN/9C8oVswviFYBfreLBoNqL3tbki2fgatwQ5oPaqtg7UzqbdMkJSukjvvb7jUaL4ukzyJaQ0oRKodNT1LATEs7HpL2j4iRe4OyFk6jFY59ggh4C6NezavI9/OxD5qtvx8sqdoFMeaIKDeOWRA2O1KdTbWgnIeX//uK41mWZZ336Lk9UyPa+0j2cXX++7CpKGVtw1tTweTw== 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=MpgzPHTXn0GiFIB34lWgQF/+mJ+ruAc4SKaSh3QDUa8=; b=fzVwkMDOzSG0b1BIMgWF4f+mNFiy0gC/DjgFkczmxESMFk7Dt2BjOIz3luKncbcQvgo/6j+qi2cTJQStarxj2dxd7z1DR7GpeIsm/j2L4qhTRFdcXrC2nzYx8H5eYc5eMriZq7gYrUugD/E5YIDKlxZ85cvoG5LWFr46aOvPJY4= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 09/12] block-backend: convert blk_co_copy_range to int64_t bytes Date: Wed, 6 Oct 2021 15:17:15 +0200 Message-Id: <20211006131718.214235-10-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d0c58142-fb96-4f25-7a7a-08d988cbaaac X-MS-TrafficTypeDiagnostic: AM6PR08MB2981: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Odue5eopjwJ5j97xDYWRxeoUaYfw0Zj5VzTi7cQi6/iCmtqqIcx7IxTTGs0ABdFBcWiPYahsDYKUm1CKpcYzTAR+jr11+7T0w05A81JEHO17/rxJMZL4AxQCJijfgS9Oz5mx5eMI8nfErbVKXZSdABD8SRwQWP9MDOfEdFACwxlyq2f5JjXayh6dMcbyKFRuazsfYAu3HrhtoREtXxsft2F0kowTrnHEekuHnDi8rGonKKIHSJtQ1u6C7Po7EoCjd2zf59+Q8CfCwAUKmPxv4iWo+gJvCZkOr1A4DJGxbTKvEz3XNd7oELFryJocbKmwlOtTyNDgVcPCul8NMBks/uT2APUGDxsfjIb9WP/AgBaJ3TZ83Iy0jhIssJdihxjrOEQPYq40CbepBSXNIo7bOA9CVhJcaIhHa985dJqryGMjqSwSWPtqgvkdfguvUGY1u6G3QMMPyF6+QVxZjgQCjnLE3mzZThrsmPLxa3iBK5IS+qh+y7/BK3l0ZjJnaktX9YmWHaGFhfoz/IQGQRAosSMw5k/bwQqcbMdaHHtXGD5yW3jYLuUOD+ADo8f+e6GfoVlJcp50AfbLJCl7KNoFeEFY7elvou8ZWyClTT4hNcbsQi5o2+HG9ZKMmY8hCh6zMVpMaUR+3qzpd/Ntl2UFhH5UrMBWPQtk1aIyBa5WGyAq+g2Hqr5pzUi85E9BBagnokDSINePTt+mGKTc3luc+Q== 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; SFS:(4636009)(366004)(4326008)(2906002)(36756003)(6512007)(6666004)(83380400001)(38100700002)(38350700002)(1076003)(6486002)(508600001)(316002)(86362001)(6506007)(6916009)(26005)(52116002)(66556008)(66476007)(66946007)(5660300002)(186003)(8676002)(956004)(8936002)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fN+qK57602FSvK7xvG39lAXa8wOBoPns8oR+Sw9Anpj+g4c+G25WjEjuyg5GhOwdBIweH6kFrZXqirOBMxK0NRQDlhEu3swwtbuOPXvyOIUPaMNzMsJgyF4FgMQM0ZTkOQdyvKCTCu1nKCVkujKiTs5zI5bkRQzdONHVPjf8reA2Jb1L+H71dOZDBut2Tf5AU6nDrIQshd6wxcoair9CVv+iFLlFNHADJkG4CQ0cQaiRzD2Hjd3S2GKqFW2RD6YOAnB7uq0C4DyKQukEpPbBBw8Q/x/SLpQPIrqkijIpNwLeMcMSRs5wg1z/RvS8fDJf9KQJq/Mz49HFlb/GW5ezBvs2DJfKCHHEeJ7MTMcUEbr4Fty7qEC9aR5JSxDpCB0xERwzhNTJSSp6NzeqnzreddPkCJ1fnY1RKWWJ7ml1IsK5fONLbhbL61cex6kXnw+1ofZgF8xtIS1m6MxY2tFnx8ZWu02+f1Yo1CeVip67lEE/bLGLjBEeacqR0QEm0VJb4nokD6SaiArVzS7tygmbX1lGLFHA3V1bJ2fjwsmGe+0SovvVgkiS3QKjcxP217vkj2nYBjoK5rUrAS59kDNodzyKph+/Bqr+IQeUIgz+KdU9CJoqMKShi1D9riPmzLGmGrQA1tNnN7quqOqZwwSLObjPM1ehrw2KKbJVo6c1vC4umze8OvvCPuw7hHED7F4K6s1gZE7f6RhHwzjXw4wYgFg5xFHHCc+EbhTxX+J81yoLvd38vJpj/ryTYKSsOXct X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0c58142-fb96-4f25-7a7a-08d988cbaaac X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:37.6150 (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: Hg8Eu48WgunYUI5gn7e9NzYFSuVycPbAq7MyGCYoTRKsEUXfU+6JiKXNy3snyKmmXQOZRFIftoh20cI6RZgTvOnFFiZ39B3iNl0jYgrgWZw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2981 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=40.107.5.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FORGED_SPF_HELO=1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633526772161100001 Content-Type: text/plain; charset="utf-8" Function is updated so that parameter type becomes wider, so all callers should be OK with it. Look at blk_co_copy_range() itself: bytes passed only to blk_check_byte_request() and bdrv_co_copy_range(), which already has int64_t bytes parameter, so we are OK. Note that requests exceeding INT_MAX are still restricted by blk_check_byte_request(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/sysemu/block-backend.h | 2 +- block/block-backend.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 69f5cfb1c5..134c442754 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -269,7 +269,7 @@ void blk_unregister_buf(BlockBackend *blk, void *host); =20 int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in, BlockBackend *blk_out, int64_t off_out, - int bytes, BdrvRequestFlags read_flags, + int64_t bytes, BdrvRequestFlags read_fl= ags, BdrvRequestFlags write_flags); =20 const BdrvChild *blk_root(BlockBackend *blk); diff --git a/block/block-backend.c b/block/block-backend.c index 018684a203..f051ea00e9 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -2412,7 +2412,7 @@ void blk_unregister_buf(BlockBackend *blk, void *host) =20 int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in, BlockBackend *blk_out, int64_t off_out, - int bytes, BdrvRequestFlags read_flags, + int64_t bytes, BdrvRequestFlags read_fl= ags, BdrvRequestFlags write_flags) { int r; --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633526422; cv=pass; d=zohomail.com; s=zohoarc; b=MnF8CqiQtOkAC9zonlqgEos4IvmNlotJ9+NrZrXMY3IYY0QHhxQ6l1g/pQECEXtzvnz/3ISM+YdKwpwELHUv7sGr79CDHlYRJTFnS30C/LqMTCwszoMM2qmNk7wUvHYmM/dra4tenLVgiRpKH/B3DuA/uubBRmbdmkXD32K1Yhw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633526422; 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=JCKDMLMiq1PHozvTEh8SH7fYDdLdGiMH2om60/QDFsA=; b=MeBxkaKkcDcMcMcRPRHiGWDTfun+4Dy7j0PvrjuWcGrrzYs30YXKzUVBlPUV3uHrmqq9/67A1Va/x8QhXKHMMTAwXwy/2yanb8imBKWPCPY7bX4RooE2qDaKwu46HLi0JoahDSTyf2ddAXZIqQTz7UcKMZG9TmzLn5DPDFbFp9Y= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633526422692148.85671127582907; Wed, 6 Oct 2021 06:20:22 -0700 (PDT) Received: from localhost ([::1]:47410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6qL-0008UH-H3 for importer@patchew.org; Wed, 06 Oct 2021 09:20:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nq-0004ly-Nb; Wed, 06 Oct 2021 09:17:46 -0400 Received: from mail-eopbgr60121.outbound.protection.outlook.com ([40.107.6.121]:24830 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nk-0004Ha-SA; Wed, 06 Oct 2021 09:17:45 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5910.eurprd08.prod.outlook.com (2603:10a6:20b:296::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Wed, 6 Oct 2021 13:17:38 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:38 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YYu35/Hqo/faSDY7UYDaF6JVPeIphZeCb3LAPLeSASY+BP/oUCb43Zsy/fmxwijrcomis19W03qbKmRPmuoFvI8sSgA22td5gkN+uCRgpPoYn29vKQ8N2OaMcODq1X49s1MOAjouPaMg8cEoTbVK9c8Zr63CZMnQiD7C/X9YCOD2WUx4AN3tv1NB5tMgbpqwzFTt+OyHiQEuUyrQHLp7XaAh9qEuulNsDPjUCjwvZKlOG8HG1QLxoflqCBaMFJP0Qh7yMvb5AYkgzuU8wkLC1UbX6ccgzYkEKFwRQdWO9wpo8iflU4H9JyA7rX3w37qLMdyXoNxEQPM3A191Zu+aow== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JCKDMLMiq1PHozvTEh8SH7fYDdLdGiMH2om60/QDFsA=; b=DbQHlVTRJJpKo3mJPKVSGwt/JwzaguiO/qz0ukjtdmAoHAmOqbCH/jtk/AfVmRMqcuSWk2vSIjF3z+DXHfkWNGYyFEL+u6y6WgJErjrxyFThl1P/hLVMec1FrhFk338LfWE1A0egPv5egZX6mo/GxqKi10g/loWTR7g1slEHq6FrHLAeG7RxdFFP4WSLvO7E/WOGCOnCQEdyAqO+CQ5qiiwSKKyss0VnaXQDuKWRWDS6BB6BPvjTTGE5Ge2kQLAXO0hDZjOCA/j4Uxo+HjLBD6nUmrmeqIGssMGD5/Ljk3NvyEnY2fSD9pq+8CSJNb1NIpWxEtp0jQUBtHUoQpVdWQ== 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=JCKDMLMiq1PHozvTEh8SH7fYDdLdGiMH2om60/QDFsA=; b=pKT07FR2CB9lCCbNs2iphHzG08XkpNSZZq688kczca6Eqr0vJC3I+PQfHx5ts5Sgi23RyKY13+/Po/aI/A0K8/j/iGoUf7smhuM4hOFQ1GSfPZKC77oQW3IKKWImhDvoR+/xtHm3fj24k2PuYbVWwrH6+dksHNfhJcHjie/FJOk= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 10/12] block-backend: convert blk_aio_ functions to int64_t bytes paramter Date: Wed, 6 Oct 2021 15:17:16 +0200 Message-Id: <20211006131718.214235-11-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6d0c40d-c97b-4193-b5b2-08d988cbab19 X-MS-TrafficTypeDiagnostic: AS8PR08MB5910: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:186; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cL48iFEiuiATjJJMdBdNoMQb+qAsvzsbl+EFYH1bYwaDVnSX2tG7K0/AeBOPyXUAHqvHNPQw+0EuFsd2W2BoypmlGp1s+/U+7aQ1eEuFUj8HqvYOlE+EQksa6B8zkXx7m1LotdPL3s3RPi0GalnLCec5qfUlV/+EiW50ZMt3nWqhQ7luPpMBOqD73tcRxXQ3sZcfFKWUutWS3YLabb9HzBqxNe742+kh5CsS8t0QYPZrsNnWhUGlyBYvKPqGcgef07uM+0PIc1gF2bXLFmXzyCDPUWbogeqp3Y3UaRcJZCO7Mzo0u1+//JtNEUDfxbRP5DTP5kq5PG3vx3dLeS+Vvpwt+Wb+WC4hw32HqZzAUma9OeHUfdsz0Z9hnYD/69E5jpKCReNQpLLJL0BqzkEPA1VyynI858u2x3ARw2mRv2V6upUrxdKWoCnXjG+5mJ/r7pZKkJSMixfO5bub5wszoQsp6ITq02rlgKGLvSDWnk0WoiJe1Z3PeXYf4uvlMGnMknpv2d5LDTkafInLRacLJlcIzKxHvFUR5mS7lWtWpg9F+bYCwPCiQbkXW0hJhbx76u7PTFT8DIgdsvYdvdmmyXc3ch9rboPOoo7rkfA/OhX944vb9IFym0XXeOtQ+vb7nT6imAMTGdmaIMSEh0UGhd3fGY5hRPoDwSKF5FaFS2SjHYrokjRqfKRb+jjUNnQCJ1mHymuGiCWBWZbQeKwQ0w== 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; SFS:(4636009)(366004)(2906002)(8936002)(83380400001)(86362001)(508600001)(52116002)(2616005)(956004)(66946007)(1076003)(316002)(8676002)(6486002)(36756003)(6506007)(186003)(6916009)(4326008)(6512007)(6666004)(66556008)(5660300002)(66476007)(38350700002)(38100700002)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8MU+slasVADKza5LyShGF0Mvr7aGM0ISrve9j/ZVBFa9zJAxeEaVyzo0k080J4z4othtfEwp7SUKS9TYJMCaPzDYj5NQ0EZ6QEg2XygvYqSnL6sj5rSxcmCQMqToaJNcefRc2/nISmmOv3tjq+HL9T4cIjlA8cEkTGEpolCQ2f3dyDTp2N/8iufAk9nkXZ1XN0D8LIjR1V7K5U0JBO0in1go2jdXOWklw4QI0BDvBYKRq+98weENCIjiOL0b9KAY2ckc7B1va5h7ffv6yEQyky7+/3zBV22UIdHlhyB/oQY2RTBjxlC/VejitdbOVjwHJAWs5AUhm13bZD25C3awIbiDOpfL9PNcBCDE8d4+a4Qzb39ZlN6eWOxV/bIOeo17Vq8rqpGqG9a6nsigE254RnH976WiwneX339dewoeQESvvndOTx59zUKugtjlZW6KWwNFmdf91Ksh0rIr5KhSrgB6/pjU8QaOBza18bfjBir3Mw+FfnzCGm8JmEzuf8UlAbDs5dkBUUSh7HMbvGJtVKwlxisl/VSV0k7HiRsGZe25lbhlpxC8iBh8HouI3OLog/FRRPdowaAbgnUZ2GfFQaw6CR4CJOSJYLubQgJPr+OLROs+UNAyD+3FWHGXF+ptQs20oyyRCbtJMVHhMzpb84J3JC6qjUxKupDXRue7pe4Sc0fw3RnrxcuK/0ZetBAa1GNwpqfkKF9zUSxz81eaprDdBfVXY/Gc2vl/JvlTg3xzPg8Zcowr4qMJKyS0TYRJ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6d0c40d-c97b-4193-b5b2-08d988cbab19 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:38.2482 (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: zIBgjeCBgxuCl9yhJAsEQ53vihAtdwiTCrOzi3clUyWMEKoK3MHiLjTiHFZlwK9dxPxUW7a3U4T0NOY1ryWaTbAEXbwmYnIOZmbBf/FCF7U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5910 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=40.107.6.121; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633526424118100001 Content-Type: text/plain; charset="utf-8" 1. Convert bytes in BlkAioEmAIOCB: aio->bytes is only passed to already int64_t interfaces, and set in blk_aio_prwv, which is updated here. 2. For all updated functions parameter type becomes wider so callers are safe. 3. In blk_aio_prwv we only store bytes to BlkAioEmAIOCB, which is updated here. 4. Other updated functions are wrappers on blk_aio_prwv. Note that blk_aio_preadv and blk_aio_pwritev become safer: before this commit, it's theoretically possible to pass qiov with size exceeding INT_MAX, which than converted to int argument of blk_aio_prwv. Now it's converted to int64_t which is a lot better. Still add assertions. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/sysemu/block-backend.h | 4 ++-- block/block-backend.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 134c442754..979829b325 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -157,7 +157,7 @@ static inline int coroutine_fn blk_co_pwrite(BlockBacke= nd *blk, int64_t offset, int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, int64_t bytes, BdrvRequestFlags flags); BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, - int bytes, BdrvRequestFlags flags, + int64_t bytes, BdrvRequestFlags flags, BlockCompletionFunc *cb, void *opaque); int blk_make_zero(BlockBackend *blk, BdrvRequestFlags flags); int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int bytes); @@ -174,7 +174,7 @@ BlockAIOCB *blk_aio_pwritev(BlockBackend *blk, int64_t = offset, BlockCompletionFunc *cb, void *opaque); BlockAIOCB *blk_aio_flush(BlockBackend *blk, BlockCompletionFunc *cb, void *opaque); -BlockAIOCB *blk_aio_pdiscard(BlockBackend *blk, int64_t offset, int bytes, +BlockAIOCB *blk_aio_pdiscard(BlockBackend *blk, int64_t offset, int64_t by= tes, BlockCompletionFunc *cb, void *opaque); void blk_aio_cancel(BlockAIOCB *acb); void blk_aio_cancel_async(BlockAIOCB *acb); diff --git a/block/block-backend.c b/block/block-backend.c index f051ea00e9..ef0f65be4b 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1380,7 +1380,7 @@ BlockAIOCB *blk_abort_aio_request(BlockBackend *blk, typedef struct BlkAioEmAIOCB { BlockAIOCB common; BlkRwCo rwco; - int bytes; + int64_t bytes; bool has_returned; } BlkAioEmAIOCB; =20 @@ -1412,7 +1412,8 @@ static void blk_aio_complete_bh(void *opaque) blk_aio_complete(acb); } =20 -static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset, int byt= es, +static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset, + int64_t bytes, void *iobuf, CoroutineEntry co_entry, BdrvRequestFlags flags, BlockCompletionFunc *cb, void *opaque) @@ -1469,10 +1470,10 @@ static void blk_aio_write_entry(void *opaque) } =20 BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, - int count, BdrvRequestFlags flags, + int64_t bytes, BdrvRequestFlags flags, BlockCompletionFunc *cb, void *opaque) { - return blk_aio_prwv(blk, offset, count, NULL, blk_aio_write_entry, + return blk_aio_prwv(blk, offset, bytes, NULL, blk_aio_write_entry, flags | BDRV_REQ_ZERO_WRITE, cb, opaque); } =20 @@ -1530,6 +1531,7 @@ BlockAIOCB *blk_aio_preadv(BlockBackend *blk, int64_t= offset, QEMUIOVector *qiov, BdrvRequestFlags flags, BlockCompletionFunc *cb, void *opaque) { + assert(qiov->size <=3D INT64_MAX); return blk_aio_prwv(blk, offset, qiov->size, qiov, blk_aio_read_entry, flags, cb, opaque); } @@ -1538,6 +1540,7 @@ BlockAIOCB *blk_aio_pwritev(BlockBackend *blk, int64_= t offset, QEMUIOVector *qiov, BdrvRequestFlags flags, BlockCompletionFunc *cb, void *opaque) { + assert(qiov->size <=3D INT64_MAX); return blk_aio_prwv(blk, offset, qiov->size, qiov, blk_aio_write_entry, flags, cb, opaque); } @@ -1618,7 +1621,7 @@ static void blk_aio_pdiscard_entry(void *opaque) } =20 BlockAIOCB *blk_aio_pdiscard(BlockBackend *blk, - int64_t offset, int bytes, + int64_t offset, int64_t bytes, BlockCompletionFunc *cb, void *opaque) { return blk_aio_prwv(blk, offset, bytes, NULL, blk_aio_pdiscard_entry, = 0, --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633526620; cv=pass; d=zohomail.com; s=zohoarc; b=mg2wi2au8BDX9LNJ4l+POPrZsI4wbdcsd36ZZWmgKpk7jT0z6pI2OCifV8CgPTdDTfgPtTbEq906U2Rdc0H1k5Npop/1YXOBO87ZvbIQP7YJOp6Ouw4cS4zaXk6z91gjVAgbhVJgjQvjuDDLzlqQDpRX1s6OmL3yZQXhPPfzbj0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633526620; 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=gBu2DEz2DQImlNi/j4N9x+ltK4O2K25+p33rd6WQirY=; b=A/cauErsRcYxkQckIIyQ/6rupzlYp9v3tbXCUaUeXX0hEZfGmif17a7f6VNIy0fv+niscvkUh5bCkFXlVjHfPnf85C/L3+tTshLTZyQlg/GjVjtGI2Y3qzdP8IoOtoPgzCBfTMXlBW1MyiTEqb4j0lH96G4KBkeHr/aP6H6me10= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633526620827398.2674888914887; Wed, 6 Oct 2021 06:23:40 -0700 (PDT) Received: from localhost ([::1]:57042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6tX-0006Uy-Tl for importer@patchew.org; Wed, 06 Oct 2021 09:23:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nt-0004rm-HX; Wed, 06 Oct 2021 09:17:49 -0400 Received: from mail-eopbgr60121.outbound.protection.outlook.com ([40.107.6.121]:24830 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nr-0004Ha-5U; Wed, 06 Oct 2021 09:17:49 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5910.eurprd08.prod.outlook.com (2603:10a6:20b:296::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Wed, 6 Oct 2021 13:17:38 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:38 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hNcpfXJ/eOnW4JvpVt68JkOhoNj0sFlKepoWOVeegUiPGUaCAUeEK9i0EEnsWokMMoklhODPla9/WIedLkISu+FDD1Xs7CFvYRVKkDpjhgCgW2cXnduCRrNrfBj8ZHNX8dRabO8DxfPuNzvyg/pLDXaOIZBlbKNK+Ett7M4TzqZX2MJiC67wlDj/IgBaZW5FZ/6sRCp4OYuXcnRZLc9KfW4bsAQtKyziVNNnUHtRIg6wfR+95uybKgjawWJcoVlL2+FLzt2BH+4GBd2QoUN/pE+g2tXP3IMO+ZC5ycWoykvetZeOVoEqsFt0MohpiLOp9TBjtYForoLYK6l9RQCwhg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gBu2DEz2DQImlNi/j4N9x+ltK4O2K25+p33rd6WQirY=; b=bzBsG+4g7IQCHnWm4+g3rdlFInMWJ1DiYXVt4ttPpZaQ4sUHc3K8kUxDmVdiHeVUFD0TsQbJrAXA3vC6VJPsHgNMEI+9lUXYu1qt3J2CvKoZ8L37wwT1Vu35r3zLd3R4dIv219DUWf/+f25Xw3qlO4n5bMJCegXUERH0f5RhF6RV22yR8HydDZeR75RelT9WDwvrtfjPZuJan/w+vmZxiG5IOeuoiijdc4dNzW2nKe1GVh6BxaTZ/KFmbALoGaqCColTPBWkDZFQDHs1HTRRwonC85MmMWbq4z9Ydq1ECF7Zi+ZYieIoRjDcEIYT9SgvFNHicTm9JllQZnd6tKUkSA== 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=gBu2DEz2DQImlNi/j4N9x+ltK4O2K25+p33rd6WQirY=; b=SZ83d7wI/ATmIX8SHC04grH6JX+5exMYmVZHvr8zWjSS5m8W1egQCH1KwDfLyzeJa1niyN9VRstcd4en4J7uYJ48NHSMlt/4ZKdC7PdLKX2C3a04vYBZ3yErNDqnzHN3iQ1tBecjiUl79LsR3wX4nuCRX54Iln8gdNrHotE3Lb0= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 11/12] block-backend: blk_pread, blk_pwrite: rename count parameter to bytes Date: Wed, 6 Oct 2021 15:17:17 +0200 Message-Id: <20211006131718.214235-12-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16da03f0-80f8-4995-0e5b-08d988cbab90 X-MS-TrafficTypeDiagnostic: AS8PR08MB5910: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:883; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LntlPlUCKzRSjEgZ6R5VcPypHs+puC3DxUb/mDHfiCkXMVm6qZ3bIkfo8elpJNW7W109Dg8pkoIkcZw/h5ZfQO+f8PAyxGb9fSY7fkCIISBGuF7bJ7l13OwHqAA2yMmrlXfEu26bePK/sjh5cYP8w29Ip5Bxnc3iACf7Ac98N88232ig8qcaXriQldtUd+WoU0eSgZgC9AvgSdXomELHnyg/jIIHQ2eTRd+L18cIV7+JObZ+oBtkgvHBPmBMAcxao60S44AvF3v1MrPSgz8SOUZoRe/Egoi/UEmbG+FwgGZMfM1IGDqjaXfOZRnThnqozIWx53JDu6REiYRISiMUSQmu5TVDQGTf1mzuMPZloHgVzZoRUVdhcJotZpsjIeBRNWbaTm43g+xymQAP0fBQHg71KidQ3te+OL5dU1hpOVHh4KjK1o4nZG1flM8dDkrTm4LxBEYUgSwM/P0nJeVEKU28wznuTufusEBf1c2wVC3BmvE6NfEoN1JHXbKLeIVJRZsnzYIvMRgRcySb9yW6afYd7lou+MwI+eAqonAWz4marPIlp6TA6by0fj5bEixEP19UPapAKjNA7Sq8a4pHawHJU4lLNK6DSqFUkKiTHPjcbehSjCpeiqB2DbYelIR2ffQf8xSxtscoSflxeB3v8IIW/axzyzOKcTKwmh9pZmrE6YmiSKXqMa917dFNysBRCKN70q4ytWgzkvT6sMYveA== 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; SFS:(4636009)(366004)(2906002)(8936002)(83380400001)(86362001)(508600001)(52116002)(2616005)(956004)(66946007)(1076003)(316002)(8676002)(6486002)(36756003)(6506007)(186003)(6916009)(4326008)(6512007)(6666004)(66556008)(5660300002)(66476007)(38350700002)(38100700002)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GiZtyxQ6p3LHfAGmxpaoCCQYtUZFmC62bTcYRngfBLg8ZzsndEwhTvPKjFj9O5huR60ddCvfutQ3aMp/kk+8rZclbB4eEaNe8eEzw5DYxYQLQk+Rt2TfbetBg5JwhFDcrHdRKNDeTVWWO3YMbwbnhWKs0kqeTq1JkkGH884SWl4oCDFfE7x+NZqXIgwz1HVdMB7VU5iqaRLtbuO7LbiuAFaBeLKsiEE2z1bmK+gL1O29sjrUPnn2Xy8U1GMIXG2Suc2a/IhLgp7Xtb+3XeXXoB7h6LkSHuH7Nibm0lGqcFR2jmXDyEL0MQLOoMZAwqhJLlPrkSBH7WEcdPxQelP6EKCLcpOu5nVv38hTh/9UVSwBaLTXxCvAr8IC0fZm1Aw99z4vjpQSTq1l/Ik9V4E8b99x07g1UrVo6XhFcPk8qu/3RTBh7qBuTbqo2NufhZ3Zdvl32Vvm6sMEzDFUsCq/IwdvY0R49MghzrvplKxmPC5H6UY8danS8qDSsmw1ocW/oxXNcyq6ELpgj1E/Tl6Joph6pttG5tlN23sdW+AaqH7qzawlMsU4cwR9f74wsym88HfJGsl8S5kNBHUWMsbk37dxMystRVYgM48mQ813MqJypxP83uVonSNOVqwg3Sr9DcKAVW11YMUBm/gTp01DEKlfzIF+4N+vCtYoylUmT6NO9e+MYVzNXiDp35YEJHuDfAq3UVCQGYYFxPRX7CVsK8WnsjTts1XSo3ECiqOzYKiZ7y6V3wlwtigyPhiBxe61 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16da03f0-80f8-4995-0e5b-08d988cbab90 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:38.8814 (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: 9bkqdNeMoPC1iEUpCDGGPa7OfTWe9rGxnke0Mv1feMJD9U5aXARdr/qGVfOsfmgvgtu0olO5tCyZg833jHCeAaSYlsdF3ysyMnCvGY1HZh4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5910 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=40.107.6.121; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633526622627100011 Content-Type: text/plain; charset="utf-8" To be consistent with declarations in include/sysemu/block-backend.h. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/block-backend.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index ef0f65be4b..e2b363ff63 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1477,27 +1477,27 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk= , int64_t offset, flags | BDRV_REQ_ZERO_WRITE, cb, opaque); } =20 -int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int count) +int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int bytes) { int ret; - QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, count); + QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); =20 blk_inc_in_flight(blk); - ret =3D blk_do_preadv(blk, offset, count, &qiov, 0); + ret =3D blk_do_preadv(blk, offset, bytes, &qiov, 0); blk_dec_in_flight(blk); =20 - return ret < 0 ? ret : count; + return ret < 0 ? ret : bytes; } =20 -int blk_pwrite(BlockBackend *blk, int64_t offset, const void *buf, int cou= nt, +int blk_pwrite(BlockBackend *blk, int64_t offset, const void *buf, int byt= es, BdrvRequestFlags flags) { int ret; - QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, count); + QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); =20 - ret =3D blk_pwritev_part(blk, offset, count, &qiov, 0, flags); + ret =3D blk_pwritev_part(blk, offset, bytes, &qiov, 0, flags); =20 - return ret < 0 ? ret : count; + return ret < 0 ? ret : bytes; } =20 int64_t blk_getlength(BlockBackend *blk) --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633526619; cv=pass; d=zohomail.com; s=zohoarc; b=WvK1B9RCAGELPxxOoHpVaMHD1KBJjYEPEmCpIuw5yMP3r5AzlvV99yE3+2JUzzzvkIeWjg6DXGbCg1kn3hWvBcyXGJMIaz4C5Bh9syfhxusWvBse4R1Ogpoa6nWpF1IEMXyUxdT07C3dF4i4YuMJchkJvfOHdgrM0bizMbbDqZ4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633526619; 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=ZuM9hLJL3qpBmCcsiuLJ8RKXFvfSozZ2aBKUZ/EkcYY=; b=Pc/H8K5YC65DmqMT+ExEKZX6fgkAibS8k0KuhSqBQie0a53K20ycBa9aDRDTRkm3PNguoz1SRi+E193Rc8fRdSpF7SnibDp5Dd+U8ffqGcH38Gr6+OMIUdMnN9XxxJu6mEG8r0q+yWw54yuWMYsm+4h09xokU5J0vRWL/5whLpo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633526619379205.19430071437762; Wed, 6 Oct 2021 06:23:39 -0700 (PDT) Received: from localhost ([::1]:56940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6tW-0006R0-85 for importer@patchew.org; Wed, 06 Oct 2021 09:23:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nz-0004wi-4J; Wed, 06 Oct 2021 09:17:55 -0400 Received: from mail-eopbgr60121.outbound.protection.outlook.com ([40.107.6.121]:24830 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6nu-0004Ha-8V; Wed, 06 Oct 2021 09:17:51 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5910.eurprd08.prod.outlook.com (2603:10a6:20b:296::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Wed, 6 Oct 2021 13:17:39 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 13:17:39 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 13:17:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q8HJvSPT6Qe2D5inYH0OEikVUwGrZ2oxYl6jT21y3XsvMSDk78o+uEQOrjf+/uTXsrdcVZuwK+a43BV+1/6TldxxmEKpQaAc5m0775jQ8hUiU6lvnLhzrg9LGMKF0pOnjQ0yQ8XmpGJzSux8PyvbtSnYJqW+vwAFgi5916AbDxgbPMBVUBvq1wXiai+mqjKgs0sxJy3olBfifnWlWS3kemV6vOB1IrNWi4w1fpcxiZLiLIjjyGO09k0h5swBSsn06zMsXbC/zEJK7JwPBd5onp09nLXmHXfXdES0RxvWrBjgfz2Hr+8Lx0tynCHQVFgkj6a/u+3dSMn0ERip+INhGw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZuM9hLJL3qpBmCcsiuLJ8RKXFvfSozZ2aBKUZ/EkcYY=; b=M37QqMcJ6Wluo2h8KVgQw9ecPLRx+ET9DMslSpuFdGuP33Z2G0jEkSymlL0VMzQjKtlIJurvKUZqi+nsl6Av5L4qDqXQy0vTOkC0gCvKr/BLX792fMSbXyKj/VAVCnbqUTJae3VYFnGZVy4eob6WHzEDF1cH7hjoj+ix4TgEnKjFfIZqW/LQ81RxqiTB5FtoVhX8Ih6BCinQUKxrJ28pa5GTn3+Ilwe2WTkoIqn6QZI+9ke5GCXKfMKdqK7lOWNWM+JKI5B37eSZkNz874SpVKzliBXp1cZ7jC/7oAsyUK/k05/sf9q03NM5qkiOavmU1gnScfx2qcUkEUDlgwCVMQ== 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=ZuM9hLJL3qpBmCcsiuLJ8RKXFvfSozZ2aBKUZ/EkcYY=; b=T/Tw5OzrRRJ8yjDoF/LNnn8uW3aCZgVZ8+Kb2mWt+GnPhxRmYn7kazIeZN19KjVt5utG+1EMd7C26I9remMPIR4eLPAmAZVxfDSnAh8oVLmJb4Hqr+zBCvKT+28P8Rqm9+B7dg33boUTViKtBfmVlKHHzrTR939VbNibcmpzG7o= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 12/12] block-backend: drop INT_MAX restriction from blk_check_byte_request() Date: Wed, 6 Oct 2021 15:17:18 +0200 Message-Id: <20211006131718.214235-13-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 286992fc-91e7-47a2-109c-08d988cbabcc X-MS-TrafficTypeDiagnostic: AS8PR08MB5910: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pK4msqFzIxw56N1ku+LCzK6jcoNWXM2gI0Ocq5KP72aJ4JaUgo1CxKXa9kGogkjFrWrcbdpzJr+98P0PcFuPnR4ngARWDQ8YOo+MiQrfGG0BXl4dvT9OMaQ4xyglQof+w7HerA6XkceBZRCc1eFY82cJRawIMt66t99TPxXZusetdxYdJqRYa3XKA49djFQA0s/f/q0hSq9I3zBFUmzoG2UL1lWvIP1509dsRR2qpPuZ54E5q+NApZQQqsZBdzJZ0USv1Tsk/CBxzwvl0HTeQ93ff0rxjVLFIi6MDklQIWdS01HIxr9i0/0LIv5JUHENJGZOaex10Wa60ERJQSiJeGXJS3kGqlVb52LvEAQxisuqe6dEhLO5u8vcVtjAbVxpHsUJuu3fxuFr7C9/3jLs13AOJwJ9fjFVIHz+FZedcoCYOn/qx32zGfSiGKif7iGVaeiuhBdkeb8iyZytufSDkTm7rkjX4+6xJ6ZYQaQ+xdC7iViEYOWGGijsBgQB4zLi1bnG0LqIyCa8zPH7zJW9krRtUTTtDnO9wRwCVDDK9czrVhxZuP6fXOOMYo80hjXxhXpIst+QoqmYUZoOtBX1oqg+2HC+IPWVjfo2Jv7qzV4HDVDMH72O9oyuZhoxdUvlluGsS2wa6TjQW73jom0AkF3a2CNgFGuk29Tyae4evlFoMrmSXx7+5qVBR+FOPJOvYrJmd9/adq9MGGqaYdWGcg== 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; SFS:(4636009)(366004)(2906002)(8936002)(83380400001)(86362001)(508600001)(52116002)(2616005)(956004)(66946007)(1076003)(316002)(8676002)(6486002)(36756003)(6506007)(186003)(6916009)(4326008)(6512007)(6666004)(66556008)(5660300002)(66476007)(38350700002)(38100700002)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1QOcugROy8L209SU2aEyF67fqGlNxJWVHBTCVuSCh52FIsaYid+vM9P1p1zj6en3B9BSW4gtm7hLZoJ+w5Xi5123deH876IW5u0T7Yx+IDj6o7x9f8xEcIwBw12MJ7YWJGe7cys3ubWMQZCl+gp3083qgBWIDFz+RSymjsLnwA/H1gFS68G5aORM3ASWTynVK3jMkEvO/69tvDHC+qCCb0E3vw2XTPX4b5EHPVOlEnUyWAkY0BjwGuKbKfXpTsSPwM4o1ys3lw5RoE0McIzfcQlt5ZYE7PYQohL6RLuAPYAHdWlh0SWWpBTgmpjxir1ANSOYGBpxzHqW+z5eSWkiuMNMDig4ZyCC4NN/bXmvmM8mXa4CHDitXIkyqWrNwTzfyfHMPpBCaWRz7BD5R/Vsuxshanl33hWm/MUsB1nPb7tynzYtT5v1rtAZFaQlNJ7yCQfLOs2LyZYoZWvCigF0gx7MBIWIzEbl+TmwY703X3XTZAyBahTU5mKRJ/5/uWShuDe4OP7U74kYpODsNcYX34zbGZ1lbXVSAbTcOPBJqmSItYPT+3fGCWboQUflv8DbzThamyYwZm91HJeFIaD9tyvMK9coCAQnpUGewb0MshrQctkfV1KPKnFovuj0TmVRap2CnUYMkU0TZ5tToX7ChRDJX6gKU0c9uohB3QgqWKz/3mnk9ndshzsxjYpiW08hzhqg66dHHEdoTQ8su1jULfVcJvBky4H3hwwFqiAo8f6TGiiLuj/SYtT7/84BwO7R X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 286992fc-91e7-47a2-109c-08d988cbabcc X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 13:17:39.4828 (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: l/yvFAc+FMhYD4nXLFpZMEIANZQF83eYReOeqmsWmokdLTQM7fkvwE1/vVGdN2nVJohFUUeFHfWHumbrZvboKJ+HK+qjUoNghtvqu3OPVQ0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5910 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=40.107.6.121; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633526620664100007 Content-Type: text/plain; charset="utf-8" blk_check_bytes_request is called from blk_co_do_preadv, blk_co_do_pwritev_part, blk_co_do_pdiscard and blk_co_copy_range before (maybe) calling throttle_group_co_io_limits_intercept() (which has int64_t argument) and then calling corresponding bdrv_co_ function. bdrv_co_ functions are OK with int64_t bytes as well. So dropping the check for INT_MAX we just get same restrictions as in bdrv_ layer: discard and write-zeroes goes through bdrv_check_qiov_request() and are allowed to be 64bit. Other requests go through bdrv_check_request32() and still restricted by INT_MAX boundary. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/block-backend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/block-backend.c b/block/block-backend.c index e2b363ff63..21d8e88311 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1166,7 +1166,7 @@ static int blk_check_byte_request(BlockBackend *blk, = int64_t offset, { int64_t len; =20 - if (bytes < 0 || bytes > INT_MAX) { + if (bytes < 0) { return -EIO; } =20 --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633629382; cv=pass; d=zohomail.com; s=zohoarc; b=EsmKXw2bZrYJJhMjJshCzLz+uxZkNRLE5EUO5apYBek6mHBvrLU6HHWsA0LoXdHzTmH2FTFqUBhcE2K1fTjgobCEYYl6OYteGJRxgwnFqIefcNC0dXFpTYqIbT0IJFMQz0ZW4jme9unjv9X84LjXtX/WEQDPKKmOIMh1gNSiw/Q= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633629382; 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=cUw469alwzGahZgaem1O5gdOVz7U+AJJQuawJAIv/nI=; b=eEnBRApnWES8ddzN7T0szBIGyUXrEwf44N1csOTC1ezXJmovxgrPzEPUIkMhVpVomJNThj16R0Nrq2VbUTUg+86N8oHoWJOxjKRx/AmaBd7MaBW9vzjqeDZIeb0XebBkJP8JfVv3H7SI0LsJnpfipeWs+qNtbYFeEBi3EsUu9uY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163362938211861.18205086843409; Thu, 7 Oct 2021 10:56:22 -0700 (PDT) Received: from localhost ([::1]:46380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYXcy-00036w-UY for importer@patchew.org; Thu, 07 Oct 2021 13:56:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYXZn-0005vV-CC; Thu, 07 Oct 2021 13:53:03 -0400 Received: from mail-db8eur05on2091.outbound.protection.outlook.com ([40.107.20.91]:59585 helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYXZj-0002il-4R; Thu, 07 Oct 2021 13:53:01 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1779.eurprd08.prod.outlook.com (2603:10a6:203:2f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Thu, 7 Oct 2021 17:52:53 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.023; Thu, 7 Oct 2021 17:52:53 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0269.eurprd06.prod.outlook.com (2603:10a6:20b:45f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15 via Frontend Transport; Thu, 7 Oct 2021 17:52:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MC/qMRcvnRzJQyUAO+hUVch4V7VMxXZQiunLnS/3cgbIftZ7++P1ZaGpX2O+3K0h4cmw2yxEGWPEXoqb5HZu4vyBiGGgoTcaTRzsNZh3CKyTAFzbXFEn3haMev4r3tl0XryWloZ7JrbKL3NPaadjZGIF9kNtTqjFX22i9fghUeVIbTQNmm34Err+iTZy4wWp20ZX7/qXYfSw+IlxwnHQnkbagRAo9mK7R+Qnjos4u1E6y7gF/lVB5Z0gRELmZ20B2jSQJCvi9zNu+6SD6sxCYJOhcXPBc/FNk8/bp7YfE/85SXPuM/ySBwb3RbQNUcMVBPb2lHaN61ykRJoa7sIB+Q== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cUw469alwzGahZgaem1O5gdOVz7U+AJJQuawJAIv/nI=; b=HaXR5ZWPsvHXNKutnzHU4qiLtebPYjGqSpij99QPeCVuadcgdSuLhSsKwUnixtRdB/nz85gdn2SqZhUJ3CPLIE5AR33Zo9TiSglsNoE9yZwCnq58Z0LxRaLOSDjTHnOGFV4YlUoYeuwqUIPJVHWzwrGyUVrpc/uRssfRaIbJ2DEeFa/qS/02wt7+Z6kNt5FKuz0e6+sQCVzu1N52hA/jDJFMnMnWFVz/zP1ef+3MBFOHptTAt2SP8OIjjD3j+JN9Vy9iHvlM/KyKlaZoq92HWo4j8c1cSDAZx7k0Hs2udhceQAh47Y4N7XSCJYbiKKztCBljPcQ2ogNmPZOtQOz3Lw== 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=cUw469alwzGahZgaem1O5gdOVz7U+AJJQuawJAIv/nI=; b=JcaMZZBf/UajZLrbrjdh+5KJLk/Vg9cIip90FB/wp3pgaBwW5t/ozbJaD99pr1YF2b+8LrhJgzBzWBv++5lyFKLINbCr7JnHb8EgH4M3XChA2qdmqV7vO7IrL/wzpcNet8nOtS0s4axynr4b3EJd2uF+77ljVGzU7HlQfIBo8GY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 13/12] block-backend: fix blk_co_flush prototype to mention coroutine_fn Date: Thu, 7 Oct 2021 19:52:42 +0200 Message-Id: <20211007175243.642516-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0269.eurprd06.prod.outlook.com (2603:10a6:20b:45f::32) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8132fa7e-e89f-4cf2-4084-08d989bb4951 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1779: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:192; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RvIxQpXzHA2ohlagTHi4HkXau/VbKfXa7+G8+MyPiFwNCaxTa4NltaX1RfPclePNta4dOB/o2Nigm6fAMbwG2dUAfoSJ4kenDtX3cThQKYg0r9EIi3lyqfoz+xpLnHaJ6501BaICuKfeWhf2GYj07w3+liHVDJf2psOcXkrC9vcy/ABTyajZ0rCKRwtpv1ZMJ6RCjrxtLdGhD/RT+M8BoRKCrAj5LHP5FWfqCuv4HVPoseShXJahq7RTPUZcbiDR5upGvGIxb5sILIHfoytnjDU8Uhctk28/ttQEfzyutyZeVtlOzMkVz6uMUtsoWbxrx9HJmbhcf3JfS4omi+melxLI9kKo4AznJmq/U3eKIrtFQghXuqFz4duXf6fikpWwFKX3tax7ApTx91bWSC95XIYFSkXxtTQE+zUwcsAm5QHIzx3+qJiY0xW6oyg7DYefvIzDbsFBS3wiTwpKesqrknE/RQ/PZZf7tmfdNn/L/2xjR4PFm7xGO4sGVoYyENOe9qALzIn4VrfR7NWXSRJ50DsJLfPBDWUCwB+DV8nKPKUW13ntILvHbcManK1BxeFIRc8itOr8TRWtnqV2j1f/iVrWhtkBSt/T3/eTQu+FAbEYBJKwUYJNY1PsxF4LP1ZdO1O+vWAXPP+nSbM/HRcpgP3PLlq1EeSUSvxx6Rc+J7hQX9cRN/daYBb+zYFZ4SAQ9KB3hN+Zsy7k2Ig3mF9X8g== 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; SFS:(4636009)(366004)(186003)(2616005)(4744005)(86362001)(1076003)(8936002)(5660300002)(316002)(6666004)(83380400001)(6486002)(8676002)(6506007)(6916009)(2906002)(52116002)(66946007)(26005)(66476007)(66556008)(38100700002)(38350700002)(956004)(6512007)(4326008)(508600001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Q6Bl6IRx20/6BNrkMUyFW2ozcBqA8iI9SVlkiSVChimzm7/P3w/ATvpS60CL?= =?us-ascii?Q?bAfgYO9focR5tKKbIjMKXh9M+Lp6hyAXh5o+2xYhS/4GTUhBGmcPRRR3BZp8?= =?us-ascii?Q?8AbmQxhyofIF/Klri0Vws3BQ9QBvrn9OdrBet/UJMDlEYnQXM1lZQ6GUpmae?= =?us-ascii?Q?chqQ7Sui++7K8y7ja1uhVvJeEGhICIi85pgFymDRBUcR9SIfeR3gsi0k4qC0?= =?us-ascii?Q?wE4IRTO1UbH1x+H0jlh1duVpGhJaZwlog+PqNDEu9K1nIVSYkoknj5LFKY2z?= =?us-ascii?Q?IriEmc7cO10S+vCdJ7t6zGdH92C9jNF3ZvdDv85vmHE/KEDgKMmcYMLIXYFB?= =?us-ascii?Q?zNy3MvfWLjWcUU0EQOtW2YmsE1mWS4YGCD+bAFO6snBTp6RzGxpDJ8AaYW3J?= =?us-ascii?Q?wY5zlheHgr01llHXrvDxNC9RPwLVi5W308+5NUFa0iw2QlD2nFt+YxN5tK2e?= =?us-ascii?Q?XoEUorCsswu90Nv1GCdVNWcUYSB6lxAUbtsQcYGbseNHTRRNnPtRGmlr9Gfm?= =?us-ascii?Q?VByqh9pEDSRTHnaWM0BAytbW6ayKv9XUIF1IQaazNGPf+H1M4JZU//oWTiQH?= =?us-ascii?Q?GH7Yqq7FrDExeZPIp4Yak4hiMxfpncSrjDjRL58ro6MPweaiF1FsGrL3agia?= =?us-ascii?Q?ESoR4wlSkvNT4owDQh4ouNSqkdDCFw+zB7bYD1QYSs9It4DyFdJr6dtWdnqC?= =?us-ascii?Q?9LiaFutM2JXAOaZJFGsyDNSQhyuUZqweIv1QiDpQkQwMQP+5HIrkl97b/tzr?= =?us-ascii?Q?zf+Nhfn6AGGmGTHH7VUqlFvLzMaG6/eIwb5537+Xi/vVZ8p8T4qWSwvWFbVb?= =?us-ascii?Q?Bcybx274P5Sim0C6KossWxJk81Y8ngZ/Q2LqWM+RS9bEFEQie+w7niV+On4r?= =?us-ascii?Q?DJr1L2WBDYxhlZqGyBbRBfSJqxg+/G+9xI8UthvGDZsr2814i+7a3eGuZ81x?= =?us-ascii?Q?+ozsfj6fHX+sgI1ecl+9xpW3AQmwGBkzBfstfdLS/Uyd/inI1ZCnrp01pxm4?= =?us-ascii?Q?5l2MBv3V+ixrxD38cccROB25Kx7HXU+JJVgq1AsfjVC0e1SojTaCzYzx6nO0?= =?us-ascii?Q?UGC9o3IbYTaqzQB+xIL0tG+gD0C/SkB4Sn8mkedvbs8XvuBjbhE/bUCpAIqU?= =?us-ascii?Q?Q70rxrvx99Xr4C2uzHOtEtZ5XeFokjZF2L+PxhJXKFSnLGbJYhuulEPDOY/J?= =?us-ascii?Q?vgpjCPQr48uPcpUOySilZ7ekV7959GktoXTu8NCb2q+2NDmTmzu41wMpP4LW?= =?us-ascii?Q?2rTgYuNMBdmVmjx8kVkXv+2mrBRltU7Bvdrqu9qrmMMg7zkf/jR2pb+qZvVx?= =?us-ascii?Q?+XoqiSVb0wizRBQa2xGCkIRX?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8132fa7e-e89f-4cf2-4084-08d989bb4951 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 17:52:53.3229 (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: BuKvfJBKNN8GaiGac6/L5h1u9NFVr/9OZLfL9CTsrUFe/HQXwJiT2XRMzbPiRJP8H4bIsciREFqRdJuxHqh/BelcpRKqsxNpzHTSfYBp4Gs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1779 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=40.107.20.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633629383978100003 Content-Type: text/plain; charset="utf-8" We do have this marker for blk_co_flush function declaration in block/block-backend.c. Add it in header too. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/sysemu/block-backend.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 979829b325..f3227098fc 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -183,7 +183,7 @@ BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned l= ong int req, void *buf, BlockCompletionFunc *cb, void *opaque); int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes); -int blk_co_flush(BlockBackend *blk); +int coroutine_fn blk_co_flush(BlockBackend *blk); int blk_flush(BlockBackend *blk); int blk_commit_all(void); void blk_inc_in_flight(BlockBackend *blk); --=20 2.31.1 From nobody Thu May 9 05:09:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1633629604; cv=pass; d=zohomail.com; s=zohoarc; b=dRslWoU5n10vT2ZQxymWmpDWnuLLZRiy1MHBONqfvbJoqsFTWpuUmu0ta2+58TwMXfrlIvUe4RGvSUDnahYpNtsgIrOGFTMhb9tiyErWFl2iKs68/il4IwZoM3DVnqizRvkBHlUrf1EInJLlyqcOZjeB4DJ6AF4DvwReJKHp/EI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633629604; 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=4N9BkkQwmtkRM44poQEW8K/WiQT5LkNKQGy5Z+bVJKs=; b=CqhAYvmroKX0TI2JVsDPt6XuM9wARnBkQMDFVp/qLVt7uKvW0bieCOUdeLmvqT5wwfh8Dr+rDnlYicVRYUXrjtd8h8dXElQr0q87r2k4+oNMabd6PBzgom00FBJkvxug2kL7g9OSHJKjEj+BaJE+xXomAFmi1SLkP4k02e92VZE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633629604290494.8962921606816; Thu, 7 Oct 2021 11:00:04 -0700 (PDT) Received: from localhost ([::1]:58972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYXgZ-00036P-1L for importer@patchew.org; Thu, 07 Oct 2021 14:00:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYXZn-0005zW-VR; Thu, 07 Oct 2021 13:53:04 -0400 Received: from mail-db8eur05on2091.outbound.protection.outlook.com ([40.107.20.91]:59585 helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYXZm-0002il-Es; Thu, 07 Oct 2021 13:53:03 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1779.eurprd08.prod.outlook.com (2603:10a6:203:2f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Thu, 7 Oct 2021 17:52:53 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a994:9f7c:53a5:84bc%4]) with mapi id 15.20.4566.023; Thu, 7 Oct 2021 17:52:53 +0000 Received: from kvm.ch-qa.sw.ru (130.117.225.5) by AS9PR06CA0269.eurprd06.prod.outlook.com (2603:10a6:20b:45f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15 via Frontend Transport; Thu, 7 Oct 2021 17:52:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a61HE/fopUe5G7uJu9cHzuCtknsnU99JRyhzDpWmAmXsOyMl7K47r3A+BZGcgxXWVvsqq42WjXI1wa+HD/SFe6fZNprfMT/KgqhvVXvdiJZvye/sU14x/ZAkGPQblgy9y+k9m5L+sF5woWypmM+jr61eP6GcsuE9sRlkcKRWj84tujY5dArInwElF6+/Zr+80LDBVUh4GDQ6rqcclHiGx22+B37KXfjKb6hpeALJF0X35bdR4gY60jmVa+UNM1iJY/lMk6X2qME+JGhyeMAWL37XC3Cru0jmJniHYUpXQJtfL8XeV9ppl8ltwQi0t2j5zuUoriH19cu48VgcA37yhA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4N9BkkQwmtkRM44poQEW8K/WiQT5LkNKQGy5Z+bVJKs=; b=KJuHU1qCkrgB18AK8UaN0gU57G2+hy4ZFoOvWs6UzuVW4RMAh4xdIREdycdHMq5qRQ7k00J2BU4q0HITsS8YzCXw1/G/1suz2f+F5R7ietZyVqtLuY5QRH++excpbPDmGWsbsIwGLuXksfPoqmh1S9r650gSS29JXEiGQ+oEVpVIZztYGnMNU7ziqwIheqe0ET2FXaHiG03wNHhUO6iZxrwFDkE1TP85w8AnuM2X1eaftrXuvOYkd1jq38QWBzT8X0vsOwewVkxdVrsqaKRIxW74CRj2RPDrPtPewFlOlWuGhkfxBHGkJpZJDRSKg5gje7rz8+2DnYpuKx5iVkkw9A== 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=4N9BkkQwmtkRM44poQEW8K/WiQT5LkNKQGy5Z+bVJKs=; b=ahdtr+ZlgFOBqqiEKxZCTi88a039L518Y2x0Wfmoo65VbVmdkeAh3G2GA7c0H/hEu83paLO4S49wDr3uDwzv4LfNawlPYondgbYXkSU+nMCI9+/KQ3/mldF7xag/EMi7W9AEyLi70sQsP+kmoXrepFnFRtLWzkSDxqZoUgGwniQ= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com Subject: [PATCH 14/12] block-backend: update blk_co_pwrite() and blk_co_pread() wrappers Date: Thu, 7 Oct 2021 19:52:43 +0200 Message-Id: <20211007175243.642516-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com> References: <20211006131718.214235-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0269.eurprd06.prod.outlook.com (2603:10a6:20b:45f::32) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2fdbe2a1-61b7-47be-59e0-08d989bb4998 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1779: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2201; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d3xf8T0ElUlhZK5ycjH+2ZGWRwUz+vC3/+x36Egl7QjfD7L4czCR4u0hjVHajoMtmQYhVC+eZ4Wuq9PhRI/kJ7W9/kaEfqRp2DkVw2KMykUUuJt2PrNST4jdd8p812vCWo2Yy3xiN8gobwkEiH6chiC8AKxAlY6BnV8pWUUQ038Y46UgZUpQrla31Bm/hNII1BCEedN+NtfgYAjus/Uk26cRgzkDKwWbdc1C9Xkv3UIuFcTFKTkJAK1OqyYW4r2TiYCe3usKTBhAY/M4xkisqmLzDdFSCjcGH63mh5+95STQRlHmMMNMn0Ug6UsdXozxReIjzkZCAS0GAsxrU8VDKKcQRk59xylPhYj0gIcanDwwRP+8dHMvlxAGbi0WX2NEQwGvltqD1wVBJH0jDLTQTirkuErPoXPsm7BYQVb+Z6m9dCkRN1SGtVW6YoojbgoKKjfuY3c//60eEoxCkRyFq1j2YaYDg5iyMLebJTS5wMKH/yMux9PxYUBYVy4IO0m1naGEPO2jzjFJwv7RNCSLPXPzrxQS9DfkMpWCgZCJSQrvG9k7wXivkSZu14pkwL7A+llQyPXZ98W16CV8fFs9SuNkDuXqimfN6pTgym+CIQNRXXth5g39Y7OiEzZm/nIxwDObmN8YF0EAMck42yDfwpGfxh9AeuxgFaBisJhnZ38xUa069l1lnbT2S/Vyv9jn 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; SFS:(4636009)(366004)(186003)(2616005)(86362001)(1076003)(8936002)(5660300002)(316002)(6666004)(83380400001)(6486002)(8676002)(6506007)(6916009)(2906002)(52116002)(66946007)(26005)(66476007)(66556008)(38100700002)(38350700002)(956004)(6512007)(4326008)(508600001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d4XmTxT5ysQ+wQxzcFpLwXkStzQy8GwhxT9qURU4vXHEHxXojwz6wz02F/nq?= =?us-ascii?Q?5YH0oI6ED014mHkAUFXhkmh/RYH8/ykif9CANMgkS2uoBt738xRcPl1wVa/6?= =?us-ascii?Q?yGsadPxKpYYjeFIJ6H4HkGQ3b4qq+s581m64Wc2Dt308FIUwOMrxrhzo+SeK?= =?us-ascii?Q?vpHt9Ppe4+Hr3IFehs0TW4vikgrzrx4wBgO5q5tf8mtE/9cfXtLrA7jfb5yy?= =?us-ascii?Q?lsm/5cAHPma0kxJVVUJ1fKkECEDWdb7rW8zgyy7MpcjG8yhvoBUsdhJxeFIH?= =?us-ascii?Q?/8BOoVGsEYYv5RDxr41ZIpQ4S8V5blBsCqMX3kqHxT3hh9bg4g0mKPzCZ3rk?= =?us-ascii?Q?l0KMYrunNf9lXhlRk2t68X/2a/iAgvMI37VaCtSfUo2s+rOahbpk1lQWnICd?= =?us-ascii?Q?SJcFnTyUE79or1iKI/sNxzZXEStDsonYZN4fOUKccTffrogqV/XciWEvsHVl?= =?us-ascii?Q?H8C6eyo1maqa4LnThUyMuk6F4aiWkR3xjJHqUEfsGHj1GoeD2dkd067EQx3E?= =?us-ascii?Q?qkFTrI88ufrbOi6wuBohKhWuO+W7anBKnyiHri71Ux0DYwGOfrRK1mjM7VNl?= =?us-ascii?Q?1TM2sbtgbFyj6EmONgFm2AWfbCF1TBgEwj9SlZA+x86rslw/ITMV8xweIm3T?= =?us-ascii?Q?wP63lbYVxG44SOTTfuXbzFX5kiEtVIkK/GqRWmfWQMqjEtG6A6/nmOQZGfqf?= =?us-ascii?Q?HVaq7KIQCleT6y/W5Qh0TGTlvZUaOycQljhyNWe8Ip7zc1vzELBkmUgFQECh?= =?us-ascii?Q?AlO9snRdyPHDKM5WCGfSyrye+XvfSda629O+yVgnU4PoKDba8xoR1vUa+gi9?= =?us-ascii?Q?oVIoceIFCB0tXn2aNQ2mmHut0IMjTeamY8+DL4MDFcI0edrEkGKsEFpEH4If?= =?us-ascii?Q?ihMPQ0L67t/CB1G/aschbR/JZW3qIRcn8iLQKO6sBb2UfeYBmlIJmab2XZWF?= =?us-ascii?Q?9yPpq74QRjxt61lxjXrn+WpALLEDNDTPT5mST1Ecnk6meATLd4r1xCdRwbvZ?= =?us-ascii?Q?T3Leg0U4DGUR1cyn8pPWbcJgbUfnCLDAcehkqzf3X+KDRFnSZ1oNWRjEBjnv?= =?us-ascii?Q?2NwZjGeMMVSWt0D82qB0CHZXddXnCtC2XS0qDE+/8oLTXqKU8nCd0nNTJxz6?= =?us-ascii?Q?HdNgYpEvT3c+h1ihuDZNSxZX98akid+DYcm/zaYKVzdaFLh7zAg1Yxl7b7Dv?= =?us-ascii?Q?ugSPWq1SzuHoet8VT04WMshrBeB4weAwl6xGTSxoIrTZvAHbaXSJNha5OR/0?= =?us-ascii?Q?rvuLn6yvFzlK00mUsvXkYDL2p2mBnQC6IWRXBg4frfTOwel/ce5kfwAxH3hk?= =?us-ascii?Q?M9595C/UEvNqwy8neyZ1wROJ?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fdbe2a1-61b7-47be-59e0-08d989bb4998 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 17:52:53.7331 (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: ASHpvN3evXUlUw4y+8C2JTgF4AslZdbLWmWK3Ktj1v1TppNvhklUSWlYgE84PFtPFznvcBFs+zrfYiXY4II6rIKErDCQm4XcYpDr+cgeviw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1779 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=40.107.20.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1633629605499100001 Content-Type: text/plain; charset="utf-8" Make bytes argument int64_t to be consistent with modern block-layer. Callers should be OK with it as type becomes wider. What is inside functions? - Conversion from int64_t to size_t. Still, we can't have a buffer larger than SIZE_MAX, therefore bytes should not be larger than SIZE_MAX as well. Add and assertion. - Passing to blk_co_pwritev() / blk_co_preadv() which already has int64_t bytes argument. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/sysemu/block-backend.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index f3227098fc..53c9b3271b 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -137,20 +137,24 @@ int coroutine_fn blk_co_pwritev(BlockBackend *blk, in= t64_t offset, BdrvRequestFlags flags); =20 static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t off= set, - unsigned int bytes, void *buf, + int64_t bytes, void *buf, BdrvRequestFlags flags) { QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); =20 + assert(bytes <=3D SIZE_MAX); + return blk_co_preadv(blk, offset, bytes, &qiov, flags); } =20 static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t of= fset, - unsigned int bytes, void *buf, + int64_t bytes, void *buf, BdrvRequestFlags flags) { QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); =20 + assert(bytes <=3D SIZE_MAX); + return blk_co_pwritev(blk, offset, bytes, &qiov, flags); } =20 --=20 2.31.1