From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id 3E9C6A0471
for <public@inbox.dpdk.org>; Fri, 21 Jun 2019 18:50:11 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 357165B3A;
Fri, 21 Jun 2019 18:50:11 +0200 (CEST)
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
by dpdk.org (Postfix) with ESMTP id 7BD2A5B3A
for <stable@dpdk.org>; Fri, 21 Jun 2019 18:50:10 +0200 (CEST)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id F224E30C1320
for <stable@dpdk.org>; Fri, 21 Jun 2019 16:50:09 +0000 (UTC)
Received: from rh.redhat.com (ovpn-117-77.ams2.redhat.com [10.36.117.77])
by smtp.corp.redhat.com (Postfix) with ESMTP id 574FD60BFB;
Fri, 21 Jun 2019 16:49:30 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: David Marchand <david.marchand@redhat.com>
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>, dpdk stable <stable@dpdk.org>
Date: Fri, 21 Jun 2019 17:46:02 +0100
Message-Id: <20190621164626.31219-18-ktraynor@redhat.com>
In-Reply-To: <20190621164626.31219-1-ktraynor@redhat.com>
References: <20190621164626.31219-1-ktraynor@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.45]); Fri, 21 Jun 2019 16:50:10 +0000 (UTC)
Subject: [dpdk-stable] patch 'net/cxgbe: do not dereference global config
struct' 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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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 06/26/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/26c9e9406e34049542a1eb2e4fd076547753d29d
Thanks.
Kevin Traynor
---
>From 26c9e9406e34049542a1eb2e4fd076547753d29d Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 15 May 2019 09:54:19 +0200
Subject: [PATCH] net/cxgbe: do not dereference global config struct
[ upstream commit 64a46f14f616ff83da9ebfa8ab1c93e62dc99dd5 ]
Prefer the existing apis rather than direct access the configuration
structure.
Fixes: 92c8a63223e5 ("cxgbe: add device configuration and Rx support")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
drivers/net/cxgbe/cxgbe_main.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c
index 6a3cbc1e5..dbdbbd170 100644
--- a/drivers/net/cxgbe/cxgbe_main.c
+++ b/drivers/net/cxgbe/cxgbe_main.c
@@ -505,5 +505,4 @@ int cxgbe_cfg_queue_count(struct rte_eth_dev *eth_dev)
void cxgbe_cfg_queues(struct rte_eth_dev *eth_dev)
{
- struct rte_config *config = rte_eal_get_configuration();
struct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);
struct adapter *adap = pi->adapter;
@@ -528,6 +527,6 @@ void cxgbe_cfg_queues(struct rte_eth_dev *eth_dev)
nb_ports;
- if (q_per_port > config->lcore_count)
- q_per_port = config->lcore_count;
+ if (q_per_port > rte_lcore_count())
+ q_per_port = rte_lcore_count();
for_each_port(adap, i) {
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-06-21 17:22:12.687674856 +0100
+++ 0018-net-cxgbe-do-not-dereference-global-config-struct.patch 2019-06-21 17:22:11.730518966 +0100
@@ -1 +1 @@
-From 64a46f14f616ff83da9ebfa8ab1c93e62dc99dd5 Mon Sep 17 00:00:00 2001
+From 26c9e9406e34049542a1eb2e4fd076547753d29d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 64a46f14f616ff83da9ebfa8ab1c93e62dc99dd5 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index b5d5cd081..c3036e136 100644
+index 6a3cbc1e5..dbdbbd170 100644