From patchwork Thu Jun 22 11:31:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artemii Morozov X-Patchwork-Id: 128907 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 6BDCB42D23; Thu, 22 Jun 2023 13:32:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABFFB42B7E; Thu, 22 Jun 2023 13:32:56 +0200 (CEST) Received: from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80]) by mails.dpdk.org (Postfix) with ESMTP id D7EC4406A2 for ; Thu, 22 Jun 2023 13:32:52 +0200 (CEST) Received: from angrod.. (unknown [141.136.90.242]) (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 25429E123D; Thu, 22 Jun 2023 15:32:52 +0400 (+04) From: Artemii Morozov To: dev@dpdk.org Cc: Ivan Malov , Viacheslav Galaktionov , Andrew Rybchenko , Andy Moreton Subject: [PATCH v6 1/4] common/sfc_efx/base: report VLAN stripping capability Date: Thu, 22 Jun 2023 15:31:01 +0400 Message-Id: <20230622113104.261556-2-artemii.morozov@arknetworks.am> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230622113104.261556-1-artemii.morozov@arknetworks.am> References: <20230531134122.119508-1-artemii.morozov@arknetworks.am> <20230622113104.261556-1-artemii.morozov@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 These changes are necessary in order to add support for stripping VLAN tags in the future. Signed-off-by: Artemii Morozov Reviewed-by: Ivan Malov Reviewed-by: Andy Moreton Acked-by: Andrew Rybchenko --- drivers/common/sfc_efx/base/ef10_nic.c | 6 ++++++ drivers/common/sfc_efx/base/efx.h | 1 + drivers/common/sfc_efx/base/siena_nic.c | 1 + 3 files changed, 8 insertions(+) diff --git a/drivers/common/sfc_efx/base/ef10_nic.c b/drivers/common/sfc_efx/base/ef10_nic.c index e1709d1200..070f4d08b5 100644 --- a/drivers/common/sfc_efx/base/ef10_nic.c +++ b/drivers/common/sfc_efx/base/ef10_nic.c @@ -1146,6 +1146,12 @@ ef10_get_datapath_caps( else encp->enc_hw_tx_insert_vlan_enabled = B_FALSE; + /* Check if firmware supports VLAN stripping. */ + if (CAP_FLAGS1(req, RX_VLAN_STRIPPING)) + encp->enc_rx_vlan_stripping_supported = B_TRUE; + else + encp->enc_rx_vlan_stripping_supported = B_FALSE; + /* Check if the firmware supports RX event batching */ if (CAP_FLAGS1(req, RX_BATCHING)) encp->enc_rx_batching_enabled = B_TRUE; diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h index 10c412bcd7..9a29583ecb 100644 --- a/drivers/common/sfc_efx/base/efx.h +++ b/drivers/common/sfc_efx/base/efx.h @@ -1616,6 +1616,7 @@ typedef struct efx_nic_cfg_s { /* Number of TSO contexts on the NIC (FATSOv2) */ uint32_t enc_fw_assisted_tso_v2_n_contexts; boolean_t enc_hw_tx_insert_vlan_enabled; + boolean_t enc_rx_vlan_stripping_supported; /* Number of PFs on the NIC */ uint32_t enc_hw_pf_count; /* Datapath firmware vadapter/vport/vswitch support */ diff --git a/drivers/common/sfc_efx/base/siena_nic.c b/drivers/common/sfc_efx/base/siena_nic.c index 9f14faf271..4b7f7cbb87 100644 --- a/drivers/common/sfc_efx/base/siena_nic.c +++ b/drivers/common/sfc_efx/base/siena_nic.c @@ -179,6 +179,7 @@ siena_board_cfg( (encp->enc_rxq_limit * EFX_RXQ_DC_NDESCS(EFX_RXQ_DC_SIZE)); encp->enc_hw_tx_insert_vlan_enabled = B_FALSE; + encp->enc_rx_vlan_stripping_supported = B_FALSE; encp->enc_fw_assisted_tso_enabled = B_FALSE; encp->enc_fw_assisted_tso_v2_enabled = B_FALSE; encp->enc_fw_assisted_tso_v2_n_contexts = 0; From patchwork Thu Jun 22 11:31:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artemii Morozov X-Patchwork-Id: 128908 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 F207342D23; Thu, 22 Jun 2023 13:33:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA15A42D0B; Thu, 22 Jun 2023 13:32:57 +0200 (CEST) Received: from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80]) by mails.dpdk.org (Postfix) with ESMTP id 65918406A2 for ; Thu, 22 Jun 2023 13:32:53 +0200 (CEST) Received: from angrod.. (unknown [141.136.90.242]) (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 E90A2E123E; Thu, 22 Jun 2023 15:32:52 +0400 (+04) From: Artemii Morozov To: dev@dpdk.org Cc: Ivan Malov , Viacheslav Galaktionov , Andrew Rybchenko Subject: [PATCH v6 2/4] common/sfc_efx/base: add API to get installed filters count Date: Thu, 22 Jun 2023 15:31:02 +0400 Message-Id: <20230622113104.261556-3-artemii.morozov@arknetworks.am> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230622113104.261556-1-artemii.morozov@arknetworks.am> References: <20230531134122.119508-1-artemii.morozov@arknetworks.am> <20230622113104.261556-1-artemii.morozov@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 This API allows to get number of installed filters. This will be used in the future patches. Signed-off-by: Artemii Morozov --- drivers/common/sfc_efx/base/ef10_filter.c | 20 +++++++++++++++++ drivers/common/sfc_efx/base/ef10_impl.h | 6 +++++ drivers/common/sfc_efx/base/efx_filter.c | 27 +++++++++++++++++++++++ drivers/common/sfc_efx/base/efx_impl.h | 7 ++++++ 4 files changed, 60 insertions(+) diff --git a/drivers/common/sfc_efx/base/ef10_filter.c b/drivers/common/sfc_efx/base/ef10_filter.c index d6940011c0..278502fb61 100644 --- a/drivers/common/sfc_efx/base/ef10_filter.c +++ b/drivers/common/sfc_efx/base/ef10_filter.c @@ -2113,6 +2113,26 @@ ef10_filter_reconfigure( return (rc); } + __checkReturn efx_rc_t +ef10_filter_get_count( + __in efx_nic_t *enp, + __out uint32_t *count) +{ + ef10_filter_table_t *table = enp->en_filter.ef_ef10_filter_table; + uint32_t filters_count; + + EFSYS_ASSERT(EFX_FAMILY_IS_EF100(enp) || EFX_FAMILY_IS_EF10(enp)); + EFSYS_ASSERT(count != NULL); + + filters_count = table->eft_unicst_filter_count + + table->eft_mulcst_filter_count + + table->eft_encap_filter_count; + + *count = filters_count; + + return (0); +} + void ef10_filter_get_default_rxq( __in efx_nic_t *enp, diff --git a/drivers/common/sfc_efx/base/ef10_impl.h b/drivers/common/sfc_efx/base/ef10_impl.h index 877aedad45..914bba10ce 100644 --- a/drivers/common/sfc_efx/base/ef10_impl.h +++ b/drivers/common/sfc_efx/base/ef10_impl.h @@ -1347,6 +1347,12 @@ ef10_filter_reconfigure( __in_ecount(6*count) uint8_t const *addrs, __in uint32_t count); +LIBEFX_INTERNAL +extern __checkReturn efx_rc_t +ef10_filter_get_count( + __in efx_nic_t *enp, + __out uint32_t *count); + LIBEFX_INTERNAL extern void ef10_filter_get_default_rxq( diff --git a/drivers/common/sfc_efx/base/efx_filter.c b/drivers/common/sfc_efx/base/efx_filter.c index 83c37ff859..a8b62ee88d 100644 --- a/drivers/common/sfc_efx/base/efx_filter.c +++ b/drivers/common/sfc_efx/base/efx_filter.c @@ -53,6 +53,7 @@ static const efx_filter_ops_t __efx_filter_siena_ops = { siena_filter_delete, /* efo_delete */ siena_filter_supported_filters, /* efo_supported_filters */ NULL, /* efo_reconfigure */ + NULL, /* efo_get_count */ }; #endif /* EFSYS_OPT_SIENA */ @@ -65,6 +66,7 @@ static const efx_filter_ops_t __efx_filter_ef10_ops = { ef10_filter_delete, /* efo_delete */ ef10_filter_supported_filters, /* efo_supported_filters */ ef10_filter_reconfigure, /* efo_reconfigure */ + ef10_filter_get_count, /* efo_get_count */ }; #endif /* EFX_OPTS_EF10() */ @@ -77,6 +79,7 @@ static const efx_filter_ops_t __efx_filter_rhead_ops = { ef10_filter_delete, /* efo_delete */ ef10_filter_supported_filters, /* efo_supported_filters */ ef10_filter_reconfigure, /* efo_reconfigure */ + ef10_filter_get_count, /* efo_get_count */ }; #endif /* EFSYS_OPT_RIVERHEAD */ @@ -306,6 +309,30 @@ efx_filter_reconfigure( return (0); +fail1: + EFSYS_PROBE1(fail1, efx_rc_t, rc); + + return (rc); +} + + __checkReturn efx_rc_t +efx_filter_get_count( + __in efx_nic_t *enp, + __out uint32_t *count) +{ + efx_rc_t rc; + + EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC); + EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE); + EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_FILTER); + + if (enp->en_efop->efo_get_count != NULL) { + if ((rc = enp->en_efop->efo_get_count(enp, count)) != 0) + goto fail1; + } + + return (0); + fail1: EFSYS_PROBE1(fail1, efx_rc_t, rc); diff --git a/drivers/common/sfc_efx/base/efx_impl.h b/drivers/common/sfc_efx/base/efx_impl.h index 45e99d01c5..d657734bc5 100644 --- a/drivers/common/sfc_efx/base/efx_impl.h +++ b/drivers/common/sfc_efx/base/efx_impl.h @@ -288,6 +288,7 @@ typedef struct efx_filter_ops_s { efx_rc_t (*efo_reconfigure)(efx_nic_t *, uint8_t const *, boolean_t, boolean_t, boolean_t, boolean_t, uint8_t const *, uint32_t); + efx_rc_t (*efo_get_count)(efx_nic_t *, uint32_t *); } efx_filter_ops_t; LIBEFX_INTERNAL @@ -302,6 +303,12 @@ efx_filter_reconfigure( __in_ecount(6*count) uint8_t const *addrs, __in uint32_t count); +LIBEFX_INTERNAL +extern __checkReturn efx_rc_t +efx_filter_get_count( + __in efx_nic_t *enp, + __out uint32_t *count); + #endif /* EFSYS_OPT_FILTER */ #if EFSYS_OPT_TUNNEL From patchwork Thu Jun 22 11:31:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artemii Morozov X-Patchwork-Id: 128909 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 281A242D23; Thu, 22 Jun 2023 13:33:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E845F42D12; Thu, 22 Jun 2023 13:32:58 +0200 (CEST) Received: from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80]) by mails.dpdk.org (Postfix) with ESMTP id 0AA7241138 for ; Thu, 22 Jun 2023 13:32:54 +0200 (CEST) Received: from angrod.. (unknown [141.136.90.242]) (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 6EF21E1232; Thu, 22 Jun 2023 15:32:53 +0400 (+04) From: Artemii Morozov To: dev@dpdk.org Cc: Ivan Malov , Viacheslav Galaktionov , Andrew Rybchenko , Andy Moreton Subject: [PATCH v6 3/4] common/sfc_efx/base: add support to enable VLAN stripping Date: Thu, 22 Jun 2023 15:31:03 +0400 Message-Id: <20230622113104.261556-4-artemii.morozov@arknetworks.am> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230622113104.261556-1-artemii.morozov@arknetworks.am> References: <20230531134122.119508-1-artemii.morozov@arknetworks.am> <20230622113104.261556-1-artemii.morozov@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 To enable VLAN stripping, two conditions must be met: the corresponding flag must be set and the appropriate Rx prefix should be requested. VLAN stripping is supported on EF100. Signed-off-by: Artemii Morozov Reviewed-by: Ivan Malov Reviewed-by: Andy Moreton Acked-by: Andrew Rybchenko --- drivers/common/sfc_efx/base/ef10_filter.c | 6 ++++ drivers/common/sfc_efx/base/efx.h | 12 +++++++ drivers/common/sfc_efx/base/efx_impl.h | 1 + drivers/common/sfc_efx/base/efx_port.c | 39 +++++++++++++++++++++++ drivers/common/sfc_efx/base/efx_rx.c | 14 ++++++++ drivers/common/sfc_efx/base/rhead_rx.c | 3 ++ drivers/common/sfc_efx/version.map | 1 + 7 files changed, 76 insertions(+) diff --git a/drivers/common/sfc_efx/base/ef10_filter.c b/drivers/common/sfc_efx/base/ef10_filter.c index 278502fb61..827b3e8f00 100644 --- a/drivers/common/sfc_efx/base/ef10_filter.c +++ b/drivers/common/sfc_efx/base/ef10_filter.c @@ -171,6 +171,7 @@ efx_mcdi_filter_op_add( EFX_MCDI_DECLARE_BUF(payload, MC_CMD_FILTER_OP_V3_IN_LEN, MC_CMD_FILTER_OP_EXT_OUT_LEN); efx_filter_match_flags_t match_flags; + efx_port_t *epp = &(enp->en_port); uint32_t port_id; efx_rc_t rc; @@ -338,6 +339,11 @@ efx_mcdi_filter_op_add( FILTER_OP_V3_IN_MATCH_SET_FLAG, 1); } + if (epp->ep_vlan_strip) { + MCDI_IN_SET_DWORD_FIELD(req, FILTER_OP_V3_IN_MATCH_ACTION_FLAGS, + FILTER_OP_V3_IN_MATCH_STRIP_VLAN, 1); + } + efx_mcdi_execute(enp, &req); if (req.emr_rc != 0) { diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h index 9a29583ecb..016bbc8ec9 100644 --- a/drivers/common/sfc_efx/base/efx.h +++ b/drivers/common/sfc_efx/base/efx.h @@ -1147,6 +1147,12 @@ efx_port_poll( __in efx_nic_t *enp, __out_opt efx_link_mode_t *link_modep); +LIBEFX_API +extern __checkReturn efx_rc_t +efx_port_vlan_strip_set( + __in efx_nic_t *enp, + __in boolean_t enabled); + LIBEFX_API extern void efx_port_fini( @@ -3101,6 +3107,12 @@ typedef enum efx_rxq_type_e { * Request user flag field in the Rx prefix of a queue. */ #define EFX_RXQ_FLAG_USER_FLAG 0x20 +/* + * Request VLAN TCI field in the Rx prefix. The flag just + * controls delivery of the stripped VLAN TCI if VLAN stripping + * is enabled and done. + */ +#define EFX_RXQ_FLAG_VLAN_STRIPPED_TCI 0x40 LIBEFX_API extern __checkReturn efx_rc_t diff --git a/drivers/common/sfc_efx/base/efx_impl.h b/drivers/common/sfc_efx/base/efx_impl.h index d657734bc5..de9d1dddc8 100644 --- a/drivers/common/sfc_efx/base/efx_impl.h +++ b/drivers/common/sfc_efx/base/efx_impl.h @@ -370,6 +370,7 @@ typedef struct efx_port_s { uint32_t ep_default_adv_cap_mask; uint32_t ep_phy_cap_mask; boolean_t ep_mac_drain; + boolean_t ep_vlan_strip; #if EFSYS_OPT_BIST efx_bist_type_t ep_current_bist; #endif diff --git a/drivers/common/sfc_efx/base/efx_port.c b/drivers/common/sfc_efx/base/efx_port.c index a5f982e335..e5a9fa6c53 100644 --- a/drivers/common/sfc_efx/base/efx_port.c +++ b/drivers/common/sfc_efx/base/efx_port.c @@ -204,6 +204,45 @@ efx_loopback_type_name( #endif /* EFSYS_OPT_LOOPBACK */ + __checkReturn efx_rc_t +efx_port_vlan_strip_set( + __in efx_nic_t *enp, + __in boolean_t enabled) +{ + efx_port_t *epp = &(enp->en_port); + efx_nic_cfg_t *encp = &(enp->en_nic_cfg); + uint32_t filters_count = 0; + efx_rc_t rc; + + EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC); + + if (enabled && !encp->enc_rx_vlan_stripping_supported) { + rc = ENOTSUP; + goto fail1; + } + + if ((rc = efx_filter_get_count(enp, &filters_count)) != 0) + goto fail2; + + if (filters_count != 0) { + rc = EINVAL; + goto fail3; + } + + epp->ep_vlan_strip = enabled; + + return (0); + +fail3: + EFSYS_PROBE(fail3); +fail2: + EFSYS_PROBE(fail2); +fail1: + EFSYS_PROBE1(fail1, efx_rc_t, rc); + + return (rc); +} + void efx_port_fini( __in efx_nic_t *enp) diff --git a/drivers/common/sfc_efx/base/efx_rx.c b/drivers/common/sfc_efx/base/efx_rx.c index 68f42f5cac..b3d9e14c67 100644 --- a/drivers/common/sfc_efx/base/efx_rx.c +++ b/drivers/common/sfc_efx/base/efx_rx.c @@ -941,11 +941,25 @@ efx_rx_qcreate_internal( goto fail5; } + if (flags & EFX_RXQ_FLAG_VLAN_STRIPPED_TCI) { + const efx_rx_prefix_layout_t *erplp = &erp->er_prefix_layout; + const efx_rx_prefix_field_info_t *vlan_tci_field; + + vlan_tci_field = + &erplp->erpl_fields[EFX_RX_PREFIX_FIELD_VLAN_STRIP_TCI]; + if (vlan_tci_field->erpfi_width_bits == 0) { + rc = ENOTSUP; + goto fail6; + } + } + enp->en_rx_qcount++; *erpp = erp; return (0); +fail6: + EFSYS_PROBE(fail6); fail5: EFSYS_PROBE(fail5); diff --git a/drivers/common/sfc_efx/base/rhead_rx.c b/drivers/common/sfc_efx/base/rhead_rx.c index d0ac5c02f8..a86551f646 100644 --- a/drivers/common/sfc_efx/base/rhead_rx.c +++ b/drivers/common/sfc_efx/base/rhead_rx.c @@ -640,6 +640,9 @@ rhead_rx_qcreate( if (flags & EFX_RXQ_FLAG_USER_FLAG) fields_mask |= 1U << EFX_RX_PREFIX_FIELD_USER_FLAG; + if (flags & EFX_RXQ_FLAG_VLAN_STRIPPED_TCI) + fields_mask |= 1U << EFX_RX_PREFIX_FIELD_VLAN_STRIP_TCI; + /* * LENGTH is required in EF100 host interface, as receive events * do not include the packet length. diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map index d9b04a611d..e0d473dc72 100644 --- a/drivers/common/sfc_efx/version.map +++ b/drivers/common/sfc_efx/version.map @@ -203,6 +203,7 @@ INTERNAL { efx_port_init; efx_port_loopback_set; efx_port_poll; + efx_port_vlan_strip_set; efx_pseudo_hdr_hash_get; efx_pseudo_hdr_pkt_length_get; From patchwork Thu Jun 22 11:31:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artemii Morozov X-Patchwork-Id: 128910 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 9FCF842D23; Thu, 22 Jun 2023 13:33:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 179C342D20; Thu, 22 Jun 2023 13:33:00 +0200 (CEST) Received: from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80]) by mails.dpdk.org (Postfix) with ESMTP id C29DA427F5 for ; Thu, 22 Jun 2023 13:32:54 +0200 (CEST) Received: from angrod.. (unknown [141.136.90.242]) (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 496DCE1274; Thu, 22 Jun 2023 15:32:54 +0400 (+04) From: Artemii Morozov To: dev@dpdk.org Cc: Ivan Malov , Viacheslav Galaktionov , Andrew Rybchenko , Andy Moreton Subject: [PATCH v6 4/4] net/sfc: support VLAN stripping offload Date: Thu, 22 Jun 2023 15:31:04 +0400 Message-Id: <20230622113104.261556-5-artemii.morozov@arknetworks.am> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230622113104.261556-1-artemii.morozov@arknetworks.am> References: <20230531134122.119508-1-artemii.morozov@arknetworks.am> <20230622113104.261556-1-artemii.morozov@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 Extract VLAN TCI provided by the HW in the prefix and put it to mbuf. VLAN stripping is supported for ef100 datapath only. This is device level offload. Signed-off-by: Artemii Morozov Reviewed-by: Viacheslav Galaktionov Reviewed-by: Ivan Malov Reviewed-by: Andy Moreton --- doc/guides/nics/sfc_efx.rst | 4 ++-- doc/guides/rel_notes/release_23_07.rst | 6 ++++++ drivers/net/sfc/sfc.h | 1 + drivers/net/sfc/sfc_dp_rx.h | 1 + drivers/net/sfc/sfc_ef100_rx.c | 24 +++++++++++++++++++++++- drivers/net/sfc/sfc_port.c | 12 ++++++++++++ drivers/net/sfc/sfc_rx.c | 10 ++++++++++ 7 files changed, 55 insertions(+), 3 deletions(-) diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index de0656876b..44fa24e1ba 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -118,6 +118,8 @@ SFC EFX PMD has support for: - Port representors (see :ref: switch_representation) +- VLAN stripping (if running firmware variant supports it) + Non-supported Features ---------------------- @@ -132,8 +134,6 @@ The features not yet supported include: - VLAN filtering -- VLAN stripping - - LRO diff --git a/doc/guides/rel_notes/release_23_07.rst b/doc/guides/rel_notes/release_23_07.rst index dc0d250e16..b961ef139f 100644 --- a/doc/guides/rel_notes/release_23_07.rst +++ b/doc/guides/rel_notes/release_23_07.rst @@ -177,6 +177,12 @@ New Features See :doc:`../prog_guide/pdcp_lib` for more information. +* **Updated Solarflare network PMD.** + + Updated the Solarflare ``sfc_efx`` driver with changes including: + + * Added VLAN stripping support on SN1000 SmartNICs + Removed Items ------------- diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h index e42abe42cb..b68bcc7d4f 100644 --- a/drivers/net/sfc/sfc.h +++ b/drivers/net/sfc/sfc.h @@ -73,6 +73,7 @@ struct sfc_port { unsigned int flow_ctrl; boolean_t flow_ctrl_autoneg; + boolean_t vlan_strip; size_t pdu; /* diff --git a/drivers/net/sfc/sfc_dp_rx.h b/drivers/net/sfc/sfc_dp_rx.h index 8a504bdcf1..9f9bf28988 100644 --- a/drivers/net/sfc/sfc_dp_rx.h +++ b/drivers/net/sfc/sfc_dp_rx.h @@ -70,6 +70,7 @@ struct sfc_dp_rx_qcreate_info { unsigned int flags; #define SFC_RXQ_FLAG_RSS_HASH 0x1 #define SFC_RXQ_FLAG_INGRESS_MPORT 0x2 +#define SFC_RXQ_FLAG_VLAN_STRIPPED_TCI 0x4 /** Rx queue size */ unsigned int rxq_entries; diff --git a/drivers/net/sfc/sfc_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c index 37b754fa33..07381df5cf 100644 --- a/drivers/net/sfc/sfc_ef100_rx.c +++ b/drivers/net/sfc/sfc_ef100_rx.c @@ -68,6 +68,7 @@ struct sfc_ef100_rxq { #define SFC_EF100_RXQ_INGRESS_MPORT 0x80 #define SFC_EF100_RXQ_USER_FLAG 0x100 #define SFC_EF100_RXQ_NIC_DMA_MAP 0x200 +#define SFC_EF100_RXQ_VLAN_STRIPPED_TCI 0x400 unsigned int ptr_mask; unsigned int evq_phase_bit_shift; unsigned int ready_pkts; @@ -392,6 +393,7 @@ static const efx_rx_prefix_layout_t sfc_ef100_rx_prefix_layout = { SFC_EF100_RX_PREFIX_FIELD(RSS_HASH, B_FALSE), SFC_EF100_RX_PREFIX_FIELD(USER_FLAG, B_FALSE), SFC_EF100_RX_PREFIX_FIELD(USER_MARK, B_FALSE), + SFC_EF100_RX_PREFIX_FIELD(VLAN_STRIP_TCI, B_FALSE), #undef SFC_EF100_RX_PREFIX_FIELD } @@ -472,6 +474,14 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq, ESF_GZ_RX_PREFIX_INGRESS_MPORT); } + if (rxq->flags & SFC_EF100_RXQ_VLAN_STRIPPED_TCI && + EFX_TEST_XWORD_BIT(rx_prefix[0], + ESF_GZ_RX_PREFIX_VLAN_STRIPPED_LBN)) { + ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; + m->vlan_tci = EFX_XWORD_FIELD(rx_prefix[0], + ESF_GZ_RX_PREFIX_VLAN_STRIP_TCI); + } + m->ol_flags = ol_flags; return true; } @@ -813,6 +823,9 @@ sfc_ef100_rx_qcreate(uint16_t port_id, uint16_t queue_id, if (info->flags & SFC_RXQ_FLAG_INGRESS_MPORT) rxq->flags |= SFC_EF100_RXQ_INGRESS_MPORT; + if (info->flags & SFC_RXQ_FLAG_VLAN_STRIPPED_TCI) + rxq->flags |= SFC_EF100_RXQ_VLAN_STRIPPED_TCI; + sfc_ef100_rx_debug(rxq, "RxQ doorbell is %p", rxq->doorbell); *dp_rxqp = &rxq->dp; @@ -892,6 +905,15 @@ sfc_ef100_rx_qstart(struct sfc_dp_rxq *dp_rxq, unsigned int evq_read_ptr, (rxq->flags & SFC_EF100_RXQ_INGRESS_MPORT)) return ENOTSUP; + /* + * Exclude the SFC_EF100_RXQ_VLAN_STRIPPED_TCI if offload was not requested + * or the prefix does not contain the corresponding field. + */ + if (!((rxq->flags & SFC_EF100_RXQ_VLAN_STRIPPED_TCI) && + ((unsup_rx_prefix_fields & + (1U << EFX_RX_PREFIX_FIELD_VLAN_STRIP_TCI)) == 0))) + rxq->flags &= ~SFC_EF100_RXQ_VLAN_STRIPPED_TCI; + rxq->prefix_size = pinfo->erpl_length; rxq->rearm_data = sfc_ef100_mk_mbuf_rearm_data(rxq->dp.dpq.port_id, rxq->prefix_size); @@ -1004,7 +1026,7 @@ struct sfc_dp_rx sfc_ef100_rx = { SFC_DP_RX_FEAT_FLOW_MARK | SFC_DP_RX_FEAT_INTR | SFC_DP_RX_FEAT_STATS, - .dev_offload_capa = 0, + .dev_offload_capa = RTE_ETH_RX_OFFLOAD_VLAN_STRIP, .queue_offload_capa = RTE_ETH_RX_OFFLOAD_CHECKSUM | RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM | RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM | diff --git a/drivers/net/sfc/sfc_port.c b/drivers/net/sfc/sfc_port.c index 0c887ddedb..f1354f5432 100644 --- a/drivers/net/sfc/sfc_port.c +++ b/drivers/net/sfc/sfc_port.c @@ -225,6 +225,11 @@ sfc_port_start(struct sfc_adapter *sa) if (rc != 0) goto fail_mac_fcntl_set; + sfc_log_init(sa, "set vlan strip to %u", port->vlan_strip); + rc = efx_port_vlan_strip_set(sa->nic, port->vlan_strip); + if (rc != 0) + goto fail_mac_vlan_strip_set; + /* Preserve pause capabilities set by above efx_mac_fcntl_set() */ efx_phy_adv_cap_get(sa->nic, EFX_PHY_CAP_CURRENT, &phy_adv_cap); SFC_ASSERT((port->phy_adv_cap & phy_pause_caps) == 0); @@ -339,6 +344,7 @@ sfc_port_start(struct sfc_adapter *sa) fail_mac_pdu_set: fail_phy_adv_cap_set: fail_mac_fcntl_set: +fail_mac_vlan_strip_set: #if EFSYS_OPT_LOOPBACK fail_loopback_set: #endif @@ -375,11 +381,17 @@ sfc_port_configure(struct sfc_adapter *sa) { const struct rte_eth_dev_data *dev_data = sa->eth_dev->data; struct sfc_port *port = &sa->port; + const struct rte_eth_rxmode *rxmode = &dev_data->dev_conf.rxmode; sfc_log_init(sa, "entry"); port->pdu = EFX_MAC_PDU(dev_data->mtu); + if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) + port->vlan_strip = true; + else + port->vlan_strip = false; + return 0; } diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index edd0f0c038..505d95a9aa 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -938,6 +938,9 @@ sfc_rx_get_offload_mask(struct sfc_adapter *sa) if (encp->enc_tunnel_encapsulations_supported == 0) no_caps |= RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM; + if (encp->enc_rx_vlan_stripping_supported == 0) + no_caps |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP; + return ~no_caps; } @@ -1109,6 +1112,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index, struct sfc_rxq *rxq; struct sfc_dp_rx_qcreate_info info; struct sfc_dp_rx_hw_limits hw_limits; + struct sfc_port *port = &sa->port; uint16_t rx_free_thresh; const char *error; @@ -1193,6 +1197,9 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index, sfc_ft_is_active(sa)) rxq_info->type_flags |= EFX_RXQ_FLAG_USER_MARK; + if (port->vlan_strip) + rxq_info->type_flags |= EFX_RXQ_FLAG_VLAN_STRIPPED_TCI; + rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_RX, sw_index, evq_entries, socket_id, &evq); if (rc != 0) @@ -1228,6 +1235,9 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index, if (rxq_info->type_flags & EFX_RXQ_FLAG_INGRESS_MPORT) rxq_info->rxq_flags |= SFC_RXQ_FLAG_INGRESS_MPORT; + if (rxq_info->type_flags & EFX_RXQ_FLAG_VLAN_STRIPPED_TCI) + rxq_info->rxq_flags |= SFC_RXQ_FLAG_VLAN_STRIPPED_TCI; + rxq->buf_size = buf_size; rc = sfc_dma_alloc(sa, "rxq", sw_index, EFX_NIC_DMA_ADDR_RX_RING,