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 B557F43B86 for ; Tue, 5 Mar 2024 10:52:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE8A84026B; Tue, 5 Mar 2024 10:52:39 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2083.outbound.protection.outlook.com [40.107.212.83]) by mails.dpdk.org (Postfix) with ESMTP id 9DDB24026B for ; Tue, 5 Mar 2024 10:52:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hRBiDCWZRRMaravcX35ggkcxTZIlXOLIdHVwpX3h1ZxDB4g2hjTK5iN+CsG5YRAwgax5laXhch4gZPt2EV5ABdm3VTtKfJkf+bm8BCZCYG/YT8fUjP2qoUogZn9308nSO4Id10mTBQVgRP74uBZEjs7VIIAUsseWFu8qOdiTjewK/fGISlisHeXHXQ3K8h2PS0koRPHYoJza4+kK7Z+CX8LwZVtxrprP7aOswOzyMt/iNzzMq2xFVgVplUG3GvJh6efF7vmWpx/OvoQH1mwjS7iH4byB/8CeOLqOfnXHm31bE2IHeXwbq84CEs75TED4YPH/eggGPI3JJLUtaoMTag== 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=NB8rfkPJBfdmIyfSJcLH0aTou2u8Rc5AuVi1WTDmc6s=; b=f+M7E/fykyMvQmZjZloXVvKFQJrupdt9Ql6auusUSxsQGzQJyoaXeNuPg+zFim+bkQu6petDKQ2LhoJlaHJmDjAeMD1qORcePWgliwYpr8gABLPc9hjJC274ZKuLOJA/YKq4Hg7bUzc19EB30kvqB18esHYfEoXWRotdVTv3sR8MN+6l1vaSyoI7xFsBhaYuAUJzcahuYuvkGRvPBYu19Ogim+iI8BFlnSlwLUGlVLjMG5l/SUXWm7GrWgLn6t8ztcNCw9gZ3pp7VMEwZS6kS+102ZP6GA/3zorsCR6tsro/8dYixfdp64p0wdAn/6FWupZvG94t3yyROyMQ19xhLQ== 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=NB8rfkPJBfdmIyfSJcLH0aTou2u8Rc5AuVi1WTDmc6s=; b=hsFya1+FbIV0ziTMM5x8S0ugnyUXO6D0FUVnqYe1N+C5qPiJuQC5VwIj6jUvuYH5LH4PgyounlGtCeKXLm3oZHt6fnhzYNUX2DTrsjGMJlgUNan3JveiKBR5ymhGU8vaZONOB4twV7ifF/a6ryuOeQ2OX4svvMvQ80Aw8uBlGpC15ZPZvnqKLgdVj8rRebvhAYAlUNL04/xbn6cwAolAPvk+yB0ok2Uq44USqGY4cmZwZD1CLlH4K8UFMpuauSc8NQICxhmtlTkktxFkyiAIM6glFYTgUYLARVD+VMf8iD/q6fl+DKQrt0HEFxnMc5X7BzCEOc+G3Dx6r/6DydVGrQ== Received: from SA9PR13CA0107.namprd13.prod.outlook.com (2603:10b6:806:24::22) by BY5PR12MB4226.namprd12.prod.outlook.com (2603:10b6:a03:203::24) 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:35 +0000 Received: from SN1PEPF0002BA51.namprd03.prod.outlook.com (2603:10b6:806:24:cafe::ce) by SA9PR13CA0107.outlook.office365.com (2603:10b6:806:24::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.23 via Frontend Transport; Tue, 5 Mar 2024 09:52:35 +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 SN1PEPF0002BA51.mail.protection.outlook.com (10.167.242.74) 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:35 +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:21 -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:19 -0800 From: Xueming Li To: Ferruh Yigit CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , "Andrew Rybchenko" , dpdk stable Subject: patch 'net/sfc: fix calloc parameters' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:30 +0800 Message-ID: <20240305094757.439387-50-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: SN1PEPF0002BA51:EE_|BY5PR12MB4226:EE_ X-MS-Office365-Filtering-Correlation-Id: ac2101be-5ca3-4cbb-932b-08dc3cf9fbf7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5kw5j0uObSPPFU45h/qAFUyqWna4iEx2Tl/5Y/1jpEnzGCgSVdZJjqOIgepbI8B5Q31KlU5L++zaphvg2bn437GL3ticKS3IcAOZLsTBu7Hfgw06DuZvqJ8E8+jFJMHyi/OPtRnzzN2TTrO2uDcKZ/19SznkEQJIfZ0S54Zx8cgnOBOMU4rW4GvC1Gsix1o/m3jU3SEKxlgv9GgAPdSyS9JBj4DU6TXgh2d2+kTvRj1+jQt4F7oOICncpDMEC5ReT419V/yi1IW2KpKpCoujrkRF3lJ0vRiNAj9WEjFZisZ0ULcpvJX1eABcJQtzkjBR0l7wFbmBZnESYfOhr/cTwrmVNo33JXxpdSA5yVBJlscixTNzT72kSCwjQmqA13QE29j9iip/DkOZGu85nrhW3oWqXRa5r/g+xrKjZVip7T1rupivl3INSu1MJChi/841ii/OU/ZYaycadFQ0LfdxFzximr5PXvelXLKVxrSis7/UMKbf8C1rU7nhhbHG2xFXXjSYkI8jW11V4Vo2NrU1OLL46iRtxTwh4dzsLxOVc+VyBtxkMGr2MFY4HhPnAnkznlQ8+yfAESY7IyrzHos6qsHnfMPdx403uP8x2xXWWjdWyDQbn5Gimz3RWnnJvxyUmyPPHCdu+xDCd3Q5nX7IYnihDlFuyBDHC6RPgUYWoSrRf+K2FMUJeVrgD4PkAE34Pv3uNXTsyM0b9512vsdpaZOwRdKmeint6N28G2MpJ7xVGgVGRNm4AcufYQkwZX9M 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)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:52:35.0191 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac2101be-5ca3-4cbb-932b-08dc3cf9fbf7 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: SN1PEPF0002BA51.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4226 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=63241d76621b2accf88e511aa2fcf2b63f0a870e Thanks. Xueming Li --- >From 63241d76621b2accf88e511aa2fcf2b63f0a870e Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Jan 2024 18:54:05 +0000 Subject: [PATCH] net/sfc: fix calloc parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 351f656ed67277f175de0a2baf296eed7e3fb21d ] 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_sfc.a.p/net_sfc_sfc_mae.c.o ../net/sfc/sfc_mae.c: In function ‘sfc_mae_action_set_list_add’: ../drivers/net/sfc/sfc_mae.c:1353:35: warning: ‘rte_calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 1353 | sizeof(struct sfc_mae_action_set *), | ^~~~~~ Fixes: 002f591f54c3 ("net/sfc: support packet replay in transfer flows") Signed-off-by: Ferruh Yigit Acked-by: Morten Brørup Reviewed-by: Andrew Rybchenko --- drivers/net/sfc/sfc_mae.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index e5ec0ae49d..60ff6d2181 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -1350,8 +1350,8 @@ sfc_mae_action_set_list_add(struct sfc_adapter *sa, action_set_list->action_sets = rte_calloc("sfc_mae_action_set_list_action_sets", - sizeof(struct sfc_mae_action_set *), - action_set_list->nb_action_sets, 0); + action_set_list->nb_action_sets, + sizeof(struct sfc_mae_action_set *), 0); if (action_set_list->action_sets == NULL) { sfc_err(sa, "failed to allocate action set list"); rte_free(action_set_list); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.477893550 +0800 +++ 0049-net-sfc-fix-calloc-parameters.patch 2024-03-05 17:39:30.753566492 +0800 @@ -1 +1 @@ -From 351f656ed67277f175de0a2baf296eed7e3fb21d Mon Sep 17 00:00:00 2001 +From 63241d76621b2accf88e511aa2fcf2b63f0a870e Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 351f656ed67277f175de0a2baf296eed7e3fb21d ] @@ -25 +27,0 @@ -Cc: stable@dpdk.org