[v2] event/dlb2: fix delayed_pop test in dlb2_selftest

Message ID 20211115163445.1438809-1-rashmi.shetty@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Jerin Jacob
Headers
Series [v2] event/dlb2: fix delayed_pop test in dlb2_selftest |

Checks

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

Commit Message

Rashmi Shetty Nov. 15, 2021, 4:34 p.m. UTC
  Number of events scheduled and available for dequeue
after token pop was set to dequeue_depth-1 instead of
dequeue_depth in test_delayed_pop. The expectation is
that all dequeue_depth number of events can be dequeued
once the last event is released.

Fixes: a10e8e96865f ("event/dlb2: add delayed token pop logic")

Signed-off-by: Rashmi Shetty <rashmi.shetty@intel.com>

---

v2:
 - Updated commit message with 'Fixes' tag (Jerin)

---
 drivers/event/dlb2/dlb2_selftest.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
  

Comments

Jerin Jacob Nov. 16, 2021, 7:07 a.m. UTC | #1
On Mon, Nov 15, 2021 at 10:04 PM Rashmi Shetty <rashmi.shetty@intel.com> wrote:
>
> Number of events scheduled and available for dequeue
> after token pop was set to dequeue_depth-1 instead of
> dequeue_depth in test_delayed_pop. The expectation is
> that all dequeue_depth number of events can be dequeued
> once the last event is released.
>
> Fixes: a10e8e96865f ("event/dlb2: add delayed token pop logic")
>
> Signed-off-by: Rashmi Shetty <rashmi.shetty@intel.com>
>
> ---
>
> v2:
>  - Updated commit message with 'Fixes' tag (Jerin)

Update git commit  as

Author: Rashmi Shetty <rashmi.shetty@intel.com>
Date:   Mon Nov 15 10:34:44 2021 -0600

    event/dlb2: fix delayed pop test in selftest

    Number of events scheduled and available for dequeue
    after token pop was set to dequeue_depth-1 instead of
    dequeue_depth in test_delayed_pop. The expectation is
    that all dequeue_depth number of events can be dequeued
    once the last event is released.

    Fixes: 07d55c418d47 ("event/dlb2: add delayed token pop logic")
    Cc: stable@dpdk.org

    Signed-off-by: Rashmi Shetty <rashmi.shetty@intel.com>
    Reviewed-by: Mike Ximing Chen <mike.ximing.chen@intel.con>

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




>
> ---
>  drivers/event/dlb2/dlb2_selftest.c | 12 ++----------
>  1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/event/dlb2/dlb2_selftest.c b/drivers/event/dlb2/dlb2_selftest.c
> index 5cf66c552c..2113bc2c99 100644
> --- a/drivers/event/dlb2/dlb2_selftest.c
> +++ b/drivers/event/dlb2/dlb2_selftest.c
> @@ -1354,7 +1354,7 @@ test_delayed_pop(void)
>         }
>
>         /* Release one more event. This will trigger the token pop, and
> -        * dequeue_depth - 1 more events will be scheduled to the device.
> +        * dequeue_depth more events will be scheduled to the device.
>          */
>         ev.op = RTE_EVENT_OP_RELEASE;
>
> @@ -1366,7 +1366,7 @@ test_delayed_pop(void)
>
>         timeout = 0xFFFFFFFFF;
>
> -       for (i = 0; i < port_conf.dequeue_depth - 1; i++) {
> +       for (i = 0; i < port_conf.dequeue_depth; i++) {
>                 if (rte_event_dequeue_burst(evdev, 0, &ev, 1, timeout) != 1) {
>                         printf("%d: event dequeue expected to succeed\n",
>                                __LINE__);
> @@ -1374,14 +1374,6 @@ test_delayed_pop(void)
>                 }
>         }
>
> -       timeout = 0x10000;
> -
> -       if (rte_event_dequeue_burst(evdev, 0, &ev, 1, timeout) != 0) {
> -               printf("%d: event dequeue expected to fail\n",
> -                      __LINE__);
> -               goto err;
> -       }
> -
>         cleanup();
>         return 0;
>
> --
> 2.25.1
>
  

Patch

diff --git a/drivers/event/dlb2/dlb2_selftest.c b/drivers/event/dlb2/dlb2_selftest.c
index 5cf66c552c..2113bc2c99 100644
--- a/drivers/event/dlb2/dlb2_selftest.c
+++ b/drivers/event/dlb2/dlb2_selftest.c
@@ -1354,7 +1354,7 @@  test_delayed_pop(void)
 	}
 
 	/* Release one more event. This will trigger the token pop, and
-	 * dequeue_depth - 1 more events will be scheduled to the device.
+	 * dequeue_depth more events will be scheduled to the device.
 	 */
 	ev.op = RTE_EVENT_OP_RELEASE;
 
@@ -1366,7 +1366,7 @@  test_delayed_pop(void)
 
 	timeout = 0xFFFFFFFFF;
 
-	for (i = 0; i < port_conf.dequeue_depth - 1; i++) {
+	for (i = 0; i < port_conf.dequeue_depth; i++) {
 		if (rte_event_dequeue_burst(evdev, 0, &ev, 1, timeout) != 1) {
 			printf("%d: event dequeue expected to succeed\n",
 			       __LINE__);
@@ -1374,14 +1374,6 @@  test_delayed_pop(void)
 		}
 	}
 
-	timeout = 0x10000;
-
-	if (rte_event_dequeue_burst(evdev, 0, &ev, 1, timeout) != 0) {
-		printf("%d: event dequeue expected to fail\n",
-		       __LINE__);
-		goto err;
-	}
-
 	cleanup();
 	return 0;