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 1200B45B90; Mon, 21 Oct 2024 10:20:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5EE8240B8C; Mon, 21 Oct 2024 10:19:46 +0200 (CEST) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mails.dpdk.org (Postfix) with ESMTP id E0F99406BB for ; Mon, 21 Oct 2024 10:19:44 +0200 (CEST) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-7ea80863f12so1741111a12.1 for ; Mon, 21 Oct 2024 01:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1729498784; x=1730103584; 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=N4e/jnahHHe7OjDlOIDlSiXXfDmOcV2HR1LFu9wk0GU=; b=E49CWLaXDboUdncHzyN5OPN4IqMKbvTkP46tDXYSyLCKGShWkh9pvlKYLE3AyrJqdo TMDV2ZFf/KQ/OryhOco9ypD4K8u5SHSEBz8G+WIwBx+EE85hityuJaWzTlwsV/UESNN1 TKW4t3AVXpprA/BYkNAJtB+fX+QEYeVjErNhU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729498784; x=1730103584; 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=N4e/jnahHHe7OjDlOIDlSiXXfDmOcV2HR1LFu9wk0GU=; b=iZm5vF+Aa/kUHx3iYtH7ez42sCBF4TTXWu5yRQgfHB0cxyv4Zr/9h4toi7pEyYNS2q KuzJl6F1Z5I47u5Pndm+5AzVhZlw+Khnf0NjXQq+1OlKXlPrs4is9VsCSjAUvUg0c7nP RZ8YuM0cFyD6t9WFcomtFpF5oJD0Fi9yM0jIaOb8EF0d0cNmSYxjFyqPDQKZ0LmIwvhf ll7ojIDL1NDLo+cHV2dqyssoo6pPo5kPKiy+ltVYfB8TEoHy4fxTvLSiRmNX9SxSsfYp bHwKC1VGAE9TKARcj4ll46kyp5rSF1E9gaITwDJ8QumExczvnDmh3Txe0bInd2S5fPdG bs1A== X-Gm-Message-State: AOJu0YxfTrM566wwzA5d/aBclRLEjXHczqLyf56ffiTA7S2G/OdkfqLj ArhUv4pLFLnlAbTZrkFSwPpwp8oVaVif2S6w+oHfSRRoHR3RZZ/bz/ydX3xCNv0+j/PFOunGFXm TTiuTtHX1837WYth1CdRuKfoGAafLKzQSZqr+8LGYcgq421L2PnlsJqjXmV/zbwaXwTVEIoVpVD YrhPaG4gjvbR7wB2Z04tMsBWw/A4Vhp58x/vk4iqkkbA== X-Google-Smtp-Source: AGHT+IGO+f+EssUWh3Hhaiif8PmywdtqrRlr7WO/EnnICLXpgjaXBGAE/aoLMAAIy/0fZLedOVaUrg== X-Received: by 2002:a05:6a21:a4c1:b0:1d8:d6b6:94c6 with SMTP id adf61e73a8af0-1d92c4ad359mr16986141637.2.1729498783388; Mon, 21 Oct 2024 01:19:43 -0700 (PDT) Received: from dhcp-10-123-154-23.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ec1313926sm2291631b3a.4.2024.10.21.01.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2024 01:19:42 -0700 (PDT) From: Sriharsha Basavapatna To: dev@dpdk.org Cc: Shuanglin Wang , Sriharsha Basavapatna , Kishore Padmanabha , Ajit Khaparde Subject: [PATCH v6 42/47] net/bnxt: tf_ulp: TFC support flow scale query for Thor2 Date: Mon, 21 Oct 2024 13:56:02 +0530 Message-Id: <20241021082607.232829-43-sriharsha.basavapatna@broadcom.com> X-Mailer: git-send-email 2.39.0.189.g4dbebc36b0 In-Reply-To: <20241021082607.232829-1-sriharsha.basavapatna@broadcom.com> References: <20241021082607.232829-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 d30339393e..ebbc5a85a9 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 @@ -1053,6 +1054,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