From patchwork Thu Mar 9 04:28:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Malov X-Patchwork-Id: 124879 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D738D41E2F; Thu, 9 Mar 2023 05:28:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BE4AF410EE; Thu, 9 Mar 2023 05:28:20 +0100 (CET) Received: from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80]) by mails.dpdk.org (Postfix) with ESMTP id 0393840A7E; 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 4712EE0439; 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 1/2] common/sfc_efx/base: allow to request MAE mark reset action Date: Thu, 9 Mar 2023 08:28:41 +0400 Message-Id: <20230309042842.8709-1-ivan.malov@arknetworks.am> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Previously, DPDK sfc driver received support for tunnel offload. In it, MAE needs to set intermediate mark from an outer rule (OR) recirculation ID in order to help the driver identify packets that hit the OR but miss on action rule (AR) lookup. But, for packets that do hit an AR, the driver wants to reset this mark so that the end receiver of traffic does not see it. The driver has a call to request such mark reset, but it does not work as it comes via the regular mark populate API, which must not be invoked after final delivery action has been added. Provide a suitable dedicated API for that. Fixes: 3a73dcfdb255 ("common/sfc_efx/base: match on recirc ID in action rules") Cc: stable@dpdk.org Signed-off-by: Ivan Malov Reviewed-by: Andy Moreton Acked-by: Andrew Rybchenko --- drivers/common/sfc_efx/base/efx.h | 18 ++++++++++++++++++ drivers/common/sfc_efx/base/efx_mae.c | 12 ++++++++++++ drivers/common/sfc_efx/version.map | 1 + 3 files changed, 31 insertions(+) diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h index 92ec18761b..f4fa88f169 100644 --- a/drivers/common/sfc_efx/base/efx.h +++ b/drivers/common/sfc_efx/base/efx.h @@ -4582,6 +4582,24 @@ efx_mae_action_set_populate_mark( __in efx_mae_actions_t *spec, __in uint32_t mark_value); +/* + * Whilst efx_mae_action_set_populate_mark() can be used to request setting + * a user mark in matching packets and demands that the request come before + * setting the final destination (deliver action), this API can be invoked + * after deliver action has been added in order to request mark reset if + * the user's own mark request has not been added as a result of parsing. + * + * It is useful when the driver chains an outer rule (OR) with an action + * rule (AR) by virtue of a recirculation ID. The OR may set mark from + * this ID to help the driver identify packets that hit the OR and do + * not hit the AR. But, for packets that do hit the AR, the driver + * wants to reset the mark value to avoid confusing recipients. + */ +LIBEFX_API +extern void +efx_mae_action_set_populate_mark_reset( + __in efx_mae_actions_t *spec); + LIBEFX_API extern __checkReturn efx_rc_t efx_mae_action_set_populate_deliver( diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c index 31f51b5548..7732d99992 100644 --- a/drivers/common/sfc_efx/base/efx_mae.c +++ b/drivers/common/sfc_efx/base/efx_mae.c @@ -1916,6 +1916,18 @@ efx_mae_action_set_populate_mark( EFX_MAE_ACTION_MARK, sizeof (mark_value), arg)); } + void +efx_mae_action_set_populate_mark_reset( + __in efx_mae_actions_t *spec) +{ + uint32_t action_mask = (1U << EFX_MAE_ACTION_MARK); + + if ((spec->ema_actions & action_mask) == 0) { + spec->ema_actions |= action_mask; + spec->ema_mark_value = 0; + } +} + __checkReturn efx_rc_t efx_mae_action_set_populate_deliver( __in efx_mae_actions_t *spec, diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map index a54aab0a08..aabc354118 100644 --- a/drivers/common/sfc_efx/version.map +++ b/drivers/common/sfc_efx/version.map @@ -103,6 +103,7 @@ INTERNAL { efx_mae_action_set_populate_encap; efx_mae_action_set_populate_flag; efx_mae_action_set_populate_mark; + efx_mae_action_set_populate_mark_reset; efx_mae_action_set_populate_set_dst_mac; efx_mae_action_set_populate_set_src_mac; efx_mae_action_set_populate_vlan_pop; From patchwork Thu Mar 9 04:28:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Malov X-Patchwork-Id: 124880 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8D73441E2F; Thu, 9 Mar 2023 05:28:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3112842B7E; Thu, 9 Mar 2023 05:28:23 +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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-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 Acked-by: Andrew Rybchenko --- 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;