From patchwork Sun Jun 4 23:25:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Malov X-Patchwork-Id: 128051 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 7C6CF42C2C; Mon, 5 Jun 2023 01:27:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 58E8942FB4; Mon, 5 Jun 2023 01:25:53 +0200 (CEST) Received: from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80]) by mails.dpdk.org (Postfix) with ESMTP id 4D45342D59 for ; Mon, 5 Jun 2023 01:25:37 +0200 (CEST) Received: from localhost.localdomain (unknown [78.109.68.201]) (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 D19BFE12D1; Mon, 5 Jun 2023 03:25:36 +0400 (+04) From: Ivan Malov To: dev@dpdk.org Cc: Andrew Rybchenko , Ferruh Yigit , Andy Moreton Subject: [PATCH v3 23/34] common/sfc_efx/base: match on conntrack mark in action rules Date: Mon, 5 Jun 2023 03:25:12 +0400 Message-Id: <20230604232523.6746-24-ivan.malov@arknetworks.am> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230604232523.6746-1-ivan.malov@arknetworks.am> References: <20230601195538.8265-1-ivan.malov@arknetworks.am> <20230604232523.6746-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 EF100 match-action engine (MAE) has conntrack assistance table. A hit in this table can provide a mark value for the following lookup stage, which is action rule lookup. Provide support for setting match on conntrack mark. Signed-off-by: Ivan Malov Reviewed-by: Andy Moreton --- drivers/common/sfc_efx/base/efx.h | 7 +++++++ drivers/common/sfc_efx/base/efx_mae.c | 28 +++++++++++++++++++++++++++ drivers/common/sfc_efx/version.map | 1 + 3 files changed, 36 insertions(+) diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h index 8c6095f747..dd9d4f29e8 100644 --- a/drivers/common/sfc_efx/base/efx.h +++ b/drivers/common/sfc_efx/base/efx.h @@ -4276,6 +4276,7 @@ typedef enum efx_mae_field_id_e { * or by using dedicated field-specific helper APIs. */ EFX_MAE_FIELD_RECIRC_ID, + EFX_MAE_FIELD_CT_MARK, EFX_MAE_FIELD_NIDS } efx_mae_field_id_t; @@ -4462,6 +4463,12 @@ efx_mae_match_spec_recirc_id_set( __in efx_mae_match_spec_t *spec, __in uint8_t recirc_id); +LIBEFX_API +extern __checkReturn efx_rc_t +efx_mae_match_spec_ct_mark_set( + __in efx_mae_match_spec_t *spec, + __in uint32_t ct_mark); + LIBEFX_API extern __checkReturn efx_rc_t efx_mae_match_spec_clone( diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c index 011f38d298..b00ed2ec7a 100644 --- a/drivers/common/sfc_efx/base/efx_mae.c +++ b/drivers/common/sfc_efx/base/efx_mae.c @@ -474,6 +474,7 @@ typedef enum efx_mae_field_cap_id_e { EFX_MAE_FIELD_ID_ENC_HAS_OVLAN = MAE_FIELD_ENC_HAS_OVLAN, EFX_MAE_FIELD_ID_ENC_HAS_IVLAN = MAE_FIELD_ENC_HAS_IVLAN, EFX_MAE_FIELD_ID_RECIRC_ID = MAE_FIELD_RECIRC_ID, + EFX_MAE_FIELD_ID_CT_MARK = MAE_FIELD_CT_MARK, EFX_MAE_FIELD_CAP_NIDS } efx_mae_field_cap_id_t; @@ -549,6 +550,7 @@ static const efx_mae_mv_desc_t __efx_mae_action_rule_mv_desc_set[] = { EFX_MAE_MV_DESC(ENC_VNET_ID_BE, EFX_MAE_FIELD_BE), EFX_MAE_MV_DESC(OUTER_RULE_ID, EFX_MAE_FIELD_LE), EFX_MAE_MV_DESC(RECIRC_ID, EFX_MAE_FIELD_LE), + EFX_MAE_MV_DESC(CT_MARK, EFX_MAE_FIELD_LE), #undef EFX_MAE_MV_DESC }; @@ -910,6 +912,32 @@ efx_mae_match_spec_recirc_id_set( return (0); +fail1: + EFSYS_PROBE1(fail1, efx_rc_t, rc); + return (rc); +} + + __checkReturn efx_rc_t +efx_mae_match_spec_ct_mark_set( + __in efx_mae_match_spec_t *spec, + __in uint32_t ct_mark) +{ + uint32_t full_mask = UINT32_MAX; + const uint8_t *vp; + const uint8_t *mp; + efx_rc_t rc; + + mp = (const uint8_t *)&full_mask; + vp = (const uint8_t *)&ct_mark; + + rc = efx_mae_match_spec_field_set(spec, EFX_MAE_FIELD_CT_MARK, + sizeof (ct_mark), vp, + sizeof (full_mask), mp); + if (rc != 0) + goto fail1; + + return (0); + fail1: EFSYS_PROBE1(fail1, efx_rc_t, rc); return (rc); diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map index b1ca8e1215..d972896210 100644 --- a/drivers/common/sfc_efx/version.map +++ b/drivers/common/sfc_efx/version.map @@ -125,6 +125,7 @@ INTERNAL { efx_mae_mac_addr_free; efx_mae_match_spec_bit_set; efx_mae_match_spec_clone; + efx_mae_match_spec_ct_mark_set; efx_mae_match_spec_field_get; efx_mae_match_spec_field_set; efx_mae_match_spec_fini;