patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [prefix=PATCH 17.11] ethdev: fix queue start and stop
@ 2018-12-14 22:20 Yongseok Koh
  2018-12-15  0:07 ` Luca Boccassi
  2018-12-19 11:04 ` Yongseok Koh
  0 siblings, 2 replies; 4+ messages in thread
From: Yongseok Koh @ 2018-12-14 22:20 UTC (permalink / raw)
  To: thomas; +Cc: stable, Qi Zhang, Konstantin Ananyev

This patch reverts
	commit d48890a39af7 ("ethdev: fix queue start")
as the corresponding upstream commit was incorrectly applied.

The upstream commit is re-applied correctly.
	commit 239c9b435ad4 ("ethdev: fix queue start")

Fixes: 0748be2cf9a2 ("ethdev: queue start and stop")
Fixes: d48890a39af7 ("ethdev: fix queue start")
Cc: Qi Zhang <qi.z.zhang@intel.com>
Cc: Konstantin Ananyev <konstantin.ananyev@intel.com>

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Reported-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Reported-by: Qi Zhang <qi.z.zhang@intel.com>
---
 lib/librte_ether/rte_ethdev.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index eea11d066..096b35faf 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -507,6 +507,13 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id)
 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
 	dev = &rte_eth_devices[port_id];
+	if (!dev->data->dev_started) {
+		RTE_PMD_DEBUG_TRACE(
+		    "port %d must be started before start any queue\n",
+		    port_id);
+		return -EINVAL;
+	}
+
 	if (rx_queue_id >= dev->data->nb_rx_queues) {
 		RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id);
 		return -EINVAL;
@@ -533,12 +540,6 @@ rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id)
 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
 	dev = &rte_eth_devices[port_id];
-	if (!dev->data->dev_started) {
-		RTE_PMD_DEBUG_TRACE(
-		    "port %d must be started before start any queue\n", port_id);
-		return -EINVAL;
-	}
-
 	if (rx_queue_id >= dev->data->nb_rx_queues) {
 		RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id);
 		return -EINVAL;
@@ -565,6 +566,13 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id)
 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
 	dev = &rte_eth_devices[port_id];
+	if (!dev->data->dev_started) {
+		RTE_PMD_DEBUG_TRACE(
+		    "port %d must be started before start any queue\n",
+		    port_id);
+		return -EINVAL;
+	}
+
 	if (tx_queue_id >= dev->data->nb_tx_queues) {
 		RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id);
 		return -EINVAL;
@@ -591,12 +599,6 @@ rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id)
 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
 	dev = &rte_eth_devices[port_id];
-	if (!dev->data->dev_started) {
-		RTE_PMD_DEBUG_TRACE(
-		    "port %d must be started before start any queue\n", port_id);
-		return -EINVAL;
-	}
-
 	if (tx_queue_id >= dev->data->nb_tx_queues) {
 		RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id);
 		return -EINVAL;
-- 
2.11.0

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [dpdk-stable] [prefix=PATCH 17.11] ethdev: fix queue start and stop
  2018-12-14 22:20 [dpdk-stable] [prefix=PATCH 17.11] ethdev: fix queue start and stop Yongseok Koh
@ 2018-12-15  0:07 ` Luca Boccassi
  2018-12-17 10:07   ` Kevin Traynor
  2018-12-19 11:04 ` Yongseok Koh
  1 sibling, 1 reply; 4+ messages in thread
From: Luca Boccassi @ 2018-12-15  0:07 UTC (permalink / raw)
  To: Yongseok Koh, thomas; +Cc: stable, Qi Zhang, Konstantin Ananyev

On Fri, 2018-12-14 at 14:20 -0800, Yongseok Koh wrote:
> This patch reverts
> 	commit d48890a39af7 ("ethdev: fix queue start")
> as the corresponding upstream commit was incorrectly applied.
> 
> The upstream commit is re-applied correctly.
> 	commit 239c9b435ad4 ("ethdev: fix queue start")
> 
> Fixes: 0748be2cf9a2 ("ethdev: queue start and stop")
> Fixes: d48890a39af7 ("ethdev: fix queue start")
> Cc: Qi Zhang <qi.z.zhang@intel.com>
> Cc: Konstantin Ananyev <konstantin.ananyev@intel.com>
> 
> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
> Reported-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> Reported-by: Qi Zhang <qi.z.zhang@intel.com>
> ---
>  lib/librte_ether/rte_ethdev.c | 26 ++++++++++++++------------
>  1 file changed, 14 insertions(+), 12 deletions(-)

Applied the same (and double checked :-) ) on 16.11, thanks for the
heads-up.

-- 
Kind regards,
Luca Boccassi

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [dpdk-stable] [prefix=PATCH 17.11] ethdev: fix queue start and stop
  2018-12-15  0:07 ` Luca Boccassi
