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 01F6948B59 for ; Thu, 20 Nov 2025 13:45:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F201540262; Thu, 20 Nov 2025 13:45:37 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 7854A40262 for ; Thu, 20 Nov 2025 13:45:36 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4779cb0a33fso8360675e9.0 for ; Thu, 20 Nov 2025 04:45:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763642736; x=1764247536; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C+d/zO0/CdFCq0SEVg2CfvNUt+OmDj3gRCGp9Fi4n/w=; b=FIaMIjYWJTsSLEz7nRgS32azLzw4H0ZAJm3AkfHjUWzu+osfcT92uzor+FIaqguEQB Ja8vFOVP5WYTeQ1wB2bjYahtM03IIvLWxpNg7D/yX0t0tHWtZAfZXGBEug5qOT4J7AfJ AjLbcG/6R5m9qoCoF26kEBm8y9Q5TOw+EJQXVY4HapkI1cn+idFCcHj+dooXn6PVei6E hL2nCnE3iQYeq8tR1JYuAPbfsULYxjvSoaso88M7A3wKWFQK/oSMaopqpiD3PbKCRKwd wBhdxeENcRPZPkdGCf0/f3WuYRz70iQgpi0Thprld/5LCG1SAnha8yaHIuyZjqji4qVD 4/QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763642736; x=1764247536; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C+d/zO0/CdFCq0SEVg2CfvNUt+OmDj3gRCGp9Fi4n/w=; b=SKvB7/YYY6cX5KXcy5xNiUJsFKCHCs8uJmJabJCx9N5qQD9suXdyxw7F7hP5OCoOIR D5L/tfvE6eq3gROQAfngk3q/XfQmILSRe5kxEN5n0KIKu7IXpPAS+4a97xw3gVcEdR9R aItAi5tpV7BxpI0tWaSTE23yJwIKlBNqAHjDaX3t7dXUW1FkhbrtotXdeIHCn/NbCLqe Oo56Rzhf8V5vjMM355ElMG8O454OZmPTW6s5XgS7BdcP3A3bZFVRNEmIrp9xJ0f4/Xa0 BvN5xEUtF/XURmm5Fn47WR2a9eZrMkxC97844fVkg+GqVzI54weYmk0IPdVZ3P0rnyvL FRAA== X-Gm-Message-State: AOJu0Yyig+HdVQirQQ/CfSvzCsvLAH4mabq+3N52+LOTwl+q46MJ1HYt jEVuqEXhQWue0GxZwd7u80S2RWQsyYskbq7gmv4q858xIetRx5l+t7InEV8r7WgM X-Gm-Gg: ASbGnctwm7kjJAkCkW06vVk2j/oqsnIvhGEc5zcmjYKAR3k+F3drj9/t9rvNKm+3Dxg KFjaWNOkNlzTg4CKY46lLgNBsgQl7AFzPlzpLp/bvzKx5+qKGQtlRGeyY9/5caeVXE0bo/OBN8D Rp3PJswZyibs59dGCCeSJdjKa9VspfE63EYVC3wi3TrmWItPnaJwfEzPFK6RtT4DfNk8W18JZoH +R05gw7m7+F+nOnjhPUI3pluFNYlIqURIRvpv9kwiMDBZHWWSPGT0recKEQEmglsKxCe52IlsS/ AcDjb7XMx7XosKJdESOOvgv/qq48kr3RxceMzMvf/TQv+7jM7SFKgePmGMdeM0Lwn+KdRxNcGsc N8HnZERS8pRA5YIfEAnYSCxXGiKE9JOEZwZOVpl3j8JHosF+IzQh2lGBZjn30qccBqdhpIW28hu ZhJRKUJrOL3OGLMhxC X-Google-Smtp-Source: AGHT+IHipTxjSIlbuQ0QK1EeayQ1/B9W7Eiv0jshrvknW9BZePggb1MCH9GESLUNPtqFZssQvc7vmQ== X-Received: by 2002:a05:600c:3541:b0:477:6d96:b3ca with SMTP id 5b1f17b1804b1-477b9dc068bmr24394615e9.5.1763642735736; Thu, 20 Nov 2025 04:45:35 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f372:8d1a:399f:e8a2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-477a9dfd643sm61631995e9.14.2025.11.20.04.45.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 04:45:35 -0800 (PST) From: luca.boccassi@gmail.com To: Aarnav JP Cc: dpdk stable Subject: patch 'net/cnxk: fix default meter pre-color' has been queued to stable release 22.11.11 Date: Thu, 20 Nov 2025 12:44:40 +0000 Message-ID: <20251120124514.757933-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251120124514.757933-1-luca.boccassi@gmail.com> References: <20251112165308.1618107-49-luca.boccassi@gmail.com> <20251120124514.757933-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/22/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/c135bec74e0add175ddb27a7675bdf812de8256f Thanks. Luca Boccassi --- >From c135bec74e0add175ddb27a7675bdf812de8256f 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 0fa18f01c7..f4450be582 100644 --- a/drivers/net/cnxk/cnxk_ethdev_mtr.c +++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c @@ -1245,7 +1245,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.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-20 12:44:13.079791666 +0000 +++ 0008-net-cnxk-fix-default-meter-pre-color.patch 2025-11-20 12:44:12.778087984 +0000 @@ -1 +1 @@ -From b595d05bf739b5330cbfca00bdb984edea579a57 Mon Sep 17 00:00:00 2001 +From c135bec74e0add175ddb27a7675bdf812de8256f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b595d05bf739b5330cbfca00bdb984edea579a57 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index edeca6dcc3..992e2d446e 100644 +index 0fa18f01c7..f4450be582 100644 @@ -21 +22 @@ -@@ -1261,7 +1261,13 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_cfg *cfg) +@@ -1245,7 +1245,13 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_cfg *cfg)