* [dpdk-dev] [PATCH] net/ice: fix TM hierarchy commit flag not reset correctly
@ 2021-10-14 6:51 Ting Xu
2021-10-19 11:27 ` Zhang, Qi Z
2021-10-21 5:54 ` [dpdk-dev] [PATCH v2] " Ting Xu
0 siblings, 2 replies; 4+ messages in thread
From: Ting Xu @ 2021-10-14 6:51 UTC (permalink / raw)
To: dev; +Cc: qi.z.zhang, qiming.yang, Ting Xu, stable
After DCF commits TM hierarchy configuration, the commit flag is set to
avoid duplicated commit. But the flag is not reset after device stop,
which prevents the update of hierarchy configuration unless close the
device. It is not reasonable. This patch fix to reset the commit flag
after device stop. Then users can delete and add nodes to commit a new
TM hierarchy configuration.
Fixes: 3a6bfc37eaf4 ("net/ice: support QoS config VF bandwidth in DCF")
Cc: stable@dpdk.org
Signed-off-by: Ting Xu <ting.xu@intel.com>
---
drivers/net/ice/ice_dcf_ethdev.c | 7 +++++++
drivers/net/ice/ice_dcf_sched.c | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c
index 3eb3b077e6..23e2d91c13 100644
--- a/drivers/net/ice/ice_dcf_ethdev.c
+++ b/drivers/net/ice/ice_dcf_ethdev.c
@@ -529,6 +529,11 @@ ice_dcf_dev_start(struct rte_eth_dev *dev)
return -EIO;
}
+ if (hw->tm_conf.root && !hw->tm_conf.committed) {
+ PMD_DRV_LOG(ERR, "please call hierarchy_commit() before starting the port");
+ return -EIO;
+ }
+
ad->pf.adapter_stopped = 0;
hw->num_queue_pairs = RTE_MAX(dev->data->nb_rx_queues,
@@ -620,6 +625,7 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
struct ice_dcf_adapter *dcf_ad = dev->data->dev_private;
struct rte_intr_handle *intr_handle = dev->intr_handle;
struct ice_adapter *ad = &dcf_ad->parent;
+ struct ice_dcf_hw *hw = &dcf_ad->real_hw;
if (ad->pf.adapter_stopped == 1) {
PMD_DRV_LOG(DEBUG, "Port is already stopped");
@@ -640,6 +646,7 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
ice_dcf_add_del_all_mac_addr(&dcf_ad->real_hw, false);
dev->data->dev_link.link_status = ETH_LINK_DOWN;
ad->pf.adapter_stopped = 1;
+ hw->tm_conf.committed = false;
return 0;
}
diff --git a/drivers/net/ice/ice_dcf_sched.c b/drivers/net/ice/ice_dcf_sched.c
index dcf2723494..65c4c82a5b 100644
--- a/drivers/net/ice/ice_dcf_sched.c
+++ b/drivers/net/ice/ice_dcf_sched.c
@@ -754,6 +754,13 @@ static int ice_dcf_hierarchy_commit(struct rte_eth_dev *dev,
uint8_t num_elem = 0;
int i, ret_val;
+ /* check if port is stopped */
+ if (adapter->parent.pf.adapter_stopped != 1) {
+ PMD_DRV_LOG(ERR, "Please stop port first");
+ ret_val = ICE_ERR_NOT_READY;
+ goto err;
+ }
+
ret_val = ice_dcf_commit_check(hw);
if (ret_val)
goto fail_clear;
@@ -871,5 +878,6 @@ static int ice_dcf_hierarchy_commit(struct rte_eth_dev *dev,
ice_dcf_tm_conf_uninit(dev);
ice_dcf_tm_conf_init(dev);
}
+err:
return ret_val;
}
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH] net/ice: fix TM hierarchy commit flag not reset correctly
2021-10-14 6:51 [dpdk-dev] [PATCH] net/ice: fix TM hierarchy commit flag not reset correctly Ting Xu
@ 2021-10-19 11:27 ` Zhang, Qi Z
2021-10-21 5:54 ` [dpdk-dev] [PATCH v2] " Ting Xu
1 sibling, 0 replies; 4+ messages in thread
From: Zhang, Qi Z @ 2021-10-19 11:27 UTC (permalink / raw)
To: Xu, Ting, dev; +Cc: Yang, Qiming, stable
> -----Original Message-----
> From: Xu, Ting <ting.xu@intel.com>
> Sent: Thursday, October 14, 2021 2:52 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Xu, Ting <ting.xu@intel.com>; stable@dpdk.org
> Subject: [PATCH] net/ice: fix TM hierarchy commit flag not reset correctly
>
> After DCF commits TM hierarchy configuration, the commit flag is set to avoid
> duplicated commit. But the flag is not reset after device stop, which prevents
> the update of hierarchy configuration unless close the device. It is not
> reasonable. This patch fix to reset the commit flag after device stop. Then users
> can delete and add nodes to commit a new TM hierarchy configuration.
>
> Fixes: 3a6bfc37eaf4 ("net/ice: support QoS config VF bandwidth in DCF")
> Cc: stable@dpdk.org
>
> Signed-off-by: Ting Xu <ting.xu@intel.com>
> ---
> drivers/net/ice/ice_dcf_ethdev.c | 7 +++++++
> drivers/net/ice/ice_dcf_sched.c | 8 ++++++++
> 2 files changed, 15 insertions(+)
>
> diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c
> index 3eb3b077e6..23e2d91c13 100644
> --- a/drivers/net/ice/ice_dcf_ethdev.c
> +++ b/drivers/net/ice/ice_dcf_ethdev.c
> @@ -529,6 +529,11 @@ ice_dcf_dev_start(struct rte_eth_dev *dev)
> return -EIO;
> }
>
> + if (hw->tm_conf.root && !hw->tm_conf.committed) {
> + PMD_DRV_LOG(ERR, "please call hierarchy_commit() before starting
> the port");
> + return -EIO;
> + }
> +
> ad->pf.adapter_stopped = 0;
>
> hw->num_queue_pairs = RTE_MAX(dev->data->nb_rx_queues, @@ -620,6
> +625,7 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
> struct ice_dcf_adapter *dcf_ad = dev->data->dev_private;
> struct rte_intr_handle *intr_handle = dev->intr_handle;
> struct ice_adapter *ad = &dcf_ad->parent;
> + struct ice_dcf_hw *hw = &dcf_ad->real_hw;
>
> if (ad->pf.adapter_stopped == 1) {
> PMD_DRV_LOG(DEBUG, "Port is already stopped"); @@ -640,6
> +646,7 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
> ice_dcf_add_del_all_mac_addr(&dcf_ad->real_hw, false);
> dev->data->dev_link.link_status = ETH_LINK_DOWN;
> ad->pf.adapter_stopped = 1;
> + hw->tm_conf.committed = false;
>
> return 0;
> }
> diff --git a/drivers/net/ice/ice_dcf_sched.c b/drivers/net/ice/ice_dcf_sched.c
> index dcf2723494..65c4c82a5b 100644
> --- a/drivers/net/ice/ice_dcf_sched.c
> +++ b/drivers/net/ice/ice_dcf_sched.c
> @@ -754,6 +754,13 @@ static int ice_dcf_hierarchy_commit(struct
> rte_eth_dev *dev,
> uint8_t num_elem = 0;
> int i, ret_val;
>
> + /* check if port is stopped */
> + if (adapter->parent.pf.adapter_stopped != 1) {
adapter_stopped is defined as a boolean
> + PMD_DRV_LOG(ERR, "Please stop port first");
> + ret_val = ICE_ERR_NOT_READY;
> + goto err;
> + }
> +
> ret_val = ice_dcf_commit_check(hw);
> if (ret_val)
> goto fail_clear;
> @@ -871,5 +878,6 @@ static int ice_dcf_hierarchy_commit(struct
> rte_eth_dev *dev,
> ice_dcf_tm_conf_uninit(dev);
> ice_dcf_tm_conf_init(dev);
> }
> +err:
> return ret_val;
> }
> --
> 2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [dpdk-dev] [PATCH v2] net/ice: fix TM hierarchy commit flag not reset correctly
2021-10-14 6:51 [dpdk-dev] [PATCH] net/ice: fix TM hierarchy commit flag not reset correctly Ting Xu
2021-10-19 11:27 ` Zhang, Qi Z
@ 2021-10-21 5:54 ` Ting Xu
2021-10-21 11:32 ` Zhang, Qi Z
1 sibling, 1 reply; 4+ messages in thread
From: Ting Xu @ 2021-10-21 5:54 UTC (permalink / raw)
To: dev; +Cc: qi.z.zhang, qiming.yang, Ting Xu, stable
After DCF commits TM hierarchy configuration, the commit flag is set to
avoid duplicated commit. But the flag is not reset after device stop,
which prevents the update of hierarchy configuration unless close the
device. It is not reasonable. This patch fix to reset the commit flag
after device stop. Then users can delete and add nodes to commit a new
TM hierarchy configuration.
Fixes: 3a6bfc37eaf4 ("net/ice: support QoS config VF bandwidth in DCF")
Cc: stable@dpdk.org
Signed-off-by: Ting Xu <ting.xu@intel.com>
---
drivers/net/ice/ice_dcf_ethdev.c | 7 +++++++
drivers/net/ice/ice_dcf_sched.c | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c
index b8a537cb85..12bdd745df 100644
--- a/drivers/net/ice/ice_dcf_ethdev.c
+++ b/drivers/net/ice/ice_dcf_ethdev.c
@@ -528,6 +528,11 @@ ice_dcf_dev_start(struct rte_eth_dev *dev)
return -EIO;
}
+ if (hw->tm_conf.root && !hw->tm_conf.committed) {
+ PMD_DRV_LOG(ERR, "please call hierarchy_commit() before starting the port");
+ return -EIO;
+ }
+
ad->pf.adapter_stopped = 0;
hw->num_queue_pairs = RTE_MAX(dev->data->nb_rx_queues,
@@ -619,6 +624,7 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
struct ice_dcf_adapter *dcf_ad = dev->data->dev_private;
struct rte_intr_handle *intr_handle = dev->intr_handle;
struct ice_adapter *ad = &dcf_ad->parent;
+ struct ice_dcf_hw *hw = &dcf_ad->real_hw;
if (ad->pf.adapter_stopped == 1) {
PMD_DRV_LOG(DEBUG, "Port is already stopped");
@@ -639,6 +645,7 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
ice_dcf_add_del_all_mac_addr(&dcf_ad->real_hw, false);
dev->data->dev_link.link_status = ETH_LINK_DOWN;
ad->pf.adapter_stopped = 1;
+ hw->tm_conf.committed = false;
return 0;
}
diff --git a/drivers/net/ice/ice_dcf_sched.c b/drivers/net/ice/ice_dcf_sched.c
index dcf2723494..a231c1e60b 100644
--- a/drivers/net/ice/ice_dcf_sched.c
+++ b/drivers/net/ice/ice_dcf_sched.c
@@ -754,6 +754,13 @@ static int ice_dcf_hierarchy_commit(struct rte_eth_dev *dev,
uint8_t num_elem = 0;
int i, ret_val;
+ /* check if port is stopped */
+ if (!adapter->parent.pf.adapter_stopped) {
+ PMD_DRV_LOG(ERR, "Please stop port first");
+ ret_val = ICE_ERR_NOT_READY;
+ goto err;
+ }
+
ret_val = ice_dcf_commit_check(hw);
if (ret_val)
goto fail_clear;
@@ -871,5 +878,6 @@ static int ice_dcf_hierarchy_commit(struct rte_eth_dev *dev,
ice_dcf_tm_conf_uninit(dev);
ice_dcf_tm_conf_init(dev);
}
+err:
return ret_val;
}
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH v2] net/ice: fix TM hierarchy commit flag not reset correctly
2021-10-21 5:54 ` [dpdk-dev] [PATCH v2] " Ting Xu
@ 2021-10-21 11:32 ` Zhang, Qi Z
0 siblings, 0 replies; 4+ messages in thread
From: Zhang, Qi Z @ 2021-10-21 11:32 UTC (permalink / raw)
To: Xu, Ting, dev; +Cc: Yang, Qiming, stable
> -----Original Message-----
> From: Xu, Ting <ting.xu@intel.com>
> Sent: Thursday, October 21, 2021 1:54 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Xu, Ting <ting.xu@intel.com>; stable@dpdk.org
> Subject: [PATCH v2] net/ice: fix TM hierarchy commit flag not reset correctly
>
> After DCF commits TM hierarchy configuration, the commit flag is set to avoid
> duplicated commit. But the flag is not reset after device stop, which prevents
> the update of hierarchy configuration unless close the device. It is not
> reasonable. This patch fix to reset the commit flag after device stop. Then users
> can delete and add nodes to commit a new TM hierarchy configuration.
>
> Fixes: 3a6bfc37eaf4 ("net/ice: support QoS config VF bandwidth in DCF")
> Cc: stable@dpdk.org
>
> Signed-off-by: Ting Xu <ting.xu@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-21 11:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-14 6:51 [dpdk-dev] [PATCH] net/ice: fix TM hierarchy commit flag not reset correctly Ting Xu
2021-10-19 11:27 ` Zhang, Qi Z
2021-10-21 5:54 ` [dpdk-dev] [PATCH v2] " Ting Xu
2021-10-21 11:32 ` Zhang, Qi Z
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).