[v4,05/27] drivers: replace master/slave terminology
diff mbox series

Message ID 20200701202359.17006-6-stephen@networkplumber.org
State Deferred
Delegated to: Thomas Monjalon
Headers show
Series
  • Replace references to master and slave
Related show

Checks

Context Check Description
ci/Intel-compilation fail Compilation issues
ci/checkpatch success coding style OK

Commit Message

Stephen Hemminger July 1, 2020, 8:23 p.m. UTC
Replace rte_get_master_lcore() with rte_get_initial_lcore().
Replace RTE_LCORE_FOREACH_SLAVE with RTE_LCORE_FOREACH_WORKER

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/bus/dpaa/dpaa_bus.c                  | 2 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dpio.c     | 6 +++---
 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 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

Comments

Burakov, Anatoly July 13, 2020, 12:52 p.m. UTC | #1
On 01-Jul-20 9:23 PM, Stephen Hemminger wrote:
> Replace rte_get_master_lcore() with rte_get_initial_lcore().
> Replace RTE_LCORE_FOREACH_SLAVE with RTE_LCORE_FOREACH_WORKER
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---

Comments in pci_common_uio.c:54 and vmbus_common_uio.c:88 refers to 
secondary process as "slave", should probably fix that too.

You mentioned "bonding" driver as needing work but there's actually a 
whole bunch of instances of such terminology being used internally in 
other drivers as well (e.g. cryptodev scheduler). A quick grep on 
"master|slave" gives us a huge list of files, and while some of them are 
spec terms (e.g. PCI bus mastering), a lot of them aren't. I'm of course 
not suggesting it all should be done in this patch, just noting that 
bonding isn't the only driver needing work :)

As for contents of this patch (provided the corrections mentioned above 
are done),

Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>

Patch
diff mbox series

diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 591e28c1e709..81d62b02428f 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -260,7 +260,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_initial_lcore();
 	else
 		if (lcore >= RTE_MAX_LCORE)
 			return -1;
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
index 21c535f2fbad..d498161fe427 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
@@ -195,7 +195,7 @@  dpaa2_configure_stashing(struct dpaa2_dpio_dev *dpio_dev, int lcoreid)
 
 	/* Set the Stashing Destination */
 	if (lcoreid < 0) {
-		lcoreid = rte_get_master_lcore();
+		lcoreid = rte_get_initial_lcore();
 		if (lcoreid < 0) {
 			DPAA2_BUS_ERR("Getting CPU Index failed");
 			return -1;
@@ -259,7 +259,7 @@  dpaa2_affine_qbman_swp(void)
 	uint64_t tid = syscall(SYS_gettid);
 
 	if (lcore_id == LCORE_ID_ANY)
-		lcore_id = rte_get_master_lcore();
+		lcore_id = rte_get_initial_lcore();
 	/* if the core id is not supported */
 	else if (lcore_id >= RTE_MAX_LCORE)
 		return -1;
@@ -307,7 +307,7 @@  dpaa2_affine_qbman_ethrx_swp(void)
 	uint64_t tid = syscall(SYS_gettid);
 
 	if (lcore_id == LCORE_ID_ANY)
-		lcore_id = rte_get_master_lcore();
+		lcore_id = rte_get_initial_lcore();
 	/* if the core id is not supported */
 	else if (lcore_id >= RTE_MAX_LCORE)
 		return -1;
diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index 24a947f27823..b649e3317ea1 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_initial_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_initial_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 9037274327b1..4ffd81d903c4 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -816,7 +816,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_initial_lcore();
 
 	hif = mrvl_get_hif(priv, core_id);
 
@@ -1620,7 +1620,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_initial_lcore();
 
 	hif = mrvl_get_hif(rxq->priv, core_id);
 	if (!hif)
@@ -1770,7 +1770,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_initial_lcore();
 
 	if (!q)
 		return;
diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c
index 54e5e4f98159..8ecbf82c5e7c 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_initial_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_initial_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..a2b6f522427a 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_initial_lcore())
 		return 0; /* FALSE */
 
 	if (softnic->params.sc && rte_lcore_has_role(thread_id, ROLE_SERVICE))