diff mbox series

[v2,4/5] eventdev/crypto: fix overflow in circular buffer

Message ID 20221201064652.1885734-4-ganapati.kundapura@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Jerin Jacob
Headers
Series [v2,1/5] eventdev/event_crypto: process event port's impl rel cap |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Ganapati Kundapura Dec. 1, 2022, 6:46 a.m. UTC 
  Crypto adapter checks CPM backpressure once in enq_run()
This leads to buffer overflow if some ops failed to flush
to cryptodev.

Checked CPM backpressure for every iteration in enq_run()

Fixes: 7901eac3409a ("eventdev: add crypto adapter implementation")

Signed-off-by: Ganapati Kundapura <ganapati.kundapura@intel.com>
---
v2:
* Updated subject line in commit message

Comments

Volodymyr Fialko Dec. 5, 2022, 11:37 a.m. UTC | #1 
> -----Original Message-----
> From: Ganapati Kundapura <ganapati.kundapura@intel.com>
> Sent: Thursday, December 1, 2022 7:47 AM
> To: dev@dpdk.org; Jerin Jacob Kollanukkaran <jerinj@marvell.com>; s.v.naga.harish.k@intel.com;
> abhinandan.gujjar@intel.com
> Cc: jay.jayatheerthan@intel.com
> Subject: [EXT] [PATCH v2 4/5] eventdev/crypto: fix overflow in circular buffer
> 
> External Email
> 
> ----------------------------------------------------------------------
> Crypto adapter checks CPM backpressure once in enq_run() This leads to buffer overflow if some ops
> failed to flush to cryptodev.
> 
> Checked CPM backpressure for every iteration in enq_run()
> 
> Fixes: 7901eac3409a ("eventdev: add crypto adapter implementation")
> 
> Signed-off-by: Ganapati Kundapura <ganapati.kundapura@intel.com>
> ---
Acked-by: Volodymyr Fialko <vfialko@marvell.com>
Gujjar, Abhinandan S Dec. 6, 2022, 4:25 p.m. UTC | #2 
> -----Original Message-----
> From: Kundapura, Ganapati <ganapati.kundapura@intel.com>
> Sent: Thursday, December 1, 2022 12:17 PM
> To: dev@dpdk.org; jerinj@marvell.com; Naga Harish K, S V
> <s.v.naga.harish.k@intel.com>; Gujjar, Abhinandan S
> <abhinandan.gujjar@intel.com>
> Cc: Jayatheerthan, Jay <jay.jayatheerthan@intel.com>
> Subject: [PATCH v2 4/5] eventdev/crypto: fix overflow in circular buffer
> 
> Crypto adapter checks CPM backpressure once in enq_run() This leads to
> buffer overflow if some ops failed to flush to cryptodev.
Adapter is agnostic to hardware, replace CPM with "crypto device"

Rephrase the commit message by adding:-
In case of crypto enqueue failures, even though backpressure flag is set to stop
further dequeue from eventdev the current logic does not stop dequeuing events
for max_nb events. This is fixed by checking backpressure just before dequeuing
events from event device.

