From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id E9CFDA04C7;
Mon, 14 Sep 2020 20:21:04 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 1E7711C116;
Mon, 14 Sep 2020 20:20:21 +0200 (CEST)
Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com
[209.85.215.194]) by dpdk.org (Postfix) with ESMTP id E0BFC1C0D2
for <dev@dpdk.org>; Mon, 14 Sep 2020 20:20:17 +0200 (CEST)
Received: by mail-pg1-f194.google.com with SMTP id f2so480561pgd.3
for <dev@dpdk.org>; Mon, 14 Sep 2020 11:20:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=ggyDbbZBdzkBNk4xZE6BbZ1i7i0f7w4AZAauD/rJcRo=;
b=CxJ8499F1rP/DOLVSe73431BJclKo/mUOeFIz4WPAnp6CNuxELuHmmsbsokoj2mB0V
Rxqn0EXjf00Rs9DUZluuYhXMAcbDSELmnlKU2Kh5dTfy0ZY66DCoOf/c4P8noSP6oaaO
ubBQILaAfAMXNZIERWdAPrvyg0e+u4Ru8cVEYyfgGafE3vmGAVAgCei8I02kHZxrnE/X
vM7BdM8Ieey5zrmfOjaUADVmyzUskG5eXFuImDxgmrGnd/0n7dc56R0U8yITT1dzqxGK
UygCk3cwdASL5HHhXA+XoDiUZdt/Wu+6ESHrNlOGipsdrs7IUcUQ4ev8VHSbZ9RSwleY
PJyA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=ggyDbbZBdzkBNk4xZE6BbZ1i7i0f7w4AZAauD/rJcRo=;
b=SyneGF9Lbk1J6doeqq5lU626m7f0T6Mczh07Z+l/DpvLJeeaRDZmE0+vyffMft8t12
qDt7PghepzAegEHNzz48V8zCoE63KjD28FOoHNva4ih+2P04qtQmnT9mjN/aj2LWV7V9
CFbGQl046K+ENDG67+spva9O2HuzHFtH9+lrS6B0PVWJB5FS+jU+Qo1+pPdRKdY3XHnC
0da/a9jDn2DRA+Hk1pExWRf+3xd5ipwsmUNC6geRpxpaFX1WBe10ARE9KgsbOMk+84Yf
C4oSFHJyheXEfh22XwFavo3j3Ppv6cGs5gRS9+CXlr/vsk3FaOcum9sUsl12vB4qt/hc
gysw==
X-Gm-Message-State: AOAM531OlkSbq+2omxCATHvcykR4CJtUsZ0ZBxPNj+vEMjCCLvaORbwN
29GasDRrErV0da2WafjAE634lsEJIijoVg==
X-Google-Smtp-Source: ABdhPJws4PmWJVjqCc9fau2chNhVqTy8OF54nE7/Rnij2MwV+XYS0+lIPieAXTpCN8ozFWby6G77Qw==
X-Received: by 2002:a17:902:b185:: with SMTP id
s5mr15481307plr.132.1600107616744;
Mon, 14 Sep 2020 11:20:16 -0700 (PDT)
Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])
by smtp.gmail.com with ESMTPSA id u6sm9952728pjy.37.2020.09.14.11.20.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 14 Sep 2020 11:20:16 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Anatoly Burakov <anatoly.burakov@intel.com>
Date: Mon, 14 Sep 2020 11:19:50 -0700
Message-Id: <20200914182002.6750-6-stephen@networkplumber.org>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200914182002.6750-1-stephen@networkplumber.org>
References: <20200911190701.29171-1-stephen@networkplumber.org>
<20200914182002.6750-1-stephen@networkplumber.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v2 05/17] drivers: replace master lcore with main
lcore
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Replace use of deprecated rte_master_lcore with rte_main_lcore.
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/bus/dpaa/dpaa_bus.c | 2 +-
drivers/net/bnxt/bnxt_ring.c | 4 ++--
drivers/net/mvpp2/mrvl_ethdev.c | 6 +++---
drivers/net/qede/base/bcm_osal.c | 4 ++--
drivers/net/softnic/rte_eth_softnic_thread.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 32e872da5209..c94c72106f2c 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -257,7 +257,7 @@ int rte_dpaa_portal_init(void *arg)
BUS_INIT_FUNC_TRACE();
if ((size_t)arg == 1 || lcore == LCORE_ID_ANY)
- lcore = rte_get_master_lcore();
+ lcore = rte_get_main_lcore();
else
if (lcore >= RTE_MAX_LCORE)
return -1;
diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index 54f654744259..910fb11c9c38 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -429,7 +429,7 @@ int bnxt_alloc_rxtx_nq_ring(struct bnxt *bp)
if (!BNXT_HAS_NQ(bp) || bp->rxtx_nq_ring)
return 0;
- socket_id = rte_lcore_to_socket_id(rte_get_master_lcore());
+ socket_id = rte_lcore_to_socket_id(rte_get_main_lcore());
nqr = rte_zmalloc_socket("nqr",
sizeof(struct bnxt_cp_ring_info),
@@ -819,7 +819,7 @@ int bnxt_alloc_async_ring_struct(struct bnxt *bp)
if (BNXT_NUM_ASYNC_CPR(bp) == 0)
return 0;
- socket_id = rte_lcore_to_socket_id(rte_get_master_lcore());
+ socket_id = rte_lcore_to_socket_id(rte_get_main_lcore());
cpr = rte_zmalloc_socket("cpr",
sizeof(struct bnxt_cp_ring_info),
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 96b27dfd309d..85deddf120b4 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -814,7 +814,7 @@ mrvl_flush_bpool(struct rte_eth_dev *dev)
unsigned int core_id = rte_lcore_id();
if (core_id == LCORE_ID_ANY)
- core_id = rte_get_master_lcore();
+ core_id = rte_get_main_lcore();
hif = mrvl_get_hif(priv, core_id);
@@ -1618,7 +1618,7 @@ mrvl_fill_bpool(struct mrvl_rxq *rxq, int num)
core_id = rte_lcore_id();
if (core_id == LCORE_ID_ANY)
- core_id = rte_get_master_lcore();
+ core_id = rte_get_main_lcore();
hif = mrvl_get_hif(rxq->priv, core_id);
if (!hif)
@@ -1768,7 +1768,7 @@ mrvl_rx_queue_release(void *rxq)
unsigned int core_id = rte_lcore_id();
if (core_id == LCORE_ID_ANY)
- core_id = rte_get_master_lcore();
+ core_id = rte_get_main_lcore();
if (!q)
return;
diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c
index 65837b53d063..4c2706ab4b90 100644
--- a/drivers/net/qede/base/bcm_osal.c
+++ b/drivers/net/qede/base/bcm_osal.c
@@ -112,7 +112,7 @@ void *osal_dma_alloc_coherent(struct ecore_dev *p_dev,
snprintf(mz_name, sizeof(mz_name), "%lx",
(unsigned long)rte_get_timer_cycles());
if (core_id == (unsigned int)LCORE_ID_ANY)
- core_id = rte_get_master_lcore();
+ core_id = rte_get_main_lcore();
socket_id = rte_lcore_to_socket_id(core_id);
mz = rte_memzone_reserve_aligned(mz_name, size, socket_id,
RTE_MEMZONE_IOVA_CONTIG, RTE_CACHE_LINE_SIZE);
@@ -151,7 +151,7 @@ void *osal_dma_alloc_coherent_aligned(struct ecore_dev *p_dev,
snprintf(mz_name, sizeof(mz_name), "%lx",
(unsigned long)rte_get_timer_cycles());
if (core_id == (unsigned int)LCORE_ID_ANY)
- core_id = rte_get_master_lcore();
+ core_id = rte_get_main_lcore();
socket_id = rte_lcore_to_socket_id(core_id);
mz = rte_memzone_reserve_aligned(mz_name, size, socket_id,
RTE_MEMZONE_IOVA_CONTIG, align);
diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c
index dcfb5eb82c18..8dbb8886e30e 100644
--- a/drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/drivers/net/softnic/rte_eth_softnic_thread.c
@@ -25,7 +25,7 @@ softnic_thread_free(struct pmd_internals *softnic)
{
uint32_t i;
- RTE_LCORE_FOREACH_SLAVE(i) {
+ RTE_LCORE_FOREACH_WORKER(i) {
struct softnic_thread *t = &softnic->thread[i];
/* MSGQs */
@@ -99,7 +99,7 @@ softnic_thread_init(struct pmd_internals *softnic)
static inline int
thread_is_valid(struct pmd_internals *softnic, uint32_t thread_id)
{
- if (thread_id == rte_get_master_lcore())
+ if (thread_id == rte_get_main_lcore())
return 0; /* FALSE */
if (softnic->params.sc && rte_lcore_has_role(thread_id, ROLE_SERVICE))
--
2.27.0