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 4FEFE470E5 for ; Thu, 25 Dec 2025 10:25:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 462F040262; Thu, 25 Dec 2025 10:25:39 +0100 (CET) Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011059.outbound.protection.outlook.com [40.107.208.59]) by mails.dpdk.org (Postfix) with ESMTP id A03EF402B7 for ; Thu, 25 Dec 2025 10:25:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=drrAOShegs65X77Me0sph0IW/Pox/2MhN0IJH6QoDLPwDA/hgnkShrQx6icQ8Dq2xz0/R7X3ANP7yC1gkdLWHCnJZjqZ1sDNZucj8///xm6Y7VrIwFsp34DCalXWjIWsjRylcPP0SjRlhACEJYArFmLKcQNJ1AO4ujae4GkdwbfcX+i3UYk7Qnt0E9QSvdjAgK9GSLufyX4Aur7vguWYgXaLk8SWbr1eSMUwAn5aHVxl1wiQCOn0rZRYlgMk9EuSqb4vmt9MbPnR1UZ+igsy8fXiW1bkYLaRm531xlzcVDV+556n5+aMQXeJo0RRUrTOT2smKzvxl4dnsI6SZ09LFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=IFaJM6mS/cnW1JMZJxp38OPPwXWByY0/ss/OnrFGdSg=; b=O5Y9nXrjLM7YjPK+sqbgIm9BzXiUblbbGUveZaEG1817O6wTeaemIVEOK50lMdsldQD8GBarCfwLS5Xy20vOD4PNF8xgPHswTOdlbfpFoQM0vPA3j8+e09QP+6EVurhmgjfjYZPeDP/IyfJUsKptFFGcOqJZu8J/ObdnG32ESXY6LwOIJte8WdJqtRkkNx3CQst3eI0sPyPOk2jqjTyI6t5O0QMOP7g9Ne+rUVfkYq/M9YfjO6aV1qhHtVPIJjRcjyKxBSBZvZzUJieItWdrVcSeomEiUYIrkTQ5+kd+oRO21XjjMQLTXZyPBlJTb4vpS8ergqTu6WyhT54l7rujug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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=IFaJM6mS/cnW1JMZJxp38OPPwXWByY0/ss/OnrFGdSg=; b=bDLlrxQ7cOPVnlppU9Rol0kaiBrjBVwXegsLy182HnVhRZQQsosHjN5wWThQPzZhC7GG107dt55EXoepW/UVhfKPkxXe/04v00aJ2S4Mlio9UxNZaO4NmGamu9SdIj6i/+JPqxJQAj+KIKimH3qIkas/PXY82SzuEGWIJ0qASkNVdDwQXIWMuffCM39RvBa8J3MUCWwrSous74nKzsNk3eKRm7fJeU2N5DI+Ih6Lp1+iD60gWeCZ1T2WehkC5AGeQ8zlZzqvU/fp2Z3dAnI1HYYGyAQxKqwbOsnvQqBPoP4wQK3xs8OS7KhnRg/Vd68T4jKQjCnin4Km55QxIM8+LQ== Received: from SN7PR04CA0101.namprd04.prod.outlook.com (2603:10b6:806:122::16) by PH7PR12MB6857.namprd12.prod.outlook.com (2603:10b6:510:1af::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 09:25:34 +0000 Received: from SN1PEPF00026367.namprd02.prod.outlook.com (2603:10b6:806:122:cafe::28) by SN7PR04CA0101.outlook.office365.com (2603:10b6:806:122::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 09:25:31 +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 SN1PEPF00026367.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:25:33 +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.2562.20; Thu, 25 Dec 2025 01:25:21 -0800 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.2562.20; Thu, 25 Dec 2025 01:25:20 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:25:19 -0800 From: Shani Peretz To: Aarnav JP CC: dpdk stable Subject: patch 'net/cnxk: fix default meter pre-color' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:44 +0200 Message-ID: <20251225091938.345892-83-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026367:EE_|PH7PR12MB6857:EE_ X-MS-Office365-Filtering-Correlation-Id: ea35f47d-c6f0-4a5e-502e-08de43978e3c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UU0wXv1qNemYY7frOfmNcjEJyeXLmMDpuIFNEvdgm1DDmnt9CQxyRoSMbohZ?= =?us-ascii?Q?hqwUpBvsyRedini+NFc1iUQqeUWdu1cvj9ekXxLyy73le+6m0UyYlcQY6+2H?= =?us-ascii?Q?h2EHWrN0t9EXXznvy00JAHcyASmT8XoNzxA8lFcoB7N4yTND6KZhMm4JBrpx?= =?us-ascii?Q?J+Mh4lWwbAlyn54sw7kVJ3k85nJBHbbPBxhaPuvbvSxPd4CQwc6VuCWemMwO?= =?us-ascii?Q?CJDYbQjTzwF15acIccIe/l6IBXiy6DoqNgonAvbmox2+7LHg+YihsFdLovuy?= =?us-ascii?Q?r67ebRyqIsrBiIzeme5/XKdvVV2PSXYFN1HBLzYWXx9/WMT2W/WHmYpeyL/w?= =?us-ascii?Q?Lj5buKDbszL5uS6hH8iUqOw4u8QEryhX5+u5uLa61vE34qWg10OwTAl0USXJ?= =?us-ascii?Q?O8v2kOBH4W3T3/OFRYPwACJpeewu4mJpM8cjgCtUCpRIyh3/kdmOARPgONWi?= =?us-ascii?Q?RW73Wd3ZBFQS8DMQBaLPXiP/pCcr28Tz8WCBLSw+lR5wM+nOzvr7Xx7CVeqz?= =?us-ascii?Q?RTlelAmx+8Bx/hwXSzb53nMmk7w/hwcA/TxIHGNXPOdJq4k/x2oZoEmQ0aSp?= =?us-ascii?Q?DVFTwvOv0iaWNmAqSQImJQAVR68fI8kuIQMF1Hc+UH3/b1/B6MXbdp3fCbds?= =?us-ascii?Q?QfsXFlUQgmyW11nYq/qdihyN4M3vqei2swjOM0oym+SDKK81OWbXwfuEfImO?= =?us-ascii?Q?4g9h9XyZU29sXTTm88I03VEYnI8uLdmUbZNE7999xkCueD7ALKjFxSHNqLxA?= =?us-ascii?Q?xi9F1SwYMjtd6rmWgPAzS7Hu2zECbDZVosnziO1nZo6id3JNMJVOQSC6RIVI?= =?us-ascii?Q?TtLEWT5zZycZsovGgN2IOnfLYfNvdpeaZISA8febmyxS1Wg7jINwcJ6tRK4w?= =?us-ascii?Q?sn/0eNGDsiZ2i7GUdMTzxVRKF6PSHtzAw3cmZBvLzS52Oqw9qOf8xbaWDdSq?= =?us-ascii?Q?8Q0JwRsueq+mcs4tIRAiKscwxUmEBpQjpxIbJWP88Gin+LO83MNbmqYWdw/0?= =?us-ascii?Q?hcLQ4q0v1z6AaBMG+lH2Ljes5GHw1AcIpIK9L6fJZ9EmXW4ILMPhXt7TzZoD?= =?us-ascii?Q?iZUm0Gbq6Le3pIMCbiSCGvBiNKXWCvHqdSPnkWct5LuETxspogpceVsSNfjQ?= =?us-ascii?Q?q/xoOFzcaE8MnBC8B+odzUVcmC0Y0IBE48x3IHmqXdFYvukA+ZzT4Liavv6I?= =?us-ascii?Q?X7XAEREFYGhKOvaTuW8r/o/4OY78wzPnBWnFuyUYYho4Q2PFuoLiusonxqIt?= =?us-ascii?Q?tvQ2l8EJFEZYN3daecIw4tHHhgiW/bcugBH+9bT0p31EiRAkJpjJ+GGLlgJX?= =?us-ascii?Q?FiZ3jU/9dsRJrb3okHWeD1BsAih6sRqiTGy4X43HbF9Lbii9csVLKDPp+Uft?= =?us-ascii?Q?2UFPiZcP9eoobYd8/zMt5tN5QgGv75l0C4JT+6GCl4tej1cGPG3Pdn6kHqVZ?= =?us-ascii?Q?PvphwrSqo+3xYiMk5JPS/6WuPC9OdA+1giKj0MPVPzjDaS8csgVTeXAag5SA?= =?us-ascii?Q?OzqUe7WLm6FKnwIjdbPhBT/bSb3AjpNoEXrsd/GmimndXegMJOU3zwPEDVN5?= =?us-ascii?Q?rgObxgWKnEI1yNEK6dLMp27Pqwzpa4SdPZKMMusO?= 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:(13230040)(1800799024)(36860700013)(376014)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:25:33.7209 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea35f47d-c6f0-4a5e-502e-08de43978e3c 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: SN1PEPF00026367.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6857 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/30/25. 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://github.com/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/457e991d5e3d1f244747b2a6fa6eb0b11aa22e77 Thanks. Shani --- >From 457e991d5e3d1f244747b2a6fa6eb0b11aa22e77 Mon Sep 17 00:00:00 2001 From: Aarnav JP Date: Thu, 13 Nov 2025 10:08:08 +0530 Subject: [PATCH] net/cnxk: fix default meter pre-color [ upstream commit b595d05bf739b5330cbfca00bdb984edea579a57 ] While converting to HW specific icolor, check for invalid default pre color. Fixes: ac35d4bf4cd6 ("net/cnxk: support ingress meter pre-color") Signed-off-by: Aarnav JP --- drivers/net/cnxk/cnxk_ethdev_mtr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c index edeca6dcc3..992e2d446e 100644 --- a/drivers/net/cnxk/cnxk_ethdev_mtr.c +++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c @@ -1261,7 +1261,13 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_cfg *cfg) cfg->alg = alg_map[profile->profile.alg]; cfg->lmode = profile->profile.packet_mode; - cfg->icolor = color_map[mtr->params.default_input_color]; + int idx = mtr->params.default_input_color; + + /* Index validation */ + if (idx >= RTE_COLORS) + cfg->icolor = ROC_NIX_BPF_COLOR_GREEN; + else + cfg->icolor = color_map[idx]; switch (RTE_MTR_COLOR_IN_PROTO_OUTER_IP) { case RTE_MTR_COLOR_IN_PROTO_OUTER_IP: -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:40.456842156 +0200 +++ 0083-net-cnxk-fix-default-meter-pre-color.patch 2025-12-25 11:16:36.173865000 +0200 @@ -1 +1 @@ -From b595d05bf739b5330cbfca00bdb984edea579a57 Mon Sep 17 00:00:00 2001 +From 457e991d5e3d1f244747b2a6fa6eb0b11aa22e77 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b595d05bf739b5330cbfca00bdb984edea579a57 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org