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 F3BB243B7D for ; Tue, 5 Mar 2024 10:57:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC69142D66; Tue, 5 Mar 2024 10:57:54 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2073.outbound.protection.outlook.com [40.107.237.73]) by mails.dpdk.org (Postfix) with ESMTP id 067244026B for ; Tue, 5 Mar 2024 10:57:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YnQ6feH9azjjV2r+5ZurgFKfGPGTiMf6WLuYsPwrS7X10ILHZZ8rr28wIRpRL9RiurB/gtceSHNCyVA7TmBPFRH/+OKrbOC1owI4bfqFuhrGp4LdntN7Q8WLSwUhDnrjy7wbKGGy/+Htq/MvS08FBNB1K1WazVtyRCa87SrAdwoRJhY+kBgKgqDdK7YkB/U23evlxy4MwiDiZDj7ywy71DG5VB5kAmIOhv/7xTsvkNdH0XL81XcUWvZ1qPdMKJN5eNnAKAtrw9biDsLZd2k/BVw5puJnk0njg/Aoz90ArGrGudxqBo3/jQHsn6u4QpOp5tdI6JedHsd/xmKtL3TY1g== 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=YJlh8rm905pyez49TnbYeikfvHVjUw/qhQeZwzBLVjk=; b=TPutlYH5HfbTjChgrdxx+skzhQLHVonFS2/6SvEtffrvRMR5MpRZbDiNz4W/lnUuRSj2HtDqqGND35hIi1RHbBXqTBLAgizATIU+i+B6K3zWAcbdaMRh/tl4m5pDPbmwbwZnL1KMWQI3mPfryO2MMaQ5bO/EuCJLaCdJ/vAP3DRjxqX82237wlAIxlXTKulr/vgkPpDT4+ayZpodu4qEdv0Cly9YDGq/S0Q+oaj7UIMHxcV/f8dI8OTrnfEr9qMXxlN+E2cXBfozgaP4VyU3qVdvq/MvL8TdWd1l0NAk+XTD3JnKJAohPbtl6BckKm7XgohA1hdzDoIrFx/ZZiXwkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=YJlh8rm905pyez49TnbYeikfvHVjUw/qhQeZwzBLVjk=; b=Ac8VelmO/s+/cPYMU32xBOA6TWv6ZSHLLqV6hggqGVRqKlBCIhnbOMuIcshEnddmqWGjqYef8P3opQsPNGci9VKEmMDFxgSV1iaZNnUFzmwNgt5ejzmkLM3FKYwA+eHXRP4BpKUjwuS9Uc3OyyCfonGmtD6AUK52cBwGsEBTJjPKigIqmTz6RMcmppRDNpdLERzHbym5kT3PulJnkbeyeHTPn65ZR6zzxH5YY+UtrqJmttKyp3AMczfPvT9SzEK33jLeZ4zGoKh0TOT+LroCZsxlwhZlU3VAAkx0Fx8r9x/D88P8Xa0z+3e4SPyBSaSlIzSx7f3jzm0phY6N4FMnUQ== Received: from SJ0PR03CA0384.namprd03.prod.outlook.com (2603:10b6:a03:3a1::29) by SN7PR12MB8001.namprd12.prod.outlook.com (2603:10b6:806:340::5) 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:57:51 +0000 Received: from SJ5PEPF000001D7.namprd05.prod.outlook.com (2603:10b6:a03:3a1:cafe::ae) by SJ0PR03CA0384.outlook.office365.com (2603:10b6:a03:3a1::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:57:51 +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 SJ5PEPF000001D7.mail.protection.outlook.com (10.167.242.59) 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:57:51 +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:57:39 -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:57:38 -0800 From: Xueming Li To: Cristian Dumitrescu CC: Ferruh Yigit , dpdk stable Subject: patch 'net/softnic: fix include of log library' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:30 +0800 Message-ID: <20240305094757.439387-110-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-Transfer-Encoding: 8bit Content-Type: text/plain 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: SJ5PEPF000001D7:EE_|SN7PR12MB8001:EE_ X-MS-Office365-Filtering-Correlation-Id: 65bf804a-5684-41d9-3ed0-08dc3cfab85d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tJGhNcWT5IEyMyuV3TuNiFXhU5g3gaY9d2n/zDdkLppptEMdt6KBpCbCCAOiG52bbGqyInd7S6ICYEXhGgEV2ebJENgSd5ua6znqe1xztnX954zoC/dWdE88diQF2GLpccDBfGWgvnVmfg3EIo8HOaYVU1W/Vs41BsgdcNGIJhfPJES4xMAHZh+Vh8ZKC6xl6cUNRmJh1owXsgMYBOPkJh2g0rs52y4qBqvCcpjvXXr/PGnA6MJByMRhiLeM2lRW2jEJ9fQMdV5nuSrU607JKXIltlpaVsfzoZv5z86jBwovbZ6AJqVCw6dUxy3JZMQoe29W06BcRbG/2mGeb+wiEWPMIrmLDMlehJ01OqFgqBmyW6Rud6kbSnjnVIyn1RzcNPm8ovMNCtWJ4m7xWRkJJSDVojkgDCXQqH3411yTR9S5SjhUIzdtWQ6fvhsvxsMfUoMvSSHvKwNbyhSAABj5U2gYh8YanmFIFYtIg9urMUk0LaVJ1Us/zVXKNM7/iboBCq7tpF2Ee6ZcRwmJQZNGCdTlxDQVUHatOiQPwhM7Gj6znxi67gJTZSqDDxXynZEuqBQOPNq0X6dTJJiVfXR5JB4rg5CaHAGX4GLw0r7uu9v7C1AG4Bgq5sdS8vuQrZK/vSKnwPwUx1UtyJNiaM3cQzgxftvNQyA6+vW+m4L8WpKimXB2rM2QAqor7ZCmZHFjqO5lRPAo7xCZIkBDPl4h8vKpt86veuY3dG0E31WrH+KMNpDsQfF2pYpRRW226LZM 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)(376005)(36860700004)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:57:51.2220 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65bf804a-5684-41d9-3ed0-08dc3cfab85d 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: SJ5PEPF000001D7.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8001 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=de543e342adb07a4d94fcf1714c1d8f1a2145dc6 Thanks. Xueming Li --- >From de543e342adb07a4d94fcf1714c1d8f1a2145dc6 Mon Sep 17 00:00:00 2001 From: Cristian Dumitrescu Date: Tue, 13 Feb 2024 17:38:09 +0000 Subject: [PATCH] net/softnic: fix include of log library Cc: Xueming Li [ upstream commit 96893df75bf50a82cabd8debe3492d564a5d13d5 ] When rte_log.h was moved to a new directory, the include path was not updated for the generated C code produced by the pipeline library, which results in build failure for this code. Fixes: 09ce41310930 ("log: separate logging functions out of EAL") Signed-off-by: Cristian Dumitrescu Tested-by: Ferruh Yigit --- drivers/net/softnic/rte_eth_softnic_cli.c | 2 ++ examples/pipeline/cli.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c index 085523fe03..95e705c553 100644 --- a/drivers/net/softnic/rte_eth_softnic_cli.c +++ b/drivers/net/softnic/rte_eth_softnic_cli.c @@ -337,6 +337,7 @@ cmd_softnic_pipeline_libbuild(struct pmd_internals *softnic __rte_unused, "-I %s/lib/eal/include " "-I %s/lib/eal/x86/include " "-I %s/lib/eal/include/generic " + "-I %s/lib/log " "-I %s/lib/meter " "-I %s/lib/port " "-I %s/lib/table " @@ -361,6 +362,7 @@ cmd_softnic_pipeline_libbuild(struct pmd_internals *softnic __rte_unused, install_dir, install_dir, install_dir, + install_dir, log_file, obj_file, lib_file, diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c index 2ae6cc579f..afb143c01f 100644 --- a/examples/pipeline/cli.c +++ b/examples/pipeline/cli.c @@ -714,6 +714,7 @@ cmd_pipeline_libbuild(char **tokens, "-I %s/lib/eal/include " "-I %s/lib/eal/x86/include " "-I %s/lib/eal/include/generic " + "-I %s/lib/log " "-I %s/lib/meter " "-I %s/lib/port " "-I %s/lib/table " @@ -738,6 +739,7 @@ cmd_pipeline_libbuild(char **tokens, install_dir, install_dir, install_dir, + install_dir, log_file, obj_file, lib_file, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.256033409 +0800 +++ 0109-net-softnic-fix-include-of-log-library.patch 2024-03-05 17:39:30.903566497 +0800 @@ -1 +1 @@ -From 96893df75bf50a82cabd8debe3492d564a5d13d5 Mon Sep 17 00:00:00 2001 +From de543e342adb07a4d94fcf1714c1d8f1a2145dc6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 96893df75bf50a82cabd8debe3492d564a5d13d5 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -41 +43 @@ -index c1efea3c1a..015717cb39 100644 +index 2ae6cc579f..afb143c01f 100644 @@ -44 +46 @@ -@@ -707,6 +707,7 @@ cmd_pipeline_libbuild(char **tokens, +@@ -714,6 +714,7 @@ cmd_pipeline_libbuild(char **tokens, @@ -52 +54 @@ -@@ -731,6 +732,7 @@ cmd_pipeline_libbuild(char **tokens, +@@ -738,6 +739,7 @@ cmd_pipeline_libbuild(char **tokens,