[dpdk-stable] patch 'distributor: fix check of workers number' has been queued to LTS release 18.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.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 09/03/19. 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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/6ba96c6bfaeb7d3406b3d0e97379cb4269a07522

Thanks.

Kevin Traynor

---
From 6ba96c6bfaeb7d3406b3d0e97379cb4269a07522 Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra@marvell.com>
Date: Fri, 5 Jul 2019 10:05:12 +0000
Subject: [PATCH] distributor: fix check of workers number

[ upstream commit acc6e5503e058553d668bc8f21038275aa3fa2e2 ]

No of workers should never exceed RTE_MAX_LCORE.
RTE_DIST_ALG_SINGLE also require no of workers check.

Fixes: 775003ad2f96 ("distributor: add new burst-capable library")

Signed-off-by: Harman Kalra <hkalra@marvell.com>
Acked-by: David Hunt <david.hunt@intel.com>
---
 lib/librte_distributor/rte_distributor.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c
index d50598377..043b8f3ae 100644
--- a/lib/librte_distributor/rte_distributor.c
+++ b/lib/librte_distributor/rte_distributor.c
@@ -596,4 +596,10 @@ rte_distributor_create_v1705(const char *name,
 	RTE_BUILD_BUG_ON((RTE_DISTRIB_MAX_WORKERS & 7) != 0);
 
+	if (name == NULL || num_workers >=
+		(unsigned int)RTE_MIN(RTE_DISTRIB_MAX_WORKERS, RTE_MAX_LCORE)) {
+		rte_errno = EINVAL;
+		return NULL;
+	}
+
 	if (alg_type == RTE_DIST_ALG_SINGLE) {
 		d = malloc(sizeof(struct rte_distributor));
@@ -613,9 +619,4 @@ rte_distributor_create_v1705(const char *name,
 	}
 
-	if (name == NULL || num_workers >= RTE_DISTRIB_MAX_WORKERS) {
-		rte_errno = EINVAL;
-		return NULL;
-	}
-
 	snprintf(mz_name, sizeof(mz_name), RTE_DISTRIB_PREFIX"%s", name);
 	mz = rte_memzone_reserve(mz_name, sizeof(*d), socket_id, NO_FLAGS);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.579821520 +0100
+++ 0049-distributor-fix-check-of-workers-number.patch	2019-08-27 09:40:10.949143684 +0100
@@ -1 +1 @@
-From acc6e5503e058553d668bc8f21038275aa3fa2e2 Mon Sep 17 00:00:00 2001
+From 6ba96c6bfaeb7d3406b3d0e97379cb4269a07522 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit acc6e5503e058553d668bc8f21038275aa3fa2e2 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 0a3213bbf..9fa05f69a 100644
+index d50598377..043b8f3ae 100644
@@ -22 +23 @@
-@@ -597,4 +597,10 @@ rte_distributor_create_v1705(const char *name,
+@@ -596,4 +596,10 @@ rte_distributor_create_v1705(const char *name,
@@ -33 +34 @@
-@@ -614,9 +620,4 @@ rte_distributor_create_v1705(const char *name,
+@@ -613,9 +619,4 @@ rte_distributor_create_v1705(const char *name,