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 F065C45B37; Mon, 14 Oct 2024 13:03:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9FAAC4067E; Mon, 14 Oct 2024 13:03:07 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by mails.dpdk.org (Postfix) with ESMTP id E4CF14027F for ; Mon, 14 Oct 2024 13:03:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728903783; x=1760439783; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FBPp+MeVNS0GE/bsxRduGHurUk342x9rEBYNmsC2fis=; b=eJCg17tjJp7McdDIY2QZvYPdhzUhonXmELIhWXg8ZvxggkvJjwd6vszk 6U2twPc8cH3XvIb85wN0nM57R7qGTnzguGhpE/fl4RmmU3lIKO4FxVtwZ FgOtnrJuPYeUfsfD6QXQ5wPkuP4IiRAjdkkRLuFo2eoiFue6nKDNxvf/l 0UF9Wal8WegoCvrfhyWyrlJ1j1pu7ewUNeVaRB7KAaCwoVcea4jzBpFQJ KkmhF1yFKlVAWDRvyiExRe+iFtOVkCMGkTcyBrgJjE3GDr9yCWooRBcdf lwnpzG+FzN7SlZiVZsb7VreuTpENQoCdWPZzziENjGrEqQLQGW/6BLcq4 Q==; X-CSE-ConnectionGUID: M106UEXdT7i2oP+vbPKxcg== X-CSE-MsgGUID: UOFyCW6AQOmcUZXgIzbZHQ== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="28340338" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="28340338" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2024 04:03:02 -0700 X-CSE-ConnectionGUID: wCyoSGiYTlKdR650VNuMEg== X-CSE-MsgGUID: OP5ECit7T2ilePmU23FzKg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,202,1725346800"; d="scan'208";a="77167113" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by fmviesa006.fm.intel.com with ESMTP; 14 Oct 2024 04:03:00 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH v2 04/10] net/ice/base: remove 255 limit on sched child nodes Date: Mon, 14 Oct 2024 12:02:08 +0100 Message-ID: <20241014110250.2314727-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014110250.2314727-1-bruce.richardson@intel.com> References: <20241011164459.1987538-1-bruce.richardson@intel.com> <20241014110250.2314727-1-bruce.richardson@intel.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 The Tx scheduler in the ice driver can be configured to have large numbers of child nodes at a given layer, but the driver code implicitly limited the number of nodes to 255 by using a u8 datatype for the number of children. Increase this to a 16-bit value throughout the code. Signed-off-by: Bruce Richardson --- drivers/net/ice/base/ice_dcb.c | 3 ++- drivers/net/ice/base/ice_sched.c | 23 +++++++++++++---------- drivers/net/ice/base/ice_type.h | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/net/ice/base/ice_dcb.c b/drivers/net/ice/base/ice_dcb.c index 4ef54613b1..e97f35b4cf 100644 --- a/drivers/net/ice/base/ice_dcb.c +++ b/drivers/net/ice/base/ice_dcb.c @@ -1585,7 +1585,8 @@ ice_update_port_tc_tree_cfg(struct ice_port_info *pi, struct ice_aqc_txsched_elem_data elem; u32 teid1, teid2; int status = 0; - u8 i, j; + u16 i; + u8 j; if (!pi) return ICE_ERR_PARAM; diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c index 373c32a518..1d6dd2af82 100644 --- a/drivers/net/ice/base/ice_sched.c +++ b/drivers/net/ice/base/ice_sched.c @@ -288,7 +288,7 @@ ice_sched_get_first_node(struct ice_port_info *pi, */ struct ice_sched_node *ice_sched_get_tc_node(struct ice_port_info *pi, u8 tc) { - u8 i; + u16 i; if (!pi || !pi->root) return NULL; @@ -311,7 +311,7 @@ void ice_free_sched_node(struct ice_port_info *pi, struct ice_sched_node *node) { struct ice_sched_node *parent; struct ice_hw *hw = pi->hw; - u8 i, j; + u16 i, j; /* Free the children before freeing up the parent node * The parent array is updated below and that shifts the nodes @@ -1503,7 +1503,7 @@ ice_sched_get_free_qgrp(struct ice_port_info *pi, struct ice_sched_node *qgrp_node, u8 owner) { struct ice_sched_node *min_qgrp; - u8 min_children; + u16 min_children; if (!qgrp_node) return qgrp_node; @@ -2063,7 +2063,7 @@ static void ice_sched_rm_agg_vsi_info(struct ice_port_info *pi, u16 vsi_handle) */ static bool ice_sched_is_leaf_node_present(struct ice_sched_node *node) { - u8 i; + u16 i; for (i = 0; i < node->num_children; i++) if (ice_sched_is_leaf_node_present(node->children[i])) @@ -2098,7 +2098,7 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner) ice_for_each_traffic_class(i) { struct ice_sched_node *vsi_node, *tc_node; - u8 j = 0; + u16 j = 0; tc_node = ice_sched_get_tc_node(pi, i); if (!tc_node) @@ -2166,7 +2166,7 @@ int ice_rm_vsi_lan_cfg(struct ice_port_info *pi, u16 vsi_handle) */ bool ice_sched_is_tree_balanced(struct ice_hw *hw, struct ice_sched_node *node) { - u8 i; + u16 i; /* start from the leaf node */ for (i = 0; i < node->num_children; i++) @@ -2240,7 +2240,8 @@ ice_sched_get_free_vsi_parent(struct ice_hw *hw, struct ice_sched_node *node, u16 *num_nodes) { u8 l = node->tx_sched_layer; - u8 vsil, i; + u8 vsil; + u16 i; vsil = ice_sched_get_vsi_layer(hw); @@ -2282,7 +2283,7 @@ ice_sched_update_parent(struct ice_sched_node *new_parent, struct ice_sched_node *node) { struct ice_sched_node *old_parent; - u8 i, j; + u16 i, j; old_parent = node->parent; @@ -2382,8 +2383,9 @@ ice_sched_move_vsi_to_agg(struct ice_port_info *pi, u16 vsi_handle, u32 agg_id, u16 num_nodes[ICE_AQC_TOPO_MAX_LEVEL_NUM] = { 0 }; u32 first_node_teid, vsi_teid; u16 num_nodes_added; - u8 aggl, vsil, i; + u8 aggl, vsil; int status; + u16 i; tc_node = ice_sched_get_tc_node(pi, tc); if (!tc_node) @@ -2498,7 +2500,8 @@ ice_move_all_vsi_to_dflt_agg(struct ice_port_info *pi, static bool ice_sched_is_agg_inuse(struct ice_port_info *pi, struct ice_sched_node *node) { - u8 vsil, i; + u8 vsil; + u16 i; vsil = ice_sched_get_vsi_layer(pi->hw); if (node->tx_sched_layer < vsil - 1) { diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h index 598a80155b..6177bf4e2a 100644 --- a/drivers/net/ice/base/ice_type.h +++ b/drivers/net/ice/base/ice_type.h @@ -1030,9 +1030,9 @@ struct ice_sched_node { struct ice_aqc_txsched_elem_data info; u32 agg_id; /* aggregator group ID */ u16 vsi_handle; + u16 num_children; u8 in_use; /* suspended or in use */ u8 tx_sched_layer; /* Logical Layer (1-9) */ - u8 num_children; u8 tc_num; u8 owner; #define ICE_SCHED_NODE_OWNER_LAN 0 -- 2.43.0