From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6F2D3A034F for ; Wed, 10 Nov 2021 07:39:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 699524014D; Wed, 10 Nov 2021 07:39:50 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2081.outbound.protection.outlook.com [40.107.244.81]) by mails.dpdk.org (Postfix) with ESMTP id 8917940142 for ; Wed, 10 Nov 2021 07:39:48 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fe8O8+gE6w9qfqEgyVxJyUhUD3nzySbJdt+WWUYfY4sT3UgWs7fQI3H21AKpIjE4OMf1uKr/R7ADx/GDkP/SIbQxNXzWlxOh1f72KrR44CXjNJsltS2SgnoAcVfMYuFqZnkaLB5Irik8vZAv6FR8rkbQ2JeZIyJt5QuabfK/uK7bPhbHcKsASU0rhEngXMEWsiTBl5DHzIrMnwepni45s6a1TD+PBG/WEU3h6PCS3C4O7ubzcIGmTyDUILeD0dcDPjMDLR+33pxqH3KM2VhJW/9+iT7raHmbRsEprSVthb03OhJqp5ZshHcUTC5jJJzvuTAZNr5T1iegR0KbM3cDkg== 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=YGUwz9TdmPDfDQujxsZ8EFDb6MkYN9J/xj6b2Ynr64I=; b=aVyZmK+4XfDPU8wzPF1kX5zE1J/vdm/DEQT9HpJGxvvRCGeMFBjSkPyT22nPI+d9zYQsqUZ56jb5RjQkKPBrYShvFOdNF1JD8kfTl7g/y3tnam5qZ8SNKlIKIOF3GiwAQFUog/81dWZT5m4ybIB4JG6SB2RCZuv1RTW9I6cwJI4fz2e/qHKOExQIoubhqOzvHgtddtWFp23t34w8jiap/LMwcF7yePOqfKLuwLAnv/wD7EqumX11ae4hEP/NQbVe58zgnViXoMgx8tk0Fz7gxn4RpDPPaZBDoPKczlxFI+4azHXfBFPdU0W3JIKLxOLe8OJaVWpv0CBpndvUQVJ68g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YGUwz9TdmPDfDQujxsZ8EFDb6MkYN9J/xj6b2Ynr64I=; b=SmrfgENedrb5ecNmSXYW/knNuRNC4UMV1kz7W+dM52Efq7smLaSoU2Pj4ZN6D9BaHTIodEFwUlPr8eD56QkUlw3P6SwbHGTlWlHsfDE378pze0ZJV//IAoTrOapSLF2+6PWmZhQA5ZNRbywY3RSdMyhaF85yBhoER1Ehr2jqzASAi+qCjykBFHJFi3QA9tz9GaY6hRrNJquhdunxcYqUZ1l8EB1LiFFU47lGCkdiJZYuhK11xQDIXvB7OXgnrE0boik78gNJ5PLHOMUbvfCgCizMA8T8Rn8nran32+KqIQ71AHawcUoBoKgDK8gSXrlWshgeUSktoV9uJYVm5Tqbng== Received: from DM6PR08CA0060.namprd08.prod.outlook.com (2603:10b6:5:1e0::34) by CH2PR12MB3943.namprd12.prod.outlook.com (2603:10b6:610:2d::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:39:47 +0000 Received: from DM6NAM11FT018.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1e0:cafe::79) by DM6PR08CA0060.outlook.office365.com (2603:10b6:5:1e0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:39:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT018.mail.protection.outlook.com (10.13.172.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:39:46 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:39:41 +0000 From: Xueming Li To: Xueming Li CC: Luca Boccassi , Matan Azrad , "dpdk stable" Date: Wed, 10 Nov 2021 14:29:11 +0800 Message-ID: <20211110063216.2744012-68-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 112c9e5e-df30-4acc-e4d9-08d9a414e329 X-MS-TrafficTypeDiagnostic: CH2PR12MB3943: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5G4oAbzh5LepiMCnjKKu/VEpzywDJ1FowQ1hGelfGuU9fwj+QGrzSerZeo2jGX+f/KXOB9T/EiSqcyxXGDkyafF2EidN8nmY5C3TfbduUBlxN48CxecJ0r7n3NKMmwJrrTp2kV6u1creqIiGwHsnLIX1Js8oydHpbDgr7DMpFQ6PQXL1Yrck1TGsXJUPfqpOMMOEYZU3axbjwPCt6MkQi17GpMfrhQBSTxfpJjKgnshsz5bnzeUWgcwKughjIrgmNoczol0clBXiZfXHQlx9q0LCzWOiC0dFh5JwcfDQY7j4hjU/T05t6auU9mfhTPbPQE/BAUoPj14Y+/1NCqVcsaOwiODbpVwv1r1O9ltmFtWBIzq7KY2mQnD4E7n6jzUt9EAKUxJzpkRoAwpkPN+4hEf5Vou2cIPTyMsL8mHJceCuKq8pKiPYiKeLFAp9SFsW8ujFtTLm4Mm1IJ2TJi5RAzBXiMlIutvoKYS4Xu54zydpOaJrPBk6DG30Jbti8sCSSz/ZD0rUOXR4lih9ChTDGoSfWnYLgaAdc40moxUQBQBAqnq9vdYP6CLOMe1Li3NLTw3tf7wK9YMtPWbc9Xp2Opf5LfAYQWteEhrKK8AI0diJdA16hQkIwGaCu1E0W83nbDINi5npWECq9eHgFSD6MbFGq5mUSm2Ad5mZmu3Tvs1/HAhxvaNyLVXelbsUsZs3euTk4vUQiX0vLvXCdjgd/qhWnGH9UQCnf3Oss0wbDG2XW/pKCftZv2svfykShbJN6rnJl8Kk+kIcIo38pqy3dKh4tnq0AzIWkofQtGBarnEO9q6c2dZtCavetuVedJEZA6bteWQf0QV1v6EyJZvIjQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(6286002)(8936002)(8676002)(6862004)(186003)(508600001)(82310400003)(6666004)(5660300002)(36756003)(55016002)(4326008)(54906003)(70206006)(26005)(1076003)(47076005)(36860700001)(7049001)(2906002)(16526019)(966005)(86362001)(83380400001)(7636003)(2616005)(53546011)(4001150100001)(37006003)(426003)(6200100001)(316002)(336012)(356005)(70586007)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:39:46.5861 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 112c9e5e-df30-4acc-e4d9-08d9a414e329 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT018.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3943 Subject: [dpdk-stable] patch 'vdpa/mlx5: fix large VM memory region registration' has been queued to stable release 20.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/6f7c9fde7173f84c2a245acac1b71bf941b217f8 Thanks. Xueming Li --- >From 6f7c9fde7173f84c2a245acac1b71bf941b217f8 Mon Sep 17 00:00:00 2001 From: Xueming Li Date: Thu, 23 Sep 2021 16:11:22 +0800 Subject: [PATCH] vdpa/mlx5: fix large VM memory region registration Cc: Xueming Li [ upstream commit 6e914454d5083046497bbd764ff5ae1547e8c6b1 ] When VM size is larger than 4G (u32) and memory region is larger than 4G, the 32-bit GCD function overflowed and returned wrong value that resulted in memory registration failure. This patch calls 64-bit GCD function to avoid overflow. Fixes: cc07a42da250 ("vdpa/mlx5: prepare memory regions") Signed-off-by: Xueming Li Reviewed-by: Matan Azrad --- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_mem.c b/drivers/vdpa/mlx5/mlx5_vdpa_mem.c index f8861d5d26..c5ab652a6b 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_mem.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_mem.c @@ -103,15 +103,15 @@ mlx5_vdpa_vhost_mem_regions_prepare(int vid, uint8_t *mode, uint64_t *mem_size, size = mem->regions[i].guest_phys_addr - (mem->regions[i - 1].guest_phys_addr + mem->regions[i - 1].size); - *gcd = rte_get_gcd(*gcd, size); + *gcd = rte_get_gcd64(*gcd, size); klm_entries_num += KLM_NUM_MAX_ALIGN(size); } size = mem->regions[i].size; - *gcd = rte_get_gcd(*gcd, size); + *gcd = rte_get_gcd64(*gcd, size); klm_entries_num += KLM_NUM_MAX_ALIGN(size); } if (*gcd > MLX5_MAX_KLM_BYTE_COUNT) - *gcd = rte_get_gcd(*gcd, MLX5_MAX_KLM_BYTE_COUNT); + *gcd = rte_get_gcd64(*gcd, MLX5_MAX_KLM_BYTE_COUNT); if (!RTE_IS_POWER_OF_2(*gcd)) { uint64_t candidate_gcd = rte_align64prevpow2(*gcd); -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:05.060201766 +0800 +++ 0067-vdpa-mlx5-fix-large-VM-memory-region-registration.patch 2021-11-10 14:17:01.824079806 +0800 @@ -1 +1 @@ -From 6e914454d5083046497bbd764ff5ae1547e8c6b1 Mon Sep 17 00:00:00 2001 +From 6f7c9fde7173f84c2a245acac1b71bf941b217f8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6e914454d5083046497bbd764ff5ae1547e8c6b1 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 59ce4e891c..a06681b494 100644 +index f8861d5d26..c5ab652a6b 100644