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 55B77459FD; Fri, 27 Sep 2024 20:04:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DF34A40647; Fri, 27 Sep 2024 20:03:29 +0200 (CEST) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mails.dpdk.org (Postfix) with ESMTP id 4391540647 for ; Fri, 27 Sep 2024 20:03:28 +0200 (CEST) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-206aee4073cso27111225ad.1 for ; Fri, 27 Sep 2024 11:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1727460207; x=1728065007; 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=edKY3wk4+rBJ60X7VBhS4YI0+NGfvNRj+MGn4KGqP44Y2hstlXsMSo9YdNp4bpwISR OEV2/U3fXTxKg8BEPF2tbiFaS8+GOuPfvQxcdGmuOsmjedR9YHpBKg1gY5pBjMMuw7zl 6j+yxwaCeDJ1/nQNmc+0wYUELMltvotcNdp0I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727460207; x=1728065007; 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=SH244FPVTiQfGrmBt85XDFC/hakMuW/Ou0GmUAPLgWn+W2hl869NPYI+fCcQ4BcQhJ GCGe8tjJCn94rzZit3io5XXXmEvSeFoOiT7+At5MWavs4704ynVhsZNhp54mAh3SA2Gh mik2b0L6fHK0tyagW57OkfULhoIVawNe2ajSY0XD6PghvD18T3VCht3nZdc0Fhisqf+Y Ch1mCZPoFopHElu6junGKZjhwDJukdlYRcJY+Uv7JxlnvdNlg8SNz4nojuoC46zafik5 PaB5xmWnohb18d4H8IIrr2KNdxfDpMcaee1ts+xOv4DS4dClIpwcrIVLFGVL3WgMK4Cu LPKw== X-Gm-Message-State: AOJu0Yw2Ki9Bmod56nf0mVD6zREip6WNdOArRBP0R6klDG+g1asGPo+z TiG58N1Kyz0Wfb73wr+GnGrmsqKbr4AJO2ovsQddDdhpmQfA6BgoMAefmY9Yxhz9v6lvSGXXHLL Yr/2gdUH+3u6Y9Adu3pPSCTk2NJM7gkzEnLBW0hY0/VhgX/zLFbz5Q55x1Y2EPOI3KC+Pp80igo w+z7X8edwz1PbHCpX5Yf5Ul5W5ikJVPT69aMTXJkn4eg== X-Google-Smtp-Source: AGHT+IFRoXGTorOjhJiPNlutPFyPp7o+zhk41KdR3ZxQm8HLE2vcquM6avdzoOyhap4LuLwri0GRyA== X-Received: by 2002:a17:903:22c9:b0:20b:4348:da58 with SMTP id d9443c01a7336-20b4348dd94mr43691735ad.54.1727460206923; Fri, 27 Sep 2024 11:03:26 -0700 (PDT) Received: from dhcp-10-123-154-23.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20b37e4e4desm16198945ad.251.2024.09.27.11.03.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2024 11:03:26 -0700 (PDT) From: Sriharsha Basavapatna To: dev@dpdk.org Cc: Shuanglin Wang , Sriharsha Basavapatna , Kishore Padmanabha , Ajit Khaparde Subject: [PATCH v2 42/47] net/bnxt: tf_ulp: TFC support flow scale query for Thor2 Date: Fri, 27 Sep 2024 23:38:24 +0530 Message-Id: <20240927180829.525350-43-sriharsha.basavapatna@broadcom.com> X-Mailer: git-send-email 2.39.0.189.g4dbebc36b0 In-Reply-To: <20240927180829.525350-1-sriharsha.basavapatna@broadcom.com> References: <20240927180829.525350-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