From patchwork Wed Aug 7 09:47:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 142995 X-Patchwork-Delegate: bruce.richardson@intel.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 C5CEC4575B; Wed, 7 Aug 2024 11:48:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AFEEB42792; Wed, 7 Aug 2024 11:47:27 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by mails.dpdk.org (Postfix) with ESMTP id 5537742793 for ; Wed, 7 Aug 2024 11:47:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723024042; x=1754560042; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jxdVXmPVYhO2u0GalZkvq+G7NSjyrBI6pORRv1zrw1g=; b=G+CvoQU8rR0RdslifBn3lt1WsYWQvtOjXVZlj8QLg2XUWqKzbAVmEfD6 CgiILbC/1AjpYk3Q1qZ1UVGleT4QpVxde+y8M4po0mbVyIw9xCnd7GXyH jFuhoWhzI3J43KmxdMo8pwtFXZTkPfQAKlAmJC3cus7hHNeTtoppVVqb0 fQQZWTYO3MqSWhc7CxhIPDUuBSHxZbon2POcaTfGUWZDsyR+JkR1H1Xp1 YI2KLYcTBrYuWxajowxgVk6PZq0ow+rU2gWTNf0LxeQEb74AIXnBm6QDD bAvFAsYVUn/vOHMMLRae57ANJsE4hyaYoFa85VBkkN2vgiQ0h7oqyWkmQ Q==; X-CSE-ConnectionGUID: uzjscjmHTK+eSuyUMu9XhQ== X-CSE-MsgGUID: 5ACALUiFQPaYXtJdTEVHzA== X-IronPort-AV: E=McAfee;i="6700,10204,11156"; a="21257944" X-IronPort-AV: E=Sophos;i="6.09,269,1716274800"; d="scan'208";a="21257944" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2024 02:47:21 -0700 X-CSE-ConnectionGUID: 6iH+HqFNR3aa0r5FbagvKg== X-CSE-MsgGUID: Tgf1nuU4Tv+Ut3KCXBSrOQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,269,1716274800"; d="scan'208";a="87467389" Received: from silpixa00400562.ir.intel.com (HELO silpixa00401385.ir.intel.com) ([10.237.214.39]) by orviesa002.jf.intel.com with ESMTP; 07 Aug 2024 02:47:20 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH v2 09/15] net/ice/base: remove 255 limit on sched child nodes Date: Wed, 7 Aug 2024 10:47:00 +0100 Message-ID: <20240807094706.459822-10-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240807094706.459822-1-bruce.richardson@intel.com> References: <20240807093407.452784-1-bruce.richardson@intel.com> <20240807094706.459822-1-bruce.richardson@intel.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 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_sched.c | 25 ++++++++++++++----------- drivers/net/ice/base/ice_type.h | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c index e398984bf2..be13833e1e 100644 --- a/drivers/net/ice/base/ice_sched.c +++ b/drivers/net/ice/base/ice_sched.c @@ -289,7 +289,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; @@ -316,7 +316,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 @@ -1473,7 +1473,7 @@ bool ice_sched_find_node_in_subtree(struct ice_hw *hw, struct ice_sched_node *base, struct ice_sched_node *node) { - u8 i; + u16 i; for (i = 0; i < base->num_children; i++) { struct ice_sched_node *child = base->children[i]; @@ -1510,7 +1510,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; @@ -2070,7 +2070,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])) @@ -2105,7 +2105,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) @@ -2173,7 +2173,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++) @@ -2247,7 +2247,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); @@ -2289,7 +2290,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; @@ -2389,7 +2390,8 @@ 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; + u16 i; int status; tc_node = ice_sched_get_tc_node(pi, tc); @@ -2505,7 +2507,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 a70e4a8afa..35f832eb9f 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