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 E75A041E2F for ; Thu, 9 Mar 2023 05:28:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA215427EE; Thu, 9 Mar 2023 05:28:22 +0100 (CET) Received: from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80]) by mails.dpdk.org (Postfix) with ESMTP id 85E2B40A7E; Thu, 9 Mar 2023 05:28:20 +0100 (CET) Received: from localhost.localdomain (unknown [78.109.74.25]) (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 agw.arknetworks.am (Postfix) with ESMTPSA id E5B8EE119A; Thu, 9 Mar 2023 08:28:19 +0400 (+04) From: Ivan Malov To: dev@dpdk.org Cc: Andrew Rybchenko , Ferruh Yigit , stable@dpdk.org, Andy Moreton Subject: [PATCH 2/2] net/sfc: fix resetting mark in tunnel offload switch rules Date: Thu, 9 Mar 2023 08:28:42 +0400 Message-Id: <20230309042842.8709-2-ivan.malov@arknetworks.am> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309042842.8709-1-ivan.malov@arknetworks.am> References: <20230309042842.8709-1-ivan.malov@arknetworks.am> 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 The currently used API is unfit for the purpose as it checks the order in which the action is being added. Use a dedicated API to request the reset. Fixes: 012bf708c20f ("net/sfc: support group flows in tunnel offload") Cc: stable@dpdk.org Signed-off-by: Ivan Malov Reviewed-by: Andy Moreton --- drivers/net/sfc/sfc_mae.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index 3daeed81b9..e5e9257998 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -3896,12 +3896,10 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, break; case SFC_FT_RULE_SWITCH: /* - * Packets that go to the rule's AR have FT mark set (from the - * TUNNEL rule OR's RECIRC_ID). Remove this mark in matching - * packets. The user may have provided their own action - * MARK above, so don't check the return value here. + * Packets that go to the rule's AR have FT mark set (from + * the TUNNEL rule OR's RECIRC_ID). Reset the mark to zero. */ - (void)efx_mae_action_set_populate_mark(ctx.spec, 0); + efx_mae_action_set_populate_mark_reset(ctx.spec); ctx.ft_switch_hit_counter = &spec_mae->ft_ctx->switch_hit_counter; -- 2.17.1