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 6316C455AD for ; Mon, 15 Jul 2024 17:31:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5AE5440DFB; Mon, 15 Jul 2024 17:31:15 +0200 (CEST) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 285B240DF8 for ; Mon, 15 Jul 2024 17:31:14 +0200 (CEST) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-426526d30aaso31064865e9.0 for ; Mon, 15 Jul 2024 08:31:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057474; x=1721662274; 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=TCAZ3iGYfBnKFqqFUAo3uXPCmN8V4dZPED0yRiyyZ0Y=; b=RFrGj/vPjd5vxJvehqU/uDR7nJZhHxYdxZQaFLwLgwrL+orKpXLKOnGDPFbazZEBxr ZqewnKxY3D7dOCJIm+zSMChKjAci40vx+p6r7jQ9dsgxYeBbEbtLi5+bALzzRFnO84cB CGQw2/+UGT17Hgb3n93KT5jBTgBxi3GSxopcHg6VKgoWpeVJekGRSVBuaAhk7hqUUGfv PC483UWdgrq+qiO4LR3MhzeJ5uhqARFauvBQpI23JTid8xPRjKxki5hofEfDnsdky7hm Cfe3KtddkqgsGIDYxYQc0Hla5MFne6Ki124Dvk6qUkLaLbQwrJFvrfftN3vP6q+djwkG pa7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057474; x=1721662274; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TCAZ3iGYfBnKFqqFUAo3uXPCmN8V4dZPED0yRiyyZ0Y=; b=nfqUdUAVbE1JlaSFfwVjB8G3FFBXdxs6No4wr0q8KCC4vCTuEZFP9buIUHut9iv7VF s7AdmgflSZwCDVeIbm2VWNUNp6uUoCmgeoZh3rRY2nD7QXzvSEoVC+bNWxDE5tMyiwJS Ip8XG76NFSMPDJdg5mOfDPAlfBNxZMssiFtFKPqfZRrrQFnpI22l1R7I++ynS5JYvo3C pypLUSKkCo2l98o96f4mBTqYzsQRa227bD6a66MspaS9TnLHuyg2n+azUG92LA0wXBtS D+cBHKwL/J+vY5UmEMYkHym03dc7WYTNOfVOUPk645Lg/f2mGaRz/PCGVLXhOqjTQ5KV wYnw== X-Forwarded-Encrypted: i=1; AJvYcCV8H2r1iqrTSsw2l2wJvzxDeJVZHNzxDFa++tvRqR5yr1gh2CatcZeGLcODNeR+a3D0qnXeAIpHig3SdzW1y+Y= X-Gm-Message-State: AOJu0Ywby6KXHknIPK+hnksMeTuLTvHvjTYsdHDw/lx3tePuRkFX1gC9 /5RbzqZJ8jbm/A0bmZb4JqCkoOkeIXMobFjM4xnQnXGAsdP/h2+TcSe8+V+TltE= X-Google-Smtp-Source: AGHT+IGrmKT6ba9cpDDHtz5okZnRWXNCAJT9FvkkNIUe7GU/gt95nOgW0iYya5KVku4RfuxEzqizAA== X-Received: by 2002:adf:f707:0:b0:367:988d:fb99 with SMTP id ffacd0b85a97d-3682407cfe9mr75155f8f.8.1721057473809; Mon, 15 Jul 2024 08:31:13 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680db047e5sm6690884f8f.107.2024.07.15.08.31.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:31:13 -0700 (PDT) From: luca.boccassi@gmail.com To: Chaoyong He Cc: Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix IPv6 TTL and DSCP flow action' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:26:54 +0100 Message-Id: <20240715152704.2229503-76-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-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.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 07/17/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f4affbfda7292608bf4d2fa4b53d77a5fc3d6683 Thanks. Luca Boccassi --- >From f4affbfda7292608bf4d2fa4b53d77a5fc3d6683 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Wed, 19 Jun 2024 17:13:38 +0800 Subject: [PATCH] net/nfp: fix IPv6 TTL and DSCP flow action [ upstream commit 76caca76bf62efb041642194adf47181f9fe1bc2 ] The IPv6 TTL and DSCP flow action logic use 'ttl_tos_flag' wrongly, actually it should use 'tc_hl_flag'. Fixes: ac12e126c482 ("net/nfp: support TTL flow action") Fixes: 3202b003bec1 ("net/nfp: support IPv6 DSCP flow action") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index faa0eda325..2635ba4cea 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -3445,7 +3445,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, ttl_tos_flag = true; } } else { - nfp_flow_action_set_hl(position, action, ttl_tos_flag); + nfp_flow_action_set_hl(position, action, tc_hl_flag); if (!tc_hl_flag) { position += sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); tc_hl_flag = true; @@ -3462,7 +3462,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, break; case RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP"); - nfp_flow_action_set_tc(position, action, ttl_tos_flag); + nfp_flow_action_set_tc(position, action, tc_hl_flag); if (!tc_hl_flag) { position += sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); tc_hl_flag = true; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:38.392360594 +0100 +++ 0076-net-nfp-fix-IPv6-TTL-and-DSCP-flow-action.patch 2024-07-15 16:19:34.720209709 +0100 @@ -1 +1 @@ -From 76caca76bf62efb041642194adf47181f9fe1bc2 Mon Sep 17 00:00:00 2001 +From f4affbfda7292608bf4d2fa4b53d77a5fc3d6683 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 76caca76bf62efb041642194adf47181f9fe1bc2 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - drivers/net/nfp/flower/nfp_flower_flow.c | 4 ++-- + drivers/net/nfp/nfp_flow.c | 4 ++-- @@ -20,5 +21,5 @@ -diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c -index bd77807db0..45a020b228 100644 ---- a/drivers/net/nfp/flower/nfp_flower_flow.c -+++ b/drivers/net/nfp/flower/nfp_flower_flow.c -@@ -3833,7 +3833,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, +diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c +index faa0eda325..2635ba4cea 100644 +--- a/drivers/net/nfp/nfp_flow.c ++++ b/drivers/net/nfp/nfp_flow.c +@@ -3445,7 +3445,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, @@ -33 +34 @@ -@@ -3850,7 +3850,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, +@@ -3462,7 +3462,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor,