eventdev/eth_tx: fix queue delete

Message ID 20220623100511.2388739-1-s.v.naga.harish.k@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Jerin Jacob
Headers
Series eventdev/eth_tx: fix queue delete |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-abi-testing warning Testing issues

Commit Message

Naga Harish K, S V June 23, 2022, 10:05 a.m. UTC
  Add spinlock protection in queue delete function.
This protects the data path while the queue delete operation
is in progress.

Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")
Cc: stable@dpdk.org

Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>
---
 lib/eventdev/rte_event_eth_tx_adapter.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
  

Comments

Jayatheerthan, Jay June 23, 2022, 2:59 p.m. UTC | #1
Looks good to me.

Acked-by: Jay Jayatheerthan <jay.jayatheerthan@intel.com>

-Jay



> -----Original Message-----
> From: Naga Harish K, S V <s.v.naga.harish.k@intel.com>
> Sent: Thursday, June 23, 2022 3:35 PM
> To: Jayatheerthan, Jay <jay.jayatheerthan@intel.com>; jerinj@marvell.com
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: [PATCH] eventdev/eth_tx: fix queue delete
> 
> Add spinlock protection in queue delete function.
> This protects the data path while the queue delete operation
> is in progress.
> 
> Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>
> ---
>  lib/eventdev/rte_event_eth_tx_adapter.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
> index c700fb7b1f..b4b37f1cae 100644
> --- a/lib/eventdev/rte_event_eth_tx_adapter.c
> +++ b/lib/eventdev/rte_event_eth_tx_adapter.c
> @@ -891,9 +891,10 @@ txa_service_queue_del(uint8_t id,
> 
>  	txa = txa_service_id_to_data(id);
> 
> +	rte_spinlock_lock(&txa->tx_lock);
>  	tqi = txa_service_queue(txa, port_id, tx_queue_id);
>  	if (tqi == NULL || !tqi->added)
> -		return 0;
> +		goto ret_unlock;
> 
>  	tb = tqi->tx_buf;
>  	tqi->added = 0;
> @@ -903,6 +904,9 @@ txa_service_queue_del(uint8_t id,
>  	txa->txa_ethdev[port_id].nb_queues--;
> 
>  	txa_service_queue_array_free(txa, port_id);
> +
> +ret_unlock:
> +	rte_spinlock_unlock(&txa->tx_lock);
>  	return 0;
>  }
> 
> --
> 2.25.1
  
Jerin Jacob July 4, 2022, 4:08 p.m. UTC | #2
On Thu, Jun 23, 2022 at 8:29 PM Jayatheerthan, Jay
<jay.jayatheerthan@intel.com> wrote:
>
> Looks good to me.
>
> Acked-by: Jay Jayatheerthan <jay.jayatheerthan@intel.com>


Applied to dpdk-next-net-eventdev/for-main. Thanks

>
> -Jay
>
>
>
> > -----Original Message-----
> > From: Naga Harish K, S V <s.v.naga.harish.k@intel.com>
> > Sent: Thursday, June 23, 2022 3:35 PM
> > To: Jayatheerthan, Jay <jay.jayatheerthan@intel.com>; jerinj@marvell.com
> > Cc: dev@dpdk.org; stable@dpdk.org
> > Subject: [PATCH] eventdev/eth_tx: fix queue delete
> >
> > Add spinlock protection in queue delete function.
> > This protects the data path while the queue delete operation
> > is in progress.
> >
> > Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>
> > ---
> >  lib/eventdev/rte_event_eth_tx_adapter.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
> > index c700fb7b1f..b4b37f1cae 100644
> > --- a/lib/eventdev/rte_event_eth_tx_adapter.c
> > +++ b/lib/eventdev/rte_event_eth_tx_adapter.c
> > @@ -891,9 +891,10 @@ txa_service_queue_del(uint8_t id,
> >
> >       txa = txa_service_id_to_data(id);
> >
> > +     rte_spinlock_lock(&txa->tx_lock);
> >       tqi = txa_service_queue(txa, port_id, tx_queue_id);
> >       if (tqi == NULL || !tqi->added)
> > -             return 0;
> > +             goto ret_unlock;
> >
> >       tb = tqi->tx_buf;
> >       tqi->added = 0;
> > @@ -903,6 +904,9 @@ txa_service_queue_del(uint8_t id,
> >       txa->txa_ethdev[port_id].nb_queues--;
> >
> >       txa_service_queue_array_free(txa, port_id);
> > +
> > +ret_unlock:
> > +     rte_spinlock_unlock(&txa->tx_lock);
> >       return 0;
> >  }
> >
> > --
> > 2.25.1
>
  

Patch

diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
index c700fb7b1f..b4b37f1cae 100644
--- a/lib/eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/eventdev/rte_event_eth_tx_adapter.c
@@ -891,9 +891,10 @@  txa_service_queue_del(uint8_t id,
 
 	txa = txa_service_id_to_data(id);
 
+	rte_spinlock_lock(&txa->tx_lock);
 	tqi = txa_service_queue(txa, port_id, tx_queue_id);
 	if (tqi == NULL || !tqi->added)
-		return 0;
+		goto ret_unlock;
 
 	tb = tqi->tx_buf;
 	tqi->added = 0;
@@ -903,6 +904,9 @@  txa_service_queue_del(uint8_t id,
 	txa->txa_ethdev[port_id].nb_queues--;
 
 	txa_service_queue_array_free(txa, port_id);
+
+ret_unlock:
+	rte_spinlock_unlock(&txa->tx_lock);
 	return 0;
 }