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 2914A48B69 for ; Fri, 21 Nov 2025 12:24:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 221D0402F0; Fri, 21 Nov 2025 12:24:24 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id A9A92402E0 for ; Fri, 21 Nov 2025 12:24:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nV2ekFjiYn4pLcFroMhPTw/8/8TwWBG4M6CxtlQGuG0=; b=RpXj9yYwj0893n1LDxglNYxYph39nqcHqTibMful3EzrDiGhmYjSdp2wYkNz9GpdIG2TUw tjD/GaqsoeNH5iyP5JLHwdxODjFGwxhSyuBwjkEv/fy6gyCUJdcB9mps6sL+PQYzEJz2YK Zb63IzRJvwt0tL0j9gMcDo8npgwmhkQ= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-605-7kKXhwD5McmTkz4G4DgXyQ-1; Fri, 21 Nov 2025 06:24:20 -0500 X-MC-Unique: 7kKXhwD5McmTkz4G4DgXyQ-1 X-Mimecast-MFC-AGG-ID: 7kKXhwD5McmTkz4G4DgXyQ_1763724260 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 18D57180009D; Fri, 21 Nov 2025 11:24:20 +0000 (UTC) Received: from rh.redhat.com (unknown [10.42.28.165]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2662430044DC; Fri, 21 Nov 2025 11:24:18 +0000 (UTC) From: Kevin Traynor To: Aarnav JP Cc: dpdk stable Subject: patch 'net/cnxk: fix default meter pre-color' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:21:04 +0000 Message-ID: <20251121112128.485623-80-ktraynor@redhat.com> In-Reply-To: <20251121112128.485623-1-ktraynor@redhat.com> References: <20251121112128.485623-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 06moe4MvfZd6djtCpNwO5cyztnrQ5FD31Myl58V_q3w_1763724260 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.4 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/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/69eaae8ca9ee3e991ead3970164b234cafc1b944 Thanks. Kevin --- >From 69eaae8ca9ee3e991ead3970164b234cafc1b944 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 @@ -1262,5 +1262,11 @@ 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) { -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:12.044135904 +0000 +++ 0080-net-cnxk-fix-default-meter-pre-color.patch 2025-11-21 11:05:09.561201587 +0000 @@ -1 +1 @@ -From b595d05bf739b5330cbfca00bdb984edea579a57 Mon Sep 17 00:00:00 2001 +From 69eaae8ca9ee3e991ead3970164b234cafc1b944 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b595d05bf739b5330cbfca00bdb984edea579a57 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org