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 9E1A7237 for ; Tue, 21 Nov 2017 14:28:15 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 52DD220CC1; Tue, 21 Nov 2017 08:28:15 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:28:15 -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=sdmzKFyTN8eR3Tet4 iUJCsLtImFM6M7gdvOzvAi0BHs=; b=QSdbaOTE+nvtWFdtHEpsr5wGlPOS89Ets HSrGz8Da/zy/iOkg7yKPZmJU7bezUP33Pxq2a8Jx1udEqvhExaN+HK6vP3fumPd7 fl7vYl1TcqhkwFG+6b3ufiZy6V7cCLJImbC2lQD0H5pqh3t9agz+dOCStt6rfEqL Pj3uq0oJwsbvULYOnSxV8V6Y1MhEUtYZq67CIc2b6bHRBUQttigvZgA8XoCSOBGD 2nZm+ZVV//04AcPhhaiyUvPfqFEMg3A4mPFM+LDGyRohEUKzUbweSaNPAvOxiwWE Y1akHJiQHiWopD5Y5aaSxgPkKb5Nnydb5ANJixYSCLvXz86qrZ63A== 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=sdmzKFyTN8eR3Tet4iUJCsLtImFM6M7gdvOzvAi0BHs=; b=jinxz85u Sd7BFFSTL8Xi3ysmhVPwvGdyacXFWm6OFC/NExa9JKezxRlK600RSsVyma5EP+2m AYyjzewUBsSZA4uNIwxdSnn8HClOOc6yDMPldGnldW1WM1PlUjuMS7hS7xJ/EBs2 whEJP7WKhUc00GORfUmLLzPCPV18UwrE8LzcnXS323uqssu/J7hmWLcB1rXCmsG4 /nBtFk+5wikSqfCpRmgBmkvV0kPazzggrsCL7C5AJgfd4oagavVQUaEM/5SwlPor 6WFcux0hxsPVJtb9VO3tvh3ZRIkBU2/8hrF2EZ7x/unqzSA+/LlVwiXfb80BRhgn AgEB87twPuFHnw== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 3E6B9247A9; Tue, 21 Nov 2017 08:28:11 -0500 (EST) From: Yuanhan Liu To: Wenzhuo Lu Cc: Cristian Dumitrescu , dpdk stable Date: Tue, 21 Nov 2017 21:18:02 +0800 Message-Id: <1511270333-31002-140-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/i40e: 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:15 -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 51587c009af9828ca60f8018bd417bb862e4d288 Mon Sep 17 00:00:00 2001 From: Wenzhuo Lu Date: Tue, 17 Oct 2017 13:50:35 +0800 Subject: [PATCH] net/i40e: fix TM level capability getting [ upstream commit 0d0f144831b24d5b54a75631de9f6c5b9074b4ce ] 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: 0fb1ef1e7930 ("net/i40e: support getting TM level capability") Signed-off-by: Wenzhuo Lu Acked-by: Cristian Dumitrescu --- drivers/net/i40e/i40e_tm.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/drivers/net/i40e/i40e_tm.c b/drivers/net/i40e/i40e_tm.c index fe99215..d46a972 100644 --- a/drivers/net/i40e/i40e_tm.c +++ b/drivers/net/i40e/i40e_tm.c @@ -755,15 +755,34 @@ i40e_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 == I40E_TM_NODE_TYPE_TC) { + /* TC */ + cap->n_nodes_max = I40E_MAX_TRAFFIC_CLASS; + cap->n_nodes_nonleaf_max = I40E_MAX_TRAFFIC_CLASS; + cap->n_nodes_leaf_max = 0; + } else { + /* queue */ + cap->n_nodes_max = hw->func_caps.num_tx_qp; + cap->n_nodes_nonleaf_max = 0; + cap->n_nodes_leaf_max = hw->func_caps.num_tx_qp; + } + + cap->non_leaf_nodes_identical = true; + cap->leaf_nodes_identical = true; + + if (level_id != I40E_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; /* 40Gbps -> 5GBps */ cap->nonleaf.shaper_private_rate_max = 5000000000ull; cap->nonleaf.shaper_shared_n_max = 0; - cap->nonleaf.sched_n_children_max = I40E_MAX_TRAFFIC_CLASS; + if (level_id == I40E_TM_NODE_TYPE_PORT) + cap->nonleaf.sched_n_children_max = + I40E_MAX_TRAFFIC_CLASS; + else + cap->nonleaf.sched_n_children_max = + hw->func_caps.num_tx_qp; 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; @@ -773,21 +792,7 @@ i40e_level_capabilities_get(struct rte_eth_dev *dev, return 0; } - /* TC or queue node */ - if (level_id == I40E_TM_NODE_TYPE_TC) { - /* TC */ - cap->n_nodes_max = I40E_MAX_TRAFFIC_CLASS; - cap->n_nodes_nonleaf_max = I40E_MAX_TRAFFIC_CLASS; - cap->n_nodes_leaf_max = 0; - cap->non_leaf_nodes_identical = true; - } else { - /* queue */ - cap->n_nodes_max = hw->func_caps.num_tx_qp; - cap->n_nodes_nonleaf_max = 0; - cap->n_nodes_leaf_max = hw->func_caps.num_tx_qp; - 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