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 30F5543B86 for ; Tue, 5 Mar 2024 10:52:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26D7142DF8; Tue, 5 Mar 2024 10:52:32 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2086.outbound.protection.outlook.com [40.107.94.86]) by mails.dpdk.org (Postfix) with ESMTP id 5C6374026B for ; Tue, 5 Mar 2024 10:52:30 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LRb8P8JHJvAXkcMTbK5GtkWgFJfdpP1ehsPI597MtlvwZ3R0A4Vk+D/IHwuCWgU4c5Xd3O901eX1LtCPAsZMWPLTMCk3xbyzopckukm+MYy+KCJk2YfrjITmqwk0pa7qhIMd4COq53lxWLcrwsDXTXG+lRdh7I+uU5DmOAx7iI2O9dJw+/WvRUsdrZWjFqQdwnon54IJr1vduz92TPP5IbpcVyNw/IoGEjSKyTyGrQ4HIcAm2trE8vic1SQAXevFbZEUaFcyIChgxNhQItkgXGMA2FRWrLyNiEG+/qZn+UBcPFGkLVn4De061q4AuadNTQMpa8QGqoy1jIcUk85NGw== 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=UWDkDw04OwdwLG0+h8pdfNX/3+6XEg6AJmQm8BJeE1g=; b=KYqo5AIiB8OPmpf0hKMQHUxwZ2OyX/YojLXm292a+XMCdC2BImeeVdHd1TlSovIzWa6fSx7m7YRe8lqOJt09Z4kU/jFnbkasQ47YNlXzZzWEEJFiHxCgvHvdTTMgeKIPq2R3nJIxkeuPKGBH682DYUhUp04hcDkKYx4yTtqh2gnI9OIBxhm7RIieKug77PhnVodbYLgTN418uE5HFlXlqxxH4R5whwq4J8LyZWEFzVAPMNSeQfdnvude5wq/CL+wENhxA0/Rsmimvf0nuYgf0kifwTp+BWO54Ve+NMwYQoNKYrVrrISjo9v6ytT5ubh8rzqdoylfyqxVHEp+oR1IFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=amd.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=UWDkDw04OwdwLG0+h8pdfNX/3+6XEg6AJmQm8BJeE1g=; b=sKBM/Mh7IcvE1KYeGxPIQlseDxPfGPiZtnOWlyYLuVU+4/Y8Y/HecUuaLrK36ErExzWSCYVHgjPEEtE+1eYIo8KCRqK0jHcc5D2RenzyL8fGTkVdJLtew+Njt/LASa9gzXlT2r6EmEiGpZYkG5OYwgyHT8IbHoGhAPfGTzIX2jfoeUJeAikhFgRMyXqw+N3lax8eQrI0u2ApZ4fxb4lDY3aj1Xj7Wlefw7Xh4A4PcWoFXM260yCSfpDus6gz6TKuMJy+PjCvHv0jn9JtuooMF9IecwLRParlL9ZE0d4x3JxQDGCBEd3ct6tV4QLQqsWPzUbiI9ZQALPYsjjtIukPTA== Received: from DM6PR02CA0138.namprd02.prod.outlook.com (2603:10b6:5:1b4::40) by SN7PR12MB7021.namprd12.prod.outlook.com (2603:10b6:806:262::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:52:27 +0000 Received: from CY4PEPF0000FCC0.namprd03.prod.outlook.com (2603:10b6:5:1b4:cafe::2a) by DM6PR02CA0138.outlook.office365.com (2603:10b6:5:1b4::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:52:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000FCC0.mail.protection.outlook.com (10.167.242.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:52:26 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 01:52:15 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Tue, 5 Mar 2024 01:52:13 -0800 From: Xueming Li To: Ferruh Yigit CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , "Dariusz Sosnowski" , dpdk stable Subject: patch 'common/mlx5: fix calloc parameters' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:27 +0800 Message-ID: <20240305094757.439387-47-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC0:EE_|SN7PR12MB7021:EE_ X-MS-Office365-Filtering-Correlation-Id: 912a0285-f817-40e4-3fc7-08dc3cf9f72e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a9/Yg6fN+3BSEA9q9UBVumOC3fgt5lT7WSvm3hL9UQVT8T6KOgfnhrr4XebsVo/MemKtb5CSxw/xN9uOUKVfu0+cMGjCOQQMhDqyJXZlh+YuESPE01Qafz0U/4myHzlq+DERnFrm2bkxt9Agq/acn7Zdtv+XgjsJYLmScMf4crQuurJei+v5uJ+vAxBnLaV28+IHPCU/pSFebXP52UZYKDJXE3AkoY/yMnQOGDf5eBNjemXhbVxFLlKC6nOK7TUpNYMkdxJZkJMxhtvzt6tg6H7MYfy4p1lTAJrq611xPtS7gEOmOTGBQ9kUdzRiKPpQwBsHeqkHlfLBgSYP8LTsz/uTPX6TZ4/6lOmiuGwCR/P6bYUsheMGIQkx3K2HpuEmOwBcOH71ysuXnZuLyUUgtZ2P2wYKOGCfJCbk3dSISO5G3+unOXvjjaallWdQIdC9JLrS096Tsse4zWn7gL1ip1IQ/d3P2SfL6Qg2uF2TXtnREVHrw4vRBiPpvNrpcf6KDUA4nwplFNucsM2bzuuw8thVL8L+0x98RT9qeR5rZA/JRrjGxnpKUJZjvlCcLpoGL65igOpH9UsIVQD/HTpi8hDctUPpt/SP8vGIQhqytRwrkwiTcifAmq8/bD+6ycZnU0VcrJ/EO6g/H+c8aZY6WmknjGZzbyNIzPqGi3LYAc75Y4Qo+CJqoOoRI7l2q6BKub2LRN1UzQ+oZx7EhhifPOk5jXPNFRv4sN/ksRKMK+BoQL15OMAP4Wa3DLTFa0h6 X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:52:26.9888 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 912a0285-f817-40e4-3fc7-08dc3cf9f72e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCC0.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7021 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 Hi, FYI, your patch has been queued to stable release 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=e3ae3295ee76a8016c023a083eef9ae68eb768eb Thanks. Xueming Li --- >From e3ae3295ee76a8016c023a083eef9ae68eb768eb Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Jan 2024 18:54:03 +0000 Subject: [PATCH] common/mlx5: fix calloc parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit f805f70bc5511cd98a34fa2f8f7bd7a3e4cd8aa3 ] gcc [1] generates warning [2] about calloc usage, because calloc parameter order is wrong, fixing it by replacing parameters. [1] gcc (GCC) 14.0.1 20240124 (experimental) [2] Compiling C object .../common_mlx5_mlx5_common_mr.c.o .../mlx5/mlx5_common_mr.c: In function ‘mlx5_mempool_get_chunks’: .../common/mlx5/mlx5_common_mr.c:1384:29: warning: ‘calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 1384 | *out = calloc(sizeof(**out), n); | ^ Fixes: 7297d2cdecce ("common/mlx5: fix external memory pool registration") Signed-off-by: Ferruh Yigit Acked-by: Morten Brørup Acked-by: Dariusz Sosnowski --- drivers/common/mlx5/mlx5_common_mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c index 40ff9153bd..85ec10d2ee 100644 --- a/drivers/common/mlx5/mlx5_common_mr.c +++ b/drivers/common/mlx5/mlx5_common_mr.c @@ -1381,7 +1381,7 @@ mlx5_mempool_get_chunks(struct rte_mempool *mp, struct mlx5_range **out, DRV_LOG(DEBUG, "Collecting chunks of regular mempool %s", mp->name); n = mp->nb_mem_chunks; - *out = calloc(sizeof(**out), n); + *out = calloc(n, sizeof(**out)); if (*out == NULL) return -1; rte_mempool_mem_iter(mp, mlx5_range_from_mempool_chunk, *out); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.397821147 +0800 +++ 0046-common-mlx5-fix-calloc-parameters.patch 2024-03-05 17:39:30.743566492 +0800 @@ -1 +1 @@ -From f805f70bc5511cd98a34fa2f8f7bd7a3e4cd8aa3 Mon Sep 17 00:00:00 2001 +From e3ae3295ee76a8016c023a083eef9ae68eb768eb Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit f805f70bc5511cd98a34fa2f8f7bd7a3e4cd8aa3 ] @@ -25 +27,0 @@ -Cc: stable@dpdk.org