> 
> Checked CPM backpressure for every iteration in enq_run()
> 
> Fixes: 7901eac3409a ("eventdev: add crypto adapter implementation")
> 
> Signed-off-by: Ganapati Kundapura <ganapati.kundapura@intel.com>
> ---
> v2:
> * Updated subject line in commit message
> 
> diff --git a/lib/eventdev/rte_event_crypto_adapter.c
> b/lib/eventdev/rte_event_crypto_adapter.c
> index 72deedd..1d39c5b 100644
> --- a/lib/eventdev/rte_event_crypto_adapter.c
> +++ b/lib/eventdev/rte_event_crypto_adapter.c
> @@ -573,14 +573,15 @@ eca_crypto_adapter_enq_run(struct
> event_crypto_adapter *adapter,
>  	if (adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW)
>  		return 0;
> 
> -	if (unlikely(adapter->stop_enq_to_cryptodev)) {
> -		nb_enqueued += eca_crypto_enq_flush(adapter);
> +	for (nb_enq = 0; nb_enq < max_enq; nb_enq += n) {
> 
> -		if (unlikely(adapter->stop_enq_to_cryptodev))
> -			goto skip_event_dequeue_burst;
> -	}
> +		if (unlikely(adapter->stop_enq_to_cryptodev)) {
> +			nb_enqueued += eca_crypto_enq_flush(adapter);
> +
> +			if (unlikely(adapter->stop_enq_to_cryptodev))
> +				break;
> +		}
> 
> -	for (nb_enq = 0; nb_enq < max_enq; nb_enq += n) {
>  		stats->event_poll_count++;
>  		n = rte_event_dequeue_burst(event_dev_id,
>  					    event_port_id, ev, BATCH_SIZE, 0);
> @@ -591,8 +592,6 @@ eca_crypto_adapter_enq_run(struct
> event_crypto_adapter *adapter,
>  		nb_enqueued += eca_enq_to_cryptodev(adapter, ev, n);
>  	}
> 
> -skip_event_dequeue_burst:
> -
>  	if ((++adapter->transmit_loop_count &
>  		(CRYPTO_ENQ_FLUSH_THRESHOLD - 1)) == 0) {
>  		nb_enqueued += eca_crypto_enq_flush(adapter);
> --
> 2.6.4
Ganapati Kundapura Dec. 7, 2022, 6:53 a.m. UTC | #3 
Hi Abhi,

> -----Original Message-----
> From: Gujjar, Abhinandan S <abhinandan.gujjar@intel.com>
> Sent: Tuesday, December 6, 2022 9:56 PM
> To: Kundapura, Ganapati <ganapati.kundapura@intel.com>; dev@dpdk.org;
> jerinj@marvell.com; Naga Harish K, S V <s.v.naga.harish.k@intel.com>
> Cc: Jayatheerthan, Jay <jay.jayatheerthan@intel.com>
> Subject: RE: [PATCH v2 4/5] eventdev/crypto: fix overflow in circular buffer
> 
> 
> 
> > -----Original Message-----
> > From: Kundapura, Ganapati <ganapati.kundapura@intel.com>
> > Sent: Thursday, December 1, 2022 12:17 PM
> > To: dev@dpdk.org; jerinj@marvell.com; Naga Harish K, S V
> > <s.v.naga.harish.k@intel.com>; Gujjar, Abhinandan S
> > <abhinandan.gujjar@intel.com>
> > Cc: Jayatheerthan, Jay <jay.jayatheerthan@intel.com>
> > Subject: [PATCH v2 4/5] eventdev/crypto: fix overflow in circular
> > buffer
> >
> > Crypto adapter checks CPM backpressure once in enq_run() This leads to
> > buffer overflow if some ops failed to flush to cryptodev.
> Adapter is agnostic to hardware, replace CPM with "crypto device"
> 
> Rephrase the commit message by adding:-
> In case of crypto enqueue failures, even though backpressure flag is set to
> stop further dequeue from eventdev the current logic does not stop
> dequeuing events for max_nb events. This is fixed by checking backpressure
> just before dequeuing events from event device.
> 
Updated in V3
> >
> > Checked CPM backpressure for every iteration in enq_run()
> >
> > Fixes: 7901eac3409a ("eventdev: add crypto adapter implementation")
> >
> > Signed-off-by: Ganapati Kundapura <ganapati.kundapura@intel.com>
> > ---
> > v2:
> > * Updated subject line in commit message
> >
> > diff --git a/lib/eventdev/rte_event_crypto_adapter.c
> > b/lib/eventdev/rte_event_crypto_adapter.c
> > index 72deedd..1d39c5b 100644
> > --- a/lib/eventdev/rte_event_crypto_adapter.c
> > +++ b/lib/eventdev/rte_event_crypto_adapter.c
> > @@ -573,14 +573,15 @@ eca_crypto_adapter_enq_run(struct
> > event_crypto_adapter *adapter,
> >  	if (adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW)
> >  		return 0;
> >
> > -	if (unlikely(adapter->stop_enq_to_cryptodev)) {
> > -		nb_enqueued += eca_crypto_enq_flush(adapter);
> > +	for (nb_enq = 0; nb_enq < max_enq; nb_enq += n) {
> >
> > -		if (unlikely(adapter->stop_enq_to_cryptodev))
> > -			goto skip_event_dequeue_burst;
> > -	}
> > +		if (unlikely(adapter->stop_enq_to_cryptodev)) {
> > +			nb_enqueued += eca_crypto_enq_flush(adapter);
> > +
> > +			if (unlikely(adapter->stop_enq_to_cryptodev))
> > +				break;
> > +		}
> >
> > -	for (nb_enq = 0; nb_enq < max_enq; nb_enq += n) {
> >  		stats->event_poll_count++;
> >  		n = rte_event_dequeue_burst(event_dev_id,
> >  					    event_port_id, ev, BATCH_SIZE, 0);
> @@ -591,8 +592,6 @@
> > eca_crypto_adapter_enq_run(struct event_crypto_adapter *adapter,
> >  		nb_enqueued += eca_enq_to_cryptodev(adapter, ev, n);
> >  	}
> >
> > -skip_event_dequeue_burst:
> > -
> >  	if ((++adapter->transmit_loop_count &
> >  		(CRYPTO_ENQ_FLUSH_THRESHOLD - 1)) == 0) {
> >  		nb_enqueued += eca_crypto_enq_flush(adapter);
> > --
> > 2.6.4
diff mbox series

Patch

diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c
index 72deedd..1d39c5b 100644
--- a/lib/eventdev/rte_event_crypto_adapter.c
+++ b/lib/eventdev/rte_event_crypto_adapter.c
@@ -573,14 +573,15 @@  eca_crypto_adapter_enq_run(struct event_crypto_adapter *adapter,
 	if (adapter->mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW)
 		return 0;
 
-	if (unlikely(adapter->stop_enq_to_cryptodev)) {
-		nb_enqueued += eca_crypto_enq_flush(adapter);
+	for (nb_enq = 0; nb_enq < max_enq; nb_enq += n) {
 
-		if (unlikely(adapter->stop_enq_to_cryptodev))
-			goto skip_event_dequeue_burst;
-	}
+		if (unlikely(adapter->stop_enq_to_cryptodev)) {
+			nb_enqueued += eca_crypto_enq_flush(adapter);
+
+			if (unlikely(adapter->stop_enq_to_cryptodev))
+				break;
+		}
 
-	for (nb_enq = 0; nb_enq < max_enq; nb_enq += n) {
 		stats->event_poll_count++;
 		n = rte_event_dequeue_burst(event_dev_id,
 					    event_port_id, ev, BATCH_SIZE, 0);
@@ -591,8 +592,6 @@  eca_crypto_adapter_enq_run(struct event_crypto_adapter *adapter,
 		nb_enqueued += eca_enq_to_cryptodev(adapter, ev, n);
 	}
 
-skip_event_dequeue_burst:
-
 	if ((++adapter->transmit_loop_count &
 		(CRYPTO_ENQ_FLUSH_THRESHOLD - 1)) == 0) {
 		nb_enqueued += eca_crypto_enq_flush(adapter);