From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 759F4235 for ; Tue, 21 Nov 2017 14:28:25 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 1E74020AFD; Tue, 21 Nov 2017 08:28:25 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:28:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=eLZglFBV2c1RNerjC rcWPRE/BKGZKyJsZMfgKtot5VE=; b=VE3ncyp7VLEDYqs0587M52g0oW7madMmL dGSDPSxYNWuztWlUaYpg0iPZ88fWTyd41IMKs5GR2sDtXc2Kk5vuU/qwDinlkNuH Cie7WvxicnUfgV8EsFH8f1i/mjMeexieAGGyyG1Dm7DGTT6nrQRc4smO+lmfvVdF HT7G9V4N/mgGoKrwEuXldTrVzIXmhVr9ehka53HuJmvDaRUWoTY+TPm2g4AN86eB mMxHkWEN5gX9EccdGhnpiUPQc3lJ6tljQKygl3qR0IlLZoX2aeibxYiN2DfA9lFk mFbGDN3za0DAojBjID++EPW9TmIM/zU0SroaleN9RH1yqVbWT/58w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=eLZglFBV2c1RNerjCrcWPRE/BKGZKyJsZMfgKtot5VE=; b=hDa6hIsM lmv2C6XoGggSNVpg2aT0t5eZfDswSjqHkVacRlVieQxIGoe2AuJRNWWGybkpgC92 3MQtnvMnszgXWKNrob4hx5v6mc5Z3V/yvCx1dcE2k9uDQUszi0+mMAuUmNNkr0Nl Z5Y6j2F/nrqZxs/CokshrpCz6CyEdsWVH0q5ZkZJueQtpsS7GrESA6703fqzurw/ VdmxZgeYcfUANCiAbdLKvPpWCbMENniq8awROax2LyxRNoT475JEKiL+vw8FOsdF jEWkMNCP4c7dlzmExzGCGx0IhwmdMTTQCm3RGmba1SXTnjaOOq7AeykhGlyjUPWX Yi4RXOrgb4ezUA== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 6134624810; Tue, 21 Nov 2017 08:28:21 -0500 (EST) From: Yuanhan Liu To: Wenzhuo Lu Cc: dpdk stable Date: Tue, 21 Nov 2017 21:18:04 +0800 Message-Id: <1511270333-31002-142-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/ixgbe: fix TM level capability getting' has been queued to stable release 17.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2017 13:28:25 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From a0c7813525be0c630e058ca58fbbb2f8847650d9 Mon Sep 17 00:00:00 2001 From: Wenzhuo Lu Date: Tue, 17 Oct 2017 13:50:37 +0800 Subject: [PATCH] net/ixgbe: fix TM level capability getting [ upstream commit 7039bcacb9abb6faa2f16c63fdbf52ca4f1a707e ] Only queue nodes should be taken as leaf nodes, all the other nodes are non-leaf nodes. Correct it when getting the TM level capability. Fixes: 596988e193f7 ("net/ixgbe: support getting TM level capability") Signed-off-by: Wenzhuo Lu --- drivers/net/ixgbe/ixgbe_tm.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_tm.c b/drivers/net/ixgbe/ixgbe_tm.c index e7d8d39..5c9b24c 100644 --- a/drivers/net/ixgbe/ixgbe_tm.c +++ b/drivers/net/ixgbe/ixgbe_tm.c @@ -876,15 +876,34 @@ ixgbe_level_capabilities_get(struct rte_eth_dev *dev, cap->n_nodes_max = 1; cap->n_nodes_nonleaf_max = 1; cap->n_nodes_leaf_max = 0; - cap->non_leaf_nodes_identical = true; - cap->leaf_nodes_identical = true; + } else if (level_id == IXGBE_TM_NODE_TYPE_TC) { + /* TC */ + cap->n_nodes_max = IXGBE_DCB_MAX_TRAFFIC_CLASS; + cap->n_nodes_nonleaf_max = IXGBE_DCB_MAX_TRAFFIC_CLASS; + cap->n_nodes_leaf_max = 0; + } else { + /* queue */ + cap->n_nodes_max = hw->mac.max_tx_queues; + cap->n_nodes_nonleaf_max = 0; + cap->n_nodes_leaf_max = hw->mac.max_tx_queues; + } + + cap->non_leaf_nodes_identical = true; + cap->leaf_nodes_identical = true; + + if (level_id != IXGBE_TM_NODE_TYPE_QUEUE) { cap->nonleaf.shaper_private_supported = true; cap->nonleaf.shaper_private_dual_rate_supported = false; cap->nonleaf.shaper_private_rate_min = 0; /* 10Gbps -> 1.25GBps */ cap->nonleaf.shaper_private_rate_max = 1250000000ull; cap->nonleaf.shaper_shared_n_max = 0; - cap->nonleaf.sched_n_children_max = IXGBE_DCB_MAX_TRAFFIC_CLASS; + if (level_id == IXGBE_TM_NODE_TYPE_PORT) + cap->nonleaf.sched_n_children_max = + IXGBE_DCB_MAX_TRAFFIC_CLASS; + else + cap->nonleaf.sched_n_children_max = + hw->mac.max_tx_queues; cap->nonleaf.sched_sp_n_priorities_max = 1; cap->nonleaf.sched_wfq_n_children_per_group_max = 0; cap->nonleaf.sched_wfq_n_groups_max = 0; @@ -894,21 +913,7 @@ ixgbe_level_capabilities_get(struct rte_eth_dev *dev, return 0; } - /* TC or queue node */ - if (level_id == IXGBE_TM_NODE_TYPE_TC) { - /* TC */ - cap->n_nodes_max = IXGBE_DCB_MAX_TRAFFIC_CLASS; - cap->n_nodes_nonleaf_max = IXGBE_DCB_MAX_TRAFFIC_CLASS; - cap->n_nodes_leaf_max = 0; - cap->non_leaf_nodes_identical = true; - } else { - /* queue */ - cap->n_nodes_max = hw->mac.max_tx_queues; - cap->n_nodes_nonleaf_max = 0; - cap->n_nodes_leaf_max = hw->mac.max_tx_queues; - cap->non_leaf_nodes_identical = true; - } - cap->leaf_nodes_identical = true; + /* queue node */ cap->leaf.shaper_private_supported = true; cap->leaf.shaper_private_dual_rate_supported = false; cap->leaf.shaper_private_rate_min = 0; -- 2.7.4