@ 2018-12-17 10:07   ` Kevin Traynor
  0 siblings, 0 replies; 4+ messages in thread
From: Kevin Traynor @ 2018-12-17 10:07 UTC (permalink / raw)
  To: Luca Boccassi, Yongseok Koh, thomas; +Cc: stable, Qi Zhang, Konstantin Ananyev

On 12/15/2018 12:07 AM, Luca Boccassi wrote:
> On Fri, 2018-12-14 at 14:20 -0800, Yongseok Koh wrote:
>> This patch reverts
>> 	commit d48890a39af7 ("ethdev: fix queue start")
>> as the corresponding upstream commit was incorrectly applied.
>>
>> The upstream commit is re-applied correctly.
>> 	commit 239c9b435ad4 ("ethdev: fix queue start")
>>
>> Fixes: 0748be2cf9a2 ("ethdev: queue start and stop")
>> Fixes: d48890a39af7 ("ethdev: fix queue start")
>> Cc: Qi Zhang <qi.z.zhang@intel.com>
>> Cc: Konstantin Ananyev <konstantin.ananyev@intel.com>
>>
>> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
>> Reported-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
>> Reported-by: Qi Zhang <qi.z.zhang@intel.com>
>> ---
>>  lib/librte_ether/rte_ethdev.c | 26 ++++++++++++++------------
>>  1 file changed, 14 insertions(+), 12 deletions(-)
> 
> Applied the same (and double checked :-) ) on 16.11, thanks for the
> heads-up.
> 

No issue for 18.08 branch as master commit was part of v18.08

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [dpdk-stable] [prefix=PATCH 17.11] ethdev: fix queue start and stop
  2018-12-14 22:20 [dpdk-stable] [prefix=PATCH 17.11] ethdev: fix queue start and stop Yongseok Koh
  2018-12-15  0:07 ` Luca Boccassi
@ 2018-12-19 11:04 ` Yongseok Koh
  1 sibling, 0 replies; 4+ messages in thread
From: Yongseok Koh @ 2018-12-19 11:04 UTC (permalink / raw)
  To: Thomas Monjalon; +Cc: stable, Qi Zhang, Konstantin Ananyev


> On Dec 14, 2018, at 2:20 PM, Yongseok Koh <yskoh@mellanox.com> wrote:
> 
> This patch reverts
> 	commit d48890a39af7 ("ethdev: fix queue start")
> as the corresponding upstream commit was incorrectly applied.
> 
> The upstream commit is re-applied correctly.
> 	commit 239c9b435ad4 ("ethdev: fix queue start")
> 
> Fixes: 0748be2cf9a2 ("ethdev: queue start and stop")
> Fixes: d48890a39af7 ("ethdev: fix queue start")
> Cc: Qi Zhang <qi.z.zhang@intel.com>
> Cc: Konstantin Ananyev <konstantin.ananyev@intel.com>
> 
> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
> Reported-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> Reported-by: Qi Zhang <qi.z.zhang@intel.com>
> ---

applied to stable/17.11

thanks,
yongseok

> lib/librte_ether/rte_ethdev.c | 26 ++++++++++++++------------
> 1 file changed, 14 insertions(+), 12 deletions(-)
> 
> diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
> index eea11d066..096b35faf 100644
> --- a/lib/librte_ether/rte_ethdev.c
> +++ b/lib/librte_ether/rte_ethdev.c
> @@ -507,6 +507,13 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id)
> 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
> 
> 	dev = &rte_eth_devices[port_id];
> +	if (!dev->data->dev_started) {
> +		RTE_PMD_DEBUG_TRACE(
> +		    "port %d must be started before start any queue\n",
> +		    port_id);
> +		return -EINVAL;
> +	}
> +
> 	if (rx_queue_id >= dev->data->nb_rx_queues) {
> 		RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id);
> 		return -EINVAL;
> @@ -533,12 +540,6 @@ rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id)
> 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
> 
> 	dev = &rte_eth_devices[port_id];
> -	if (!dev->data->dev_started) {
> -		RTE_PMD_DEBUG_TRACE(
> -		    "port %d must be started before start any queue\n", port_id);
> -		return -EINVAL;
> -	}
> -
> 	if (rx_queue_id >= dev->data->nb_rx_queues) {
> 		RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id);
> 		return -EINVAL;
> @@ -565,6 +566,13 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id)
> 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
> 
> 	dev = &rte_eth_devices[port_id];
> +	if (!dev->data->dev_started) {
> +		RTE_PMD_DEBUG_TRACE(
> +		    "port %d must be started before start any queue\n",
> +		    port_id);
> +		return -EINVAL;
> +	}
> +
> 	if (tx_queue_id >= dev->data->nb_tx_queues) {
> 		RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id);
> 		return -EINVAL;
> @@ -591,12 +599,6 @@ rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id)
> 	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
> 
> 	dev = &rte_eth_devices[port_id];
> -	if (!dev->data->dev_started) {
> -		RTE_PMD_DEBUG_TRACE(
> -		    "port %d must be started before start any queue\n", port_id);
> -		return -EINVAL;
> -	}
> -
> 	if (tx_queue_id >= dev->data->nb_tx_queues) {
> 		RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id);
> 		return -EINVAL;
> -- 
> 2.11.0
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-12-19 11:04 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-14 22:20 [dpdk-stable] [prefix=PATCH 17.11] ethdev: fix queue start and stop Yongseok Koh
2018-12-15  0:07 ` Luca Boccassi
2018-12-17 10:07   ` Kevin Traynor
2018-12-19 11:04 ` Yongseok Koh

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).