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 4DFAF458A8; Fri, 30 Aug 2024 15:54:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E33F342EDB; Fri, 30 Aug 2024 15:54:08 +0200 (CEST) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mails.dpdk.org (Postfix) with ESMTP id A99FA42EDA for ; Fri, 30 Aug 2024 15:54:06 +0200 (CEST) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-715abede256so1391916b3a.3 for ; Fri, 30 Aug 2024 06:54:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1725026045; x=1725630845; 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=8hiUaiPq29zHFZyKAiCEYh/QyBeLIjXGqeh4zfWZV9s=; b=Q5mun6I+enKUffjHRDitHZJq5ld39FsPqTeJe0jlSJWIh/Y3PJQJUozMw7ssZsEKo7 I7VUTqZfJj70Bmv0eN3nW5T87fA9oVLTeJEu4Wu2TDbv4s9ENq0NU2DstfTs/t76gwjI iyIjm2cs66PHFljuBxRnoS/pUOz35vOv5CU2E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725026045; x=1725630845; 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=8hiUaiPq29zHFZyKAiCEYh/QyBeLIjXGqeh4zfWZV9s=; b=Gz/drBRR/wzz9O4dZ8LXoI+HLbOVoxZ5YaZGfCYS0N6oebAQty5NqMeByEL1k4v8AA sR9PhkEZwXYLN0hnw9Z8F4RmpuHQP4Blgh8stEbKYSrhS2KL7N4nc+szAK5eYqr7czUQ 4sSZeWmT9+R+yuG4Al4RI6EpPL4uDOnzgxeasHk5tYAyddf7sz11ergkfAPuqZYTdg5E FlnVOAvKBwG63/+8GgVWzFAlGhJsqWGQnNKQDwfx///NOwHf8cpJLpQevvkmW9UD82Fy qYPRguTNkkmrEPIIBPXSUxvlmAwu+CfLAfT8lcY8tB8k/EMGJ15Qr8sfLmWb6H9cYSPy zghA== X-Gm-Message-State: AOJu0YwU/kBpaW9O1W6RadwtdEWQaJxUimsM38ouA3m+cl8qSSmFYIiV NMBkyUR3OX7UGZjsBUZk0K5Lt31FS2ozivBqZcAhFIQC6gjUMGOYwBU2q7XA0u7y29PSCyYHqj8 +P8nIqSRXgws2zYXWitEJQEKkNT27sdgHummEgjP8/H5xgBjISQWilWdj5HITL6YoGafQwRQnQI hcHdjnAvto8FgvVTxZu75HHCrEShudwRil8LokLZmMqwR3 X-Google-Smtp-Source: AGHT+IGzOhUQY4s0C5k352yHbqRHDhSRqqtcdoLM18V4iFDPO5olTxHK58/sPdxG6rCsT18e1S4XXA== X-Received: by 2002:a17:902:d2c8:b0:201:db69:2d16 with SMTP id d9443c01a7336-2050c40df88mr67247465ad.47.1725026045166; Fri, 30 Aug 2024 06:54:05 -0700 (PDT) Received: from dhcp-10-123-154-23.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-205155658dfsm27067145ad.297.2024.08.30.06.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 06:54:04 -0700 (PDT) From: Sriharsha Basavapatna To: dev@dpdk.org Cc: Kishore Padmanabha , Shuanglin Wang , Michael Baucom , Sriharsha Basavapatna Subject: [PATCH 27/47] net/bnxt: tf_ulp: fixed parent child db counters Date: Fri, 30 Aug 2024 19:30:29 +0530 Message-Id: <20240830140049.1715230-28-sriharsha.basavapatna@broadcom.com> X-Mailer: git-send-email 2.39.0.189.g4dbebc36b0 In-Reply-To: <20240830140049.1715230-1-sriharsha.basavapatna@broadcom.com> References: <20240830140049.1715230-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: Kishore Padmanabha The locking for the parent child counters need to be done till the stats are retrieved. Also the OVS is creating multiple F1 flows for same tunnel hence reference count needs to be maintined for the F1 flows. Fix name conflicts for class and action tables. Matcher allocates hash tables for class and action entries. These tables should have different names for each port. Signed-off-by: Kishore Padmanabha Signed-off-by: Shuanglin Wang Reviewed-by: Michael Baucom Signed-off-by: Sriharsha Basavapatna --- drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c | 37 +++++++++++++++++---------- drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 22 ++++++++++------ drivers/net/bnxt/tf_ulp/ulp_flow_db.h | 2 ++ drivers/net/bnxt/tf_ulp/ulp_matcher.c | 12 +++++++-- 4 files changed, 50 insertions(+), 23 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c index b880b545da..0c46c7d4c9 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c +++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c @@ -563,23 +563,29 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context *ctxt, } while (!rc && nxt_resource_index); - bnxt_ulp_cntxt_release_fdb_lock(ctxt); - - if (rc || !found_cntr_resource) + if (rc || !found_cntr_resource) { + bnxt_ulp_cntxt_release_fdb_lock(ctxt); return rc; + } dir = params.direction; - if (!(ulp_fc_info->flags & ULP_FLAG_FC_SW_AGG_EN)) - return fc_ops->ulp_flow_stat_get(ctxt, dir, - params.resource_hndl, count); + if (!(ulp_fc_info->flags & ULP_FLAG_FC_SW_AGG_EN)) { + rc = fc_ops->ulp_flow_stat_get(ctxt, dir, + params.resource_hndl, count); + bnxt_ulp_cntxt_release_fdb_lock(ctxt); + return rc; + } if (!found_parent_flow && params.resource_sub_type == BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT) { hw_cntr_id = params.resource_hndl; - if (!ulp_fc_info->num_counters) - return fc_ops->ulp_flow_stat_get(ctxt, dir, - hw_cntr_id, count); + if (!ulp_fc_info->num_counters) { + rc = fc_ops->ulp_flow_stat_get(ctxt, dir, + hw_cntr_id, count); + bnxt_ulp_cntxt_release_fdb_lock(ctxt); + return rc; + } /* TODO: * Think about optimizing with try_lock later @@ -603,9 +609,14 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context *ctxt, params.resource_sub_type == BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT) { /* Get stats from the parent child table */ - ulp_flow_db_parent_flow_count_get(ctxt, pc_idx, - &count->hits, &count->bytes, - count->reset); + if (ulp_flow_db_parent_flow_count_get(ctxt, flow_id, + pc_idx, + &count->hits, + &count->bytes, + count->reset)) { + bnxt_ulp_cntxt_release_fdb_lock(ctxt); + return -EIO; + } if (count->hits) count->hits_set = 1; if (count->bytes) @@ -613,7 +624,7 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context *ctxt, } else { rc = -EINVAL; } - + bnxt_ulp_cntxt_release_fdb_lock(ctxt); 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 099ae7adc8..679dab0f17 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c +++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c @@ -836,7 +836,6 @@ ulp_flow_db_fid_free(struct bnxt_ulp_context *ulp_ctxt, #ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG BNXT_DRV_DBG(DEBUG, "flow_id = %u:%u freed\n", flow_type, fid); #endif - /* all good, return success */ return 0; } @@ -1383,13 +1382,12 @@ ulp_flow_db_pc_db_parent_flow_set(struct bnxt_ulp_context *ulp_ctxt, if (set_flag) { pc_entry->parent_fid = parent_fid; + pc_entry->parent_ref_cnt++; } else { - if (pc_entry->parent_fid != parent_fid) - BNXT_DRV_DBG(ERR, "Panic: invalid parent id\n"); - pc_entry->parent_fid = 0; - + if (pc_entry->parent_ref_cnt > 0) + pc_entry->parent_ref_cnt--; /* Free the parent child db entry if no user present */ - if (!pc_entry->f2_cnt) + if (!pc_entry->parent_ref_cnt && !pc_entry->f2_cnt) ulp_flow_db_pc_db_entry_free(ulp_ctxt, pc_entry); } return 0; @@ -1444,7 +1442,7 @@ ulp_flow_db_pc_db_child_flow_set(struct bnxt_ulp_context *ulp_ctxt, ULP_INDEX_BITMAP_RESET(t[a_idx], child_fid); if (pc_entry->f2_cnt) pc_entry->f2_cnt--; - if (!pc_entry->f2_cnt && !pc_entry->parent_fid) + if (!pc_entry->f2_cnt && !pc_entry->parent_ref_cnt) ulp_flow_db_pc_db_entry_free(ulp_ctxt, pc_entry); } return 0; @@ -1536,7 +1534,7 @@ ulp_flow_db_parent_flow_count_accum_set(struct bnxt_ulp_context *ulp_ctxt, /* check for parent idx validity */ p_pdb = &flow_db->parent_child_db; if (pc_idx >= p_pdb->entries_count || - !p_pdb->parent_flow_tbl[pc_idx].parent_fid) { + !p_pdb->parent_flow_tbl[pc_idx].parent_ref_cnt) { BNXT_DRV_DBG(ERR, "Invalid parent child index %x\n", pc_idx); return -EINVAL; } @@ -1784,6 +1782,7 @@ ulp_flow_db_parent_flow_count_update(struct bnxt_ulp_context *ulp_ctxt, */ int32_t ulp_flow_db_parent_flow_count_get(struct bnxt_ulp_context *ulp_ctxt, + uint32_t flow_id, uint32_t pc_idx, uint64_t *packet_count, uint64_t *byte_count, uint8_t count_reset) { @@ -1796,6 +1795,13 @@ ulp_flow_db_parent_flow_count_get(struct bnxt_ulp_context *ulp_ctxt, return -EINVAL; } + /* stale parent fid */ + if (flow_id != pc_entry->parent_fid) { + *packet_count = 0; + *byte_count = 0; + return 0; + } + if (pc_entry->counter_acc) { *packet_count = pc_entry->pkt_count; *byte_count = pc_entry->byte_count; diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h index 39810c81c4..5a4b5a1ebf 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h +++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h @@ -63,6 +63,7 @@ struct bnxt_ulp_flow_tbl { struct ulp_fdb_parent_info { uint32_t valid; uint32_t parent_fid; + uint32_t parent_ref_cnt; uint32_t counter_acc; uint64_t pkt_count; uint64_t byte_count; @@ -389,6 +390,7 @@ ulp_flow_db_parent_flow_count_update(struct bnxt_ulp_context *ulp_ctxt, */ int32_t ulp_flow_db_parent_flow_count_get(struct bnxt_ulp_context *ulp_ctxt, + uint32_t flow_id, uint32_t pc_idx, uint64_t *packet_count, uint64_t *byte_count, diff --git a/drivers/net/bnxt/tf_ulp/ulp_matcher.c b/drivers/net/bnxt/tf_ulp/ulp_matcher.c index 2284fb6423..9e0a9458e7 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_matcher.c +++ b/drivers/net/bnxt/tf_ulp/ulp_matcher.c @@ -327,9 +327,17 @@ ulp_matcher_action_match(struct ulp_rte_parser_params *params, int32_t ulp_matcher_init(struct bnxt_ulp_context *ulp_ctx) { struct rte_hash_parameters hash_tbl_params = {0}; - char hash_class_tbl_name[64] = "bnxt_ulp_class_matcher"; - char hash_act_tbl_name[64] = "bnxt_ulp_act_matcher"; + char hash_class_tbl_name[64] = {0}; + char hash_act_tbl_name[64] = {0}; struct bnxt_ulp_matcher_data *data; + uint16_t port_id; + + /* append port_id to the buffer name */ + port_id = ulp_ctx->bp->eth_dev->data->port_id; + snprintf(hash_class_tbl_name, sizeof(hash_class_tbl_name), + "bnxt_ulp_class_matcher_%d", port_id); + snprintf(hash_act_tbl_name, sizeof(hash_act_tbl_name), + "bnxt_ulp_act_matcher_%d", port_id); data = rte_zmalloc("bnxt_ulp_matcher_data", sizeof(struct bnxt_ulp_matcher_data), 0); -- 2.39.3