[dpdk-stable] patch 'event/dsw: fix enqueue burst return value' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/24/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From a23ef1c188a9ab83a0a8e2fc188789b2795e49fd Mon Sep 17 00:00:00 2001
From: Yuri Chipchev <yuric at marvell.com>
Date: Wed, 6 May 2020 23:18:37 +0300
Subject: [PATCH] event/dsw: fix enqueue burst return value
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 1c4975d6dfa244cf52a2836ca267ba4a7b3ec75e ]

The returned number from rte_event_enqueue_*()
wouldn't include events marked with RTE_EVENT_OP_RELEASE.

Fixes: 1c8e3caa3 ("event/dsw: add event scheduling and device start/stop")

Signed-off-by: Yuri Chipchev <yuric at marvell.com>
Reviewed-by: Liron Himi <lironh at marvell.com>
Acked-by: Mattias Rönnblom <mattias.ronnblom at ericsson.com>
---
 drivers/event/dsw/dsw_event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c
index f3873c54e5..0df9209e4f 100644
--- a/drivers/event/dsw/dsw_event.c
+++ b/drivers/event/dsw/dsw_event.c
@@ -1097,7 +1097,7 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port,
 	DSW_LOG_DP_PORT(DEBUG, source_port->id, "%d non-release events "
 			"accepted.\n", num_non_release);
 
-	return num_non_release;
+	return (num_non_release + num_release);
 }
 
 uint16_t
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:39.300834212 +0100
+++ 0001-event-dsw-fix-enqueue-burst-return-value.patch	2020-05-22 10:37:39.048411280 +0100
@@ -1,4 +1,4 @@
-From 1c4975d6dfa244cf52a2836ca267ba4a7b3ec75e Mon Sep 17 00:00:00 2001
+From a23ef1c188a9ab83a0a8e2fc188789b2795e49fd Mon Sep 17 00:00:00 2001
 From: Yuri Chipchev <yuric at marvell.com>
 Date: Wed, 6 May 2020 23:18:37 +0300
 Subject: [PATCH] event/dsw: fix enqueue burst return value
@@ -6,11 +6,12 @@
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+[ upstream commit 1c4975d6dfa244cf52a2836ca267ba4a7b3ec75e ]
+
 The returned number from rte_event_enqueue_*()
 wouldn't include events marked with RTE_EVENT_OP_RELEASE.
 
 Fixes: 1c8e3caa3 ("event/dsw: add event scheduling and device start/stop")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yuri Chipchev <yuric at marvell.com>
 Reviewed-by: Liron Himi <lironh at marvell.com>
@@ -20,10 +21,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c
-index e5e3597aae..611b36781f 100644
+index f3873c54e5..0df9209e4f 100644
 --- a/drivers/event/dsw/dsw_event.c
 +++ b/drivers/event/dsw/dsw_event.c
-@@ -1231,7 +1231,7 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port,
+@@ -1097,7 +1097,7 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port,
  	DSW_LOG_DP_PORT(DEBUG, source_port->id, "%d non-release events "
  			"accepted.\n", num_non_release);