Skip to content

Replace references to master and slave

Stephen Hemminger dpdk-dev 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest27 patches 46 repliesIn review
  2. v327 patches 0 repliesSuperseded
  3. v2 RFC26 patches 1 replySuperseded

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/27eal: rename terms used for DPDK lcoresdoc/guides/nics/memif.rst lib/librte_eal/common/eal_common_launch.c lib/librte_eal/common/eal_common_lcore.c +18 more+216 -1891 reply
2/27kni: fix reference to master/slave processlib/librte_kni/rte_kni.h+1 -11 reply
3/27bbdev: rename master to initial lcoreexamples/bbdev_app/main.c+7 -71 reply
4/27librte_power: change reference to rte_master_lcorelib/librte_power/rte_power_empty_poll.c+1 -11 reply
5/27drivers: replace master/slave terminologydrivers/bus/dpaa/dpaa_bus.c drivers/bus/fslmc/portal/dpaa2_hw_dpio.c drivers/net/bnxt/bnxt_ring.c +3 more+13 -131 reply
6/27examples/distributor: rename master to initialexamples/distributor/main.c+5 -51 reply
7/27examples/bond: replace references to master lcoreexamples/bond/main.c+4 -41 reply
8/27examples/ethtool-app: replace references to slave with workerexamples/ethtool/ethtool-app/main.c+5 -51 reply
9/27examples/ip_pipeline: replace references to master_lcoreexamples/ip_pipeline/main.c examples/ip_pipeline/thread.c+9 -92 replies
10/27examples/qos_{meter/sched}: replace references to master lcoreexamples/qos_meter/main.c examples/qos_sched/args.c examples/qos_sched/cmdline.c +1 more+15 -151 reply
11/27examples/l3fwd: replace references to master lcoreexamples/l3fwd-acl/main.c examples/l3fwd-graph/main.c examples/l3fwd-power/main.c +1 more+20 -201 reply
12/27examples/l2fwd: replace references to master lcoreexamples/l2fwd-cat/l2fwd-cat.c examples/l2fwd-crypto/main.c examples/l2fwd-event/l2fwd_event_generic.c +6 more+18 -181 reply
13/27examples/multi_process: replace references to master lcoreexamples/multi_process/client_server_mp/mp_server/main.c examples/multi_process/simple_mp/main.c examples/multi_process/symmetric_mp/main.c+9 -91 reply
14/27examples/performance-thread: replace reference to master lcoreexamples/performance-thread/l3fwd-thread/main.c examples/performance-thread/pthread_shim/main.c+8 -81 reply
15/27examples/ptpclient: replace references to master lcoreexamples/ptpclient/ptpclient.c+1 -11 reply
16/27examples/ipcsec-secgw: replace references to master lcoreexamples/ipsec-secgw/event_helper.c examples/ipsec-secgw/ipsec-secgw.c+5 -51 reply
17/27examples: replace reference to master lcoreexamples/eventdev_pipeline/main.c examples/flow_classify/flow_classify.c examples/helloworld/main.c +16 more+66 -671 reply
18/27app/test-pmd: change references to master/slaveapp/test-pmd/config.c app/test-pmd/parameters.c app/test-pmd/softnicfwd.c +1 more+6 -61 reply
19/27test-eventdev: replace references to slave with worker lcoresapp/test-eventdev/evt_options.c app/test-eventdev/test_order_common.c app/test-eventdev/test_perf_common.c +1 more+19 -191 reply
20/27app/test: replace refernces to master/slaveapp/test/autotest_test_funcs.py app/test/test.c app/test/test_atomic.c +33 more+297 -2971 reply
21/27doc: fix incorrect reference to master processdoc/guides/prog_guide/thread_safety_dpdk_functions.rst+2 -21 reply
22/27doc: update references to master/slave lcore in documentationdoc/guides/contributing/coding_style.rst doc/guides/faq/faq.rst doc/guides/howto/debug_troubleshoot.rst +25 more+69 -661 reply
23/27app/pdump: replace references to master/slave lcoreapp/pdump/main.c+1 -11 reply
24/27app/test-XXX: replace reference to master/slaveapp/test-acl/main.c app/test-bbdev/test_bbdev_perf.c app/test-compress-perf/main.c +4 more+25 -251 reply
25/27eal: mark old naming as deprecatedlib/librte_eal/include/rte_launch.h lib/librte_eal/include/rte_lcore.h+5 -315 replies
26/27memif: replace master/slave with server/clientdoc/guides/nics/memif.rst drivers/net/memif/memif.h drivers/net/memif/memif_socket.c +3 more+163 -1622 replies
27/27vhost: rename SLAVE to CLIENTdrivers/vdpa/ifc/ifcvf_vdpa.c drivers/vdpa/mlx5/mlx5_vdpa.c lib/librte_vhost/rte_vhost.h +6 more+87 -862 replies

