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 8D00043B86 for ; Tue, 5 Mar 2024 10:52:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 817D142DDF; Tue, 5 Mar 2024 10:52:34 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2056.outbound.protection.outlook.com [40.107.223.56]) by mails.dpdk.org (Postfix) with ESMTP id B633F4026B for ; Tue, 5 Mar 2024 10:52:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SIRJHvufZDXZIBp1PCbOZ9JoM+kmiBA92dULEtjLzjJtsP3RIcbzXqT5lH43gDbZyL5ZJGNN4eRmS8KkzUS+PUg23X5UtbVPjqUXLTyFCw3+uvxm0J6rcWqS4UVETVw7TOSDauTRXlJh9pGdYEsq7w53/8ZRUh0EgDRO5RR20L/wnnqhM4Uwze52phnLfdrP7Hi4AxLBOHripqvIAaQO8Qx5iTwoJ4n3TOoATlxOwFRuyGNkfK0RXmpEU91cSd2IiatDDfTiQJIlRxy+ADto/e7B6i1NREQ7vXInseDbRkFyq+Afn9CmZP0E6tKAGb8ctvPnxFVwXFnreqHtkHmuvA== 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=KUscnW5LIh+HBLRny1FQ8ZbU6fHzcwVfiY+EFyjEGKk=; b=GKeGNpQSuPmEBNZaKHvZZiL1JdT91mWHeiVjg0evyFbtYDCjRAL2ebfFL+lnrNxtYIndIdqWPvTM1xVabDPA14RUCS0uFG4S8JKKFYHP+Nf0qAxPkDe5dWyBK4VRUhlblnL0scA/v7e2wlxYoM/kQqR/bhVid0ebd6dthA8+VmyDXp5gUyvsoy3ad4KDNUqgtkzGVPu48NINir781m2Tf/LTTFz/TGPiiFw6pc5V+KeDBL5an2G91D82H6KoUyz5jWMWnMvNnK4bE0czd7/XzJDfa7JBndgL4+0VJZQ8FDcOhxJ6WWeHiRiEDXICe82f3x4efS0lR89oAf168dclYQ== 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=KUscnW5LIh+HBLRny1FQ8ZbU6fHzcwVfiY+EFyjEGKk=; b=iMaAja1YVIqYhysyN+OucD0SSRjVJfCikLnBWlmropeqz+bJLfyKHc3qcZZ8RN4hLLD2CT0gc4kpcOoLo3rUl1c9qlG7hKHCTAw43oVaOee1rOJTsWjazdxOGBi5yYCo7ok34C4ZIrOGaRlz5peUKVeYCRhNtmARxOz55Z4ovy+zfEoG1y1GSmoupDhisnvyxCcFfkn/9pQTLSDi0d/cDRqUl0lz4k/0E1cr6hLdF0ggoPFz78SweSu2VoVM45V+IK91bIKCXL2Qw/86DXNiUVY5w0m19BE2nriEo9clQDVUFZIEYZjUAwNLGJKg44UmYx6sRMK6Ql45OPzOcySbsw== Received: from CY5PR03CA0001.namprd03.prod.outlook.com (2603:10b6:930:8::29) by DM4PR12MB6349.namprd12.prod.outlook.com (2603:10b6:8:a4::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.32; Tue, 5 Mar 2024 09:52:30 +0000 Received: from CY4PEPF0000FCC2.namprd03.prod.outlook.com (2603:10b6:930:8:cafe::f) by CY5PR03CA0001.outlook.office365.com (2603:10b6:930:8::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24 via Frontend Transport; Tue, 5 Mar 2024 09:52:30 +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 CY4PEPF0000FCC2.mail.protection.outlook.com (10.167.242.104) 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:29 +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:19 -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:17 -0800 From: Xueming Li To: Ferruh Yigit CC: Chaoyong He , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'net/nfp: fix calloc parameters' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:29 +0800 Message-ID: <20240305094757.439387-49-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: CY4PEPF0000FCC2:EE_|DM4PR12MB6349:EE_ X-MS-Office365-Filtering-Correlation-Id: a68a9f64-5a89-4edc-f455-08dc3cf9f8f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8NbiHBzgdbhTmYkzoPa/jsJ9pBrXhsVMljVQUUFCI0ckeGAsm5vkYFWbpWjl16JP2z6sslrc7miGO6qxaV32djw6E5CaNqxHDqJsKszCffGZViSxkfqGQ/eWEa59RP2abOZOO/hHwiNOIxkSBuCH1wg/a04+pET3kx3zaFnWR+rAQTZCi/P9EgL/KBLBTfXABPWmfvmY1+fLfruIRjVsZhCvxzq3OPCCb9gkBK2aFofev59fGFjgFXwsbV1jcM7vKUf+PLQ3RQclcf5k9sgXREfnPbOSY4cXp8XOi8SzVyyu5vpXfujd+XCKtBhXITlaGjRGnnUceSvuOPIBk2VJfWY35J0qekvWZhW/x6Dq8AGCsx/VEea6OdH65BvEs4DgAlixSVYe0D0Y+9dImAEDAunfIuI9/01n1KZfZJGCTjyB3QdDiiprNh4hrQ5d8KHE6hziJOs7k2p3mAYh6zsAl0K2gdma0uGFR/jjh/3IQzs1owKr5wid58Z982hSpMMvarMMOL2YNWUh6tS3JXtV/ryYsAstTfvMZE08Ta3exYDLr9zp+j5iS5fLvPvHliFGTJvN8DG2fMLvx1excsNbDmGO6K/VfgbL4n9gCscK0r96k3sNuFkvi20Q3irBYpboJZE4m16tt9AIXv8SEBzDQBrH8I032QIuTc7rPdasCVRuS2tA11qD545B7TkFKtuB0INcby2Xe5Gtq03iGv4dP8yi6KXHEjex7qKObZ6rYaFfMH6U3jeXbC70EwX3e9fZ 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)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:52:29.9818 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a68a9f64-5a89-4edc-f455-08dc3cf9f8f6 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: CY4PEPF0000FCC2.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6349 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=acad009eedab668baf31f2aed512a3fd48a226cf Thanks. Xueming Li --- >From acad009eedab668baf31f2aed512a3fd48a226cf Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Jan 2024 18:53:59 +0000 Subject: [PATCH] net/nfp: fix calloc parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 0352f47a3bf923574afe17e822af58bedc7ead49 ] gcc [1] generates warning [2] about calloc usage, because calloc parameter order is wrong, fixing it by replacing parameters. [1] gcc (GCC) 14.0.0 20231102 (experimental) [2] Compiling C object .../net_nfp_nfpcore_nfp_mutex.c.o .../net/nfp/nfpcore/nfp_mutex.c: In function ‘nfp_cpp_mutex_alloc’: ../drivers/net/nfp/nfpcore/nfp_mutex.c:171:15: warning: allocation of insufficient size ‘1’ for type ‘struct nfp_cpp_mutex’ with size ‘48’ [-Walloc-size] 171 | mutex = calloc(sizeof(*mutex), 1); | ^ Fixes: c7e9729da6b5 ("net/nfp: support CPP") Signed-off-by: Ferruh Yigit Acked-by: Chaoyong He Acked-by: Morten Brørup --- drivers/net/nfp/nfpcore/nfp_mutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c index 3c10c7a090..edb78dfdc9 100644 --- a/drivers/net/nfp/nfpcore/nfp_mutex.c +++ b/drivers/net/nfp/nfpcore/nfp_mutex.c @@ -168,7 +168,7 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, if (tmp != key) return NULL; - mutex = calloc(sizeof(*mutex), 1); + mutex = calloc(1, sizeof(*mutex)); if (mutex == NULL) return NULL; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.455542749 +0800 +++ 0048-net-nfp-fix-calloc-parameters.patch 2024-03-05 17:39:30.753566492 +0800 @@ -1 +1 @@ -From 0352f47a3bf923574afe17e822af58bedc7ead49 Mon Sep 17 00:00:00 2001 +From acad009eedab668baf31f2aed512a3fd48a226cf Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 0352f47a3bf923574afe17e822af58bedc7ead49 ] @@ -25 +27,0 @@ -Cc: stable@dpdk.org