From patchwork Fri Aug 30 14:00:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sriharsha Basavapatna X-Patchwork-Id: 143491 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 CBAF0458A8; Fri, 30 Aug 2024 15:55:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 811CA42F08; Fri, 30 Aug 2024 15:55:00 +0200 (CEST) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mails.dpdk.org (Postfix) with ESMTP id 88AB542EFF for ; Fri, 30 Aug 2024 15:54:50 +0200 (CEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2053525bd90so2970525ad.0 for ; Fri, 30 Aug 2024 06:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1725026089; x=1725630889; 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=tArg9yv7U8twPa+bX8EocxgHL4ODl+NFRjf3KKg3dgg=; b=YPxw90oq6sYJXYj9Ryo4qRqJhIpeAogt2xr9+UQ3oYFCCNmXj5b3xhDSxiKVi1stcU yhDXmfSLcmLZkj84gv4MWD6kNLeTk+TYFGwvjlsvU9GT3/cPNRdwQcYD+11XnkVwCeHM 2xxbkA23f6m+8wV6WFdJuxOB85TA2yUB77n+Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725026089; x=1725630889; 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=tArg9yv7U8twPa+bX8EocxgHL4ODl+NFRjf3KKg3dgg=; b=FM1muIywCnCCY26QtEIJewFsk2tsbNf/2UgkPR5onhjvxlc8spYvcFJXJcv6A1dd/u l1DQSST8TBtwrxN8SohsoElmnX18KXdadRKn9QcZwf2N6aYKlJkszjRjfQjlHd15nFs9 8lbYQmSsbeN4siM/Kj0UqKvQnY/aRW0LF+kS1UTJsapTX9PniLOehErOfoNfYwPGfnVu LwcSl6xWZfWj2R/hX4hg5NIkVzoStBIuKuTN6zuiSUbJ0AK9DGHkQw2XQhV0PFt8IgNS 1b3hFTKzF23R9CIe1VWYY6h8yhNol0H9dwjJlQmg2phFOCutgXuCWCqizHxFcztMhuKm 2u1w== X-Gm-Message-State: AOJu0YzAE2A8Q8njeUXXMIp3JZ8zc3cpRl7n8BSBkaB55Iw7HYvJez91 QKOnvNUIhFY29p4j6Wcy5ow7AaeHBGe3hXE0l3txMr8iA2PhC6XejtokfF+sDF5I7jwnGYyIAZw U5BgJym9aGBcvTvCRQwFuWjERfUbYXPNnWOs5/Lgo4cnV6fpQkqdaARi08rbpkgvTz9Ny/eBgz+ SiGmAqeD8rxRTAf5930F9FTvi+ZM5PZzQ9taUCtbk1M17L X-Google-Smtp-Source: AGHT+IH/5TgEuqI+wSTCpYvcvxQnvztbsjj3cTTatPSatrdQ8sLysXP8a8XtAuarNJzU0wa8S3YAgQ== X-Received: by 2002:a17:902:e744:b0:202:f8e:7749 with SMTP id d9443c01a7336-2050c42dab4mr72097345ad.34.1725026089094; Fri, 30 Aug 2024 06:54:49 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 06:54:48 -0700 (PDT) From: Sriharsha Basavapatna To: dev@dpdk.org Cc: Randy Schacher , Kishore Padmanabha , Sriharsha Basavapatna Subject: [PATCH 36/47] net/bnxt: tf_ulp: add support for rss flow query to ULP Date: Fri, 30 Aug 2024 19:30:38 +0530 Message-Id: <20240830140049.1715230-37-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 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 Support flow query rss command for truflow in ULP layer. Signed-off-by: Randy Schacher Reviewed-by: Kishore Padmanabha Signed-off-by: Sriharsha Basavapatna --- drivers/net/bnxt/bnxt_vnic.c | 39 +++++++++++++- drivers/net/bnxt/bnxt_vnic.h | 6 +++ drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c | 71 +++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c index 16373be015..6b31b35715 100644 --- a/drivers/net/bnxt/bnxt_vnic.c +++ b/drivers/net/bnxt/bnxt_vnic.c @@ -30,6 +30,7 @@ ((BNXT_VNIC_BITMAP_SIZE - 1) - \ ((i) % BNXT_VNIC_BITMAP_SIZE))) & 1) +static uint16_t rss_query_queues[BNXT_VNIC_MAX_QUEUE_SIZE]; /* * VNIC Functions */ @@ -777,16 +778,21 @@ bnxt_vnic_rss_create(struct bnxt *bp, } /* hwrm_type conversion */ + vnic->hash_f = rss_info->rss_func; + vnic->rss_types = rss_info->rss_types; vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss_info->rss_types); vnic->hash_mode = bnxt_rte_to_hwrm_hash_level(bp, rss_info->rss_types, rss_info->rss_level); /* configure the key */ - if (!rss_info->key_len) + if (!rss_info->key_len) { /* If hash key has not been specified, use random hash key.*/ bnxt_prandom_bytes(vnic->rss_hash_key, HW_HASH_KEY_SIZE); - else + vnic->key_len = HW_HASH_KEY_SIZE; + } else { memcpy(vnic->rss_hash_key, rss_info->key, rss_info->key_len); + vnic->key_len = rss_info->key_len; + } /* Prepare the indirection table */ bnxt_vnic_populate_rss_table(bp, vnic); @@ -820,6 +826,35 @@ bnxt_vnic_rss_create(struct bnxt *bp, return NULL; } +void +bnxt_vnic_rss_query_info_fill(struct bnxt *bp, + struct rte_flow_action_rss *rss_conf, + uint16_t vnic_id) +{ + struct bnxt_vnic_info *vnic_info; + int idx; + + vnic_info = bnxt_vnic_queue_db_get_vnic(bp, vnic_id); + if (vnic_info == NULL) { + PMD_DRV_LOG(ERR, "lookup failed for id %d\n", vnic_id); + return; + } + + rss_conf->key_len = vnic_info->key_len; + rss_conf->key = vnic_info->rss_hash_key; + rss_conf->func = vnic_info->hash_f; + rss_conf->level = vnic_info->hash_mode; + rss_conf->types = vnic_info->rss_types; + + memset(rss_query_queues, 0, sizeof(rss_query_queues)); + for (idx = 0; idx < BNXT_VNIC_MAX_QUEUE_SIZE; idx++) + if (BNXT_VNIC_BITMAP_GET(vnic_info->queue_bitmap, idx)) { + rss_query_queues[rss_conf->queue_num] = idx; + rss_conf->queue_num += 1; + } + rss_conf->queue = (const uint16_t *)&rss_query_queues; +} + int32_t bnxt_vnic_rss_queue_status_update(struct bnxt *bp, struct bnxt_vnic_info *vnic) { diff --git a/drivers/net/bnxt/bnxt_vnic.h b/drivers/net/bnxt/bnxt_vnic.h index fe3fc4e540..c4a7c5257c 100644 --- a/drivers/net/bnxt/bnxt_vnic.h +++ b/drivers/net/bnxt/bnxt_vnic.h @@ -75,10 +75,13 @@ struct bnxt_vnic_info { bool rss_dflt_cr; uint16_t ref_cnt; uint64_t queue_bitmap[BNXT_VNIC_MAX_QUEUE_SZ_IN_64BITS]; + uint64_t rss_types; + uint32_t key_len; /**< Hash key length in bytes. */ STAILQ_HEAD(, bnxt_filter_info) filter; STAILQ_HEAD(, rte_flow) flow_list; uint8_t ring_select_mode; + enum rte_eth_hash_function hash_f; enum rte_eth_hash_function hash_f_local; uint64_t rss_types_local; uint8_t metadata_format; @@ -121,6 +124,9 @@ int32_t bnxt_vnic_queue_db_init(struct bnxt *bp); int32_t bnxt_vnic_queue_db_deinit(struct bnxt *bp); void bnxt_vnic_queue_db_update_dlft_vnic(struct bnxt *bp); +void bnxt_vnic_rss_query_info_fill(struct bnxt *bp, + struct rte_flow_action_rss *rss_conf, + uint16_t vnic_id); int32_t bnxt_vnic_rss_queue_status_update(struct bnxt *bp, struct bnxt_vnic_info *vnic); diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c index 85fb03e922..4c99c785c0 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c @@ -577,6 +577,66 @@ bnxt_ulp_flow_flush(struct rte_eth_dev *eth_dev, return ret; } +/* + * Fill the rte_flow_query_rss 'rss_conf' argument passed + * in the rte_flow_query() with the values obtained and + * accumulated locally. + * + * ctxt [in] The ulp context for the flow counter manager + * + * flow_id [in] The HW flow ID + * + * rss_conf [out] The rte_flow_query_count 'data' that is set + * + */ +static int ulp_flow_query_rss_get(struct bnxt_ulp_context *ctxt, + uint32_t flow_id, + struct rte_flow_action_rss *rss_conf) +{ + struct ulp_flow_db_res_params params; + uint32_t nxt_resource_index = 0; + bool found_cntr_resource = false; + struct bnxt *bp; + uint16_t vnic_id = 0; + int rc = 0; + + bp = bnxt_ulp_cntxt_bp_get(ctxt); + if (!bp) { + BNXT_DRV_DBG(ERR, "Failed to get bp from ulp cntxt\n"); + return -EINVAL; + } + + if (bnxt_ulp_cntxt_acquire_fdb_lock(ctxt)) { + BNXT_DRV_DBG(ERR, "Flow db lock acquire failed\n"); + return -EINVAL; + } + do { + rc = ulp_flow_db_resource_get(ctxt, + BNXT_ULP_FDB_TYPE_REGULAR, + flow_id, + &nxt_resource_index, + ¶ms); + if (params.resource_func == + BNXT_ULP_RESOURCE_FUNC_VNIC_TABLE && + (params.resource_sub_type == + BNXT_ULP_RESOURCE_SUB_TYPE_VNIC_TABLE_RSS || + params.resource_sub_type == + BNXT_ULP_RESOURCE_SUB_TYPE_VNIC_TABLE_QUEUE)) { + vnic_id = params.resource_hndl; + found_cntr_resource = true; + break; + } + + } while (!rc && nxt_resource_index); + + if (found_cntr_resource) + bnxt_vnic_rss_query_info_fill(bp, rss_conf, vnic_id); + + bnxt_ulp_cntxt_release_fdb_lock(ctxt); + + return rc; +} + /* Function to query the rte flows. */ static int32_t bnxt_ulp_flow_query(struct rte_eth_dev *eth_dev, @@ -587,6 +647,7 @@ bnxt_ulp_flow_query(struct rte_eth_dev *eth_dev, { int rc = 0; struct bnxt_ulp_context *ulp_ctx; + struct rte_flow_action_rss *rss_conf; struct rte_flow_query_count *count; uint32_t flow_id; @@ -602,6 +663,16 @@ bnxt_ulp_flow_query(struct rte_eth_dev *eth_dev, flow_id = (uint32_t)(uintptr_t)flow; switch (action->type) { + case RTE_FLOW_ACTION_TYPE_RSS: + rss_conf = (struct rte_flow_action_rss *)data; + rc = ulp_flow_query_rss_get(ulp_ctx, flow_id, rss_conf); + if (rc) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "Failed to query RSS info."); + } + + break; case RTE_FLOW_ACTION_TYPE_COUNT: count = data; rc = ulp_fc_mgr_query_count_get(ulp_ctx, flow_id, count);