From: Wenzhuo Lu <wenzhuo.lu@intel.com>
To: dev@dpdk.org
Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
Subject: [dpdk-dev] [PATCH v2 5/7] net/i40e: fix not supporting NULL TM profile
Date: Tue, 17 Oct 2017 13:50:38 +0800 [thread overview]
Message-ID: <1508219440-97150-6-git-send-email-wenzhuo.lu@intel.com> (raw)
In-Reply-To: <1508219440-97150-1-git-send-email-wenzhuo.lu@intel.com>
It's by design that APP can add a TM node without shaper
profile. But i40e doesn't support it currently.
Fixes: 03a249b62bbd ("net/i40e: support adding TM node")
Fixes: cac29c3c00a4 ("net/i40e: support committing TM hierarchy")
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
drivers/net/i40e/i40e_tm.c | 47 +++++++++++++++++++++++++++++++---------------
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/drivers/net/i40e/i40e_tm.c b/drivers/net/i40e/i40e_tm.c
index d46a972..f4d1cb8 100644
--- a/drivers/net/i40e/i40e_tm.c
+++ b/drivers/net/i40e/i40e_tm.c
@@ -480,7 +480,7 @@ static int i40e_hierarchy_commit(struct rte_eth_dev *dev,
struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
enum i40e_tm_node_type node_type = I40E_TM_NODE_TYPE_MAX;
enum i40e_tm_node_type parent_node_type = I40E_TM_NODE_TYPE_MAX;
- struct i40e_tm_shaper_profile *shaper_profile;
+ struct i40e_tm_shaper_profile *shaper_profile = NULL;
struct i40e_tm_node *tm_node;
struct i40e_tm_node *parent_node;
uint16_t tc_nb = 0;
@@ -509,12 +509,15 @@ static int i40e_hierarchy_commit(struct rte_eth_dev *dev,
}
/* check the shaper profile id */
- shaper_profile = i40e_shaper_profile_search(dev,
- params->shaper_profile_id);
- if (!shaper_profile) {
- error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS_SHAPER_PROFILE_ID;
- error->message = "shaper profile not exist";
- return -EINVAL;
+ if (params->shaper_profile_id != RTE_TM_SHAPER_PROFILE_ID_NONE) {
+ shaper_profile = i40e_shaper_profile_search(
+ dev, params->shaper_profile_id);
+ if (!shaper_profile) {
+ error->type =
+ RTE_TM_ERROR_TYPE_NODE_PARAMS_SHAPER_PROFILE_ID;
+ error->message = "shaper profile not exist";
+ return -EINVAL;
+ }
}
/* root node if not have a parent */
@@ -551,7 +554,8 @@ static int i40e_hierarchy_commit(struct rte_eth_dev *dev,
pf->tm_conf.root = tm_node;
/* increase the reference counter of the shaper profile */
- shaper_profile->reference_count++;
+ if (shaper_profile)
+ shaper_profile->reference_count++;
return 0;
}
@@ -633,7 +637,8 @@ static int i40e_hierarchy_commit(struct rte_eth_dev *dev,
tm_node->parent->reference_count++;
/* increase the reference counter of the shaper profile */
- shaper_profile->reference_count++;
+ if (shaper_profile)
+ shaper_profile->reference_count++;
return 0;
}
@@ -680,14 +685,16 @@ static int i40e_hierarchy_commit(struct rte_eth_dev *dev,
/* root node */
if (node_type == I40E_TM_NODE_TYPE_PORT) {
- tm_node->shaper_profile->reference_count--;
+ if (tm_node->shaper_profile)
+ tm_node->shaper_profile->reference_count--;
rte_free(tm_node);
pf->tm_conf.root = NULL;
return 0;
}
/* TC or queue node */
- tm_node->shaper_profile->reference_count--;
+ if (tm_node->shaper_profile)
+ tm_node->shaper_profile->reference_count--;
tm_node->parent->reference_count--;
if (node_type == I40E_TM_NODE_TYPE_TC) {
TAILQ_REMOVE(&pf->tm_conf.tc_list, tm_node, node);
@@ -895,11 +902,15 @@ static int i40e_hierarchy_commit(struct rte_eth_dev *dev,
* If the port has a max bandwidth, the TCs should have none.
*/
/* port */
- bw = pf->tm_conf.root->shaper_profile->profile.peak.rate;
+ if (pf->tm_conf.root->shaper_profile)
+ bw = pf->tm_conf.root->shaper_profile->profile.peak.rate;
+ else
+ bw = 0;
if (bw) {
/* check if any TC has a max bandwidth */
TAILQ_FOREACH(tm_node, tc_list, node) {
- if (tm_node->shaper_profile->profile.peak.rate) {
+ if (tm_node->shaper_profile &&
+ tm_node->shaper_profile->profile.peak.rate) {
error->type = RTE_TM_ERROR_TYPE_SHAPER_PROFILE;
error->message = "no port and TC max bandwidth"
" in parallel";
@@ -943,7 +954,10 @@ static int i40e_hierarchy_commit(struct rte_eth_dev *dev,
}
tc_map &= ~BIT_ULL(i);
- bw = tm_node->shaper_profile->profile.peak.rate;
+ if (tm_node->shaper_profile)
+ bw = tm_node->shaper_profile->profile.peak.rate;
+ else
+ bw = 0;
if (!bw)
continue;
@@ -954,7 +968,10 @@ static int i40e_hierarchy_commit(struct rte_eth_dev *dev,
}
TAILQ_FOREACH(tm_node, queue_list, node) {
- bw = tm_node->shaper_profile->profile.peak.rate;
+ if (tm_node->shaper_profile)
+ bw = tm_node->shaper_profile->profile.peak.rate;
+ else
+ bw = 0;
if (bw) {
error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS;
error->message = "not support queue QoS";
--
1.9.3
next prev parent reply other threads:[~2017-10-17 5:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-13 2:58 [dpdk-dev] [PATCH 0/6] fix TM (Traffic Management) issues on i40e and ixgbe Wenzhuo Lu
2017-10-13 2:58 ` [dpdk-dev] [PATCH 1/6] net/i40e: fix TM node parameter checking Wenzhuo Lu
2017-10-13 2:58 ` [dpdk-dev] [PATCH 2/6] net/i40e: fix TM level capability getting Wenzhuo Lu
2017-10-13 2:58 ` [dpdk-dev] [PATCH 3/6] net/ixgbe: fix TM node parameter checking Wenzhuo Lu
2017-10-13 2:58 ` [dpdk-dev] [PATCH 4/6] net/ixgbe: fix TM level capability getting Wenzhuo Lu
2017-10-13 2:58 ` [dpdk-dev] [PATCH 5/6] net/i40e: fix not supporting NULL TM profile Wenzhuo Lu
2017-10-13 2:58 ` [dpdk-dev] [PATCH 6/6] net/ixgbe: " Wenzhuo Lu
2017-10-17 5:50 ` [dpdk-dev] [PATCH v2 0/7] fix TM (Traffic Management) issues on i40e and ixgbe Wenzhuo Lu
2017-10-17 5:50 ` [dpdk-dev] [PATCH v2 1/7] net/i40e: fix TM node parameter checking Wenzhuo Lu
2017-10-17 5:50 ` [dpdk-dev] [PATCH v2 2/7] net/i40e: fix TM level capability getting Wenzhuo Lu
2017-10-17 5:50 ` [dpdk-dev] [PATCH v2 3/7] net/ixgbe: fix TM node parameter checking Wenzhuo Lu
2017-10-17 5:50 ` [dpdk-dev] [PATCH v2 4/7] net/ixgbe: fix TM level capability getting Wenzhuo Lu
2017-10-17 5:50 ` Wenzhuo Lu [this message]
2017-10-17 5:50 ` [dpdk-dev] [PATCH v2 6/7] net/ixgbe: fix not supporting NULL TM profile Wenzhuo Lu
2017-10-17 5:50 ` [dpdk-dev] [PATCH v2 7/7] net/i40e: fix wrong parent when adding TM node Wenzhuo Lu
2017-10-20 14:18 ` [dpdk-dev] [PATCH v2 0/7] fix TM (Traffic Management) issues on i40e and ixgbe Dumitrescu, Cristian
2017-10-23 17:02 ` Ferruh Yigit
2017-10-20 14:17 ` [dpdk-dev] [PATCH 0/6] " Dumitrescu, Cristian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1508219440-97150-6-git-send-email-wenzhuo.lu@intel.com \
--to=wenzhuo.lu@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).