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 291C443B86 for ; Tue, 5 Mar 2024 10:52:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2322142D7D; Tue, 5 Mar 2024 10:52:03 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2083.outbound.protection.outlook.com [40.107.93.83]) by mails.dpdk.org (Postfix) with ESMTP id A1B954014F for ; Tue, 5 Mar 2024 10:52:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=af19QOnBm/TiU3AZI5eWYZnZBiR/495G7OnG/FDnRssrVhoqO6wdWAQ61erPYxrEpiGKp8YjckR6+w5mKo9gdOp6e7PF+cyW/WW9VL/+35ZrJeOwCi1pljW3TH3wKxL/ULBbXsMJt99LmEBiVnFB8E37VLMZdrXg/DOK9sksvY1vTuYMIfg7gCBTQ6h5RseDN1TprGvmBObYZDCxMn1GAI4Bq4l42ix42oaxb6F7Azd6fxv77iNSSdaPvhh4k2iTVs+cuYgGQvmZTxFi+ZAVvswU1w3ucSIhCbVVEdTmTxNtFS+7MsDXiOFzKPJmXWEpIsXql8C4Rw6Myb4lHWNv1A== 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=0eud2KVtNFzw1GK5e8E8GNMeU49FWByxyaVwLM+0LBs=; b=WRWZaSvyBSS07so1PP0feJ7ys08wbwUazttska2LIpX5E4uKqapx5L+FMPtGr1y4YgEOq6t8fZvqqwUby0dp/+ikqjy10ZKd+IfIC02z6dLsbu8tFyhyJ5TBOPeUeLzZlFSGHmk/kCQE6ST7Tkmg6zbBCCWxInlFRXB+GtzgApwnBzULeSMrGcH/M7E+U0ciuJg+bk7Sfga16sKrE0TWLvDDAcwLcfkXTrLiITsMfXZvnQPI6xki7tUN1Z2TyCbp4iG9wUlx3eAuIEYtTQRYhX1y2aeBkMG/1rSHQrP1/plExjsC5WLtKWNV+4dlvaivW74FwWpW9zc6PDSXXvGOEQ== 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=0eud2KVtNFzw1GK5e8E8GNMeU49FWByxyaVwLM+0LBs=; b=OgfgKjeZKy1boRpC+LxAcDL6opfeyTtesalRdbvV+nJ9oip4AMAvsjz8qYKKjeHJyJMK6BqVLCsZ8kMg1o0G71asndO7OejFE3E9NQux+hu4HsWlHr4hRhDwCBJFHzadMDM3gSNV2eX4eSktrGkQ4U/Nitak07s2fUEadrAOoiIZC2M+x2nie6ELLRp7guT2cTVNwBuCDJZq4H/kXsYW59h5RaAtQ5oJtoIzJg7lICEA8j1FvGlT6mf/TztCGS/AJlhPr6xE5wnaiErZQj5UXH2+IecfNQJFveDtdWuaGE7eU0/dZ/qtoL4oMW458haTtn52B3jVpLP0crDSQulmPQ== Received: from SA0PR11CA0083.namprd11.prod.outlook.com (2603:10b6:806:d2::28) by DS7PR12MB5744.namprd12.prod.outlook.com (2603:10b6:8:73::18) 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:51:59 +0000 Received: from SN1PEPF0002BA4F.namprd03.prod.outlook.com (2603:10b6:806:d2:cafe::68) by SA0PR11CA0083.outlook.office365.com (2603:10b6:806:d2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38 via Frontend Transport; Tue, 5 Mar 2024 09:51:58 +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 SN1PEPF0002BA4F.mail.protection.outlook.com (10.167.242.72) 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:51:58 +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:51:50 -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:51:48 -0800 From: Xueming Li To: Ferruh Yigit CC: Cristian Dumitrescu , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'pipeline: fix calloc parameters' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:23 +0800 Message-ID: <20240305094757.439387-43-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: SN1PEPF0002BA4F:EE_|DS7PR12MB5744:EE_ X-MS-Office365-Filtering-Correlation-Id: 60668a7c-99cd-40d1-ae48-08dc3cf9e662 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gs/5InBL5EjU31S7Ej91L1yv1YPEHCtQGneYkOhRZn7S2wM5EnHiuicEEvyI1vyitFevOdwuImE8tX9o/oFPbVj3rzgdPO2foN3R5MEgrLpzjcs92vPOhfkBekRWVysQOncpFophBi5ohYIyAUh0jPqEvCanNOtV5Lt2YKE/L2EGluOIQe6p8/PA0r9KH4F+zFWDIyIJiKglU4fPoOfQZpJ4sMacYIfHtj8Nc103kWFt2yXoh/+6y4WWmgt/qkJ3voWSbv5Q1bLG6TXv/aAmRW6I+hI8cKS3eLj7cTz5dnknbRrvUH/Mwc/wqrXnbqGBtcpGZNZ0R7OaGZrqkafTgQ1+xb3g5DRTVxTmSliypfnSBcoZtkJX+6/OAByapP9dExWVrpXX7NyOtplMYnEwSb3Y+hYLRHD/wmdIl3wliELje5JmJBFXp1nkMzifALE0ogclL3rZAKqLGlWeySjm8l6GwtzeOUJzczSWZIGg9UkagbytPOlMlNjVgQ+ZSS43Yf18fYoSlIynfEW2s5OJn/PtjivbdcpbdxCLLGRnY026c6o0cC3OT3qDen6q5kMpjGkWeiOgm8EKlpgrZmGIGynbS4zRQvTD5p29wY52O40/OCfd7l+X5dkPlHgIfDjCu9HiPu2OYuhW4BU+KcEMJZwp+IBCl2IZOk9QwItIyZAPnOYH28aems9KwWY+RcY+wKSxx97QhARGExHTUqrvre7e/J0RwcnT8fNBxS6Oy7GbkgXrhPiu70lSdRVYkbpa 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)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:51:58.8267 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60668a7c-99cd-40d1-ae48-08dc3cf9e662 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: SN1PEPF0002BA4F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5744 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=600e30b793ef66ba9022a65d336455e376881146 Thanks. Xueming Li --- >From 600e30b793ef66ba9022a65d336455e376881146 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Jan 2024 18:53:58 +0000 Subject: [PATCH] pipeline: fix calloc parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 0594ae0c42773d62aff870df25e73394f7f0a5a5 ] 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 .../pipeline_rte_swx_pipeline_spec.c.o .../rte_swx_pipeline_spec.c: In function ‘pipeline_spec_parse’: ../lib/pipeline/rte_swx_pipeline_spec.c:2893:11: warning: allocation of insufficient size ‘1’ for type ‘struct pipeline_spec’ with size ‘144’ [-Walloc-size] 2893 | s = calloc(sizeof(struct pipeline_spec), 1); | ^ .../rte_swx_pipeline_spec.c: In function ‘pipeline_iospec_parse’: ../lib/pipeline/rte_swx_pipeline_spec.c:4244:11: warning: allocation of insufficient size ‘1’ for type ‘struct pipeline_iospec’ with size ‘64’ [-Walloc-size] 4244 | s = calloc(sizeof(struct pipeline_iospec), 1); | ^ Fixes: 30c4abb90942 ("pipeline: rework specification file-based pipeline build") Fixes: 54cae37ef4ef ("pipeline: support I/O specification") Signed-off-by: Ferruh Yigit Acked-by: Cristian Dumitrescu Acked-by: Morten Brørup --- lib/pipeline/rte_swx_pipeline_spec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pipeline/rte_swx_pipeline_spec.c b/lib/pipeline/rte_swx_pipeline_spec.c index 2bba0d0524..17419e7b85 100644 --- a/lib/pipeline/rte_swx_pipeline_spec.c +++ b/lib/pipeline/rte_swx_pipeline_spec.c @@ -2890,7 +2890,7 @@ pipeline_spec_parse(FILE *spec, } /* Memory allocation. */ - s = calloc(sizeof(struct pipeline_spec), 1); + s = calloc(1, sizeof(struct pipeline_spec)); if (!s) { if (err_line) *err_line = n_lines; @@ -4241,7 +4241,7 @@ pipeline_iospec_parse(FILE *spec, } /* Memory allocation. */ - s = calloc(sizeof(struct pipeline_iospec), 1); + s = calloc(1, sizeof(struct pipeline_iospec)); if (!s) { if (err_line) *err_line = n_lines; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.297020344 +0800 +++ 0042-pipeline-fix-calloc-parameters.patch 2024-03-05 17:39:30.733566492 +0800 @@ -1 +1 @@ -From 0594ae0c42773d62aff870df25e73394f7f0a5a5 Mon Sep 17 00:00:00 2001 +From 600e30b793ef66ba9022a65d336455e376881146 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 0594ae0c42773d62aff870df25e73394f7f0a5a5 ] @@ -33 +35,0 @@ -Cc: stable@dpdk.org