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 5CDF143B86 for ; Tue, 5 Mar 2024 10:52:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 54E784026B; Tue, 5 Mar 2024 10:52:33 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2070.outbound.protection.outlook.com [40.107.243.70]) by mails.dpdk.org (Postfix) with ESMTP id B41254014F for ; Tue, 5 Mar 2024 10:52:31 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZRB1BgRiCEyK77gB0Djj8kuLfimFSwD40ewSLQgOd/FpSAAaVNi9jZfMA0oqIIye0VjMiSEGBm/bJ3eiqZdEyD9IQUnoNdoY8GXeEiKo3JAwodT584VSQbCpWUzz0x7Z2j+js24/7cS6KSRjvlugXgozRmkS5J9HPzjQdgpnCBHGjtg0/TA5k1F+AjIyslFQSx04lVQEXAkYYKpxZuocWTloYpu5jnIKWEuQd30yAf262FjnNeHS7bE4HWrZtqfHlFT7IpjMxR5axopwKoNvgg704m0pDHLda/l7EPDVNxU//0xnyNbvlrONzcFSYnsFWN5kdsPLPhC1LnL8EmwbiQ== 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=rBFo+kvw/p9NtcwRf6RrmWaY611qSvUpmPDQ5GzyzPk=; b=kHVuQtodmtOcmnYu3rGKxkYoEFSLHv31VWJXBO8rGvyoOtu3XSEhRYWnt5xbcqgw2qM5hN01F/HjJDSje+UGaWfyQ9n2Wm9mT0C/6KEOcPZbPgmrTP8FMAGkG1TmifL7kM1aPA0/OxK9+oGOp+M/8yylwGLIsA2ZeIa3ZbYRFh98kwITC20ARBGPyIwtYEmCQcn2LBNQQkU8DGfGxtb7Mr0vCI8KQgq5Od9FOFrni+P+o6yg7xadanmyHNZQSgMNIelBJZsSqmIrPhKzd1LHeWeJyGj5zsBe5Qre5EV46d48RkpiM1UIbwaDsaxbczi7dgDB0JU70pmMQzF4I+WUMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=rBFo+kvw/p9NtcwRf6RrmWaY611qSvUpmPDQ5GzyzPk=; b=jJhq/Q6V0TmUiyTFSnVtYFV5pUSJRszi0V5OH3XXueNX1zyOXFooOj17KnrXF1GLial2punXE2Wj55IpnqmY5RwnFXGFDDd//SnDaVXZM1kCUfPDrZQe9g02oWdk6VQrru8Fx/+oCHvJp12axcntYm5J5k/Ymq5IlOvWsxQNwoCwNWvtRWZhmn+kZhYAVzCFUcXGgqDM3TFEjCFTtwSV5MkckqqbagaR+Kiz8po70V8dmnQSv9vxcPv62EM69UG9Kj76lH2kSv5dXWifz2CmLD20l6rS+7n2rfmGjzpBJn5rFVfFvSv/g5WQxwT7Q+8Lpe2FZtqpMv3ioGlOooxFGA== Received: from PA7P264CA0133.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:36e::15) by CYXPR12MB9278.namprd12.prod.outlook.com (2603:10b6:930:e5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:52:29 +0000 Received: from SN1PEPF0002BA50.namprd03.prod.outlook.com (2603:10a6:102:36e:cafe::3b) by PA7P264CA0133.outlook.office365.com (2603:10a6:102:36e::15) 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.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF0002BA50.mail.protection.outlook.com (10.167.242.73) 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:27 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) 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:17 -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:15 -0800 From: Xueming Li To: Ferruh Yigit CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'net/bnx2x: fix calloc parameters' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:28 +0800 Message-ID: <20240305094757.439387-48-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: SN1PEPF0002BA50:EE_|CYXPR12MB9278:EE_ X-MS-Office365-Filtering-Correlation-Id: 901ac81d-ef61-4682-0f26-08dc3cf9f776 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YPYDDapCUayTDVhQS6OvDPAnVXHcpjJWgmR1WFhMLApGjFgIqmQarXZYcnIkcvNHhJqB19gfKIJw7Ea0aEFisPzaEb+QRIW0V0PRoBz9X1NTgjnQp9JZkzTAVA4Ultvuai2xLdwAkVFXNC6r5hfEc0WfipqPMtY3GWEKf+W5aYROeZ/FMRir20vho197LNDRpIDUqCdiKXZ2exUQRL0zUAK8VfaL4GOGL6UUG785L1Jpte9+Cm0sdPwPKfF6Bt09tf3XlIzcLhExv6WRuzyN7+JppPfDdLYGhq3NpQ6S7cHap7gqcEddXVHzGSfY1VdgWaKKjugyPbJQ8H2sQvZMPsVONq9POKD1qYLrve8T8sbFCqEqxYAPCNnrCWY3h+SZGWre4dPLdf65edj6O24GBspoHXBFeoNMqc7eUk0otnnl7ynKYLh17mnlf0GejXe96WBGcz66XTPjBqIVe6CqIis5CtBmVivcncqBip8xTIJe41XjeWW1C3ulvr+AympAA+Yp69OQxvhAeFGVcGgsLw5E9FcKOxwO0oblnt5BS8w/dyzp7v+JTrQ+GLTw9xzTruLHWwvBbVJyuqG89Cy7gytnWa4/nDg5s3FGSxB9Yv/ptxmsmEsQSEOFjElOAbKtZSaG8OemODPXJZtj7704/dQiN6/q9ziKVqyckcGbnDVLi3xfdyMbYNEFwEXqaqkE+U7Gv5qaE/cij4b1pG+fitKjuKj2W0xdpfKY+WYaNlvxFn7u9dyBIlrkvOBvODz9 X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:52:27.4594 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 901ac81d-ef61-4682-0f26-08dc3cf9f776 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002BA50.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9278 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=238a03cdec9c471a8de6c87b92c09af8ba39871b Thanks. Xueming Li --- >From 238a03cdec9c471a8de6c87b92c09af8ba39871b Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Jan 2024 18:54:04 +0000 Subject: [PATCH] net/bnx2x: fix calloc parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit ff0d80191617d3b4435e0f473b129cdc539c23f5 ] gcc [1] generates warning [2] about rte_calloc usage, because rte_calloc parameter order is wrong, fixing it by replacing parameters. [1] gcc (GCC) 14.0.1 20240124 (experimental) [2] Compiling C object drivers/libtmp_rte_net_bnx2x.a.p/net_bnx2x_bnx2x.c.o ../drivers/net/bnx2x/bnx2x.c: In function ‘bnx2x_alloc_ilt_lines_mem’: ../drivers/net/bnx2x/bnx2x.c:2392:44: warning: ‘rte_calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 2392 | sizeof(struct ilt_line), ILT_MAX_LINES, | ^~~~~~ Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Ferruh Yigit Acked-by: Morten Brørup --- drivers/net/bnx2x/bnx2x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index c3283c94f3..597ee43359 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -2389,7 +2389,7 @@ int bnx2x_alloc_ilt_mem(struct bnx2x_softc *sc) static int bnx2x_alloc_ilt_lines_mem(struct bnx2x_softc *sc) { sc->ilt->lines = rte_calloc("", - sizeof(struct ilt_line), ILT_MAX_LINES, + ILT_MAX_LINES, sizeof(struct ilt_line), RTE_CACHE_LINE_SIZE); return sc->ilt->lines == NULL; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.427704748 +0800 +++ 0047-net-bnx2x-fix-calloc-parameters.patch 2024-03-05 17:39:30.753566492 +0800 @@ -1 +1 @@ -From ff0d80191617d3b4435e0f473b129cdc539c23f5 Mon Sep 17 00:00:00 2001 +From 238a03cdec9c471a8de6c87b92c09af8ba39871b Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit ff0d80191617d3b4435e0f473b129cdc539c23f5 ] @@ -25 +27,0 @@ -Cc: stable@dpdk.org