Reviews trailers per patch

22 of 27 patches have a Reviewed-by or Acked-by.

PatchAnatoly Burakov
1/27
2/27A-b
3/27R-b
4/27A-b
5/27R-b
6/27R-b
7/27A-b
8/27A-b
9/27A-b
10/27A-b
11/27A-b
12/27A-b
13/27A-b
14/27A-b
15/27A-b
16/27A-b
17/27A-b
18/27A-b
19/27A-b
20/27
21/27A-b
22/27
23/27A-b
24/27A-b
25/27
26/27A-b
27/27

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [dpdk-dev] [PATCH v4 00/27] Replace references to master and slave

This set of patches changes the API and conventions around referring to DPDK lcores. The first patch changes rte_get_master_lcore_id and related calls. The rest fix the DPDK to use the new naming.

Buried in the documentation set are a couple of patches where we were using incorrect naming around primary/secondary process.

This will could/should be flagged as an API policy violation since new API is jumping the queue of EXPERIMENTAL. But we can vote on the exception.

The one area left to be fixed is the bonding device.

v4
- fix checkpatch warnings
note: this patchset will cause some false positives
v3
- modify vhost to replace slave with client
- modify memif to replace slave with client
- fix variable names s2m becomes i2w etc.

Stephen Hemminger (27):
eal: rename terms used for DPDK lcores
kni: fix reference to master/slave process
bbdev: rename master to initial lcore
librte_power: change reference to rte_master_lcore
drivers: replace master/slave terminology examples/distributor: rename master to initial examples/bond: replace references to master lcore examples/ethtool-app: replace references to slave with worker examples/ip_pipeline: replace references to master_lcore examples/qos_{meter/sched}: replace references to master lcore examples/l3fwd: replace references to master lcore examples/l2fwd: replace references to master lcore examples/multi_process: replace references to master lcore examples/performance-thread: replace reference to master lcore examples/ptpclient: replace references to master lcore examples/ipcsec-secgw: replace references to master lcore
examples: replace reference to master lcore app/test-pmd: change references to master/slave
test-eventdev: replace references to slave with worker lcores app/test: replace refernces to master/slave
doc: fix incorrect reference to master process
doc: update references to master/slave lcore in documentation app/pdump: replace references to master/slave lcore app/test-XXX: replace reference to master/slave
eal: mark old naming as deprecated
memif: replace master/slave with server/client
vhost: rename SLAVE to CLIENT

 app/pdump/main.c                              |   2 +-
 app/test-acl/main.c                           |   2 +-
 app/test-bbdev/test_bbdev_perf.c              |  16 +--
 app/test-compress-perf/main.c                 |   8 +-
 app/test-crypto-perf/main.c                   |  14 +-
 app/test-eventdev/evt_options.c               |   2 +-
 app/test-eventdev/test_order_common.c         |  12 +-
 app/test-eventdev/test_perf_common.c          |  16 +--
 app/test-eventdev/test_pipeline_common.c      |   8 +-
 app/test-flow-perf/main.c                     |   2 +-
 app/test-pipeline/main.c                      |   4 +-
 app/test-pmd/config.c                         |   4 +-
 app/test-pmd/parameters.c                     |   2 +-
 app/test-pmd/softnicfwd.c                     |   2 +-
 app/test-pmd/testpmd.c                        |   4 +-
 app/test-sad/main.c                           |   4 +-
 app/test/autotest_test_funcs.py               |   2 +-
 app/test/test.c                               |   2 +-
 app/test/test_atomic.c                        |  26 ++--
 app/test/test_barrier.c                       |   2 +-
 app/test/test_cryptodev.c                     |  16 +--
 app/test/test_distributor.c                   |   8 +-
 app/test/test_distributor_perf.c              |  11 +-
 app/test/test_eal_flags.c                     |  32 ++---
 app/test/test_efd.c                           |   2 +-
 app/test/test_efd_perf.c                      |   2 +-
 app/test/test_func_reentrancy.c               |  25 ++--
 app/test/test_hash_multiwriter.c              |   4 +-
 app/test/test_hash_readwrite.c                |  38 +++---
 app/test/test_kni.c                           |  16 +--
 app/test/test_malloc.c                        |  12 +-
 app/test/test_mbuf.c                          |  36 ++---
 app/test/test_mcslock.c                       |  28 ++--
 app/test/test_mempool_perf.c                  |  10 +-
 app/test/test_mp_secondary.c                  |   2 +-
 app/test/test_pdump.c                         |   2 +-
 app/test/test_per_lcore.c                     |  14 +-
 app/test/test_pmd_perf.c                      |  20 +--
 app/test/test_rcu_qsbr.c                      |   2 +-
 app/test/test_rcu_qsbr_perf.c                 |   2 +-
 app/test/test_ring_perf.c                     |  14 +-
 app/test/test_ring_stress_impl.h              |  10 +-
 app/test/test_rwlock.c                        |  28 ++--
 app/test/test_service_cores.c                 |  10 +-
 app/test/test_spinlock.c                      |  34 ++---
 app/test/test_stack.c                         |   2 +-
 app/test/test_stack_perf.c                    |   6 +-
 app/test/test_ticketlock.c                    |  36 ++---
 app/test/test_timer.c                         | 107 ++++++++-------
 app/test/test_timer_racecond.c                |  27 ++--
 app/test/test_timer_secondary.c               |   2 +-
 app/test/test_trace_perf.c                    |   4 +-
 doc/guides/contributing/coding_style.rst      |   2 +-
 doc/guides/faq/faq.rst                        |   6 +-
 doc/guides/howto/debug_troubleshoot.rst       |   2 +-
 doc/guides/linux_gsg/eal_args.include.rst     |   4 +-
 doc/guides/nics/bnxt.rst                      |   2 +-
 doc/guides/nics/fail_safe.rst                 |   3 -
 doc/guides/nics/memif.rst                     |  82 +++++------
 .../prog_guide/env_abstraction_layer.rst      |   6 +-
 .../prog_guide/event_ethernet_rx_adapter.rst  |   2 +-
 doc/guides/prog_guide/glossary.rst            |   8 +-
 .../thread_safety_dpdk_functions.rst          |   4 +-
 doc/guides/rel_notes/release_20_08.rst        |   7 +-
 doc/guides/sample_app_ug/bbdev_app.rst        |   2 +-
 doc/guides/sample_app_ug/ethtool.rst          |   4 +-
 doc/guides/sample_app_ug/hello_world.rst      |   8 +-
 doc/guides/sample_app_ug/ioat.rst             |  12 +-
 doc/guides/sample_app_ug/ip_pipeline.rst      |   4 +-
 doc/guides/sample_app_ug/keep_alive.rst       |   2 +-
 doc/guides/sample_app_ug/l2_forward_event.rst |   4 +-
 .../sample_app_ug/l2_forward_real_virtual.rst |   4 +-
 doc/guides/sample_app_ug/l3_forward_graph.rst |   6 +-
 .../sample_app_ug/l3_forward_power_man.rst    |   2 +-
 doc/guides/sample_app_ug/link_status_intr.rst |   4 +-
 doc/guides/sample_app_ug/multi_process.rst    |   6 +-
 doc/guides/sample_app_ug/packet_ordering.rst  |   8 +-
 .../sample_app_ug/performance_thread.rst      |   6 +-
 doc/guides/sample_app_ug/qos_scheduler.rst    |   4 +-
 doc/guides/sample_app_ug/timer.rst            |  13 +-
 doc/guides/testpmd_app_ug/run_app.rst         |   2 +-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst   |   2 +-
 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/memif/memif.h                     |  40 +++---
 drivers/net/memif/memif_socket.c              |  54 ++++----
 drivers/net/memif/memif_socket.h              |   5 +-
 drivers/net/memif/rte_eth_memif.c             | 128 +++++++++---------
 drivers/net/memif/rte_eth_memif.h             |  20 +--
 drivers/net/mvpp2/mrvl_ethdev.c               |   6 +-
 drivers/net/qede/base/bcm_osal.c              |   4 +-
 drivers/net/softnic/rte_eth_softnic_thread.c  |   4 +-
 drivers/vdpa/ifc/ifcvf_vdpa.c                 |   4 +-
 drivers/vdpa/mlx5/mlx5_vdpa.c                 |   4 +-
 examples/bbdev_app/main.c                     |  14 +-
 examples/bond/main.c                          |   8 +-
 examples/distributor/main.c                   |  10 +-
 examples/ethtool/ethtool-app/main.c           |  10 +-
 examples/eventdev_pipeline/main.c             |   2 +-
 examples/flow_classify/flow_classify.c        |   2 +-
 examples/helloworld/main.c                    |   6 +-
 examples/ioat/ioatfwd.c                       |   6 +-
 examples/ip_fragmentation/main.c              |   4 +-
 examples/ip_pipeline/main.c                   |   2 +-
 examples/ip_pipeline/thread.c                 |  16 +--
 examples/ip_reassembly/main.c                 |   4 +-
 examples/ipsec-secgw/event_helper.c           |   6 +-
 examples/ipsec-secgw/ipsec-secgw.c            |   4 +-
 examples/ipv4_multicast/main.c                |   4 +-
 examples/kni/main.c                           |   7 +-
 examples/l2fwd-cat/l2fwd-cat.c                |   2 +-
 examples/l2fwd-crypto/main.c                  |   8 +-
 examples/l2fwd-event/l2fwd_event_generic.c    |   2 +-
 .../l2fwd-event/l2fwd_event_internal_port.c   |   2 +-
 examples/l2fwd-event/l2fwd_poll.c             |   2 +-
 examples/l2fwd-event/main.c                   |   2 +-
 examples/l2fwd-jobstats/main.c                |   4 +-
 examples/l2fwd-keepalive/main.c               |   6 +-
 examples/l2fwd/main.c                         |   8 +-
 examples/l3fwd-acl/main.c                     |   4 +-
 examples/l3fwd-graph/main.c                   |  14 +-
 examples/l3fwd-power/main.c                   |  20 +--
 examples/l3fwd/main.c                         |   2 +-
 examples/link_status_interrupt/main.c         |   8 +-
 .../client_server_mp/mp_server/main.c         |  10 +-
 examples/multi_process/simple_mp/main.c       |   6 +-
 examples/multi_process/symmetric_mp/main.c    |   2 +-
 examples/ntb/ntb_fwd.c                        |  14 +-
 examples/packet_ordering/main.c               |  22 +--
 .../performance-thread/l3fwd-thread/main.c    |  12 +-
 .../performance-thread/pthread_shim/main.c    |   4 +-
 examples/ptpclient/ptpclient.c                |   2 +-
 examples/qos_meter/main.c                     |   4 +-
 examples/qos_sched/args.c                     |  22 +--
 examples/qos_sched/cmdline.c                  |   2 +-
 examples/qos_sched/main.c                     |   2 +-
 examples/rxtx_callbacks/main.c                |   2 +-
 examples/server_node_efd/server/main.c        |  10 +-
 examples/skeleton/basicfwd.c                  |   2 +-
 examples/tep_termination/main.c               |  12 +-
 examples/timer/main.c                         |   8 +-
 examples/vhost/main.c                         |  10 +-
 examples/vmdq/main.c                          |   4 +-
 examples/vmdq_dcb/main.c                      |   6 +-
 lib/librte_eal/common/eal_common_launch.c     |  36 ++---
 lib/librte_eal/common/eal_common_lcore.c      |  11 +-
 lib/librte_eal/common/eal_common_options.c    |  62 ++++-----
 lib/librte_eal/common/eal_options.h           |   4 +-
 lib/librte_eal/common/eal_private.h           |   6 +-
 lib/librte_eal/common/eal_thread.h            |   6 +-
 lib/librte_eal/common/rte_random.c            |   2 +-
 lib/librte_eal/common/rte_service.c           |   2 +-
 lib/librte_eal/freebsd/eal.c                  |  24 ++--
 lib/librte_eal/freebsd/eal_thread.c           |  34 ++---
 lib/librte_eal/include/rte_eal.h              |   4 +-
 lib/librte_eal/include/rte_eal_trace.h        |   4 +-
 lib/librte_eal/include/rte_launch.h           |  62 +++++----
 lib/librte_eal/include/rte_lcore.h            |  31 ++++-
 lib/librte_eal/linux/eal.c                    |  24 ++--
 lib/librte_eal/linux/eal_memory.c             |  10 +-
 lib/librte_eal/linux/eal_thread.c             |  34 ++---
 lib/librte_eal/rte_eal_version.map            |   1 +
 lib/librte_eal/windows/eal.c                  |  14 +-
 lib/librte_eal/windows/eal_thread.c           |  32 ++---
 lib/librte_kni/rte_kni.h                      |   2 +-
 lib/librte_power/rte_power_empty_poll.c       |   2 +-
 lib/librte_vhost/rte_vhost.h                  |  16 +--
 lib/librte_vhost/rte_vhost_version.map        |   2 +-
 lib/librte_vhost/vhost.c                      |   4 +-
 lib/librte_vhost/vhost.h                      |   4 +-
 lib/librte_vhost/vhost_crypto.c               |   2 +-
 lib/librte_vhost/vhost_user.c                 |  96 ++++++-------
 lib/librte_vhost/vhost_user.h                 |  41 +++---
 174 files changed, 1074 insertions(+), 1041 deletions(-)
Signature · 1 line
2.26.2