From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1919CA0613 for ; Tue, 27 Aug 2019 11:31:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 10A6A1BFFA; Tue, 27 Aug 2019 11:31:56 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 029281BFFA for ; Tue, 27 Aug 2019 11:31:55 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7695D8980F4; Tue, 27 Aug 2019 09:31:54 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F2EC5C1D6; Tue, 27 Aug 2019 09:31:53 +0000 (UTC) From: Kevin Traynor To: Harman Kalra Cc: David Hunt , dpdk stable Date: Tue, 27 Aug 2019 10:30:26 +0100 Message-Id: <20190827093032.20423-49-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Tue, 27 Aug 2019 09:31:54 +0000 (UTC) Subject: [dpdk-stable] patch 'distributor: fix check of workers number' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: David Hunt --- 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,