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 A955A45A76; Tue, 1 Oct 2024 07:54:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 967EA40A7D; Tue, 1 Oct 2024 07:53:29 +0200 (CEST) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mails.dpdk.org (Postfix) with ESMTP id 7073340A7F for ; Tue, 1 Oct 2024 07:53:28 +0200 (CEST) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-70b2421471aso3173838a12.0 for ; Mon, 30 Sep 2024 22:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1727762007; x=1728366807; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CJiEHOyqM4yszsYxRDCqc/r3vQRXfGraGVA9WiYkmeQ=; b=DpSWarQq2iC2JEUIt2dw4Sbk3Jl0M5q4XFtceUt3mrCXgBGux6H3/Vd5NmyBOApbRn KF9/DlNQn+pTwbYj+sl6A37XhXX9ecYik67+zBX1g+jzjw7aGlwMsanvqUf6muVLuIyo VMbNhBqlXYyGDB/oyuHbOoT9/QfccEJSdfwSg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727762007; x=1728366807; h=content-transfer-encoding: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=CJiEHOyqM4yszsYxRDCqc/r3vQRXfGraGVA9WiYkmeQ=; b=F/xdOcio8x3HZIxv4zjcaSKyobgYy0QZ2g8qbwvpiBWmJIFNAyUxUV5yvzL5XBJQny itxjtxWvBKxl16qL4Fg50r1vAaQXnexZd/tYF1pBYZNz0x8bJlopJeNTxxJanv+JIFiA ELBc9pDkZcePKpnIVIEfWJusrn5IHyQoAM2yoUeBE4V/KL4JYDZwg5Pof3MZFcrmbULp jHEDnZ+9Q63mrIfp/ckrNYoLZHBj0a6fHTLsCl/kmhOw+BUHnoygMQGwE/pJ2Pwo33Ht Q+M4mbSBXP6/LYevEEKRGmaEQcSBctCC5PNpbXbCpthUE7f5Hx0dx1/YeOeacqEvigM8 4M5A== X-Gm-Message-State: AOJu0YxUsCvtY5PEusp9haJv5XzHznBvqjwlbXYwTwbYBIePPjl7gk97 aqS/r0u1rQQtTdOMq35m/PEExFMCuXexNnhrf9pt8V76NXj7WSVN4pGEwkYNOk19cjDeWVLYNOh CFVxK1gsusNw9k1uW3vg46CE0LC9LPBEK2Z1pfbFUxqqpjZ6qLBgrf6zYYG8Qsr6dPRD7Bw/qey zRfDsKbwSICEmAiwc6LmPoozK8VloxKi0BS3bn78HsmA== X-Google-Smtp-Source: AGHT+IGoK0/qvGC0hyk35B89GwFLsUY+8grb5CmLQuY1VE2qdXLgwifXQS+c6hshQtJaXmhua4a+TQ== X-Received: by 2002:a05:6a21:174b:b0:1c4:a1f4:3490 with SMTP id adf61e73a8af0-1d4fa7ae379mr17907346637.39.1727762007061; Mon, 30 Sep 2024 22:53:27 -0700 (PDT) Received: from dhcp-10-123-154-23.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7e6db2c8af2sm7513792a12.48.2024.09.30.22.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 22:53:26 -0700 (PDT) From: Sriharsha Basavapatna To: dev@dpdk.org Cc: Shuanglin Wang , Sriharsha Basavapatna , Kishore Padmanabha , Ajit Khaparde Subject: [PATCH v3 42/47] net/bnxt: tf_ulp: TFC support flow scale query for Thor2 Date: Tue, 1 Oct 2024 11:28:28 +0530 Message-Id: <20241001055833.757163-43-sriharsha.basavapatna@broadcom.com> X-Mailer: git-send-email 2.39.0.189.g4dbebc36b0 In-Reply-To: <20241001055833.757163-1-sriharsha.basavapatna@broadcom.com> References: <20241001055833.757163-1-sriharsha.basavapatna@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Shuanglin Wang TFC supports the flow scale query feature for OVS application. The resource usage(WC-TCAM) is tracked inside Thor2 firmware. This patch is to query the wc-tcam usage info when adding/ deleting a flow. It is just for debugging purpose and disabled by default. Using the build flag -DTF_FLOW_SCALE_QUERY to enable it. And users should use niccli to query the resource usage. Signed-off-by: Shuanglin Wang Signed-off-by: Sriharsha Basavapatna Reviewed-by: Kishore Padmanabha Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c | 6 ++++++ drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 9 +++++---- drivers/net/bnxt/tf_ulp/ulp_mapper.c | 26 ++++++++++++++++++++++++-- drivers/net/bnxt/tf_ulp/ulp_mapper.h | 5 +++++ 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c index 9c9e206285..31ab61b512 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c @@ -34,6 +34,7 @@ #include "ulp_ha_mgr.h" #include "bnxt_tf_pmd_shim.h" #include "ulp_template_db_tbl.h" +#include "tfc_resources.h" /* define to enable shared table scope */ #define TFC_SHARED_TBL_SCOPE_ENABLE 0 @@ -1052,6 +1053,11 @@ ulp_tfc_init(struct bnxt *bp, } } +#ifdef TF_FLOW_SCALE_QUERY + /* Query resource statstics from firmware */ + tfc_resc_usage_query_all(bp); +#endif /* TF_FLOW_SCALE_QUERY */ + BNXT_DRV_DBG(DEBUG, "ulp ctx has been initialized\n"); return rc; diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c index 341c8c2dfe..8984808b67 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c +++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c @@ -15,6 +15,7 @@ #include "ulp_tun.h" #ifdef TF_FLOW_SCALE_QUERY #include "tf_resources.h" +#include "tfc_resources.h" #endif /* TF_FLOW_SCALE_QUERY */ #define ULP_FLOW_DB_RES_DIR_BIT 31 @@ -963,11 +964,12 @@ ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx, #ifdef TF_FLOW_SCALE_QUERY tf_resc_pause_usage_update(); #endif + while (!ulp_flow_db_next_entry_get(flow_db, flow_type, &fid)) ulp_mapper_resources_free(ulp_ctx, flow_type, fid, NULL); + #ifdef TF_FLOW_SCALE_QUERY - tf_resc_resume_usage_update(); - tf_resc_usage_update_all(ulp_ctx->bp); + ulp_resc_usage_sync(ulp_ctx); #endif bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx); @@ -1017,8 +1019,7 @@ ulp_flow_db_function_flow_flush(struct bnxt_ulp_context *ulp_ctx, NULL); } #ifdef TF_FLOW_SCALE_QUERY - tf_resc_resume_usage_update(); - tf_resc_usage_update_all(ulp_ctx->bp); + ulp_resc_usage_sync(ulp_ctx); #endif bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx); return 0; diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c index 5dfe72df17..c595e7cfc3 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c +++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c @@ -24,6 +24,7 @@ #include "bnxt_tf_pmd_shim.h" #ifdef TF_FLOW_SCALE_QUERY #include "tf_resources.h" +#include "tfc_resources.h" #endif /* TF_FLOW_SCALE_QUERY */ static uint8_t mapper_fld_zeros[16] = { 0 }; @@ -4322,7 +4323,7 @@ ulp_mapper_resources_free(struct bnxt_ulp_context *ulp_ctx, #ifdef TF_FLOW_SCALE_QUERY /* update for regular flows only */ if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR) - tf_resc_usage_update_all(ulp_ctx->bp); + ulp_resc_usage_sync(ulp_ctx); #endif /* TF_FLOW_SCALE_QUERY */ return frc; @@ -4475,7 +4476,7 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx, } #ifdef TF_FLOW_SCALE_QUERY - tf_resc_usage_update_all(ulp_ctx->bp); + ulp_resc_usage_sync(ulp_ctx); #endif /* TF_FLOW_SCALE_QUERY */ return rc; @@ -4514,6 +4515,27 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx, return rc; } +#ifdef TF_FLOW_SCALE_QUERY +/* Sync resource usage state with firmware */ +int ulp_resc_usage_sync(struct bnxt_ulp_context *ulp_ctx) +{ + uint32_t dev_id; + if (unlikely(bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id))) { + BNXT_DRV_DBG(ERR, "Invalid ulp context\n"); + return -EINVAL; + } + + if (dev_id == BNXT_ULP_DEVICE_ID_THOR) { + tf_resc_resume_usage_update(); + tf_resc_usage_update_all(ulp_ctx->bp); + } else if (dev_id == BNXT_ULP_DEVICE_ID_THOR2) { + tfc_resc_usage_query_all(ulp_ctx->bp); + } + + return 0; +} +#endif /* TF_FLOW_SCALE_QUERY */ + int32_t ulp_mapper_init(struct bnxt_ulp_context *ulp_ctx) { diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.h b/drivers/net/bnxt/tf_ulp/ulp_mapper.h index 0f43e2a8b5..d2fc716232 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_mapper.h +++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.h @@ -302,4 +302,9 @@ ulp_mapper_init(struct bnxt_ulp_context *ulp_ctx); void ulp_mapper_deinit(struct bnxt_ulp_context *ulp_ctx); +#ifdef TF_FLOW_SCALE_QUERY +int32_t +ulp_resc_usage_sync(struct bnxt_ulp_context *ulp_ctx); +#endif /* TF_FLOW_SCALE_QUERY */ + #endif /* _ULP_MAPPER_H_ */ -- 2.39.3