From patchwork Thu May 4 17:36:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 126690 X-Patchwork-Delegate: ajit.khaparde@broadcom.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 C9B9D42A65; Thu, 4 May 2023 19:37:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5622942D47; Thu, 4 May 2023 19:36:36 +0200 (CEST) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mails.dpdk.org (Postfix) with ESMTP id 91B8642BDA for ; Thu, 4 May 2023 19:36:34 +0200 (CEST) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-52c6f81193cso523049a12.1 for ; Thu, 04 May 2023 10:36:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1683221793; x=1685813793; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=veyo8BnUdBz32AXUIjCiMbYYY+0/iNmzhUDaOhlOaEI=; b=AoQDKM09dpHnQXjtHCthhTP3shwGVc4QxpSxv5XsS7Y+6MMcLx2qLvkR9gd8frW6CG +ZYtMX3orDRPobuB18PAtGFhk6UDf6whm6K71QzBN2C93loTONJvFwzPN4GN5xYhbU9o 4OqNiQHXMTLTziCwfUoKKyIEEUx+s/1nIFCmM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683221793; x=1685813793; h=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=veyo8BnUdBz32AXUIjCiMbYYY+0/iNmzhUDaOhlOaEI=; b=l6FWo5GQ0ZCDKsXLHEsl7zv0guI6xXUZaJi3dZAsAVsaYYBJnisliLCjtdv8evz92Y C5J5wA35XzDzO8gMQW8RQrpHMJuXUlwXMBrYUbkw2aTChoCg/ggL7vZzsGpWX55gfzCe U5CM7fJXguXEbV49YRUkqRsWbkUv7PXWyEhlfA1eni/dehih4FFxlCp66erpiuG6xIiU v7SWBVNp6RyYLrrl7V70CAB6w6iTGCR6b56YsZS9ixjuYNJQ5wGfqDpguGEvBiA2/9GZ UFZHgOFdEKNICErWh23m+yizzvVDTGlbI85kaP07VxnV9gdmHK+B4Al2+86o3RYXPLpc 4UpA== X-Gm-Message-State: AC+VfDy6rvRptcXO6gVOLXgt7lKrWXS5LWb/9sv9gN6U591JxZXbupKW qB/3Fy1Mk5FCybTLbVtmt/CmB6+J5n1+L7vjEVZqbJvqezCeJnTST2nPML8exvDqV+RcEnyAjOi zP+ukwK8RJWJSQYOTCC78E4d16piml2CTygv7XTDHF43V8h4GyANjc+h2Y1P5QZyJkRcp X-Google-Smtp-Source: ACHHUZ5sHi6e3S19QVSGzJrFl9hziXMtb9mwzyN1nIAs4HrlErsPPp12o/ZgD66SYwaAILzfSXo7ng== X-Received: by 2002:a05:6a20:7f93:b0:ee:786b:d6f8 with SMTP id d19-20020a056a207f9300b000ee786bd6f8mr3450188pzj.57.1683221792876; Thu, 04 May 2023 10:36:32 -0700 (PDT) Received: from localhost.localdomain ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id v11-20020aa7850b000000b0062bc045bf4fsm26305230pfn.19.2023.05.04.10.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 May 2023 10:36:32 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: Randy Schacher , Jay Ding Subject: [PATCH v3 07/11] net/bnxt: add support for rte meter Date: Thu, 4 May 2023 10:36:08 -0700 Message-Id: <20230504173612.17696-8-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230504173612.17696-1-ajit.khaparde@broadcom.com> References: <20230504173612.17696-1-ajit.khaparde@broadcom.com> 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 From: Randy Schacher Add RTE meter support into the ULP layer. Currently: - Chaining of meters is not supported - Meter can be shared by multiple flows - srtcm_rfc2697 type is supported - Stats are not supported in the implementation yet Signed-off-by: Randy Schacher Signed-off-by: Jay Ding Acked-by: Ajit Khaparde --- doc/guides/nics/features/bnxt.ini | 1 + drivers/net/bnxt/bnxt.h | 2 + drivers/net/bnxt/bnxt_ethdev.c | 1 + drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 8 + drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 3 + drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c | 909 ++++++++++++++++++ drivers/net/bnxt/tf_ulp/meson.build | 1 + drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c | 4 +- drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 29 + drivers/net/bnxt/tf_ulp/ulp_rte_parser.h | 5 + 10 files changed, 961 insertions(+), 2 deletions(-) create mode 100644 drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c diff --git a/doc/guides/nics/features/bnxt.ini b/doc/guides/nics/features/bnxt.ini index 9c456fa863..2809beb629 100644 --- a/doc/guides/nics/features/bnxt.ini +++ b/doc/guides/nics/features/bnxt.ini @@ -77,6 +77,7 @@ dec_ttl = Y drop = Y jump = Y mark = Y +meter = Y of_pop_vlan = Y of_push_vlan = Y of_set_vlan_pcp = Y diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 6dd3c8b87c..7d508c7c23 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -1014,6 +1014,7 @@ bnxt_udp_tunnel_port_add_op(struct rte_eth_dev *eth_dev, struct rte_eth_udp_tunnel *udp_tunnel); extern const struct rte_flow_ops bnxt_flow_ops; +extern const struct rte_flow_ops bnxt_flow_meter_ops; #define bnxt_acquire_flow_lock(bp) \ pthread_mutex_lock(&(bp)->flow_lock) @@ -1065,6 +1066,7 @@ int bnxt_flow_ops_get_op(struct rte_eth_dev *dev, int bnxt_dev_start_op(struct rte_eth_dev *eth_dev); int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev); void bnxt_handle_vf_cfg_change(void *arg); +int bnxt_flow_meter_ops_get(struct rte_eth_dev *eth_dev, void *arg); struct bnxt_vnic_info *bnxt_get_default_vnic(struct bnxt *bp); struct tf *bnxt_get_tfp_session(struct bnxt *bp, enum bnxt_session_type type); #endif diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 4d84aaee0c..7bceb0524a 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4091,6 +4091,7 @@ static const struct eth_dev_ops bnxt_dev_ops = { .timesync_adjust_time = bnxt_timesync_adjust_time, .timesync_read_rx_timestamp = bnxt_timesync_read_rx_timestamp, .timesync_read_tx_timestamp = bnxt_timesync_read_tx_timestamp, + .mtr_ops_get = bnxt_flow_meter_ops_get, }; static uint32_t bnxt_map_reset_regs(struct bnxt *bp, uint32_t reg) diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c index 08eb0c6063..3459140f18 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c @@ -1681,6 +1681,14 @@ bnxt_ulp_init(struct bnxt *bp, return rc; } + if (ulp_dev_id == BNXT_ULP_DEVICE_ID_THOR) { + rc = bnxt_flow_meter_init(bp); + if (rc) { + BNXT_TF_DBG(ERR, "Failed to config meter\n"); + goto jump_to_error; + } + } + BNXT_TF_DBG(DEBUG, "ulp ctx has been initialized\n"); return rc; diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h index 53d76e1465..a6ad5c1eaa 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h @@ -371,6 +371,9 @@ bnxt_ulp_vxlan_ip_port_set(struct bnxt_ulp_context *ulp_ctx, unsigned int bnxt_ulp_vxlan_ip_port_get(struct bnxt_ulp_context *ulp_ctx); +int32_t +bnxt_flow_meter_init(struct bnxt *bp); + uint32_t bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id); diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c new file mode 100644 index 0000000000..2461c46f90 --- /dev/null +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c @@ -0,0 +1,909 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2014-2023 Broadcom + * All rights reserved. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bnxt.h" +#include "bnxt_filter.h" +#include "bnxt_hwrm.h" +#include "bnxt_ring.h" +#include "bnxt_rxq.h" +#include "bnxt_rxr.h" +#include "bnxt_vnic.h" +#include "hsi_struct_def_dpdk.h" + +#include "tfp.h" +#include "bnxt_tf_common.h" +#include "ulp_rte_parser.h" +#include "ulp_matcher.h" +#include "ulp_flow_db.h" +#include "ulp_mapper.h" +#include "ulp_fc_mgr.h" +#include "ulp_port_db.h" +#include "ulp_ha_mgr.h" +#include "ulp_tun.h" +#include + +/** + * Meter init status + */ +int bnxt_meter_initialized; + +/** + * Internal api to config global config. + * returns 0 on success. + */ +static int32_t +bnxt_meter_global_cfg_update(struct bnxt *bp, + enum tf_dir dir, + enum tf_global_config_type type, + uint32_t offset, + uint32_t value, + uint32_t set_flag) +{ + uint32_t global_cfg = 0; + struct tf_global_cfg_parms parms = { 0 }; + struct tf *tfp; + int32_t rc = 0; + + parms.dir = dir, + parms.type = type, + parms.offset = offset, + parms.config = (uint8_t *)&global_cfg, + parms.config_sz_in_bytes = sizeof(global_cfg); + + tfp = bnxt_ulp_bp_tfp_get(bp, BNXT_ULP_SESSION_TYPE_DEFAULT); + rc = tf_get_global_cfg(tfp, &parms); + if (rc) { + BNXT_TF_DBG(ERR, "Failed to get global cfg 0x%x rc:%d\n", + type, rc); + return rc; + } + + if (set_flag) + global_cfg |= value; + else + global_cfg &= ~value; + + rc = tf_set_global_cfg(tfp, &parms); + if (rc) { + BNXT_TF_DBG(ERR, "Failed to set global cfg 0x%x rc:%d\n", + type, rc); + return rc; + } + return rc; +} + +/** + * When a port is initialized by dpdk. This functions is called + * to enable the meter and initializes the meter global configurations. + */ +#define BNXT_THOR_FMTCR_NUM_MET_MET_1K (0x7UL << 20) +#define BNXT_THOR_FMTCR_CNTRS_ENABLE (0x1UL << 25) +#define BNXT_THOR_FMTCR_INTERVAL_1K (1024) +int32_t +bnxt_flow_meter_init(struct bnxt *bp) +{ + int rc = 0; + + /* + * Enable metering. Set the meter global configuration register. + * Set number of meter to 1K. Disable the drop counter for now. + */ + rc = bnxt_meter_global_cfg_update(bp, TF_DIR_RX, TF_METER_CFG, + 0, + BNXT_THOR_FMTCR_NUM_MET_MET_1K, + 1); + if (rc) { + BNXT_TF_DBG(ERR, "Failed to set rx meter configuration\n"); + goto jump_to_error; + } + + rc = bnxt_meter_global_cfg_update(bp, TF_DIR_TX, TF_METER_CFG, + 0, + BNXT_THOR_FMTCR_NUM_MET_MET_1K, + 1); + if (rc) { + BNXT_TF_DBG(ERR, "Failed to set tx meter configuration\n"); + goto jump_to_error; + } + + /* + * Set meter refresh rate to 1024 clock cycle. This value works for + * most bit rates especially for high rates. + */ + rc = bnxt_meter_global_cfg_update(bp, TF_DIR_RX, TF_METER_INTERVAL_CFG, + 0, + BNXT_THOR_FMTCR_INTERVAL_1K, + 1); + if (rc) { + BNXT_TF_DBG(ERR, "Failed to set rx meter interval\n"); + goto jump_to_error; + } + + rc = bnxt_meter_global_cfg_update(bp, TF_DIR_TX, TF_METER_INTERVAL_CFG, + 0, + BNXT_THOR_FMTCR_INTERVAL_1K, + 1); + if (rc) { + BNXT_TF_DBG(ERR, "Failed to set tx meter interval\n"); + goto jump_to_error; + } + + bnxt_meter_initialized = 1; + BNXT_TF_DBG(DEBUG, "Bnxt flow meter has been initialized\n"); + return rc; + +jump_to_error: + return rc; +} + +/** + * Get meter capabilities. + */ +#define MAX_FLOW_PER_METER 1024 +#define MAX_METER_RATE_100GBPS ((1ULL << 30) * 100 / 8) +static int +bnxt_flow_mtr_cap_get(struct rte_eth_dev *dev, + struct rte_mtr_capabilities *cap, + struct rte_mtr_error *error) +{ + struct bnxt *bp = dev->data->dev_private; + uint32_t ulp_dev_id = BNXT_ULP_DEVICE_ID_LAST; + struct tf_get_session_info_parms iparms; + struct tf *tfp; + int32_t rc = 0; + + if (!bnxt_meter_initialized) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Bnxt meter is not initialized"); + + rc = bnxt_ulp_cntxt_dev_id_get(bp->ulp_ctx, &ulp_dev_id); + if (rc) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Unable to get device id from ulp"); + + /* Get number of meter reserved for this session */ + memset(&iparms, 0, sizeof(iparms)); + tfp = bnxt_ulp_bp_tfp_get(bp, BNXT_ULP_SESSION_TYPE_DEFAULT); + rc = tf_get_session_info(tfp, &iparms); + if (rc != 0) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Failed to get session resource info"); + + memset(cap, 0, sizeof(struct rte_mtr_capabilities)); + + cap->n_max = iparms.session_info.tbl[TF_DIR_RX].info[TF_TBL_TYPE_METER_INST].stride; + if (!cap->n_max) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "Meter is not supported"); + + cap->srtcm_rfc2697_byte_mode_supported = 1; + cap->n_shared_max = cap->n_max; + /* No meter is identical */ + cap->identical = 1; + cap->shared_identical = 1; + cap->shared_n_flows_per_mtr_max = MAX_FLOW_PER_METER; + cap->chaining_n_mtrs_per_flow_max = 1; /* Chaining is not supported. */ + cap->meter_srtcm_rfc2697_n_max = cap->n_max; + cap->meter_rate_max = MAX_METER_RATE_100GBPS; + /* No stats supported now */ + cap->stats_mask = 0; + + return 0; +} + +/** + * Calculate mantissa and exponent for cir / eir reg. + */ +#define BNXT_CPU_CLOCK 800 +#define MEGA 1000000 +#define NUM_BIT_PER_BYTE 8 +static inline void +bnxt_ulp_flow_meter_xir_calc(int64_t xir, uint32_t *reg) +{ + int64_t temp; + uint16_t m = 0; + uint16_t e = 0; + uint8_t *swap = 0; + + /* Special case xir == 0 ? both exp and matissa are 0. */ + if (xir == 0) { + *reg = 0; + return; + } + + /* + * e = floor(log2(cir)) + 27 + * a (MBps) = xir (bps) / MEGA + * b (MBpc) = a (MBps) / CPU_CLOCK (Mcps) + * e = floor(log2(b)) + 27 + */ + temp = xir * (1 << 24) / (BNXT_CPU_CLOCK >> 3) / MEGA; + e = log2(temp); + + /* + * m = round(b/2^(e-27) - 1) * 2048 + * = round(b*2^(27-e) - 1) * 2^11 + * = round(b*2^(38-e) - 2^11) + * + */ + m = xir * (1 << (38 - e)) / BNXT_CPU_CLOCK / MEGA - (1 << 11); + *reg = ((m & 0x7FF) << 6) | (e & 0x3F); + swap = (uint8_t *)reg; + *reg = swap[0] << 16 | swap[1] << 8 | swap[2]; +} + +/** + * Calculate mantissa and exponent for cbs / ebs reg. + */ +static inline void +bnxt_ulp_flow_meter_xbs_calc(int64_t xbs, uint16_t *reg) +{ + uint16_t m = 0; + uint16_t e = 0; + + if (xbs == 0) { + *reg = 0; + return; + } + + /* + * e = floor(log2(xbs)) + 1 + */ + e = log2(xbs) + 1; + + /* + * m = round(xbs/2^(e-1) - 1) * 128 + * = round(xbs*2^(1-e) - 1) * 2^7 + * = round(xbs*2^(8-e) - 2^7) + * + */ + m = xbs / (1 << (e - 8)) - (1 << 7); + *reg = ((m & 0x7F) << 5) | (e & 0x1F); + *reg = rte_cpu_to_be_16(*reg); +} + +/** + * Parse the meter profile. + */ +static inline int +bnxt_ulp_meter_profile_parse(struct ulp_rte_act_prop *act_prop, + const struct rte_mtr_meter_profile *profile, + struct rte_mtr_error *error) +{ + uint64_t cir, cbs, eir, ebs; + uint32_t cir_reg, eir_reg; + uint16_t cbs_reg, ebs_reg; + bool alg_rfc2698 = false; + bool pm = false; + + /* Profile must not be NULL. */ + if (profile == NULL) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_METER_PROFILE, + NULL, "Meter profile is null."); + + if (profile->packet_mode) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_METER_PROFILE, + NULL, + "Metering packet_mode is not supported"); + + switch (profile->alg) { + case RTE_MTR_SRTCM_RFC2697: + cir = profile->srtcm_rfc2697.cir; + cbs = profile->srtcm_rfc2697.cbs; + eir = 0; + ebs = profile->srtcm_rfc2697.ebs; + break; + case RTE_MTR_TRTCM_RFC2698: + cir = profile->trtcm_rfc2698.cir; + cbs = profile->trtcm_rfc2698.cbs; + eir = profile->trtcm_rfc2698.pir; + ebs = profile->trtcm_rfc2698.pbs; + alg_rfc2698 = true; + break; + case RTE_MTR_TRTCM_RFC4115: + cir = profile->trtcm_rfc4115.cir; + cbs = profile->trtcm_rfc4115.cbs; + eir = profile->trtcm_rfc4115.eir; + ebs = profile->trtcm_rfc4115.ebs; + alg_rfc2698 = true; + break; + default: + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_METER_PROFILE, + NULL, + "Metering algorithm type is invalid"); + } + + /* The CBS and EBS must be configured so that at least one + * of them is larger than 0. It is recommended that when + * the value of the CBS or the EBS is larger than 0, it + * is larger than or equal to the size of the largest possible + * IP packet in the stream. + */ + if (cbs == 0 && ebs == 0) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_METER_PROFILE, + NULL, + "CBS & EBS cannot both be 0. One of" + " them should be larger than the MTU"); + + if (alg_rfc2698 && eir < cir) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_METER_PROFILE, + NULL, + "PIR must be equal to or greater than CIR"); + + bnxt_ulp_flow_meter_xir_calc(cir, &cir_reg); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_PROF_CIR], + &cir_reg, + BNXT_ULP_ACT_PROP_SZ_METER_PROF_CIR); + + bnxt_ulp_flow_meter_xir_calc(eir, &eir_reg); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_PROF_EIR], + &eir_reg, + BNXT_ULP_ACT_PROP_SZ_METER_PROF_EIR); + + bnxt_ulp_flow_meter_xbs_calc(cbs, &cbs_reg); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_PROF_CBS], + &cbs_reg, + BNXT_ULP_ACT_PROP_SZ_METER_PROF_CBS); + + bnxt_ulp_flow_meter_xbs_calc(ebs, &ebs_reg); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_PROF_EBS], + &ebs_reg, + BNXT_ULP_ACT_PROP_SZ_METER_PROF_EBS); + + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_PROF_RFC2698], + &alg_rfc2698, + BNXT_ULP_ACT_PROP_SZ_METER_PROF_RFC2698); + + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_PROF_PM], + &pm, + BNXT_ULP_ACT_PROP_SZ_METER_PROF_PM); + + return 0; +} + +/** + * Add MTR profile. + */ +static int +bnxt_flow_meter_profile_add(struct rte_eth_dev *dev, + uint32_t meter_profile_id, + struct rte_mtr_meter_profile *profile, + struct rte_mtr_error *error) +{ + struct bnxt_ulp_context *ulp_ctx; + struct ulp_rte_parser_params params; + struct ulp_rte_act_prop *act_prop = ¶ms.act_prop; + struct bnxt_ulp_mapper_create_parms mparms = { 0 }; + uint32_t act_tid; + uint16_t func_id; + int ret; + uint32_t tmp_profile_id; + + if (!bnxt_meter_initialized) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Bnxt meter is not initialized"); + + ulp_ctx = bnxt_ulp_eth_dev_ptr2_cntxt_get(dev); + if (!ulp_ctx) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "ULP context is not initialized"); + + /* Initialize the parser params */ + memset(¶ms, 0, sizeof(struct ulp_rte_parser_params)); + params.ulp_ctx = ulp_ctx; + params.act_bitmap.bits = BNXT_ULP_ACT_BIT_METER_PROFILE; + /* not direction from rte_mtr. Set ingress by default */ + params.dir_attr |= BNXT_ULP_FLOW_ATTR_INGRESS; + + tmp_profile_id = tfp_cpu_to_be_32(meter_profile_id); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_PROF_ID], + &tmp_profile_id, + BNXT_ULP_ACT_PROP_SZ_METER_PROF_ID); + + ret = bnxt_ulp_meter_profile_parse(act_prop, profile, error); + if (ret) + goto parse_error; + + ret = ulp_matcher_action_match(¶ms, &act_tid); + if (ret != BNXT_TF_RC_SUCCESS) + goto act_error; + + bnxt_ulp_init_mapper_params(&mparms, ¶ms, + BNXT_ULP_FDB_TYPE_REGULAR); + mparms.act_tid = act_tid; + + /* Get the function id */ + if (ulp_port_db_port_func_id_get(ulp_ctx, + dev->data->port_id, + &func_id)) { + BNXT_TF_DBG(ERR, "conversion of port to func id failed\n"); + goto act_error; + } + + /* Protect flow creation */ + if (bnxt_ulp_cntxt_acquire_fdb_lock(ulp_ctx)) { + BNXT_TF_DBG(ERR, "Flow db lock acquire failed\n"); + goto act_error; + } + + ret = ulp_mapper_flow_create(params.ulp_ctx, &mparms); + bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx); + + if (ret) + goto act_error; + + return 0; +parse_error: + return ret; +act_error: + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Failed to add meter profile."); +} + +/** + * Delete meter profile. + */ +static int +bnxt_flow_meter_profile_delete(struct rte_eth_dev *dev, + uint32_t meter_profile_id, + struct rte_mtr_error *error) +{ + struct bnxt_ulp_context *ulp_ctx; + struct ulp_rte_parser_params params; + struct ulp_rte_act_prop *act_prop = ¶ms.act_prop; + struct bnxt_ulp_mapper_create_parms mparms = { 0 }; + uint32_t act_tid; + uint16_t func_id; + int ret; + uint32_t tmp_profile_id; + + if (!bnxt_meter_initialized) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Bnxt meter is not initialized"); + + ulp_ctx = bnxt_ulp_eth_dev_ptr2_cntxt_get(dev); + if (!ulp_ctx) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "ULP context is not initialized"); + + /* Initialize the parser params */ + memset(¶ms, 0, sizeof(struct ulp_rte_parser_params)); + params.ulp_ctx = ulp_ctx; + params.act_bitmap.bits = BNXT_ULP_ACT_BIT_METER_PROFILE; + params.act_bitmap.bits |= BNXT_ULP_ACT_BIT_DELETE; + /* not direction from rte_mtr. Set ingress by default */ + params.dir_attr |= BNXT_ULP_FLOW_ATTR_INGRESS; + + tmp_profile_id = tfp_cpu_to_be_32(meter_profile_id); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_PROF_ID], + &tmp_profile_id, + BNXT_ULP_ACT_PROP_SZ_METER_PROF_ID); + + ret = ulp_matcher_action_match(¶ms, &act_tid); + if (ret != BNXT_TF_RC_SUCCESS) + goto parse_error; + + bnxt_ulp_init_mapper_params(&mparms, ¶ms, + BNXT_ULP_FDB_TYPE_REGULAR); + mparms.act_tid = act_tid; + + /* Get the function id */ + if (ulp_port_db_port_func_id_get(ulp_ctx, + dev->data->port_id, + &func_id)) { + BNXT_TF_DBG(ERR, "conversion of port to func id failed\n"); + goto parse_error; + } + + /* Protect flow creation */ + if (bnxt_ulp_cntxt_acquire_fdb_lock(ulp_ctx)) { + BNXT_TF_DBG(ERR, "Flow db lock acquire failed\n"); + goto parse_error; + } + + ret = ulp_mapper_flow_create(params.ulp_ctx, &mparms); + bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx); + + if (ret) + goto parse_error; + + BNXT_TF_DBG(DEBUG, "Bnxt flow meter profile %d deleted\n", + meter_profile_id); + + return 0; + +parse_error: + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Failed to delete meter profile."); +} + +/** + * Create meter. + */ +static int +bnxt_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, + struct rte_mtr_params *params, int shared __rte_unused, + struct rte_mtr_error *error) +{ + struct bnxt_ulp_context *ulp_ctx; + struct ulp_rte_parser_params pparams; + struct ulp_rte_act_prop *act_prop = &pparams.act_prop; + struct bnxt_ulp_mapper_create_parms mparms = { 0 }; + uint32_t act_tid; + uint16_t func_id; + bool meter_en = params->meter_enable ? true : false; + int ret; + uint32_t tmp_meter_id, tmp_profile_id; + + if (!bnxt_meter_initialized) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Bnxt meter is not initialized"); + + ulp_ctx = bnxt_ulp_eth_dev_ptr2_cntxt_get(dev); + if (!ulp_ctx) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "ULP context is not initialized"); + + /* Initialize the parser params */ + memset(&pparams, 0, sizeof(struct ulp_rte_parser_params)); + pparams.ulp_ctx = ulp_ctx; + pparams.act_bitmap.bits = BNXT_ULP_ACT_BIT_SHARED_METER; + /* not direction from rte_mtr. Set ingress by default */ + pparams.dir_attr |= BNXT_ULP_FLOW_ATTR_INGRESS; + + tmp_meter_id = tfp_cpu_to_be_32(meter_id); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_INST_ID], + &tmp_meter_id, + BNXT_ULP_ACT_PROP_SZ_METER_INST_ID); + + tmp_profile_id = tfp_cpu_to_be_32(params->meter_profile_id); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_PROF_ID], + &tmp_profile_id, + BNXT_ULP_ACT_PROP_SZ_METER_PROF_ID); + + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_INST_MTR_VAL], + &meter_en, + BNXT_ULP_ACT_PROP_SZ_METER_INST_MTR_VAL); + + ret = ulp_matcher_action_match(&pparams, &act_tid); + if (ret != BNXT_TF_RC_SUCCESS) + goto parse_error; + + bnxt_ulp_init_mapper_params(&mparms, &pparams, + BNXT_ULP_FDB_TYPE_REGULAR); + mparms.act_tid = act_tid; + + /* Get the function id */ + if (ulp_port_db_port_func_id_get(ulp_ctx, + dev->data->port_id, + &func_id)) { + BNXT_TF_DBG(ERR, "conversion of port to func id failed\n"); + goto parse_error; + } + + /* Protect flow creation */ + if (bnxt_ulp_cntxt_acquire_fdb_lock(ulp_ctx)) { + BNXT_TF_DBG(ERR, "Flow db lock acquire failed\n"); + goto parse_error; + } + + ret = ulp_mapper_flow_create(pparams.ulp_ctx, &mparms); + bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx); + + if (ret) + goto parse_error; + + BNXT_TF_DBG(DEBUG, "Bnxt flow meter %d is created\n", meter_id); + + return 0; +parse_error: + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Failed to add meter."); +} + +/** + * Destroy meter. + */ +static int +bnxt_flow_meter_destroy(struct rte_eth_dev *dev, + uint32_t meter_id, + struct rte_mtr_error *error) +{ + struct bnxt_ulp_context *ulp_ctx; + struct ulp_rte_parser_params pparams; + struct ulp_rte_act_prop *act_prop = &pparams.act_prop; + struct bnxt_ulp_mapper_create_parms mparms = { 0 }; + uint32_t act_tid; + uint16_t func_id; + int ret; + uint32_t tmp_meter_id; + + if (!bnxt_meter_initialized) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Bnxt meter is not initialized"); + + ulp_ctx = bnxt_ulp_eth_dev_ptr2_cntxt_get(dev); + if (!ulp_ctx) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "ULP context is not initialized"); + + /* Initialize the parser params */ + memset(&pparams, 0, sizeof(struct ulp_rte_parser_params)); + pparams.ulp_ctx = ulp_ctx; + pparams.act_bitmap.bits = BNXT_ULP_ACT_BIT_SHARED_METER; + pparams.act_bitmap.bits |= BNXT_ULP_ACT_BIT_DELETE; + /* not direction from rte_mtr. Set ingress by default */ + pparams.dir_attr |= BNXT_ULP_FLOW_ATTR_INGRESS; + + tmp_meter_id = tfp_cpu_to_be_32(meter_id); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_INST_ID], + &tmp_meter_id, + BNXT_ULP_ACT_PROP_SZ_METER_INST_ID); + + ret = ulp_matcher_action_match(&pparams, &act_tid); + if (ret != BNXT_TF_RC_SUCCESS) + goto parse_error; + + bnxt_ulp_init_mapper_params(&mparms, &pparams, + BNXT_ULP_FDB_TYPE_REGULAR); + mparms.act_tid = act_tid; + + /* Get the function id */ + if (ulp_port_db_port_func_id_get(ulp_ctx, + dev->data->port_id, + &func_id)) { + BNXT_TF_DBG(ERR, "conversion of port to func id failed\n"); + goto parse_error; + } + + /* Protect flow creation */ + if (bnxt_ulp_cntxt_acquire_fdb_lock(ulp_ctx)) { + BNXT_TF_DBG(ERR, "Flow db lock acquire failed\n"); + goto parse_error; + } + + ret = ulp_mapper_flow_create(pparams.ulp_ctx, &mparms); + bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx); + + if (ret) + goto parse_error; + + BNXT_TF_DBG(DEBUG, "Bnxt flow meter %d is deleted\n", meter_id); + + return 0; +parse_error: + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Failed to delete meter."); +} + +/** + * Set meter valid/invalid. + */ +static int +bnxt_flow_meter_enable_set(struct rte_eth_dev *dev, + uint32_t meter_id, + uint8_t val, + struct rte_mtr_error *error) +{ + struct bnxt_ulp_context *ulp_ctx; + struct ulp_rte_parser_params pparams; + struct ulp_rte_act_prop *act_prop = &pparams.act_prop; + struct bnxt_ulp_mapper_create_parms mparms = { 0 }; + uint32_t act_tid; + uint16_t func_id; + int ret; + uint32_t tmp_meter_id; + + if (!bnxt_meter_initialized) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Bnxt meter is not initialized"); + + ulp_ctx = bnxt_ulp_eth_dev_ptr2_cntxt_get(dev); + if (!ulp_ctx) + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "ULP context is not initialized"); + + /* Initialize the parser params */ + memset(&pparams, 0, sizeof(struct ulp_rte_parser_params)); + pparams.ulp_ctx = ulp_ctx; + pparams.act_bitmap.bits = BNXT_ULP_ACT_BIT_SHARED_METER; + pparams.act_bitmap.bits |= BNXT_ULP_ACT_BIT_UPDATE; + /* not direction from rte_mtr. Set ingress by default */ + pparams.dir_attr |= BNXT_ULP_FLOW_ATTR_INGRESS; + + tmp_meter_id = tfp_cpu_to_be_32(meter_id); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_INST_ID], + &tmp_meter_id, + BNXT_ULP_ACT_PROP_SZ_METER_INST_ID); + act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_INST_MTR_VAL_UPDATE] = 1; + act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER_INST_MTR_VAL] = val; + + ret = ulp_matcher_action_match(&pparams, &act_tid); + if (ret != BNXT_TF_RC_SUCCESS) + goto parse_error; + + bnxt_ulp_init_mapper_params(&mparms, &pparams, + BNXT_ULP_FDB_TYPE_REGULAR); + mparms.act_tid = act_tid; + + /* Get the function id */ + if (ulp_port_db_port_func_id_get(ulp_ctx, + dev->data->port_id, + &func_id)) { + BNXT_TF_DBG(ERR, "conversion of port to func id failed\n"); + goto parse_error; + } + + /* Protect flow creation */ + if (bnxt_ulp_cntxt_acquire_fdb_lock(ulp_ctx)) { + BNXT_TF_DBG(ERR, "Flow db lock acquire failed\n"); + goto parse_error; + } + + ret = ulp_mapper_flow_create(pparams.ulp_ctx, &mparms); + bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx); + + if (ret) + goto parse_error; + + BNXT_TF_DBG(DEBUG, "Bnxt flow meter %d is %s\n", + meter_id, val ? "enabled" : "disabled"); + + return 0; +parse_error: + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Failed to enable/disable meter."); +} + +/** + * Enable flow meter. + */ +static int +bnxt_flow_meter_enable(struct rte_eth_dev *dev, + uint32_t meter_id, + struct rte_mtr_error *error) +{ + return bnxt_flow_meter_enable_set(dev, meter_id, 1, error); +} + +/** + * Disable flow meter. + */ +static int +bnxt_flow_meter_disable(struct rte_eth_dev *dev, + uint32_t meter_id, + struct rte_mtr_error *error) +{ + return bnxt_flow_meter_enable_set(dev, meter_id, 0, error); +} + +/** + * Update meter profile. + */ +static int +bnxt_flow_meter_profile_update(struct rte_eth_dev *dev __rte_unused, + uint32_t meter_id __rte_unused, + uint32_t meter_profile_id __rte_unused, + struct rte_mtr_error *error) +{ + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Meter_profile_update not supported"); +} + +/** + * Udate meter stats mask. + */ +static int +bnxt_flow_meter_stats_update(struct rte_eth_dev *dev __rte_unused, + uint32_t meter_id __rte_unused, + uint64_t stats_mask __rte_unused, + struct rte_mtr_error *error) +{ + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Meter_stats_update not supported"); +} + +/** + * Read meter statistics. + */ +static int +bnxt_flow_meter_stats_read(struct rte_eth_dev *dev __rte_unused, + uint32_t meter_id __rte_unused, + struct rte_mtr_stats *stats __rte_unused, + uint64_t *stats_mask __rte_unused, + int clear __rte_unused, + struct rte_mtr_error *error) +{ + return -rte_mtr_error_set(error, ENOTSUP, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Meter_stats_read not supported yet"); +} + +static const struct rte_mtr_ops bnxt_flow_mtr_ops = { + .capabilities_get = bnxt_flow_mtr_cap_get, + .meter_profile_add = bnxt_flow_meter_profile_add, + .meter_profile_delete = bnxt_flow_meter_profile_delete, + .meter_policy_validate = NULL, + .meter_policy_add = NULL, + .meter_policy_delete = NULL, + .create = bnxt_flow_meter_create, + .destroy = bnxt_flow_meter_destroy, + .meter_enable = bnxt_flow_meter_enable, + .meter_disable = bnxt_flow_meter_disable, + .meter_profile_update = bnxt_flow_meter_profile_update, + .meter_dscp_table_update = NULL, + .stats_update = bnxt_flow_meter_stats_update, + .stats_read = bnxt_flow_meter_stats_read, +}; + +/** + * Get meter operations. + */ +int +bnxt_flow_meter_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg) +{ + *(const struct rte_mtr_ops **)arg = &bnxt_flow_mtr_ops; + return 0; +} diff --git a/drivers/net/bnxt/tf_ulp/meson.build b/drivers/net/bnxt/tf_ulp/meson.build index c7df7e42f1..53a34b4413 100644 --- a/drivers/net/bnxt/tf_ulp/meson.build +++ b/drivers/net/bnxt/tf_ulp/meson.build @@ -11,6 +11,7 @@ sources += files( 'bnxt_tf_pmd_shim.c', 'bnxt_ulp.c', 'bnxt_ulp_flow.c', + 'bnxt_ulp_meter.c', 'ulp_def_rules.c', 'ulp_fc_mgr.c', 'ulp_flow_db.c', diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c index 1fbfe18db3..af02f857d3 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c +++ b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c @@ -66,8 +66,8 @@ struct bnxt_ulp_rte_act_info ulp_act_info[] = { .proto_act_func = ulp_rte_port_act_handler }, [RTE_FLOW_ACTION_TYPE_METER] = { - .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED, - .proto_act_func = NULL + .act_type = BNXT_ULP_ACT_TYPE_SUPPORTED, + .proto_act_func = ulp_rte_meter_act_handler }, [RTE_FLOW_ACTION_TYPE_SECURITY] = { .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED, diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c index d7450b92ff..d64c9e4968 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c +++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c @@ -2697,6 +2697,35 @@ ulp_rte_queue_act_handler(const struct rte_flow_action *action_item, return BNXT_TF_RC_SUCCESS; } +/* Function to handle the parsing of RTE Flow action meter. */ +int32_t +ulp_rte_meter_act_handler(const struct rte_flow_action *action_item, + struct ulp_rte_parser_params *params) +{ + const struct rte_flow_action_meter *meter; + struct ulp_rte_act_prop *act_prop = ¶ms->act_prop; + uint32_t tmp_meter_id; + + if (action_item == NULL || action_item->conf == NULL) { + BNXT_TF_DBG(ERR, "Parse Err: invalid meter configuration\n"); + return BNXT_TF_RC_ERROR; + } + + meter = action_item->conf; + if (meter) { + /* validate the mtr_id and update the reference counter */ + tmp_meter_id = tfp_cpu_to_be_32(meter->mtr_id); + memcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_METER], + &tmp_meter_id, + BNXT_ULP_ACT_PROP_SZ_METER); + } + + /* set the meter action header bit */ + ULP_BITMAP_SET(params->act_bitmap.bits, BNXT_ULP_ACT_BIT_METER); + + return BNXT_TF_RC_SUCCESS; +} + /* Function to handle the parsing of RTE Flow action set mac src.*/ int32_t ulp_rte_set_mac_src_act_handler(const struct rte_flow_action *action_item, diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h index 401ce4885d..74c7170a45 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h +++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h @@ -292,4 +292,9 @@ ulp_rte_set_mac_src_act_handler(const struct rte_flow_action *action_item, int32_t ulp_rte_set_mac_dst_act_handler(const struct rte_flow_action *action_item, struct ulp_rte_parser_params *params); + +/* Function to handle the parsing of RTE Flow action meter. */ +int32_t +ulp_rte_meter_act_handler(const struct rte_flow_action *action_item, + struct ulp_rte_parser_params *params); #endif /* _ULP_RTE_PARSER_H_ */