* [PATCH 000/227] use NUMA node terminology across the tree
@ 2026-11-03 14:49 Chengwen Feng
2026-11-03 14:49 ` [PATCH 001/227] eal: add NUMA-aware APIs Chengwen Feng
` (227 more replies)
0 siblings, 228 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
The DPDK tree conflates CPU sockets with NUMA memory nodes: public
APIs, structure fields and macros are named after "socket" although
they actually identify a NUMA node (e.g. rte_socket_id(), the
socket_id field of rte_memzone, SOCKET_ID_ANY). This naming misleads
application developers and pollutes vendor code that targets NUMA
topologies.
This series renames the terminology tree-wide:
Foundation (EAL):
- New NUMA-aware functions are added: rte_numa_id(),
rte_numa_count(), rte_numa_id_by_idx(), rte_lcore_to_numa_id(),
rte_malloc_heap_numa_is_external(), and friends.
- SOCKET_ID_ANY becomes RTE_NUMA_ID_ANY; SOCKET_ID_ANY is kept as a
deprecated macro alias.
- The socket_id fields of the public structures are renamed to
numa_id, keeping socket_id as a deprecated union alias (so field
offsets, and therefore ABI layout, are unchanged). Affected
structures include rte_memzone, rte_memseg, rte_memseg_list,
rte_mempool, rte_hash_parameters, rte_graph, rte_service_spec,
rte_acl_param, rte_gro_param, rte_ipsec_sad_conf, rte_member_*,
rte_bbdev_*, rte_cryptodev_config, rte_compressdev_config,
rte_event_*, rte_ml_dev_config, rte_rawdev* -- see
doc/guides/rel_notes/deprecation.rst for the full list.
Libraries:
- Library-specific APIs follow the same pattern: ethdev, cryptodev,
compressdev, rawdev, mldev, bbdev and eventdev gain NUMA-named
device APIs (e.g. rte_event_dev_numa_id()) with the socket
variants kept as deprecated aliases.
Drivers, applications, examples and documentation:
- One commit per unit; in-tree users are updated in the same commit
as the unit they belong to, moving from libs to drivers and then
to app/examples.
- The programming guides and API docs are updated to the new names.
Compatibility notes:
- The deprecated aliases preserve source compatibility for external
applications for one release; they will be removed in a future
release, as recorded in deprecation.rst.
- No ABI break: the deprecated union alias keeps the layout
identical.
- Device arguments and command-line options that literally use the
"socket" name (e.g. --socket-mem, --socket-limit, the
socket_id= parameter of the bbdev/compressdev vdevs) are
intentionally NOT renamed to avoid breaking user scripts; their
documentation still describes the existing parameter names.
Feedback on whether/how to migrate these user-facing names is
welcome.
This series is based on v26.11-rc2 and developped by AI.
Chengwen Feng (227):
eal: add NUMA-aware APIs
mempool: use NUMA node terminology
ring: use NUMA node terminology
hash: use NUMA node terminology
member: use NUMA node terminology
ethdev: rename device socket API to NUMA node API
cryptodev: rename device socket API to NUMA node API
compressdev: rename device socket API to NUMA node API
rawdev: rename device socket API to NUMA node API
mldev: rename device socket API to NUMA node API
bbdev: rename device socket API to NUMA node API
eventdev: rename device socket API to NUMA node API
acl: use NUMA node terminology
ipsec: use NUMA node terminology
graph: use NUMA node terminology
gro: use NUMA node terminology
fib: use NUMA node terminology
rib: use NUMA node terminology
lpm: use NUMA node terminology
efd: use NUMA node terminology
ip_frag: use NUMA node terminology
node: use NUMA node terminology
distributor: use NUMA node terminology
reorder: use NUMA node terminology
stack: use NUMA node terminology
regexdev: use NUMA node terminology
metrics: use NUMA node terminology
mbuf: use NUMA node terminology
timer: use NUMA node terminology
table: use NUMA node terminology
rcu: use NUMA node terminology
pdump: use NUMA node terminology
pdcp: use NUMA node terminology
latencystats: use NUMA node terminology
gpudev: use NUMA node terminology
dmadev: use NUMA node terminology
dispatcher: use NUMA node terminology
vhost: use NUMA node terminology
baseband/acc: use NUMA node terminology
baseband/fpga_5gnr_fec: use NUMA node terminology
baseband/fpga_lte_fec: use NUMA node terminology
baseband/null: use NUMA node terminology
baseband/turbo_sw: use NUMA node terminology
bus/auxiliary: use NUMA node terminology
bus/dpaa: use NUMA node terminology
bus/fslmc: use NUMA node terminology
bus/ifpga: use NUMA node terminology
bus/pci: use NUMA node terminology
bus/platform: use NUMA node terminology
bus/vdev: use NUMA node terminology
bus/vmbus: use NUMA node terminology
common/cnxk: use NUMA node terminology
common/nitrox: use NUMA node terminology
common/zsda: use NUMA node terminology
compress/isal: use NUMA node terminology
compress/mlx5: use NUMA node terminology
compress/nitrox: use NUMA node terminology
compress/octeontx: use NUMA node terminology
compress/uadk: use NUMA node terminology
compress/zlib: use NUMA node terminology
compress/zsda: use NUMA node terminology
crypto/armv8: use NUMA node terminology
crypto/bcmfs: use NUMA node terminology
crypto/caam_jr: use NUMA node terminology
crypto/ccp: use NUMA node terminology
crypto/cnxk: use NUMA node terminology
crypto/dpaa2_sec: use NUMA node terminology
crypto/dpaa_sec: use NUMA node terminology
crypto/ionic: use NUMA node terminology
crypto/ipsec_mb: use NUMA node terminology
crypto/mlx5: use NUMA node terminology
crypto/mvsam: use NUMA node terminology
crypto/nitrox: use NUMA node terminology
crypto/null: use NUMA node terminology
crypto/octeontx: use NUMA node terminology
crypto/openssl: use NUMA node terminology
crypto/scheduler: use NUMA node terminology
crypto/uadk: use NUMA node terminology
crypto/virtio: use NUMA node terminology
crypto/zsda: use NUMA node terminology
dma/ae4dma: use NUMA node terminology
dma/cnxk: use NUMA node terminology
dma/dpaa: use NUMA node terminology
dma/dpaa2: use NUMA node terminology
dma/hisi_acc: use NUMA node terminology
dma/idxd: use NUMA node terminology
dma/imx_edma5: use NUMA node terminology
dma/odm: use NUMA node terminology
dma/skeleton: use NUMA node terminology
event/cnxk: use NUMA node terminology
event/dlb2: use NUMA node terminology
event/dpaa: use NUMA node terminology
event/dpaa2: use NUMA node terminology
event/dsw: use NUMA node terminology
event/octeontx: use NUMA node terminology
event/opdl: use NUMA node terminology
event/skeleton: use NUMA node terminology
event/sw: use NUMA node terminology
mempool/bucket: use NUMA node terminology
mempool/cnxk: use NUMA node terminology
ml/cnxk: use NUMA node terminology
net/af_packet: use NUMA node terminology
net/af_xdp: use NUMA node terminology
net/ark: use NUMA node terminology
net/atlantic: use NUMA node terminology
net/avp: use NUMA node terminology
net/axgbe: use NUMA node terminology
net/bnx2x: use NUMA node terminology
net/bnxt: use NUMA node terminology
net/bonding: use NUMA node terminology
net/cnxk: use NUMA node terminology
net/cxgbe: use NUMA node terminology
net/dpaa: use NUMA node terminology
net/dpaa2: use NUMA node terminology
net/ena: use NUMA node terminology
net/enetc: use NUMA node terminology
net/enetfec: use NUMA node terminology
net/enic: use NUMA node terminology
net/failsafe: use NUMA node terminology
net/gve: use NUMA node terminology
net/hinic: use NUMA node terminology
net/hinic3: use NUMA node terminology
net/hns3: use NUMA node terminology
net/intel: use NUMA node terminology
net/ionic: use NUMA node terminology
net/mana: use NUMA node terminology
net/memif: use NUMA node terminology
net/mlx4: use NUMA node terminology
net/mvneta: use NUMA node terminology
net/mvpp2: use NUMA node terminology
net/nbl: use NUMA node terminology
net/netvsc: use NUMA node terminology
net/nfb: use NUMA node terminology
net/nfp: use NUMA node terminology
net/ngbe: use NUMA node terminology
net/ntnic: use NUMA node terminology
net/null: use NUMA node terminology
net/octeon_ep: use NUMA node terminology
net/octeontx: use NUMA node terminology
net/pcap: use NUMA node terminology
net/pfe: use NUMA node terminology
net/qede: use NUMA node terminology
net/r8169: use NUMA node terminology
net/ring: use NUMA node terminology
net/rnp: use NUMA node terminology
net/sfc: use NUMA node terminology
net/softnic: use NUMA node terminology
net/sxe2: use NUMA node terminology
net/tap: use NUMA node terminology
net/thunderx: use NUMA node terminology
net/txgbe: use NUMA node terminology
net/vhost: use NUMA node terminology
net/virtio: use NUMA node terminology
net/vmxnet3: use NUMA node terminology
net/xsc: use NUMA node terminology
net/zxdh: use NUMA node terminology
raw/cnxk_bphy: use NUMA node terminology
raw/cnxk_gpio: use NUMA node terminology
raw/cnxk_rvu_lf: use NUMA node terminology
raw/dpaa2_cmdif: use NUMA node terminology
raw/gdtc: use NUMA node terminology
raw/ifpga: use NUMA node terminology
raw/ntb: use NUMA node terminology
raw/skeleton: use NUMA node terminology
regex/cn9k: use NUMA node terminology
regex/mlx5: use NUMA node terminology
vdpa/mlx5: use NUMA node terminology
drivers: use NUMA node terminology
drivers: use NUMA node terminology
test: use NUMA node terminology
app/testpmd: use NUMA node terminology
app/proc-info: use NUMA node terminology
app/graph: use NUMA node terminology
app/pdump: use NUMA node terminology
app/dumpcap: use NUMA node terminology
app/test-mldev: use NUMA node terminology
app/test-eventdev: use NUMA node terminology
app/test-compress-perf: use NUMA node terminology
app/test-crypto-perf: use NUMA node terminology
app/test-bbdev: use NUMA node terminology
app/test-security-perf: use NUMA node terminology
app/test-regex: use NUMA node terminology
app/test-flow-perf: use NUMA node terminology
examples/bbdev_app: use NUMA node terminology
examples/bond: use NUMA node terminology
examples/distributor: use NUMA node terminology
examples/dma: use NUMA node terminology
examples/ethtool: use NUMA node terminology
examples/eventdev_pipeline: use NUMA node terminology
examples/fips_validation: use NUMA node terminology
examples/flow_filtering: use NUMA node terminology
examples/ip_fragmentation: use NUMA node terminology
examples/ip_reassembly: use NUMA node terminology
examples/ipsec-secgw: use NUMA node terminology
examples/ipv4_multicast: use NUMA node terminology
examples/l2fwd: use NUMA node terminology
examples/l2fwd-cat: use NUMA node terminology
examples/l2fwd-crypto: use NUMA node terminology
examples/l2fwd-event: use NUMA node terminology
examples/l2fwd-jobstats: use NUMA node terminology
examples/l2fwd-keepalive: use NUMA node terminology
examples/l2fwd-macsec: use NUMA node terminology
examples/l3fwd: use NUMA node terminology
examples/l3fwd-graph: use NUMA node terminology
examples/l3fwd-power: use NUMA node terminology
examples/link_status_interrupt: use NUMA node terminology
examples/multi_process: use NUMA node terminology
examples/ntb: use NUMA node terminology
examples/packet_ordering: use NUMA node terminology
examples/pipeline: use NUMA node terminology
examples/ptpclient: use NUMA node terminology
examples/ptp_tap_relay_sw: use NUMA node terminology
examples/qos_meter: use NUMA node terminology
examples/qos_sched: use NUMA node terminology
examples/rxtx_callbacks: use NUMA node terminology
examples/server_node_efd: use NUMA node terminology
examples/skeleton: use NUMA node terminology
examples/vhost: use NUMA node terminology
examples/vhost_crypto: use NUMA node terminology
examples/vm_power_manager: use NUMA node terminology
examples/vmdq: use NUMA node terminology
examples/vmdq_dcb: use NUMA node terminology
eal: deprecate legacy socket API aliases
doc: use NUMA node terminology
test-dma-perf: use NUMA node terminology
test/memzone: fix NUMA node terminology rename
examples: fix NUMA node terminology residue
app/dumpcap/main.c | 4 +-
app/graph/ethdev.c | 4 +-
app/graph/graph.c | 4 +-
app/graph/l2fwd.c | 2 +-
app/graph/l3fwd.c | 10 +-
app/pdump/main.c | 12 +-
app/proc-info/main.c | 10 +-
app/test-acl/main.c | 6 +-
app/test-bbdev/test_bbdev.c | 38 ++--
app/test-bbdev/test_bbdev_perf.c | 96 ++++----
.../comp_perf_test_common.c | 44 ++--
.../comp_perf_test_cyclecount.c | 6 +-
.../comp_perf_test_throughput.c | 6 +-
.../comp_perf_test_verify.c | 4 +-
app/test-compress-perf/main.c | 22 +-
app/test-crypto-perf/cperf_test_common.c | 6 +-
app/test-crypto-perf/main.c | 54 ++---
app/test-dma-perf/benchmark.c | 8 +-
app/test-eventdev/evt_common.h | 2 +-
app/test-eventdev/evt_options.c | 8 +-
app/test-eventdev/evt_options.h | 2 +-
app/test-eventdev/test_order_common.c | 14 +-
app/test-eventdev/test_perf_common.c | 36 +--
app/test-eventdev/test_pipeline_common.c | 14 +-
app/test-flow-perf/main.c | 10 +-
app/test-mldev/ml_options.c | 14 +-
app/test-mldev/ml_options.h | 4 +-
app/test-mldev/test_common.c | 10 +-
app/test-mldev/test_device_ops.c | 10 +-
app/test-mldev/test_inference_common.c | 26 +--
app/test-mldev/test_model_ops.c | 4 +-
app/test-pmd/cmdline.c | 26 +--
app/test-pmd/config.c | 10 +-
app/test-pmd/noisy_vnf.c | 2 +-
app/test-pmd/parameters.c | 46 ++--
app/test-pmd/testpmd.c | 122 +++++-----
app/test-pmd/testpmd.h | 20 +-
app/test-regex/main.c | 6 +-
app/test-sad/main.c | 2 +-
app/test-security-perf/test_security_perf.c | 10 +-
app/test/sample_packet_forward.c | 10 +-
app/test/test_acl.c | 8 +-
app/test/test_bitratestats.c | 2 +-
app/test/test_bpf.c | 8 +-
app/test/test_cksum.c | 2 +-
app/test/test_compressdev.c | 22 +-
app/test/test_cryptodev.c | 50 ++---
app/test/test_cryptodev_asym.c | 12 +-
app/test/test_cryptodev_crosscheck.c | 10 +-
app/test/test_distributor.c | 14 +-
app/test/test_distributor_perf.c | 6 +-
app/test/test_dmadev.c | 4 +-
app/test/test_efd.c | 64 +++---
app/test/test_efd_perf.c | 22 +-
app/test/test_ethdev_api.c | 6 +-
app/test/test_event_crypto_adapter.c | 14 +-
app/test/test_event_dma_adapter.c | 6 +-
app/test/test_event_eth_rx_adapter.c | 8 +-
app/test/test_event_eth_tx_adapter.c | 6 +-
app/test/test_event_ring.c | 14 +-
app/test/test_event_timer_adapter.c | 6 +-
app/test/test_event_vector_adapter.c | 8 +-
app/test/test_eventdev.c | 16 +-
app/test/test_external_mem.c | 18 +-
app/test/test_fib.c | 48 ++--
app/test/test_fib6.c | 66 +++---
app/test/test_fib6_perf.c | 2 +-
app/test/test_fib_perf.c | 2 +-
app/test/test_func_reentrancy.c | 16 +-
app/test/test_graph.c | 6 +-
app/test/test_graph_feature_arc.c | 2 +-
app/test/test_graph_perf.c | 6 +-
app/test/test_hash.c | 72 +++---
app/test/test_hash_multiwriter.c | 2 +-
app/test/test_hash_perf.c | 4 +-
app/test/test_hash_readwrite.c | 2 +-
app/test/test_hash_readwrite_lf_perf.c | 2 +-
app/test/test_ipfrag.c | 6 +-
app/test/test_ipsec.c | 12 +-
app/test/test_ipsec_perf.c | 12 +-
app/test/test_ipsec_sad.c | 24 +-
app/test/test_latencystats.c | 2 +-
app/test/test_link_bonding.c | 22 +-
app/test/test_link_bonding_mode4.c | 16 +-
app/test/test_link_bonding_rssconf.c | 8 +-
app/test/test_lpm.c | 64 +++---
app/test/test_lpm6.c | 70 +++---
app/test/test_lpm6_perf.c | 2 +-
app/test/test_lpm_perf.c | 4 +-
app/test/test_malloc.c | 152 ++++++-------
app/test/test_malloc_perf.c | 2 +-
app/test/test_mbuf.c | 18 +-
app/test/test_member.c | 6 +-
app/test/test_member_perf.c | 6 +-
app/test/test_mempool.c | 40 ++--
app/test/test_mempool_perf.c | 10 +-
app/test/test_memzone.c | 121 +++++-----
app/test/test_metrics.c | 2 +-
app/test/test_mp_secondary.c | 8 +-
app/test/test_net_ether.c | 2 +-
app/test/test_pcapng.c | 2 +-
app/test/test_pdcp.c | 14 +-
app/test/test_pdump.c | 2 +-
app/test/test_per_lcore.c | 4 +-
app/test/test_pmd_af_packet.c | 10 +-
app/test/test_pmd_memif.c | 2 +-
app/test/test_pmd_pcap.c | 6 +-
app/test/test_pmd_perf.c | 72 +++---
app/test/test_pmd_ring.c | 2 +-
app/test/test_pmd_ring_perf.c | 2 +-
app/test/test_pmd_tap.c | 6 +-
app/test/test_rcu_qsbr.c | 2 +-
app/test/test_rcu_qsbr_perf.c | 2 +-
app/test/test_reassembly.c | 4 +-
app/test/test_reassembly_perf.c | 4 +-
app/test/test_reorder.c | 20 +-
app/test/test_rib.c | 20 +-
app/test/test_rib6.c | 20 +-
app/test/test_ring.c | 28 +--
app/test/test_ring.h | 6 +-
app/test/test_ring_perf.c | 20 +-
app/test/test_security.c | 2 +-
app/test/test_security_inline_macsec.c | 8 +-
app/test/test_security_inline_proto.c | 12 +-
app/test/test_stack.c | 10 +-
app/test/test_stack_perf.c | 14 +-
app/test/test_timer_secondary.c | 4 +-
app/test/virtual_pmd.c | 32 +--
app/test/virtual_pmd.h | 2 +-
doc/api/doxy-api.conf.in | 1 +
doc/guides/prog_guide/bbdev.rst | 14 +-
doc/guides/prog_guide/compressdev.rst | 4 +-
.../prog_guide/env_abstraction_layer.rst | 32 +--
.../eventdev/event_timer_adapter.rst | 2 +-
.../eventdev/event_vector_adapter.rst | 2 +-
doc/guides/prog_guide/eventdev/eventdev.rst | 2 +-
doc/guides/prog_guide/gpudev.rst | 2 +-
doc/guides/prog_guide/ptr_compress_lib.rst | 2 +-
doc/guides/rel_notes/deprecation.rst | 27 +++
doc/guides/rel_notes/release_26_11.rst | 25 ++-
drivers/baseband/acc/acc_common.h | 4 +-
drivers/baseband/acc/rte_acc100_pmd.c | 44 ++--
drivers/baseband/acc/rte_vrb_pmd.c | 46 ++--
.../fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 24 +-
drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 24 +-
drivers/baseband/la12xx/bbdev_la12xx.c | 2 +-
drivers/baseband/null/bbdev_null.c | 26 +--
.../baseband/turbo_sw/bbdev_turbo_software.c | 54 ++---
drivers/bus/auxiliary/auxiliary_common.c | 2 +-
drivers/bus/auxiliary/linux/auxiliary.c | 2 +-
drivers/bus/dpaa/dpaa_bus.c | 2 +-
drivers/bus/fslmc/fslmc_bus.c | 2 +-
drivers/bus/ifpga/ifpga_bus.c | 2 +-
drivers/bus/pci/bsd/pci.c | 2 +-
drivers/bus/pci/linux/pci.c | 2 +-
drivers/bus/pci/pci_common.c | 2 +-
drivers/bus/pci/windows/pci.c | 2 +-
drivers/bus/platform/platform.c | 2 +-
drivers/bus/vdev/vdev.c | 4 +-
drivers/bus/vmbus/linux/vmbus_bus.c | 2 +-
drivers/bus/vmbus/vmbus_channel.c | 2 +-
drivers/bus/vmbus/vmbus_common.c | 2 +-
drivers/common/cnxk/roc_platform.c | 2 +-
drivers/common/cnxk/roc_platform.h | 2 +-
.../common/mlx5/linux/mlx5_common_auxiliary.c | 6 +-
drivers/common/mlx5/linux/mlx5_nl.c | 4 +-
drivers/common/mlx5/mlx5_common.c | 4 +-
drivers/common/mlx5/mlx5_common_mr.c | 16 +-
drivers/common/mlx5/mlx5_common_mr.h | 2 +-
drivers/common/mlx5/mlx5_common_utils.c | 6 +-
drivers/common/mlx5/mlx5_devx_cmds.c | 50 ++---
drivers/common/mlx5/mlx5_malloc.c | 10 +-
drivers/common/mlx5/mlx5_malloc.h | 4 +-
drivers/common/mlx5/windows/mlx5_common_os.c | 4 +-
drivers/common/nitrox/nitrox_device.c | 2 +-
drivers/common/nitrox/nitrox_qp.c | 16 +-
drivers/common/nitrox/nitrox_qp.h | 2 +-
drivers/common/qat/qat_device.c | 2 +-
drivers/common/qat/qat_qp.c | 22 +-
drivers/common/qat/qat_qp.h | 2 +-
drivers/common/zsda/zsda_device.c | 4 +-
drivers/common/zsda/zsda_qp.c | 18 +-
drivers/common/zsda/zsda_qp.h | 4 +-
drivers/compress/isal/isal_compress_pmd.c | 4 +-
drivers/compress/isal/isal_compress_pmd_ops.c | 26 +--
drivers/compress/mlx5/mlx5_compress.c | 22 +-
drivers/compress/nitrox/nitrox_comp.c | 22 +-
drivers/compress/nitrox/nitrox_comp_reqmgr.c | 22 +-
drivers/compress/nitrox/nitrox_comp_reqmgr.h | 2 +-
drivers/compress/octeontx/otx_zip_pmd.c | 18 +-
drivers/compress/qat/qat_comp.c | 14 +-
drivers/compress/qat/qat_comp.h | 2 +-
drivers/compress/qat/qat_comp_pmd.c | 36 +--
drivers/compress/qat/qat_comp_pmd.h | 2 +-
drivers/compress/uadk/uadk_compress_pmd.c | 14 +-
drivers/compress/zlib/zlib_pmd.c | 2 +-
drivers/compress/zlib/zlib_pmd_ops.c | 16 +-
drivers/compress/zsda/zsda_comp_pmd.c | 14 +-
drivers/crypto/armv8/rte_armv8_pmd.c | 6 +-
drivers/crypto/armv8/rte_armv8_pmd_ops.c | 12 +-
drivers/crypto/bcmfs/bcmfs_qp.c | 16 +-
drivers/crypto/bcmfs/bcmfs_qp.h | 2 +-
drivers/crypto/bcmfs/bcmfs_sym_pmd.c | 12 +-
drivers/crypto/caam_jr/caam_jr.c | 8 +-
drivers/crypto/ccp/ccp_dev.c | 14 +-
drivers/crypto/ccp/ccp_pmd_ops.c | 14 +-
drivers/crypto/ccp/rte_ccp_pmd.c | 10 +-
drivers/crypto/cnxk/cn10k_cryptodev.c | 2 +-
drivers/crypto/cnxk/cn20k_cryptodev.c | 2 +-
drivers/crypto/cnxk/cn9k_cryptodev.c | 2 +-
drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 12 +-
drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 4 +-
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 +-
drivers/crypto/dpaa_sec/dpaa_sec.c | 8 +-
drivers/crypto/ionic/ionic_crypto.h | 6 +-
drivers/crypto/ionic/ionic_crypto_main.c | 42 ++--
drivers/crypto/ionic/ionic_crypto_ops.c | 8 +-
drivers/crypto/ionic/ionic_crypto_vdev.c | 2 +-
drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 22 +-
drivers/crypto/ipsec_mb/ipsec_mb_private.c | 2 +-
drivers/crypto/ipsec_mb/ipsec_mb_private.h | 4 +-
drivers/crypto/ipsec_mb/pmd_aesni_gcm.c | 6 +-
drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 2 +-
drivers/crypto/ipsec_mb/pmd_snow3g.c | 2 +-
drivers/crypto/ipsec_mb/pmd_zuc.c | 2 +-
drivers/crypto/mlx5/mlx5_crypto.c | 2 +-
drivers/crypto/mlx5/mlx5_crypto_gcm.c | 18 +-
drivers/crypto/mlx5/mlx5_crypto_xts.c | 12 +-
drivers/crypto/mvsam/rte_mrvl_pmd.c | 8 +-
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 8 +-
drivers/crypto/nitrox/nitrox_sym.c | 12 +-
drivers/crypto/nitrox/nitrox_sym_reqmgr.c | 4 +-
drivers/crypto/nitrox/nitrox_sym_reqmgr.h | 2 +-
drivers/crypto/null/null_crypto_pmd.c | 4 +-
drivers/crypto/null/null_crypto_pmd_ops.c | 12 +-
drivers/crypto/octeontx/otx_cryptodev.c | 2 +-
.../crypto/octeontx/otx_cryptodev_hw_access.c | 2 +-
drivers/crypto/octeontx/otx_cryptodev_ops.c | 6 +-
drivers/crypto/openssl/rte_openssl_pmd.c | 4 +-
drivers/crypto/openssl/rte_openssl_pmd_ops.c | 12 +-
drivers/crypto/qat/asym/qat_asym.c | 2 +-
drivers/crypto/qat/dev/qat_asym_pmd_gen1.c | 2 +-
drivers/crypto/qat/dev/qat_crypto_pmd_gen2.c | 6 +-
drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c | 2 +-
drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c | 4 +-
drivers/crypto/qat/dev/qat_crypto_pmd_gen5.c | 2 +-
drivers/crypto/qat/dev/qat_crypto_pmd_gen6.c | 2 +-
.../crypto/qat/dev/qat_crypto_pmd_gen_lce.c | 2 +-
drivers/crypto/qat/dev/qat_sym_pmd_gen1.c | 2 +-
drivers/crypto/qat/qat_crypto.c | 4 +-
drivers/crypto/qat/qat_crypto.h | 2 +-
drivers/crypto/qat/qat_sym.c | 2 +-
.../scheduler/rte_cryptodev_scheduler.c | 16 +-
drivers/crypto/scheduler/scheduler_failover.c | 4 +-
.../crypto/scheduler/scheduler_multicore.c | 12 +-
.../scheduler/scheduler_pkt_size_distr.c | 8 +-
drivers/crypto/scheduler/scheduler_pmd.c | 24 +-
drivers/crypto/scheduler/scheduler_pmd_ops.c | 10 +-
.../crypto/scheduler/scheduler_roundrobin.c | 4 +-
drivers/crypto/uadk/uadk_crypto_pmd.c | 12 +-
drivers/crypto/virtio/virtio_cryptodev.c | 14 +-
drivers/crypto/virtio/virtio_cryptodev.h | 2 +-
drivers/crypto/virtio/virtio_user_cryptodev.c | 2 +-
drivers/crypto/virtio/virtqueue.c | 2 +-
drivers/crypto/zsda/zsda_crypto_pmd.c | 12 +-
drivers/dma/ae4dma/ae4dma_dmadev.c | 6 +-
drivers/dma/cnxk/cnxk_dmadev.c | 2 +-
drivers/dma/dpaa/dpaa_qdma.c | 2 +-
drivers/dma/dpaa2/dpaa2_qdma.c | 4 +-
drivers/dma/hisi_acc/hisi_acc_dmadev.c | 2 +-
drivers/dma/idxd/idxd_bus.c | 2 +-
drivers/dma/idxd/idxd_common.c | 2 +-
drivers/dma/imx_edma5/imx_edma5_dmadev.c | 8 +-
drivers/dma/odm/odm.c | 4 +-
drivers/dma/skeleton/skeleton_dmadev.c | 26 +--
drivers/dma/skeleton/skeleton_dmadev.h | 2 +-
drivers/event/cnxk/cn10k_eventdev.c | 4 +-
drivers/event/cnxk/cn20k_eventdev.c | 4 +-
drivers/event/cnxk/cn9k_eventdev.c | 8 +-
drivers/event/cnxk/cnxk_eventdev.c | 2 +-
drivers/event/cnxk/cnxk_eventdev_adptr.c | 2 +-
drivers/event/cnxk/cnxk_eventdev_selftest.c | 2 +-
drivers/event/cnxk/cnxk_tim_evdev.c | 4 +-
drivers/event/dlb2/dlb2.c | 8 +-
drivers/event/dlb2/dlb2_priv.h | 4 +-
drivers/event/dlb2/dlb2_selftest.c | 2 +-
drivers/event/dlb2/dlb2_xstats.c | 8 +-
drivers/event/dlb2/pf/dlb2_pf.c | 14 +-
drivers/event/dpaa/dpaa_eventdev.c | 2 +-
drivers/event/dpaa2/dpaa2_eventdev.c | 2 +-
drivers/event/dpaa2/dpaa2_eventdev_selftest.c | 2 +-
drivers/event/dsw/dsw_evdev.c | 6 +-
drivers/event/octeontx/ssovf_evdev.c | 6 +-
drivers/event/octeontx/ssovf_evdev_selftest.c | 2 +-
drivers/event/octeontx/ssovf_worker.c | 2 +-
drivers/event/octeontx/timvf_evdev.c | 2 +-
drivers/event/opdl/opdl_evdev.c | 16 +-
drivers/event/opdl/opdl_ring.c | 6 +-
drivers/event/opdl/opdl_ring.h | 2 +-
drivers/event/opdl/opdl_test.c | 2 +-
drivers/event/skeleton/skeleton_eventdev.c | 18 +-
drivers/event/sw/event_ring.h | 4 +-
drivers/event/sw/sw_evdev.c | 32 +--
drivers/event/sw/sw_evdev_selftest.c | 2 +-
drivers/event/sw/sw_evdev_xstats.c | 4 +-
drivers/mempool/bucket/rte_mempool_bucket.c | 14 +-
drivers/mempool/cnxk/cn10k_mempool_ops.c | 2 +-
drivers/mempool/cnxk/cnxk_mempool.c | 2 +-
.../mempool/octeontx/rte_mempool_octeontx.c | 4 +-
drivers/mempool/ring/rte_mempool_ring.c | 2 +-
drivers/mempool/stack/rte_mempool_stack.c | 2 +-
drivers/ml/cnxk/cn10k_ml_dev.c | 2 +-
drivers/ml/cnxk/cnxk_ml_ops.c | 12 +-
drivers/ml/cnxk/mvtvm_ml_dev.c | 2 +-
drivers/net/af_packet/rte_eth_af_packet.c | 22 +-
drivers/net/af_xdp/rte_eth_af_xdp.c | 34 +--
drivers/net/ark/ark_ethdev.c | 4 +-
drivers/net/ark/ark_ethdev_rx.c | 14 +-
drivers/net/ark/ark_ethdev_rx.h | 2 +-
drivers/net/ark/ark_ethdev_tx.c | 14 +-
drivers/net/ark/ark_ethdev_tx.h | 2 +-
drivers/net/atlantic/atl_ethdev.h | 4 +-
drivers/net/atlantic/atl_rxtx.c | 24 +-
drivers/net/avp/avp_ethdev.c | 16 +-
drivers/net/axgbe/axgbe_rxtx.c | 16 +-
drivers/net/axgbe/axgbe_rxtx.h | 4 +-
drivers/net/bnx2x/bnx2x.c | 2 +-
drivers/net/bnx2x/bnx2x_rxtx.c | 22 +-
drivers/net/bnx2x/bnx2x_rxtx.h | 4 +-
drivers/net/bnxt/bnxt_ethdev.c | 6 +-
drivers/net/bnxt/bnxt_mpc.c | 38 ++--
drivers/net/bnxt/bnxt_reps.c | 32 +--
drivers/net/bnxt/bnxt_reps.h | 4 +-
drivers/net/bnxt/bnxt_ring.c | 12 +-
drivers/net/bnxt/bnxt_ring.h | 2 +-
drivers/net/bnxt/bnxt_rxq.c | 10 +-
drivers/net/bnxt/bnxt_rxq.h | 2 +-
drivers/net/bnxt/bnxt_rxr.c | 22 +-
drivers/net/bnxt/bnxt_rxr.h | 2 +-
drivers/net/bnxt/bnxt_txq.c | 14 +-
drivers/net/bnxt/bnxt_txq.h | 2 +-
drivers/net/bnxt/bnxt_txr.c | 18 +-
drivers/net/bnxt/bnxt_txr.h | 2 +-
drivers/net/bnxt/bnxt_vnic.c | 2 +-
drivers/net/bnxt/tf_core/v3/tfc_tbl_scope.c | 2 +-
drivers/net/bnxt/tf_ulp/ulp_matcher.c | 4 +-
drivers/net/bonding/eth_bond_private.h | 2 +-
drivers/net/bonding/rte_eth_bond.h | 4 +-
drivers/net/bonding/rte_eth_bond_8023ad.c | 14 +-
drivers/net/bonding/rte_eth_bond_alb.c | 4 +-
drivers/net/bonding/rte_eth_bond_api.c | 4 +-
drivers/net/bonding/rte_eth_bond_args.c | 14 +-
drivers/net/bonding/rte_eth_bond_flow.c | 2 +-
drivers/net/bonding/rte_eth_bond_pmd.c | 36 +--
drivers/net/cnxk/cnxk_eswitch.c | 2 +-
drivers/net/cnxk/cnxk_ethdev_sec.c | 6 +-
drivers/net/cnxk/cnxk_lookup.c | 2 +-
drivers/net/cnxk/cnxk_rep.h | 4 +-
drivers/net/cnxk/cnxk_rep_ops.c | 8 +-
drivers/net/cxgbe/base/adapter.h | 6 +-
drivers/net/cxgbe/cxgbe_ethdev.c | 16 +-
drivers/net/cxgbe/cxgbe_main.c | 18 +-
drivers/net/cxgbe/cxgbe_pfvf.h | 4 +-
drivers/net/cxgbe/cxgbevf_main.c | 4 +-
drivers/net/cxgbe/sge.c | 28 +--
drivers/net/dpaa/dpaa_ethdev.c | 6 +-
drivers/net/dpaa2/dpaa2_ethdev.c | 6 +-
drivers/net/dpaa2/dpaa2_tm.c | 6 +-
drivers/net/ena/base/ena_plat_dpdk.h | 6 +-
drivers/net/ena/ena_ethdev.c | 42 ++--
drivers/net/ena/ena_ethdev.h | 2 +-
drivers/net/enetc/enetc.h | 4 +-
drivers/net/enetc/enetc4_ethdev.c | 4 +-
drivers/net/enetc/enetc_ethdev.c | 4 +-
drivers/net/enetfec/enet_ethdev.c | 4 +-
drivers/net/enic/base/vnic_cq.c | 8 +-
drivers/net/enic/base/vnic_cq.h | 4 +-
drivers/net/enic/base/vnic_dev.c | 4 +-
drivers/net/enic/base/vnic_dev.h | 2 +-
drivers/net/enic/base/vnic_rq.c | 6 +-
drivers/net/enic/base/vnic_rq.h | 2 +-
drivers/net/enic/base/vnic_wq.c | 8 +-
drivers/net/enic/base/vnic_wq.h | 2 +-
drivers/net/enic/enic.h | 4 +-
drivers/net/enic/enic_ethdev.c | 8 +-
drivers/net/enic/enic_fm_flow.c | 2 +-
drivers/net/enic/enic_main.c | 32 +--
drivers/net/enic/enic_sriov.c | 10 +-
drivers/net/enic/enic_vf_representor.c | 8 +-
drivers/net/failsafe/failsafe.c | 6 +-
drivers/net/failsafe/failsafe_ether.c | 4 +-
drivers/net/failsafe/failsafe_intr.c | 2 +-
drivers/net/failsafe/failsafe_ops.c | 12 +-
drivers/net/failsafe/failsafe_private.h | 4 +-
drivers/net/gve/base/gve_osdep.h | 2 +-
drivers/net/gve/gve_ethdev.c | 14 +-
drivers/net/gve/gve_ethdev.h | 8 +-
drivers/net/gve/gve_rx.c | 16 +-
drivers/net/gve/gve_rx_dqo.c | 24 +-
drivers/net/gve/gve_tx.c | 18 +-
drivers/net/gve/gve_tx_dqo.c | 16 +-
drivers/net/hinic/base/hinic_compat.h | 6 +-
drivers/net/hinic/base/hinic_pmd_api_cmd.c | 6 +-
drivers/net/hinic/base/hinic_pmd_eqs.c | 2 +-
drivers/net/hinic/base/hinic_pmd_hwdev.c | 20 +-
drivers/net/hinic/base/hinic_pmd_mbox.c | 2 +-
drivers/net/hinic/base/hinic_pmd_wq.c | 10 +-
drivers/net/hinic/base/hinic_pmd_wq.h | 2 +-
drivers/net/hinic/hinic_pmd_ethdev.c | 26 +--
drivers/net/hinic/hinic_pmd_rx.c | 16 +-
drivers/net/hinic/hinic_pmd_rx.h | 4 +-
drivers/net/hinic/hinic_pmd_tx.c | 8 +-
drivers/net/hinic/hinic_pmd_tx.h | 4 +-
drivers/net/hinic3/base/hinic3_cmdq.c | 2 +-
drivers/net/hinic3/base/hinic3_eqs.c | 2 +-
drivers/net/hinic3/base/hinic3_hwdev.c | 4 +-
drivers/net/hinic3/base/hinic3_hwdev.h | 2 +-
drivers/net/hinic3/base/hinic3_mbox.c | 4 +-
drivers/net/hinic3/base/hinic3_wq.c | 2 +-
drivers/net/hinic3/hinic3_ethdev.c | 38 ++--
drivers/net/hns3/hns3_cmd.c | 2 +-
drivers/net/hns3/hns3_fdir.c | 2 +-
drivers/net/hns3/hns3_rxtx.c | 44 ++--
drivers/net/hns3/hns3_rxtx.h | 6 +-
drivers/net/intel/cpfl/cpfl_ethdev.c | 4 +-
drivers/net/intel/cpfl/cpfl_representor.c | 4 +-
drivers/net/intel/cpfl/cpfl_rxtx.c | 74 +++----
drivers/net/intel/cpfl/cpfl_rxtx.h | 4 +-
drivers/net/intel/e1000/e1000_ethdev.h | 8 +-
drivers/net/intel/e1000/em_rxtx.c | 8 +-
drivers/net/intel/e1000/igb_rxtx.c | 8 +-
drivers/net/intel/e1000/igc_txrx.c | 8 +-
drivers/net/intel/e1000/igc_txrx.h | 4 +-
drivers/net/intel/fm10k/fm10k_ethdev.c | 28 +--
drivers/net/intel/i40e/i40e_ethdev.c | 4 +-
drivers/net/intel/i40e/i40e_ethdev.h | 2 +-
drivers/net/intel/i40e/i40e_fdir.c | 8 +-
drivers/net/intel/i40e/i40e_flow_ethertype.c | 2 +-
drivers/net/intel/i40e/i40e_rxtx.c | 44 ++--
drivers/net/intel/i40e/i40e_rxtx.h | 4 +-
drivers/net/intel/i40e/i40e_vf_representor.c | 4 +-
drivers/net/intel/iavf/iavf_osdep.c | 2 +-
drivers/net/intel/iavf/iavf_rxtx.c | 32 +--
drivers/net/intel/iavf/iavf_rxtx.h | 4 +-
.../net/intel/ice/ice_dcf_vf_representor.c | 4 +-
drivers/net/intel/ice/ice_fdir_filter.c | 8 +-
drivers/net/intel/ice/ice_osdep.h | 2 +-
drivers/net/intel/ice/ice_rxtx.c | 46 ++--
drivers/net/intel/ice/ice_rxtx.h | 4 +-
drivers/net/intel/idpf/idpf_common_rxtx.c | 6 +-
drivers/net/intel/idpf/idpf_common_rxtx.h | 2 +-
drivers/net/intel/idpf/idpf_osdep.h | 2 +-
drivers/net/intel/idpf/idpf_rxtx.c | 60 ++---
drivers/net/intel/idpf/idpf_rxtx.h | 4 +-
drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 2 +-
drivers/net/intel/ipn3ke/ipn3ke_representor.c | 4 +-
drivers/net/intel/ixgbe/ixgbe_ethdev.c | 2 +-
drivers/net/intel/ixgbe/ixgbe_ethdev.h | 4 +-
drivers/net/intel/ixgbe/ixgbe_rxtx.c | 32 +--
.../net/intel/ixgbe/ixgbe_vf_representor.c | 4 +-
drivers/net/ionic/ionic_lif.c | 38 ++--
drivers/net/ionic/ionic_lif.h | 4 +-
drivers/net/ionic/ionic_main.c | 6 +-
drivers/net/ionic/ionic_rxtx.c | 12 +-
drivers/net/ionic/ionic_rxtx.h | 4 +-
drivers/net/mana/mana.c | 54 ++---
drivers/net/mana/mr.c | 4 +-
drivers/net/memif/memif_socket.c | 2 +-
drivers/net/memif/rte_eth_memif.c | 4 +-
drivers/net/mlx4/mlx4.c | 8 +-
drivers/net/mlx4/mlx4_mr.c | 14 +-
drivers/net/mlx4/mlx4_utils.c | 14 +-
drivers/net/mlx5/hws/mlx5dr_internal.h | 4 +-
drivers/net/mlx5/linux/mlx5_ethdev_os.c | 8 +-
drivers/net/mlx5/linux/mlx5_os.c | 14 +-
drivers/net/mlx5/linux/mlx5_verbs.c | 6 +-
drivers/net/mlx5/linux/mlx5_vlan_os.c | 2 +-
drivers/net/mlx5/mlx5.c | 16 +-
drivers/net/mlx5/mlx5_devx.c | 12 +-
drivers/net/mlx5/mlx5_ethdev.c | 6 +-
drivers/net/mlx5/mlx5_flow.c | 29 +--
drivers/net/mlx5/mlx5_flow_aso.c | 8 +-
drivers/net/mlx5/mlx5_flow_dv.c | 32 +--
drivers/net/mlx5/mlx5_flow_flex.c | 4 +-
drivers/net/mlx5/mlx5_flow_geneve.c | 2 +-
drivers/net/mlx5/mlx5_flow_hw.c | 48 ++--
drivers/net/mlx5/mlx5_flow_meter.c | 14 +-
drivers/net/mlx5/mlx5_flow_quota.c | 6 +-
drivers/net/mlx5/mlx5_flow_verbs.c | 2 +-
drivers/net/mlx5/mlx5_hws_cnt.c | 30 +--
drivers/net/mlx5/mlx5_nta_sample.c | 16 +-
drivers/net/mlx5/mlx5_nta_split.c | 2 +-
drivers/net/mlx5/mlx5_rss.c | 4 +-
drivers/net/mlx5/mlx5_rxq.c | 24 +-
drivers/net/mlx5/mlx5_stats.c | 2 +-
drivers/net/mlx5/mlx5_trigger.c | 2 +-
drivers/net/mlx5/mlx5_tx.c | 2 +-
drivers/net/mlx5/mlx5_txq.c | 13 +-
drivers/net/mlx5/mlx5_utils.c | 30 +--
drivers/net/mlx5/windows/mlx5_flow_os.c | 4 +-
drivers/net/mlx5/windows/mlx5_os.c | 8 +-
drivers/net/mvneta/mvneta_ethdev.c | 2 +-
drivers/net/mvneta/mvneta_rxtx.c | 4 +-
drivers/net/mvpp2/mrvl_ethdev.c | 6 +-
drivers/net/mvpp2/mrvl_flow.c | 8 +-
drivers/net/mvpp2/mrvl_mtr.c | 4 +-
drivers/net/mvpp2/mrvl_qos.c | 4 +-
drivers/net/mvpp2/mrvl_tm.c | 6 +-
drivers/net/nbl/nbl_common/nbl_common.c | 2 +-
drivers/net/nbl/nbl_dev/nbl_dev.c | 8 +-
drivers/net/nbl/nbl_dev/nbl_dev.h | 4 +-
drivers/net/nbl/nbl_hw/nbl_txrx.c | 14 +-
drivers/net/nbl/nbl_include/nbl_include.h | 4 +-
drivers/net/netvsc/hn_ethdev.c | 6 +-
drivers/net/netvsc/hn_rxtx.c | 30 +--
drivers/net/netvsc/hn_var.h | 10 +-
drivers/net/netvsc/hn_vf.c | 8 +-
drivers/net/nfb/nfb_ethdev.c | 2 +-
drivers/net/nfb/nfb_rx.c | 8 +-
drivers/net/nfb/nfb_rx.h | 2 +-
drivers/net/nfb/nfb_tx.c | 8 +-
drivers/net/nfb/nfb_tx.h | 2 +-
drivers/net/nfp/flower/nfp_conntrack.c | 2 +-
drivers/net/nfp/flower/nfp_flower.c | 16 +-
drivers/net/nfp/flower/nfp_flower_flow.c | 10 +-
.../net/nfp/flower/nfp_flower_representor.c | 20 +-
drivers/net/nfp/nfd3/nfp_nfd3.h | 2 +-
drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 12 +-
drivers/net/nfp/nfdk/nfp_nfdk.h | 2 +-
drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 12 +-
drivers/net/nfp/nfp_net_common.c | 2 +-
drivers/net/nfp/nfp_net_flow.c | 2 +-
drivers/net/nfp/nfp_rxtx.c | 18 +-
drivers/net/nfp/nfp_rxtx.h | 4 +-
drivers/net/nfp/nfpcore/nfp_sync.c | 2 +-
drivers/net/ngbe/ngbe_ethdev.c | 2 +-
drivers/net/ngbe/ngbe_ethdev.h | 4 +-
drivers/net/ngbe/ngbe_rxtx.c | 28 +--
drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c | 4 +-
.../link_mgmt/link_100g/nt4ga_link_100g.c | 2 +-
.../link_agx_100g/nt4ga_agx_link_100g.c | 2 +-
.../flow_api/profile_inline/flm_age_queue.c | 2 +-
.../flow_api/profile_inline/flm_evt_queue.c | 2 +-
.../flow_api/profile_inline/flm_lrn_queue.c | 2 +-
drivers/net/ntnic/ntnic_ethdev.c | 24 +-
drivers/net/ntnic/ntutil/nt_util.c | 4 +-
drivers/net/null/rte_eth_null.c | 14 +-
drivers/net/octeon_ep/otx_ep_common.h | 4 +-
drivers/net/octeon_ep/otx_ep_ethdev.c | 12 +-
drivers/net/octeon_ep/otx_ep_rxtx.c | 32 +--
drivers/net/octeontx/octeontx_ethdev.c | 40 ++--
drivers/net/pcap/pcap_ethdev.c | 14 +-
drivers/net/pfe/pfe_ethdev.c | 4 +-
drivers/net/qede/base/bcm_osal.c | 12 +-
drivers/net/qede/qede_filter.c | 2 +-
drivers/net/qede/qede_rxtx.c | 54 ++---
drivers/net/qede/qede_rxtx.h | 4 +-
drivers/net/r8169/r8169_ethdev.h | 4 +-
drivers/net/r8169/r8169_hw.c | 2 +-
drivers/net/r8169/r8169_rxtx.c | 16 +-
drivers/net/ring/rte_eth_ring.c | 20 +-
drivers/net/rnp/base/rnp_osdep.h | 2 +-
drivers/net/rnp/rnp_ethdev.c | 4 +-
drivers/net/rnp/rnp_rxtx.c | 40 ++--
drivers/net/rnp/rnp_rxtx.h | 4 +-
drivers/net/sfc/sfc.c | 20 +-
drivers/net/sfc/sfc.h | 4 +-
drivers/net/sfc/sfc_dp_rx.h | 4 +-
drivers/net/sfc/sfc_dp_tx.h | 4 +-
drivers/net/sfc/sfc_ef100_rx.c | 10 +-
drivers/net/sfc/sfc_ef100_tx.c | 10 +-
drivers/net/sfc/sfc_ef10_essb_rx.c | 10 +-
drivers/net/sfc/sfc_ef10_rx.c | 10 +-
drivers/net/sfc/sfc_ef10_tx.c | 14 +-
drivers/net/sfc/sfc_ethdev.c | 16 +-
drivers/net/sfc/sfc_ev.c | 10 +-
drivers/net/sfc/sfc_ev.h | 2 +-
drivers/net/sfc/sfc_mae.c | 2 +-
drivers/net/sfc/sfc_mae_counter.c | 26 +--
drivers/net/sfc/sfc_mcdi.c | 2 +-
drivers/net/sfc/sfc_port.c | 10 +-
drivers/net/sfc/sfc_repr.c | 20 +-
drivers/net/sfc/sfc_repr_proxy.c | 18 +-
drivers/net/sfc/sfc_rx.c | 26 +--
drivers/net/sfc/sfc_rx.h | 2 +-
drivers/net/sfc/sfc_service.c | 22 +-
drivers/net/sfc/sfc_service.h | 2 +-
drivers/net/sfc/sfc_sw_stats.c | 4 +-
drivers/net/sfc/sfc_tbl_meta_cache.c | 2 +-
drivers/net/sfc/sfc_tso.c | 6 +-
drivers/net/sfc/sfc_tx.c | 28 +--
drivers/net/sfc/sfc_tx.h | 4 +-
drivers/net/softnic/rte_eth_softnic.c | 6 +-
drivers/net/softnic/rte_eth_softnic_thread.c | 4 +-
drivers/net/sxe2/sxe2_ethdev_repr.c | 2 +-
drivers/net/sxe2/sxe2_mp.c | 2 +-
drivers/net/sxe2/sxe2_rx.c | 16 +-
drivers/net/sxe2/sxe2_rx.h | 2 +-
drivers/net/sxe2/sxe2_tx.c | 16 +-
drivers/net/sxe2/sxe2_tx.h | 2 +-
drivers/net/tap/rte_eth_tap.c | 22 +-
drivers/net/thunderx/nicvf_ethdev.c | 24 +-
drivers/net/txgbe/txgbe_ethdev.c | 6 +-
drivers/net/txgbe/txgbe_ethdev.h | 4 +-
drivers/net/txgbe/txgbe_rxtx.c | 34 +--
drivers/net/vhost/rte_eth_vhost.c | 28 +--
drivers/net/virtio/virtio_ethdev.c | 4 +-
drivers/net/virtio/virtio_ethdev.h | 4 +-
drivers/net/virtio/virtio_rxtx.c | 6 +-
.../net/virtio/virtio_user/virtio_user_dev.c | 2 +-
drivers/net/virtio/virtqueue.c | 6 +-
drivers/net/vmxnet3/vmxnet3_ethdev.c | 14 +-
drivers/net/vmxnet3/vmxnet3_ethdev.h | 4 +-
drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 +-
drivers/net/xsc/xsc_ethdev.c | 4 +-
drivers/net/xsc/xsc_rx.c | 2 +-
drivers/net/xsc/xsc_rxtx.h | 6 +-
drivers/net/xsc/xsc_tx.c | 4 +-
drivers/net/xsc/xsc_vfio.c | 18 +-
drivers/net/xsc/xsc_vfio_mbox.c | 6 +-
drivers/net/zxdh/zxdh_ethdev.c | 18 +-
drivers/net/zxdh/zxdh_queue.c | 4 +-
drivers/net/zxdh/zxdh_queue.h | 4 +-
drivers/raw/cnxk_bphy/cnxk_bphy.c | 2 +-
drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 2 +-
drivers/raw/cnxk_gpio/cnxk_gpio.c | 4 +-
drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c | 2 +-
drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 10 +-
drivers/raw/gdtc/gdtc_rawdev.c | 6 +-
drivers/raw/ifpga/afu_pmd_core.c | 14 +-
drivers/raw/ifpga/base/ifpga_defines.h | 2 +-
drivers/raw/ifpga/base/ifpga_fme.c | 4 +-
drivers/raw/ifpga/base/ifpga_hw.h | 2 +-
drivers/raw/ifpga/ifpga_rawdev.c | 10 +-
drivers/raw/ntb/ntb.c | 26 +--
drivers/raw/skeleton/skeleton_rawdev.c | 10 +-
drivers/raw/skeleton/skeleton_rawdev_test.c | 14 +-
drivers/regex/cn9k/cn9k_regexdev.c | 6 +-
drivers/regex/mlx5/mlx5_regex_control.c | 6 +-
drivers/vdpa/mlx5/mlx5_vdpa_cthread.c | 2 +-
drivers/vdpa/mlx5/mlx5_vdpa_event.c | 4 +-
examples/bbdev_app/main.c | 18 +-
examples/bond/main.c | 12 +-
examples/distributor/main.c | 30 +--
examples/dma/dmafwd.c | 8 +-
examples/ethtool/ethtool-app/main.c | 6 +-
examples/ethtool/lib/rte_ethtool.c | 4 +-
.../pipeline_worker_generic.c | 6 +-
.../eventdev_pipeline/pipeline_worker_tx.c | 6 +-
examples/fips_validation/fips_dev_self_test.c | 10 +-
examples/fips_validation/main.c | 14 +-
examples/flow_filtering/main.c | 6 +-
examples/ip_fragmentation/main.c | 10 +-
examples/ip_reassembly/main.c | 18 +-
examples/ipsec-secgw/event_helper.c | 14 +-
examples/ipsec-secgw/ipsec-secgw.c | 132 +++++------
examples/ipsec-secgw/ipsec-secgw.h | 2 +-
examples/ipsec-secgw/ipsec.h | 10 +-
examples/ipsec-secgw/ipsec_worker.c | 56 ++---
examples/ipsec-secgw/rt.c | 22 +-
examples/ipsec-secgw/sa.c | 30 +--
examples/ipsec-secgw/sad.c | 12 +-
examples/ipsec-secgw/sad.h | 2 +-
examples/ipsec-secgw/sp4.c | 12 +-
examples/ipsec-secgw/sp6.c | 12 +-
examples/ipv4_multicast/main.c | 14 +-
examples/l2fwd-cat/l2fwd-cat.c | 12 +-
examples/l2fwd-crypto/main.c | 38 ++--
examples/l2fwd-event/l2fwd_common.c | 4 +-
examples/l2fwd-event/l2fwd_poll.c | 4 +-
examples/l2fwd-event/main.c | 4 +-
examples/l2fwd-jobstats/main.c | 10 +-
examples/l2fwd-keepalive/main.c | 10 +-
examples/l2fwd-macsec/main.c | 12 +-
examples/l2fwd/main.c | 10 +-
examples/l3fwd-graph/main.c | 24 +-
examples/l3fwd-power/main.c | 32 +--
examples/l3fwd/l3fwd.h | 2 +-
examples/l3fwd/l3fwd_acl.c | 26 +--
examples/l3fwd/l3fwd_em.c | 8 +-
examples/l3fwd/l3fwd_event.h | 2 +-
examples/l3fwd/l3fwd_fib.c | 4 +-
examples/l3fwd/l3fwd_lpm.c | 4 +-
examples/l3fwd/main.c | 16 +-
examples/link_status_interrupt/main.c | 10 +-
.../client_server_mp/mp_client/client.c | 4 +-
.../client_server_mp/mp_server/init.c | 14 +-
examples/multi_process/simple_mp/main.c | 6 +-
examples/multi_process/symmetric_mp/main.c | 6 +-
examples/ntb/ntb_fwd.c | 14 +-
examples/packet_ordering/main.c | 16 +-
examples/pipeline/obj.c | 12 +-
examples/ptp_tap_relay_sw/ptp_tap_relay_sw.c | 6 +-
examples/ptpclient/ptpclient.c | 6 +-
examples/qos_meter/main.c | 14 +-
examples/qos_sched/args.c | 4 +-
examples/qos_sched/init.c | 8 +-
examples/rxtx_callbacks/main.c | 12 +-
examples/server_node_efd/efd_node/node.c | 6 +-
examples/server_node_efd/efd_server/init.c | 22 +-
examples/server_node_efd/efd_server/main.c | 8 +-
examples/skeleton/basicfwd.c | 12 +-
examples/vhost/main.c | 6 +-
examples/vhost_crypto/main.c | 26 +--
examples/vm_power_manager/main.c | 6 +-
examples/vmdq/main.c | 6 +-
examples/vmdq_dcb/main.c | 6 +-
lib/acl/acl.h | 4 +-
lib/acl/acl_gen.c | 10 +-
lib/acl/rte_acl.c | 14 +-
lib/acl/rte_acl.h | 14 +-
lib/bbdev/bbdev_trace.h | 4 +-
lib/bbdev/rte_bbdev.c | 26 +--
lib/bbdev/rte_bbdev.h | 36 ++-
lib/bbdev/rte_bbdev_op.h | 6 +-
lib/bbdev/rte_bbdev_pmd.h | 2 +-
lib/compressdev/rte_comp.c | 4 +-
lib/compressdev/rte_comp.h | 4 +-
lib/compressdev/rte_compressdev.c | 35 +--
lib/compressdev/rte_compressdev.h | 35 ++-
lib/compressdev/rte_compressdev_internal.h | 2 +-
lib/compressdev/rte_compressdev_pmd.c | 10 +-
lib/compressdev/rte_compressdev_pmd.h | 12 +-
lib/cryptodev/cryptodev_pmd.c | 14 +-
lib/cryptodev/cryptodev_pmd.h | 24 +-
lib/cryptodev/cryptodev_trace.h | 18 +-
lib/cryptodev/cryptodev_trace_points.c | 4 +-
lib/cryptodev/rte_crypto.h | 4 +-
lib/cryptodev/rte_cryptodev.c | 63 +++---
lib/cryptodev/rte_cryptodev.h | 56 +++--
lib/dispatcher/rte_dispatcher.c | 12 +-
lib/distributor/rte_distributor.c | 6 +-
lib/distributor/rte_distributor.h | 4 +-
lib/distributor/rte_distributor_single.c | 4 +-
lib/distributor/rte_distributor_single.h | 4 +-
lib/dmadev/rte_dmadev.c | 4 +-
lib/eal/common/eal_common_dynmem.c | 174 +++++++--------
lib/eal/common/eal_common_lcore.c | 85 ++++---
lib/eal/common/eal_common_memalloc.c | 38 ++--
lib/eal/common/eal_common_memory.c | 52 ++---
lib/eal/common/eal_common_memzone.c | 38 ++--
lib/eal/common/eal_common_options.c | 12 +-
lib/eal/common/eal_common_thread.c | 34 +--
lib/eal/common/eal_hugepages.h | 2 +-
lib/eal/common/eal_internal_cfg.h | 2 +-
lib/eal/common/eal_memalloc.h | 10 +-
lib/eal/common/eal_memcfg.h | 2 +-
lib/eal/common/eal_private.h | 12 +-
lib/eal/common/eal_thread.h | 6 +-
lib/eal/common/malloc_heap.c | 204 +++++++++--------
lib/eal/common/malloc_heap.h | 12 +-
lib/eal/common/malloc_mp.c | 10 +-
lib/eal/common/malloc_mp.h | 4 +-
lib/eal/common/rte_malloc.c | 156 ++++++++-----
lib/eal/freebsd/eal.c | 12 +-
lib/eal/freebsd/eal_lcore.c | 2 +-
lib/eal/freebsd/eal_memalloc.c | 4 +-
lib/eal/freebsd/eal_memory.c | 2 +-
lib/eal/include/eal_trace_internal.h | 16 +-
lib/eal/include/rte_lcore.h | 71 +++++-
lib/eal/include/rte_malloc.h | 208 ++++++++++++++++--
lib/eal/include/rte_memory.h | 30 ++-
lib/eal/include/rte_memzone.h | 22 +-
lib/eal/include/rte_service_component.h | 12 +-
lib/eal/linux/eal.c | 16 +-
lib/eal/linux/eal_hugepage_info.c | 40 ++--
lib/eal/linux/eal_lcore.c | 2 +-
lib/eal/linux/eal_memalloc.c | 40 ++--
lib/eal/linux/eal_memory.c | 78 +++----
lib/eal/windows/eal_hugepages.c | 12 +-
lib/eal/windows/eal_lcore.c | 42 ++--
lib/eal/windows/eal_memalloc.c | 40 ++--
lib/eal/windows/eal_memory.c | 10 +-
lib/eal/windows/eal_windows.h | 18 +-
lib/efd/rte_efd.c | 104 ++++-----
lib/efd/rte_efd.h | 38 ++--
lib/ethdev/ethdev_driver.c | 10 +-
lib/ethdev/ethdev_driver.h | 10 +-
lib/ethdev/ethdev_pci.h | 8 +-
lib/ethdev/ethdev_private.c | 2 +-
lib/ethdev/ethdev_trace.h | 6 +-
lib/ethdev/ethdev_trace_points.c | 4 +-
lib/ethdev/ethdev_vdev.h | 2 +-
lib/ethdev/rte_ethdev.c | 31 ++-
lib/ethdev/rte_ethdev.h | 39 +++-
lib/ethdev/rte_ethdev_telemetry.c | 2 +-
lib/eventdev/event_timer_adapter_pmd.h | 4 +-
lib/eventdev/event_vector_adapter_pmd.h | 4 +-
lib/eventdev/eventdev_pmd.h | 10 +-
lib/eventdev/eventdev_pmd_pci.h | 4 +-
lib/eventdev/eventdev_pmd_vdev.h | 12 +-
lib/eventdev/eventdev_trace.h | 14 +-
lib/eventdev/eventdev_trace_points.c | 4 +-
lib/eventdev/rte_event_crypto_adapter.c | 30 +--
lib/eventdev/rte_event_dma_adapter.c | 38 ++--
lib/eventdev/rte_event_eth_rx_adapter.c | 68 +++---
lib/eventdev/rte_event_eth_tx_adapter.c | 30 +--
lib/eventdev/rte_event_ring.c | 6 +-
lib/eventdev/rte_event_ring.h | 8 +-
lib/eventdev/rte_event_timer_adapter.c | 16 +-
lib/eventdev/rte_event_timer_adapter.h | 11 +-
lib/eventdev/rte_event_vector_adapter.c | 12 +-
lib/eventdev/rte_event_vector_adapter.h | 11 +-
lib/eventdev/rte_eventdev.c | 33 +--
lib/eventdev/rte_eventdev.h | 25 ++-
lib/fib/dir24_8.c | 14 +-
lib/fib/dir24_8.h | 2 +-
lib/fib/rte_fib.c | 14 +-
lib/fib/rte_fib.h | 6 +-
lib/fib/rte_fib6.c | 14 +-
lib/fib/rte_fib6.h | 6 +-
lib/fib/trie.c | 14 +-
lib/fib/trie.h | 2 +-
lib/gpudev/gpudev.c | 2 +-
lib/graph/graph.c | 14 +-
lib/graph/graph_debug.c | 2 +-
lib/graph/graph_feature_arc.c | 4 +-
lib/graph/graph_pcap.c | 2 +-
lib/graph/graph_populate.c | 4 +-
lib/graph/graph_private.h | 4 +-
lib/graph/graph_stats.c | 18 +-
lib/graph/rte_graph.h | 21 +-
lib/graph/rte_graph_model_mcore_dispatch.c | 4 +-
lib/graph/rte_graph_worker_common.h | 10 +-
lib/gro/gro_tcp4.c | 14 +-
lib/gro/gro_tcp4.h | 6 +-
lib/gro/gro_tcp6.c | 14 +-
lib/gro/gro_tcp6.h | 6 +-
lib/gro/gro_udp4.c | 14 +-
lib/gro/gro_udp4.h | 6 +-
lib/gro/gro_vxlan_tcp4.c | 14 +-
lib/gro/gro_vxlan_tcp4.h | 6 +-
lib/gro/gro_vxlan_udp4.c | 14 +-
lib/gro/gro_vxlan_udp4.h | 6 +-
lib/gro/rte_gro.c | 8 +-
lib/gro/rte_gro.h | 17 +-
lib/hash/rte_cuckoo_hash.c | 28 +--
lib/hash/rte_fbk_hash.c | 2 +-
lib/hash/rte_fbk_hash.h | 10 +-
lib/hash/rte_hash.h | 10 +-
lib/ip_frag/rte_ip_frag.h | 8 +-
lib/ip_frag/rte_ip_frag_common.c | 12 +-
lib/ipsec/ipsec_sad.c | 6 +-
lib/ipsec/rte_ipsec_sad.h | 11 +-
lib/latencystats/rte_latencystats.c | 2 +-
lib/lpm/rte_lpm.c | 16 +-
lib/lpm/rte_lpm.h | 6 +-
lib/lpm/rte_lpm6.c | 10 +-
lib/lpm/rte_lpm6.h | 6 +-
lib/mbuf/rte_mbuf.c | 12 +-
lib/mbuf/rte_mbuf.h | 18 +-
lib/mbuf/rte_mbuf_dyn.c | 2 +-
lib/mbuf/rte_mbuf_pool_ops.c | 4 +-
lib/member/rte_member.c | 8 +-
lib/member/rte_member.h | 20 +-
lib/member/rte_member_heap.h | 18 +-
lib/member/rte_member_ht.c | 4 +-
lib/member/rte_member_sketch.c | 24 +-
lib/member/rte_member_vbf.c | 4 +-
lib/mempool/mempool_trace.h | 4 +-
lib/mempool/rte_mempool.c | 60 ++---
lib/mempool/rte_mempool.h | 38 ++--
lib/metrics/rte_metrics.c | 4 +-
lib/metrics/rte_metrics.h | 4 +-
lib/metrics/rte_metrics_telemetry.c | 4 +-
lib/mldev/rte_mldev.c | 24 +-
lib/mldev/rte_mldev.h | 33 +--
lib/mldev/rte_mldev_core.h | 10 +-
lib/mldev/rte_mldev_pmd.c | 10 +-
lib/mldev/rte_mldev_pmd.h | 10 +-
lib/node/ip4_lookup.c | 4 +-
lib/node/ip4_lookup_fib.c | 10 +-
lib/node/ip6_lookup.c | 4 +-
lib/node/ip6_lookup_fib.c | 10 +-
lib/node/kernel_rx.c | 4 +-
lib/node/node_mbuf_dynfield.c | 2 +-
lib/node/udp4_input.c | 8 +-
lib/pdcp/rte_pdcp.c | 4 +-
lib/pdump/rte_pdump.c | 2 +-
lib/rawdev/rte_rawdev.c | 25 ++-
lib/rawdev/rte_rawdev.h | 38 +++-
lib/rawdev/rte_rawdev_pmd.h | 8 +-
lib/rcu/rte_rcu_qsbr.c | 2 +-
lib/regexdev/rte_regexdev.c | 2 +-
lib/reorder/rte_reorder.c | 4 +-
lib/reorder/rte_reorder.h | 4 +-
lib/rib/rte_rib.c | 8 +-
lib/rib/rte_rib.h | 6 +-
lib/rib/rte_rib6.c | 8 +-
lib/rib/rte_rib6.h | 6 +-
lib/ring/rte_ring.c | 12 +-
lib/ring/rte_ring.h | 8 +-
lib/ring/rte_ring_elem.h | 8 +-
lib/stack/rte_stack.c | 4 +-
lib/stack/rte_stack.h | 8 +-
lib/table/rte_swx_table_em.c | 2 +-
lib/table/rte_swx_table_learner.c | 2 +-
lib/table/rte_swx_table_selector.c | 2 +-
lib/table/rte_swx_table_wm.c | 4 +-
lib/timer/rte_timer.c | 2 +-
lib/vhost/iotlb.c | 2 +-
lib/vhost/rte_vhost_crypto.h | 4 +-
lib/vhost/vhost.c | 4 +-
lib/vhost/vhost_crypto.c | 16 +-
lib/vhost/vhost_user.c | 22 +-
905 files changed, 6113 insertions(+), 5439 deletions(-)
--
2.55.0
^ permalink raw reply [flat|nested] 229+ messages in thread
* [PATCH 001/227] eal: add NUMA-aware APIs
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 002/227] mempool: use NUMA node terminology Chengwen Feng
` (226 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
DPDK has long used socket_id terminology for NUMA allocation,
which conflates CPU sockets with NUMA memory nodes.
Add NUMA-named APIs while keeping the legacy socket-named ones
as functional aliases (to be deprecated once the in-tree
migration completes):
- rte_numa_id(), rte_numa_count(), rte_numa_id_by_idx()
- rte_lcore_to_numa_id()
- rte_cpu_numa_id() (renamed from experimental rte_cpu_socket_id())
- rte_malloc_numa(), rte_zmalloc_numa(), rte_calloc_numa(),
rte_realloc_numa()
- rte_malloc_get_numa_stats() and struct rte_malloc_numa_stats
- rte_malloc_heap_get_numa_id(), rte_malloc_heap_numa_is_external()
- RTE_NUMA_ID_ANY constant (legacy SOCKET_ID_ANY kept as alias)
Convert EAL internals, comments, log messages and telemetry keys
to the NUMA node terminology, and update the EAL programmer guide
accordingly.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-flow-perf/main.c | 4 +-
app/test-pmd/cmdline.c | 4 +-
app/test-pmd/testpmd.c | 4 +-
app/test/test_external_mem.c | 6 +-
app/test/test_malloc.c | 22 +-
app/test/test_memzone.c | 4 +-
.../prog_guide/env_abstraction_layer.rst | 32 +--
doc/guides/rel_notes/release_26_11.rst | 16 +-
lib/eal/common/eal_common_dynmem.c | 172 +++++++--------
lib/eal/common/eal_common_lcore.c | 85 +++++---
lib/eal/common/eal_common_memalloc.c | 38 ++--
lib/eal/common/eal_common_memory.c | 44 ++--
lib/eal/common/eal_common_memzone.c | 34 +--
lib/eal/common/eal_common_options.c | 12 +-
lib/eal/common/eal_common_thread.c | 34 +--
lib/eal/common/eal_hugepages.h | 2 +-
lib/eal/common/eal_internal_cfg.h | 2 +-
lib/eal/common/eal_memalloc.h | 10 +-
lib/eal/common/eal_memcfg.h | 2 +-
lib/eal/common/eal_private.h | 12 +-
lib/eal/common/eal_thread.h | 6 +-
lib/eal/common/malloc_heap.c | 200 +++++++++--------
lib/eal/common/malloc_heap.h | 12 +-
lib/eal/common/malloc_mp.c | 10 +-
lib/eal/common/malloc_mp.h | 4 +-
lib/eal/common/rte_malloc.c | 156 +++++++++-----
lib/eal/freebsd/eal.c | 12 +-
lib/eal/freebsd/eal_lcore.c | 2 +-
lib/eal/freebsd/eal_memalloc.c | 4 +-
lib/eal/freebsd/eal_memory.c | 2 +-
lib/eal/include/eal_trace_internal.h | 16 +-
lib/eal/include/rte_lcore.h | 66 +++++-
lib/eal/include/rte_malloc.h | 201 ++++++++++++++++--
lib/eal/include/rte_memory.h | 8 +-
lib/eal/include/rte_memzone.h | 12 +-
lib/eal/linux/eal.c | 16 +-
lib/eal/linux/eal_hugepage_info.c | 40 ++--
lib/eal/linux/eal_lcore.c | 2 +-
lib/eal/linux/eal_memalloc.c | 38 ++--
lib/eal/linux/eal_memory.c | 76 +++----
lib/eal/windows/eal_hugepages.c | 12 +-
lib/eal/windows/eal_lcore.c | 42 ++--
lib/eal/windows/eal_memalloc.c | 38 ++--
lib/eal/windows/eal_memory.c | 10 +-
lib/eal/windows/eal_windows.h | 18 +-
45 files changed, 927 insertions(+), 615 deletions(-)
diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c
index 6636d1517f..db7269315c 100644
--- a/app/test-flow-perf/main.c
+++ b/app/test-flow-perf/main.c
@@ -1006,7 +1006,7 @@ args_parse(int argc, char **argv)
static size_t
dump_socket_mem(FILE *f)
{
- struct rte_malloc_socket_stats socket_stats;
+ struct rte_malloc_numa_stats socket_stats;
unsigned int i = 0;
size_t total = 0;
size_t alloc = 0;
@@ -1017,7 +1017,7 @@ dump_socket_mem(FILE *f)
for (i = 0; i < RTE_MAX_NUMA_NODES; i++) {
- if (rte_malloc_get_socket_stats(i, &socket_stats) ||
+ if (rte_malloc_get_numa_stats(i, &socket_stats) ||
!socket_stats.heap_totalsz_bytes)
continue;
active_nodes = true;
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 51078a2a73..cdf73540ec 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -9367,7 +9367,7 @@ dump_struct_sizes(void)
static void
dump_socket_mem(FILE *f)
{
- struct rte_malloc_socket_stats socket_stats;
+ struct rte_malloc_numa_stats socket_stats;
unsigned int i;
size_t total = 0;
size_t alloc = 0;
@@ -9378,7 +9378,7 @@ dump_socket_mem(FILE *f)
static size_t last_total;
for (i = 0; i < RTE_MAX_NUMA_NODES; i++) {
- if (rte_malloc_get_socket_stats(i, &socket_stats) ||
+ if (rte_malloc_get_numa_stats(i, &socket_stats) ||
!socket_stats.heap_totalsz_bytes)
continue;
total += socket_stats.heap_totalsz_bytes;
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index d6211a9a8a..c99b54a003 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1086,7 +1086,7 @@ setup_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, bool huge)
memset(¶m, 0, sizeof(param));
/* check if our heap exists */
- socket_id = rte_malloc_heap_get_socket(EXTMEM_HEAP_NAME);
+ socket_id = rte_malloc_heap_get_numa_id(EXTMEM_HEAP_NAME);
if (socket_id < 0) {
/* create our heap */
ret = rte_malloc_heap_create(EXTMEM_HEAP_NAME);
@@ -1327,7 +1327,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
rte_exit(EXIT_FAILURE, "Could not create external memory\n");
heap_socket =
- rte_malloc_heap_get_socket(EXTMEM_HEAP_NAME);
+ rte_malloc_heap_get_numa_id(EXTMEM_HEAP_NAME);
if (heap_socket < 0)
rte_exit(EXIT_FAILURE, "Could not get external memory socket ID\n");
diff --git a/app/test/test_external_mem.c b/app/test/test_external_mem.c
index 2c8d0d8e00..8e6313f4e9 100644
--- a/app/test/test_external_mem.c
+++ b/app/test/test_external_mem.c
@@ -103,7 +103,7 @@ test_malloc_invalid_param(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
goto fail;
}
- if (rte_malloc_heap_get_socket(name) >= 0 ||
+ if (rte_malloc_heap_get_numa_id(name) >= 0 ||
rte_errno != EINVAL) {
printf("%s():%i: Found socket for heap with invalid name\n",
__func__, __LINE__);
@@ -145,7 +145,7 @@ test_malloc_invalid_param(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
__func__, __LINE__);
goto fail;
}
- if (rte_malloc_heap_get_socket(valid_name) >= 0 ||
+ if (rte_malloc_heap_get_numa_id(valid_name) >= 0 ||
rte_errno != ENOENT) {
printf("%s():%i: Found socket for heap with invalid name\n",
__func__, __LINE__);
@@ -296,7 +296,7 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
}
/* get socket ID corresponding to this heap */
- socket_id = rte_malloc_heap_get_socket(heap_name);
+ socket_id = rte_malloc_heap_get_numa_id(heap_name);
if (socket_id < 0) {
printf("%s():%i: cannot find socket for external heap\n",
__func__, __LINE__);
diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index 151d1a3f2c..3674dc3f7f 100644
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -278,7 +278,7 @@ test_multi_alloc_statistics(void)
{
int ret = -1; /* default return is error, cleared at end on success */
int socket = 0;
- struct rte_malloc_socket_stats pre_stats, post_stats ,first_stats, second_stats;
+ struct rte_malloc_numa_stats pre_stats, post_stats, first_stats, second_stats;
size_t size = 2048;
int align = 1024;
int overhead = 0;
@@ -313,7 +313,7 @@ test_multi_alloc_statistics(void)
printf("Failed to add memory to heap\n");
goto cleanup_allocated_memory;
}
- socket = rte_malloc_heap_get_socket(__func__);
+ socket = rte_malloc_heap_get_numa_id(__func__);
if (socket < 0) {
printf("Failed to get socket for test malloc heap.\n");
goto cleanup_all;
@@ -322,13 +322,13 @@ test_multi_alloc_statistics(void)
/* Dynamically calculate the overhead by allocating one cacheline and
* then comparing what was allocated from the heap.
*/
- rte_malloc_get_socket_stats(socket, &pre_stats);
+ rte_malloc_get_numa_stats(socket, &pre_stats);
void *dummy = rte_malloc_socket(NULL, RTE_CACHE_LINE_SIZE, 0, socket);
if (dummy == NULL)
goto cleanup_all;
- rte_malloc_get_socket_stats(socket, &post_stats);
+ rte_malloc_get_numa_stats(socket, &post_stats);
/* after subtracting cache line, remainder is overhead */
overhead = post_stats.heap_allocsz_bytes - pre_stats.heap_allocsz_bytes;
@@ -337,7 +337,7 @@ test_multi_alloc_statistics(void)
rte_free(dummy);
/* Now start the real tests */
- rte_malloc_get_socket_stats(socket, &pre_stats);
+ rte_malloc_get_numa_stats(socket, &pre_stats);
void *p1 = rte_malloc_socket("stats", size , align, socket);
if (!p1)
@@ -346,7 +346,7 @@ test_multi_alloc_statistics(void)
rte_free(p1);
rte_malloc_dump_stats(stdout, "stats");
- rte_malloc_get_socket_stats(socket,&post_stats);
+ rte_malloc_get_numa_stats(socket, &post_stats);
/* Check statistics reported are correct */
/* All post stats should be equal to pre stats after alloc freed */
if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) ||
@@ -360,23 +360,23 @@ test_multi_alloc_statistics(void)
/* Check two consecutive allocations */
size = 1024;
align = 0;
- rte_malloc_get_socket_stats(socket,&pre_stats);
+ rte_malloc_get_numa_stats(socket, &pre_stats);
void *p2 = rte_malloc_socket("add", size ,align, socket);
if (!p2)
goto cleanup_all;
- rte_malloc_get_socket_stats(socket,&first_stats);
+ rte_malloc_get_numa_stats(socket, &first_stats);
void *p3 = rte_malloc_socket("add2", size,align, socket);
if (!p3)
goto cleanup_all;
- rte_malloc_get_socket_stats(socket,&second_stats);
+ rte_malloc_get_numa_stats(socket, &second_stats);
rte_free(p2);
rte_free(p3);
/* After freeing both allocations check stats return to original */
- rte_malloc_get_socket_stats(socket, &post_stats);
+ rte_malloc_get_numa_stats(socket, &post_stats);
if(second_stats.heap_totalsz_bytes != first_stats.heap_totalsz_bytes) {
printf("Incorrect heap statistics: Total size \n");
@@ -704,7 +704,7 @@ test_realloc(void)
ret = -1;
goto end;
}
- realloc_heap_socket = rte_malloc_heap_get_socket(heap_name);
+ realloc_heap_socket = rte_malloc_heap_get_numa_id(heap_name);
mem = mmap(NULL, mem_sz, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index 8712690561..1b6555df55 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -493,10 +493,10 @@ test_memzone_reserve_flags(void)
static size_t
find_max_block_free_size(unsigned int align, unsigned int socket_id)
{
- struct rte_malloc_socket_stats stats;
+ struct rte_malloc_numa_stats stats;
size_t len, overhead;
- if (rte_malloc_get_socket_stats(socket_id, &stats) < 0)
+ if (rte_malloc_get_numa_stats(socket_id, &stats) < 0)
return 0;
len = stats.greatest_free_size;
diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst
index 2f13ee846e..4119a0ebd5 100644
--- a/doc/guides/prog_guide/env_abstraction_layer.rst
+++ b/doc/guides/prog_guide/env_abstraction_layer.rst
@@ -374,10 +374,10 @@ manual memory management.
Using a set of malloc heap API's is the recommended way to use externally
allocated memory in DPDK. In this way, support for externally allocated memory
-is implemented through overloading the socket ID - externally allocated heaps
-will have socket ID's that would be considered invalid under normal
+is implemented through overloading the NUMA node ID - externally allocated heaps
+will have NUMA node IDs that would be considered invalid under normal
circumstances. Requesting an allocation to take place from a specified
-externally allocated memory is a matter of supplying the correct socket ID to
+externally allocated memory is a matter of supplying the correct NUMA node ID to
DPDK allocator, either directly (e.g. through a call to ``rte_malloc``) or
indirectly (through data structure-specific allocation API's such as
``rte_ring_create``). Using these API's also ensures that mapping of externally
@@ -399,12 +399,12 @@ The expected workflow is as follows:
- If IOVA table is not specified, IOVA addresses will be assumed to be
unavailable, and DMA mappings will not be performed
- Other processes must attach to the memory area before they can use it
-* Get socket ID used for the heap
-* Use normal DPDK allocation procedures, using supplied socket ID
+* Get NUMA node ID used for the heap
+* Use normal DPDK allocation procedures, using supplied NUMA node ID
* If memory area is no longer needed, it can be removed from the heap
- Other processes must detach from this memory area before it can be removed
* If heap is no longer needed, remove it
- - Socket ID will become invalid and will not be reused
+ - NUMA node ID will become invalid and will not be reused
For more information, please refer to ``rte_malloc`` API documentation,
specifically the ``rte_malloc_heap_*`` family of function calls.
@@ -790,11 +790,11 @@ Public Thread API
There are two public APIs ``rte_thread_set_affinity()`` and ``rte_thread_get_affinity()`` introduced for threads.
When they're used in any pthread context, the Thread Local Storage(TLS) will be set/get.
-Those TLS include *_cpuset* and *_socket_id*:
+Those TLS include *_cpuset* and *_numa_id*:
* *_cpuset* stores the CPUs bitmap to which the pthread is affinitized.
-* *_socket_id* stores the NUMA node of the CPU set. If the CPUs in CPU set belong to different NUMA node, the *_socket_id* will be set to SOCKET_ID_ANY.
+* *_numa_id* stores the NUMA node of the CPU set. If the CPUs in CPU set belong to different NUMA node, the *_numa_id* will be set to RTE_NUMA_ID_ANY.
Control Thread API
@@ -948,16 +948,16 @@ Signal Safety
rte_lcore_index
rte_lcore_is_enabled
rte_lcore_to_cpu_id
- rte_lcore_to_socket_id
+ rte_lcore_to_numa_id
rte_log_get_global_level
rte_log_get_level
rte_memory_get_nchannel
rte_memory_get_nrank
+ rte_numa_count
+ rte_numa_id
+ rte_numa_id_by_idx
rte_reciprocal_value
rte_reciprocal_value_u64
- rte_socket_count
- rte_socket_id
- rte_socket_id_by_idx
rte_strerror
rte_strscpy
rte_strsplit
@@ -1018,9 +1018,9 @@ The rte_malloc() takes an align argument that can be used to request a memory
area that is aligned on a multiple of this value (which must be a power of two).
On systems with NUMA support, a call to the rte_malloc() function will return
-memory that has been allocated on the NUMA socket of the core which made the call.
+memory that has been allocated on the NUMA node of the core which made the call.
A set of APIs is also provided, to allow memory to be explicitly allocated on a
-NUMA socket directly, or by allocated on the NUMA socket where another core is
+NUMA node directly, or by allocated on the NUMA node where another core is
located, in the case where the memory is to be used by a logical core other than
on the one doing the memory allocation.
@@ -1041,7 +1041,7 @@ Data Structures
There are two data structure types used internally in the malloc library:
-* struct malloc_heap - used to track free space on a per-socket basis
+* struct malloc_heap - used to track free space on a per-NUMA-node basis
* struct malloc_elem - the basic element of allocation and free-space
tracking inside the library.
@@ -1049,7 +1049,7 @@ There are two data structure types used internally in the malloc library:
Structure: malloc_heap
""""""""""""""""""""""
-The malloc_heap structure is used to manage free space on a per-socket basis.
+The malloc_heap structure is used to manage free space on a per-NUMA-node basis.
Internally, there is one heap structure per NUMA node, which allows us to
allocate memory to a thread based on the NUMA node on which this thread runs.
While this does not guarantee that the memory will be used on that NUMA node,
diff --git a/doc/guides/rel_notes/release_26_11.rst b/doc/guides/rel_notes/release_26_11.rst
index 8ca8379cc6..0298d7bb36 100644
--- a/doc/guides/rel_notes/release_26_11.rst
+++ b/doc/guides/rel_notes/release_26_11.rst
@@ -68,10 +68,20 @@ New Features
and use pointer arithmetic instead of integer casts to enable compiler optimizations.
See API changes below.
-* **Added API to get CPU socket ID.**
+* **Added NUMA-aware APIs.**
- Added the experimental ``rte_cpu_socket_id()`` function
- to map an OS logical CPU ID to the NUMA socket containing that CPU.
+ Introduced NUMA terminology APIs to replace the socket-named ones:
+ ``rte_numa_id()``, ``rte_numa_count()``, ``rte_numa_id_by_idx()``,
+ ``rte_lcore_to_numa_id()``, the experimental ``rte_cpu_numa_id()``,
+ ``rte_malloc_numa()`` with the ``rte_zmalloc_numa()``,
+ ``rte_calloc_numa()`` and ``rte_realloc_numa()`` variants,
+ and the ``RTE_NUMA_ID_ANY`` constant.
+ The legacy socket-named APIs are kept as aliases pending deprecation.
+
+* **Added API to get CPU NUMA node ID.**
+
+ Added the experimental ``rte_cpu_numa_id()`` function
+ to map an OS logical CPU ID to the NUMA node containing that CPU.
* **Added pile stack and mempool driver.**
diff --git a/lib/eal/common/eal_common_dynmem.c b/lib/eal/common/eal_common_dynmem.c
index 868d274dc0..56fa190280 100644
--- a/lib/eal/common/eal_common_dynmem.c
+++ b/lib/eal/common/eal_common_dynmem.c
@@ -23,7 +23,7 @@ eal_dynmem_memseg_lists_init(void)
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
struct memtype {
uint64_t page_sz;
- int socket_id;
+ int numa_id;
unsigned int hpi_idx;
unsigned int n_segs;
size_t mem_sz;
@@ -45,7 +45,7 @@ eal_dynmem_memseg_lists_init(void)
* figuring out amount of memory we're going to have is a long and very
* involved process. the basic element we're operating with is a memory
* type, defined as a combination of NUMA node ID and page size (so that
- * e.g. 2 sockets with 2 page sizes yield 4 memory types in total).
+ * e.g. 2 NUMA nodes with 2 page sizes yield 4 memory types in total).
*
* deciding amount of memory going towards each memory type is a
* balancing act between maximum segments per type, maximum memory per
@@ -57,7 +57,7 @@ eal_dynmem_memseg_lists_init(void)
*/
/* maximum number of memtypes we're ever going to get */
- n_memtypes = internal_conf->num_hugepage_sizes * rte_socket_count();
+ n_memtypes = internal_conf->num_hugepage_sizes * rte_numa_count();
/* can we fit all memtypes into the memseg lists? */
if (n_memtypes > RTE_MAX_MEMSEG_LISTS) {
@@ -76,21 +76,21 @@ eal_dynmem_memseg_lists_init(void)
hpi = &internal_conf->hugepage_info[hpi_idx];
hugepage_sz = hpi->hugepage_sz;
- for (i = 0; i < (int) rte_socket_count(); i++, cur_type++) {
- int socket_id = rte_socket_id_by_idx(i);
+ for (i = 0; i < (int) rte_numa_count(); i++, cur_type++) {
+ int numa_id = rte_numa_id_by_idx(i);
#ifndef RTE_EAL_NUMA_AWARE_HUGEPAGES
- /* we can still sort pages by socket in legacy mode */
- if (!internal_conf->legacy_mem && socket_id > 0)
+ /* we can still sort pages by NUMA node in legacy mode */
+ if (!internal_conf->legacy_mem && numa_id > 0)
break;
#endif
memtypes[cur_type].page_sz = hugepage_sz;
- memtypes[cur_type].socket_id = socket_id;
+ memtypes[cur_type].numa_id = numa_id;
memtypes[cur_type].hpi_idx = hpi_idx;
EAL_LOG(DEBUG, "Detected memory type: "
- "socket_id:%u hugepage_sz:%" PRIu64,
- socket_id, hugepage_sz);
+ "numa_id:%u hugepage_sz:%" PRIu64,
+ numa_id, hugepage_sz);
}
}
/* number of memtypes could have been lower due to no NUMA support */
@@ -144,21 +144,21 @@ eal_dynmem_memseg_lists_init(void)
for (cur_type = 0; cur_type < n_memtypes; cur_type++) {
struct memtype *type = &memtypes[cur_type];
uint64_t pagesz;
- int socket_id;
+ int numa_id;
/* skip page sizes with zero memory limit */
if (type->n_segs == 0)
continue;
pagesz = type->page_sz;
- socket_id = type->socket_id;
+ numa_id = type->numa_id;
- EAL_LOG(DEBUG, "Creating segment list: n_segs:%u socket_id:%i hugepage_sz:%" PRIu64,
- type->n_segs, socket_id, pagesz);
+ EAL_LOG(DEBUG, "Creating segment list: n_segs:%u numa_id:%i hugepage_sz:%" PRIu64,
+ type->n_segs, numa_id, pagesz);
msl = &mcfg->memsegs[msl_idx];
- if (eal_memseg_list_init(msl, pagesz, type->n_segs, socket_id, msl_idx, true))
+ if (eal_memseg_list_init(msl, pagesz, type->n_segs, numa_id, msl_idx, true))
goto out;
if (eal_memseg_list_assign(msl,
@@ -196,9 +196,9 @@ hugepage_count_walk(const struct rte_memseg_list *msl, void *arg)
}
static int
-limits_callback(int socket_id, size_t cur_limit, size_t new_len)
+limits_callback(int numa_id, size_t cur_limit, size_t new_len)
{
- RTE_SET_USED(socket_id);
+ RTE_SET_USED(numa_id);
RTE_SET_USED(cur_limit);
RTE_SET_USED(new_len);
return -1;
@@ -209,7 +209,7 @@ eal_dynmem_hugepage_init(void)
{
struct hugepage_info used_hp[MAX_HUGEPAGE_SIZES];
uint64_t memory[RTE_MAX_NUMA_NODES];
- int hp_sz_idx, socket_id;
+ int hp_sz_idx, numa_id;
struct internal_config *internal_conf =
eal_get_internal_configuration();
@@ -228,7 +228,7 @@ eal_dynmem_hugepage_init(void)
used_hp[hp_sz_idx].hugepage_sz = hpi->hugepage_sz;
#ifndef RTE_ARCH_64
- /* for 32-bit, limit number of pages on socket to whatever we've
+ /* for 32-bit, limit number of pages on NUMA node to whatever we've
* preallocated, as we cannot allocate more.
*/
memset(&dummy, 0, sizeof(dummy));
@@ -251,7 +251,7 @@ eal_dynmem_hugepage_init(void)
memory[hp_sz_idx] = internal_conf->numa_mem[hp_sz_idx];
/* calculate final number of pages */
- if (eal_dynmem_calc_num_pages_per_socket(memory,
+ if (eal_dynmem_calc_num_pages_per_numa_node(memory,
internal_conf->hugepage_info, used_hp,
internal_conf->num_hugepage_sizes) < 0)
return -1;
@@ -259,11 +259,11 @@ eal_dynmem_hugepage_init(void)
for (hp_sz_idx = 0;
hp_sz_idx < (int)internal_conf->num_hugepage_sizes;
hp_sz_idx++) {
- for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES;
- socket_id++) {
+ for (numa_id = 0; numa_id < RTE_MAX_NUMA_NODES;
+ numa_id++) {
struct rte_memseg **pages;
struct hugepage_info *hpi = &used_hp[hp_sz_idx];
- unsigned int num_pages = hpi->num_pages[socket_id];
+ unsigned int num_pages = hpi->num_pages[numa_id];
unsigned int num_pages_alloc;
if (num_pages == 0)
@@ -271,8 +271,8 @@ eal_dynmem_hugepage_init(void)
EAL_LOG(DEBUG,
"Allocating %u pages of size %" PRIu64 "M "
- "on socket %i",
- num_pages, hpi->hugepage_sz >> 20, socket_id);
+ "on NUMA node %i",
+ num_pages, hpi->hugepage_sz >> 20, numa_id);
/* we may not be able to allocate all pages in one go,
* because we break up our memory map into multiple
@@ -296,7 +296,7 @@ eal_dynmem_hugepage_init(void)
/* do not request exact number of pages */
cur_pages = eal_memalloc_alloc_seg_bulk(pages,
needed, hpi->hugepage_sz,
- socket_id, false);
+ numa_id, false);
if (cur_pages <= 0) {
free(pages);
return -1;
@@ -315,16 +315,16 @@ eal_dynmem_hugepage_init(void)
}
}
- /* if socket limits were specified, set them */
+ /* if NUMA node limits were specified, set them */
if (internal_conf->force_numa_limits) {
unsigned int i;
for (i = 0; i < RTE_MAX_NUMA_NODES; i++) {
uint64_t limit = internal_conf->numa_limit[i];
if (limit == 0)
continue;
- if (rte_mem_alloc_validator_register("socket-limit",
+ if (rte_mem_alloc_validator_register("numa-limit",
limits_callback, i, limit))
- EAL_LOG(ERR, "Failed to register socket limits validator callback");
+ EAL_LOG(ERR, "Failed to register NUMA node limits validator callback");
}
}
return 0;
@@ -332,7 +332,7 @@ eal_dynmem_hugepage_init(void)
__rte_unused /* function is unused on 32-bit builds */
static inline uint64_t
-get_socket_mem_size(int socket)
+get_numa_node_mem_size(int numa_id)
{
uint64_t size = 0;
unsigned int i;
@@ -341,18 +341,18 @@ get_socket_mem_size(int socket)
for (i = 0; i < internal_conf->num_hugepage_sizes; i++) {
struct hugepage_info *hpi = &internal_conf->hugepage_info[i];
- size += hpi->hugepage_sz * hpi->num_pages[socket];
+ size += hpi->hugepage_sz * hpi->num_pages[numa_id];
}
return size;
}
int
-eal_dynmem_calc_num_pages_per_socket(
+eal_dynmem_calc_num_pages_per_numa_node(
uint64_t *memory, struct hugepage_info *hp_info,
struct hugepage_info *hp_used, unsigned int num_hp_info)
{
- unsigned int socket, j, i = 0;
+ unsigned int numa_id, j, i = 0;
unsigned int requested, available;
int total_num_pages = 0;
uint64_t remaining_mem, cur_mem;
@@ -363,107 +363,107 @@ eal_dynmem_calc_num_pages_per_socket(
if (num_hp_info == 0)
return -1;
- /* if specific memory amounts per socket weren't requested */
+ /* if specific memory amounts per numa_id weren't requested */
if (internal_conf->force_numa == 0) {
size_t total_size;
#ifdef RTE_ARCH_64
- int cpu_per_socket[RTE_MAX_NUMA_NODES];
+ int cpu_per_numa_node[RTE_MAX_NUMA_NODES];
size_t default_size;
unsigned int lcore_id;
- /* Compute number of cores per socket */
- memset(cpu_per_socket, 0, sizeof(cpu_per_socket));
+ /* Compute number of cores per NUMA node */
+ memset(cpu_per_numa_node, 0, sizeof(cpu_per_numa_node));
RTE_LCORE_FOREACH(lcore_id) {
- cpu_per_socket[rte_lcore_to_socket_id(lcore_id)]++;
+ cpu_per_numa_node[rte_lcore_to_numa_id(lcore_id)]++;
}
/*
* Automatically spread requested memory amongst detected
- * sockets according to number of cores from CPU mask present
- * on each socket.
+ * NUMA nodes according to number of cores from CPU mask present
+ * on each NUMA node.
*/
total_size = internal_conf->memory;
- for (socket = 0; socket < RTE_MAX_NUMA_NODES && total_size != 0;
- socket++) {
+ for (numa_id = 0; numa_id < RTE_MAX_NUMA_NODES && total_size != 0;
+ numa_id++) {
- /* Set memory amount per socket */
+ /* Set memory amount per NUMA node */
default_size = internal_conf->memory *
- cpu_per_socket[socket] / rte_lcore_count();
+ cpu_per_numa_node[numa_id] / rte_lcore_count();
- /* Limit to maximum available memory on socket */
+ /* Limit to maximum available memory on NUMA node */
default_size = RTE_MIN(
- default_size, get_socket_mem_size(socket));
+ default_size, get_numa_node_mem_size(numa_id));
/* Update sizes */
- memory[socket] = default_size;
+ memory[numa_id] = default_size;
total_size -= default_size;
}
/*
* If some memory is remaining, try to allocate it by getting
- * all available memory from sockets, one after the other.
+ * all available memory from NUMA nodes, one after the other.
*/
- for (socket = 0; socket < RTE_MAX_NUMA_NODES && total_size != 0;
- socket++) {
+ for (numa_id = 0; numa_id < RTE_MAX_NUMA_NODES && total_size != 0;
+ numa_id++) {
/* take whatever is available */
default_size = RTE_MIN(
- get_socket_mem_size(socket) - memory[socket],
+ get_numa_node_mem_size(numa_id) - memory[numa_id],
total_size);
/* Update sizes */
- memory[socket] += default_size;
+ memory[numa_id] += default_size;
total_size -= default_size;
}
#else
/* in 32-bit mode, allocate all of the memory only on main
- * lcore socket
+ * lcore NUMA node
*/
total_size = internal_conf->memory;
- for (socket = 0; socket < RTE_MAX_NUMA_NODES && total_size != 0;
- socket++) {
+ for (numa_id = 0; numa_id < RTE_MAX_NUMA_NODES && total_size != 0;
+ numa_id++) {
struct rte_config *cfg = rte_eal_get_configuration();
- unsigned int main_lcore_socket;
+ unsigned int main_lcore_numa_node;
- main_lcore_socket =
- rte_lcore_to_socket_id(cfg->main_lcore);
+ main_lcore_numa_node =
+ rte_lcore_to_numa_id(cfg->main_lcore);
- if (main_lcore_socket != socket)
+ if (main_lcore_numa_node != numa_id)
continue;
/* Update sizes */
- memory[socket] = total_size;
+ memory[numa_id] = total_size;
break;
}
#endif
}
- for (socket = 0; socket < RTE_MAX_NUMA_NODES && total_mem != 0;
- socket++) {
- /* skips if the memory on specific socket wasn't requested */
- for (i = 0; i < num_hp_info && memory[socket] != 0; i++) {
+ for (numa_id = 0; numa_id < RTE_MAX_NUMA_NODES && total_mem != 0;
+ numa_id++) {
+ /* skips if the memory on specific NUMA node was not requested */
+ for (i = 0; i < num_hp_info && memory[numa_id] != 0; i++) {
rte_strscpy(hp_used[i].hugedir, hp_info[i].hugedir,
sizeof(hp_used[i].hugedir));
- hp_used[i].num_pages[socket] = RTE_MIN(
- memory[socket] / hp_info[i].hugepage_sz,
- hp_info[i].num_pages[socket]);
+ hp_used[i].num_pages[numa_id] = RTE_MIN(
+ memory[numa_id] / hp_info[i].hugepage_sz,
+ hp_info[i].num_pages[numa_id]);
- cur_mem = hp_used[i].num_pages[socket] *
+ cur_mem = hp_used[i].num_pages[numa_id] *
hp_used[i].hugepage_sz;
- memory[socket] -= cur_mem;
+ memory[numa_id] -= cur_mem;
total_mem -= cur_mem;
- total_num_pages += hp_used[i].num_pages[socket];
+ total_num_pages += hp_used[i].num_pages[numa_id];
/* check if we have met all memory requests */
- if (memory[socket] == 0)
+ if (memory[numa_id] == 0)
break;
/* Check if we have any more pages left at this size,
* if so, move on to next size.
*/
- if (hp_used[i].num_pages[socket] ==
- hp_info[i].num_pages[socket])
+ if (hp_used[i].num_pages[numa_id] ==
+ hp_info[i].num_pages[numa_id])
continue;
/* At this point we know that there are more pages
* available that are bigger than the memory we want,
@@ -473,29 +473,29 @@ eal_dynmem_calc_num_pages_per_socket(
remaining_mem = 0;
for (j = i+1; j < num_hp_info; j++)
remaining_mem += hp_info[j].hugepage_sz *
- hp_info[j].num_pages[socket];
+ hp_info[j].num_pages[numa_id];
/* Is there enough other memory?
* If not, allocate another page and quit.
*/
- if (remaining_mem < memory[socket]) {
+ if (remaining_mem < memory[numa_id]) {
cur_mem = RTE_MIN(
- memory[socket], hp_info[i].hugepage_sz);
- memory[socket] -= cur_mem;
+ memory[numa_id], hp_info[i].hugepage_sz);
+ memory[numa_id] -= cur_mem;
total_mem -= cur_mem;
- hp_used[i].num_pages[socket]++;
+ hp_used[i].num_pages[numa_id]++;
total_num_pages++;
- break; /* we are done with this socket*/
+ break; /* we are done with this numa_id*/
}
}
- /* if we didn't satisfy all memory requirements per socket */
- if (memory[socket] > 0 &&
- internal_conf->numa_mem[socket] != 0) {
- requested = internal_conf->numa_mem[socket] / 0x100000;
- available = requested - (memory[socket] / 0x100000);
- EAL_LOG(ERR, "Not enough memory available on socket %u! Requested: %uMB, available: %uMB",
- socket, requested, available);
+ /* if we didn't satisfy all memory requirements per numa_id */
+ if (memory[numa_id] > 0 &&
+ internal_conf->numa_mem[numa_id] != 0) {
+ requested = internal_conf->numa_mem[numa_id] / 0x100000;
+ available = requested - (memory[numa_id] / 0x100000);
+ EAL_LOG(ERR, "Not enough memory available on numa_id %u! Requested: %uMB, available: %uMB",
+ numa_id, requested, available);
return -1;
}
}
diff --git a/lib/eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c
index 3ddacdb8ce..f569307e51 100644
--- a/lib/eal/common/eal_common_lcore.c
+++ b/lib/eal/common/eal_common_lcore.c
@@ -124,25 +124,32 @@ unsigned int rte_get_next_lcore(unsigned int i, int skip_main, int wrap)
return i;
}
+RTE_EXPORT_SYMBOL(rte_lcore_to_numa_id)
+unsigned int
+rte_lcore_to_numa_id(unsigned int lcore_id)
+{
+ return lcore_config[lcore_id].numa_id;
+}
+
RTE_EXPORT_SYMBOL(rte_lcore_to_socket_id)
unsigned int
rte_lcore_to_socket_id(unsigned int lcore_id)
{
- return lcore_config[lcore_id].numa_id;
+ return rte_lcore_to_numa_id(lcore_id);
}
-RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_cpu_socket_id, 26.11)
+RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_cpu_numa_id, 26.11)
unsigned int
-rte_cpu_socket_id(unsigned int cpu_id)
+rte_cpu_numa_id(unsigned int cpu_id)
{
if (eal_cpu_detected(cpu_id) == 0)
- return (unsigned int)SOCKET_ID_ANY;
+ return (unsigned int)RTE_NUMA_ID_ANY;
- return eal_cpu_socket_id(cpu_id);
+ return eal_cpu_numa_id(cpu_id);
}
static int
-socket_id_cmp(const void *a, const void *b)
+numa_id_cmp(const void *a, const void *b)
{
const int *lcore_id_a = a;
const int *lcore_id_b = b;
@@ -166,11 +173,11 @@ rte_eal_cpu_init(void)
struct rte_config *config = rte_eal_get_configuration();
unsigned lcore_id;
unsigned count = 0;
- unsigned int socket_id, prev_socket_id;
+ unsigned int numa_id, prev_numa_id;
#if CPU_SETSIZE > RTE_MAX_LCORE
- int lcore_to_socket_id[CPU_SETSIZE] = {0};
+ int lcore_to_numa_id[CPU_SETSIZE] = {0};
#else
- int lcore_to_socket_id[RTE_MAX_LCORE] = {0};
+ int lcore_to_numa_id[RTE_MAX_LCORE] = {0};
#endif
/*
@@ -183,9 +190,9 @@ rte_eal_cpu_init(void)
/* init cpuset for per lcore config */
CPU_ZERO(&lcore_config[lcore_id].cpuset);
- /* find socket first */
- socket_id = eal_cpu_socket_id(lcore_id);
- lcore_to_socket_id[lcore_id] = socket_id;
+ /* find NUMA node first */
+ numa_id = eal_cpu_numa_id(lcore_id);
+ lcore_to_numa_id[lcore_id] = numa_id;
if (eal_cpu_detected(lcore_id) == 0) {
config->lcore_role[lcore_id] = RTE_LCORE_ROLE_OFF;
@@ -203,7 +210,7 @@ rte_eal_cpu_init(void)
config->lcore_role[lcore_id] = RTE_LCORE_ROLE_RTE;
lcore_config[lcore_id].core_role = RTE_LCORE_ROLE_RTE;
lcore_config[lcore_id].core_id = eal_cpu_core_id(lcore_id);
- lcore_config[lcore_id].numa_id = socket_id;
+ lcore_config[lcore_id].numa_id = numa_id;
EAL_LOG(DEBUG, "Detected lcore %u as "
"core %u on NUMA node %u",
lcore_id, lcore_config[lcore_id].core_id,
@@ -213,11 +220,11 @@ rte_eal_cpu_init(void)
for (; lcore_id < CPU_SETSIZE; lcore_id++) {
if (eal_cpu_detected(lcore_id) == 0)
continue;
- socket_id = eal_cpu_socket_id(lcore_id);
- lcore_to_socket_id[lcore_id] = socket_id;
+ numa_id = eal_cpu_numa_id(lcore_id);
+ lcore_to_numa_id[lcore_id] = numa_id;
EAL_LOG(DEBUG, "Skipped lcore %u as core %u on NUMA node %u",
lcore_id, eal_cpu_core_id(lcore_id),
- socket_id);
+ numa_id);
}
/* Set the count of enabled logical cores of the EAL configuration */
@@ -227,17 +234,17 @@ rte_eal_cpu_init(void)
RTE_MAX_LCORE);
EAL_LOG(INFO, "Detected CPU lcores: %u", config->lcore_count);
- /* sort all socket id's in ascending order */
- qsort(lcore_to_socket_id, RTE_DIM(lcore_to_socket_id),
- sizeof(lcore_to_socket_id[0]), socket_id_cmp);
+ /* sort all NUMA node IDs in ascending order */
+ qsort(lcore_to_numa_id, RTE_DIM(lcore_to_numa_id),
+ sizeof(lcore_to_numa_id[0]), numa_id_cmp);
- prev_socket_id = -1;
+ prev_numa_id = -1;
config->numa_node_count = 0;
- for (lcore_id = 0; lcore_id < RTE_DIM(lcore_to_socket_id); lcore_id++) {
- socket_id = lcore_to_socket_id[lcore_id];
- if (socket_id != prev_socket_id)
- config->numa_nodes[config->numa_node_count++] = socket_id;
- prev_socket_id = socket_id;
+ for (lcore_id = 0; lcore_id < RTE_DIM(lcore_to_numa_id); lcore_id++) {
+ numa_id = lcore_to_numa_id[lcore_id];
+ if (numa_id != prev_numa_id)
+ config->numa_nodes[config->numa_node_count++] = numa_id;
+ prev_numa_id = numa_id;
if (config->numa_node_count >= RTE_MAX_NUMA_NODES)
break;
}
@@ -246,17 +253,24 @@ rte_eal_cpu_init(void)
return 0;
}
-RTE_EXPORT_SYMBOL(rte_socket_count)
+RTE_EXPORT_SYMBOL(rte_numa_count)
unsigned int
-rte_socket_count(void)
+rte_numa_count(void)
{
const struct rte_config *config = rte_eal_get_configuration();
return config->numa_node_count;
}
-RTE_EXPORT_SYMBOL(rte_socket_id_by_idx)
+RTE_EXPORT_SYMBOL(rte_socket_count)
+unsigned int
+rte_socket_count(void)
+{
+ return rte_numa_count();
+}
+
+RTE_EXPORT_SYMBOL(rte_numa_id_by_idx)
int
-rte_socket_id_by_idx(unsigned int idx)
+rte_numa_id_by_idx(unsigned int idx)
{
const struct rte_config *config = rte_eal_get_configuration();
if (idx >= config->numa_node_count) {
@@ -266,6 +280,13 @@ rte_socket_id_by_idx(unsigned int idx)
return config->numa_nodes[idx];
}
+RTE_EXPORT_SYMBOL(rte_socket_id_by_idx)
+int
+rte_socket_id_by_idx(unsigned int idx)
+{
+ return rte_numa_id_by_idx(idx);
+}
+
static rte_rwlock_t lcore_lock = RTE_RWLOCK_INITIALIZER;
struct lcore_callback {
TAILQ_ENTRY(lcore_callback) next;
@@ -527,8 +548,8 @@ lcore_dump_cb(unsigned int lcore_id, void *arg)
}
}
cpuset = eal_cpuset_to_str(&lcore_config[lcore_id].cpuset);
- fprintf(f, "lcore %u, socket %u, role %s, cpuset %s\n", lcore_id,
- rte_lcore_to_socket_id(lcore_id),
+ fprintf(f, "lcore %u, numa node %u, role %s, cpuset %s\n", lcore_id,
+ rte_lcore_to_numa_id(lcore_id),
lcore_role_str(cfg->lcore_role[lcore_id]),
cpuset != NULL ? cpuset : "<unknown>");
free(cpuset);
@@ -594,7 +615,7 @@ lcore_telemetry_info_cb(unsigned int lcore_id, void *arg)
rte_tel_data_start_dict(info->d);
rte_tel_data_add_dict_int(info->d, "lcore_id", lcore_id);
- rte_tel_data_add_dict_int(info->d, "socket", rte_lcore_to_socket_id(lcore_id));
+ rte_tel_data_add_dict_int(info->d, "numa_id", rte_lcore_to_numa_id(lcore_id));
rte_tel_data_add_dict_string(info->d, "role", lcore_role_str(cfg->lcore_role[lcore_id]));
cpuset = rte_tel_data_alloc();
if (cpuset == NULL)
diff --git a/lib/eal/common/eal_common_memalloc.c b/lib/eal/common/eal_common_memalloc.c
index 47e782f395..42f90148e5 100644
--- a/lib/eal/common/eal_common_memalloc.c
+++ b/lib/eal/common/eal_common_memalloc.c
@@ -25,7 +25,7 @@ struct mem_alloc_validator_entry {
TAILQ_ENTRY(mem_alloc_validator_entry) next;
char name[RTE_MEM_ALLOC_VALIDATOR_NAME_LEN];
rte_mem_alloc_validator_t clb;
- int socket_id;
+ int numa_id;
size_t limit;
};
@@ -54,12 +54,12 @@ find_mem_event_callback(const char *name, void *arg)
}
static struct mem_alloc_validator_entry *
-find_mem_alloc_validator(const char *name, int socket_id)
+find_mem_alloc_validator(const char *name, int numa_id)
{
struct mem_alloc_validator_entry *r;
TAILQ_FOREACH(r, &mem_alloc_validator_list, next) {
- if (!strcmp(r->name, name) && r->socket_id == socket_id)
+ if (!strcmp(r->name, name) && r->numa_id == numa_id)
break;
}
return r;
@@ -252,11 +252,11 @@ eal_memalloc_mem_event_notify(enum rte_mem_event event, const void *start,
int
eal_memalloc_mem_alloc_validator_register(const char *name,
- rte_mem_alloc_validator_t clb, int socket_id, size_t limit)
+ rte_mem_alloc_validator_t clb, int numa_id, size_t limit)
{
struct mem_alloc_validator_entry *entry;
int ret, len;
- if (name == NULL || clb == NULL || socket_id < 0) {
+ if (name == NULL || clb == NULL || numa_id < 0) {
rte_errno = EINVAL;
return -1;
}
@@ -270,7 +270,7 @@ eal_memalloc_mem_alloc_validator_register(const char *name,
}
rte_rwlock_write_lock(&mem_alloc_validator_rwlock);
- entry = find_mem_alloc_validator(name, socket_id);
+ entry = find_mem_alloc_validator(name, numa_id);
if (entry != NULL) {
rte_errno = EEXIST;
ret = -1;
@@ -286,15 +286,15 @@ eal_memalloc_mem_alloc_validator_register(const char *name,
/* callback successfully created and is valid, add it to the list */
entry->clb = clb;
- entry->socket_id = socket_id;
+ entry->numa_id = numa_id;
entry->limit = limit;
strlcpy(entry->name, name, RTE_MEM_ALLOC_VALIDATOR_NAME_LEN);
TAILQ_INSERT_TAIL(&mem_alloc_validator_list, entry, next);
ret = 0;
- EAL_LOG(DEBUG, "Mem alloc validator '%s' on socket %i with limit %zu registered",
- name, socket_id, limit);
+ EAL_LOG(DEBUG, "Mem alloc validator '%s' on NUMA node %i with limit %zu registered",
+ name, numa_id, limit);
unlock:
rte_rwlock_write_unlock(&mem_alloc_validator_rwlock);
@@ -302,12 +302,12 @@ eal_memalloc_mem_alloc_validator_register(const char *name,
}
int
-eal_memalloc_mem_alloc_validator_unregister(const char *name, int socket_id)
+eal_memalloc_mem_alloc_validator_unregister(const char *name, int numa_id)
{
struct mem_alloc_validator_entry *entry;
int ret, len;
- if (name == NULL || socket_id < 0) {
+ if (name == NULL || numa_id < 0) {
rte_errno = EINVAL;
return -1;
}
@@ -321,7 +321,7 @@ eal_memalloc_mem_alloc_validator_unregister(const char *name, int socket_id)
}
rte_rwlock_write_lock(&mem_alloc_validator_rwlock);
- entry = find_mem_alloc_validator(name, socket_id);
+ entry = find_mem_alloc_validator(name, numa_id);
if (entry == NULL) {
rte_errno = ENOENT;
ret = -1;
@@ -332,8 +332,8 @@ eal_memalloc_mem_alloc_validator_unregister(const char *name, int socket_id)
ret = 0;
- EAL_LOG(DEBUG, "Mem alloc validator '%s' on socket %i unregistered",
- name, socket_id);
+ EAL_LOG(DEBUG, "Mem alloc validator '%s' on NUMA node %i unregistered",
+ name, numa_id);
unlock:
rte_rwlock_write_unlock(&mem_alloc_validator_rwlock);
@@ -341,7 +341,7 @@ eal_memalloc_mem_alloc_validator_unregister(const char *name, int socket_id)
}
int
-eal_memalloc_mem_alloc_validate(int socket_id, size_t new_len)
+eal_memalloc_mem_alloc_validate(int numa_id, size_t new_len)
{
struct mem_alloc_validator_entry *entry;
int ret = 0;
@@ -349,11 +349,11 @@ eal_memalloc_mem_alloc_validate(int socket_id, size_t new_len)
rte_rwlock_read_lock(&mem_alloc_validator_rwlock);
TAILQ_FOREACH(entry, &mem_alloc_validator_list, next) {
- if (entry->socket_id != socket_id || entry->limit > new_len)
+ if (entry->numa_id != numa_id || entry->limit > new_len)
continue;
- EAL_LOG(DEBUG, "Calling mem alloc validator '%s' on socket %i",
- entry->name, entry->socket_id);
- if (entry->clb(socket_id, entry->limit, new_len) < 0)
+ EAL_LOG(DEBUG, "Calling mem alloc validator '%s' on NUMA node %i",
+ entry->name, entry->numa_id);
+ if (entry->clb(numa_id, entry->limit, new_len) < 0)
ret = -1;
}
diff --git a/lib/eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c
index 33681e7a37..cd22c254a1 100644
--- a/lib/eal/common/eal_common_memory.c
+++ b/lib/eal/common/eal_common_memory.c
@@ -204,7 +204,7 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
int
eal_memseg_list_init_named(struct rte_memseg_list *msl, const char *name,
- uint64_t page_sz, int n_segs, int socket_id, bool heap)
+ uint64_t page_sz, int n_segs, int numa_id, bool heap)
{
if (rte_fbarray_init(&msl->memseg_arr, name, n_segs,
sizeof(struct rte_memseg))) {
@@ -214,26 +214,26 @@ eal_memseg_list_init_named(struct rte_memseg_list *msl, const char *name,
}
msl->page_sz = page_sz;
- msl->socket_id = socket_id;
+ msl->socket_id = numa_id;
msl->base_va = NULL;
msl->heap = heap;
EAL_LOG(DEBUG,
- "Memseg list allocated at socket %i, page size 0x%"PRIx64"kB",
- socket_id, page_sz >> 10);
+ "Memseg list allocated at NUMA node %i, page size 0x%"PRIx64"kB",
+ numa_id, page_sz >> 10);
return 0;
}
int
eal_memseg_list_init(struct rte_memseg_list *msl, uint64_t page_sz,
- int n_segs, int socket_id, int msl_idx, bool heap)
+ int n_segs, int numa_id, int msl_idx, bool heap)
{
char name[RTE_FBARRAY_NAME_LEN];
- snprintf(name, sizeof(name), MEMSEG_LIST_FMT, page_sz >> 10, socket_id, msl_idx);
+ snprintf(name, sizeof(name), MEMSEG_LIST_FMT, page_sz >> 10, numa_id, msl_idx);
- return eal_memseg_list_init_named(msl, name, page_sz, n_segs, socket_id, heap);
+ return eal_memseg_list_init_named(msl, name, page_sz, n_segs, numa_id, heap);
}
int
@@ -477,7 +477,7 @@ dump_memseg(const struct rte_memseg_list *msl, const struct rte_memseg *ms,
fd = eal_memalloc_get_seg_fd(msl_idx, ms_idx);
fprintf(f, "Segment %i-%i: IOVA:0x%"PRIx64", len:%zu, "
- "virt:%p, socket_id:%"PRId32", "
+ "virt:%p, numa_id:%"PRId32", "
"hugepage_sz:%"PRIu64", nchannel:%"PRIx32", "
"nrank:%"PRIx32" fd:%i\n",
msl_idx, ms_idx,
@@ -533,7 +533,7 @@ rte_mem_event_callback_unregister(const char *name, void *arg)
RTE_EXPORT_SYMBOL(rte_mem_alloc_validator_register)
int
rte_mem_alloc_validator_register(const char *name,
- rte_mem_alloc_validator_t clb, int socket_id, size_t limit)
+ rte_mem_alloc_validator_t clb, int numa_id, size_t limit)
{
const struct internal_config *internal_conf =
eal_get_internal_configuration();
@@ -544,13 +544,13 @@ rte_mem_alloc_validator_register(const char *name,
rte_errno = ENOTSUP;
return -1;
}
- return eal_memalloc_mem_alloc_validator_register(name, clb, socket_id,
+ return eal_memalloc_mem_alloc_validator_register(name, clb, numa_id,
limit);
}
RTE_EXPORT_SYMBOL(rte_mem_alloc_validator_unregister)
int
-rte_mem_alloc_validator_unregister(const char *name, int socket_id)
+rte_mem_alloc_validator_unregister(const char *name, int numa_id)
{
const struct internal_config *internal_conf =
eal_get_internal_configuration();
@@ -561,7 +561,7 @@ rte_mem_alloc_validator_unregister(const char *name, int socket_id)
rte_errno = ENOTSUP;
return -1;
}
- return eal_memalloc_mem_alloc_validator_unregister(name, socket_id);
+ return eal_memalloc_mem_alloc_validator_unregister(name, numa_id);
}
/* Dump the physical memory layout on console */
@@ -966,7 +966,7 @@ rte_extmem_register(void *va_addr, size_t len, rte_iova_t iova_addrs[],
unsigned int n_pages, size_t page_sz)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- unsigned int socket_id, n;
+ unsigned int numa_id, n;
int ret = 0;
if (va_addr == NULL || page_sz == 0 || len == 0 ||
@@ -986,10 +986,10 @@ rte_extmem_register(void *va_addr, size_t len, rte_iova_t iova_addrs[],
goto unlock;
}
- /* get next available socket ID */
- socket_id = mcfg->next_socket_id;
- if (socket_id > INT32_MAX) {
- EAL_LOG(ERR, "Cannot assign new socket ID's");
+ /* get next available NUMA node ID */
+ numa_id = mcfg->next_numa_id;
+ if (numa_id > INT32_MAX) {
+ EAL_LOG(ERR, "Cannot assign new NUMA node IDs");
rte_errno = ENOSPC;
ret = -1;
goto unlock;
@@ -998,13 +998,13 @@ rte_extmem_register(void *va_addr, size_t len, rte_iova_t iova_addrs[],
/* we can create a new memseg */
n = len / page_sz;
if (malloc_heap_create_external_seg(va_addr, iova_addrs, n,
- page_sz, "extmem", socket_id) == NULL) {
+ page_sz, "extmem", numa_id) == NULL) {
ret = -1;
goto unlock;
}
- /* memseg list successfully created - increment next socket ID */
- mcfg->next_socket_id++;
+ /* memseg list successfully created - increment next NUMA node ID */
+ mcfg->next_numa_id++;
unlock:
rte_mcfg_mem_write_unlock();
return ret;
@@ -1193,7 +1193,7 @@ handle_eal_heap_info_request(const char *cmd __rte_unused, const char *params,
struct rte_tel_data *d)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- struct rte_malloc_socket_stats sock_stats;
+ struct rte_malloc_numa_stats sock_stats;
struct malloc_heap *heap;
unsigned int heap_id;
@@ -1230,7 +1230,7 @@ handle_eal_heap_list_request(const char *cmd __rte_unused,
struct rte_tel_data *d)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- struct rte_malloc_socket_stats sock_stats;
+ struct rte_malloc_numa_stats sock_stats;
unsigned int heap_id;
rte_tel_data_start_array(d, RTE_TEL_INT_VAL);
diff --git a/lib/eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c
index db43af13a8..d325193b9d 100644
--- a/lib/eal/common/eal_common_memzone.c
+++ b/lib/eal/common/eal_common_memzone.c
@@ -102,7 +102,7 @@ memzone_lookup_thread_unsafe(const char *name)
static const struct rte_memzone *
memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
- int socket_id, unsigned int flags, unsigned int align,
+ int numa_id, unsigned int flags, unsigned int align,
unsigned int bound)
{
struct rte_memzone *mz;
@@ -171,7 +171,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
return NULL;
}
- if ((socket_id != SOCKET_ID_ANY) && socket_id < 0) {
+ if ((numa_id != RTE_NUMA_ID_ANY) && numa_id < 0) {
rte_errno = EINVAL;
return NULL;
}
@@ -181,11 +181,11 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
return NULL;
}
- /* only set socket to SOCKET_ID_ANY if we aren't allocating for an
+ /* only set NUMA node to RTE_NUMA_ID_ANY if we are not allocating for an
* external heap.
*/
- if (!rte_eal_has_hugepages() && socket_id < RTE_MAX_NUMA_NODES)
- socket_id = SOCKET_ID_ANY;
+ if (!rte_eal_has_hugepages() && numa_id < RTE_MAX_NUMA_NODES)
+ numa_id = RTE_NUMA_ID_ANY;
contig = (flags & RTE_MEMZONE_IOVA_CONTIG) != 0;
/* malloc only cares about size flags, remove contig flag from flags */
@@ -194,12 +194,12 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
if (len == 0 && bound == 0) {
/* no size constraints were placed, so use malloc elem len */
requested_len = 0;
- mz_addr = malloc_heap_alloc_biggest(socket_id, flags, align, contig);
+ mz_addr = malloc_heap_alloc_biggest(numa_id, flags, align, contig);
} else {
if (len == 0)
requested_len = bound;
/* allocate memory on heap */
- mz_addr = malloc_heap_alloc(requested_len, socket_id, flags, align, bound, contig);
+ mz_addr = malloc_heap_alloc(requested_len, numa_id, flags, align, bound, contig);
}
if (mz_addr == NULL) {
rte_errno = ENOMEM;
@@ -239,7 +239,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
}
static const struct rte_memzone *
-rte_memzone_reserve_thread_safe(const char *name, size_t len, int socket_id,
+rte_memzone_reserve_thread_safe(const char *name, size_t len, int numa_id,
unsigned int flags, unsigned int align, unsigned int bound)
{
struct rte_mem_config *mcfg;
@@ -251,9 +251,9 @@ rte_memzone_reserve_thread_safe(const char *name, size_t len, int socket_id,
rte_rwlock_write_lock(&mcfg->mlock);
mz = memzone_reserve_aligned_thread_unsafe(
- name, len, socket_id, flags, align, bound);
+ name, len, numa_id, flags, align, bound);
- rte_eal_trace_memzone_reserve(name, len, socket_id, flags, align,
+ rte_eal_trace_memzone_reserve(name, len, numa_id, flags, align,
bound, mz);
rte_rwlock_write_unlock(&mcfg->mlock);
@@ -268,10 +268,10 @@ rte_memzone_reserve_thread_safe(const char *name, size_t len, int socket_id,
*/
RTE_EXPORT_SYMBOL(rte_memzone_reserve_bounded)
const struct rte_memzone *
-rte_memzone_reserve_bounded(const char *name, size_t len, int socket_id,
+rte_memzone_reserve_bounded(const char *name, size_t len, int numa_id,
unsigned flags, unsigned align, unsigned bound)
{
- return rte_memzone_reserve_thread_safe(name, len, socket_id, flags,
+ return rte_memzone_reserve_thread_safe(name, len, numa_id, flags,
align, bound);
}
@@ -281,10 +281,10 @@ rte_memzone_reserve_bounded(const char *name, size_t len, int socket_id,
*/
RTE_EXPORT_SYMBOL(rte_memzone_reserve_aligned)
const struct rte_memzone *
-rte_memzone_reserve_aligned(const char *name, size_t len, int socket_id,
+rte_memzone_reserve_aligned(const char *name, size_t len, int numa_id,
unsigned flags, unsigned align)
{
- return rte_memzone_reserve_thread_safe(name, len, socket_id, flags,
+ return rte_memzone_reserve_thread_safe(name, len, numa_id, flags,
align, 0);
}
@@ -294,10 +294,10 @@ rte_memzone_reserve_aligned(const char *name, size_t len, int socket_id,
*/
RTE_EXPORT_SYMBOL(rte_memzone_reserve)
const struct rte_memzone *
-rte_memzone_reserve(const char *name, size_t len, int socket_id,
+rte_memzone_reserve(const char *name, size_t len, int numa_id,
unsigned flags)
{
- return rte_memzone_reserve_thread_safe(name, len, socket_id,
+ return rte_memzone_reserve_thread_safe(name, len, numa_id,
flags, RTE_CACHE_LINE_SIZE, 0);
}
@@ -388,7 +388,7 @@ dump_memzone(const struct rte_memzone *mz, void *arg)
info->total_size += mz->len;
fprintf(f, "Zone %u: name:<%s>, len:0x%zx, virt:%p, "
- "socket_id:%"PRId32", flags:%"PRIx32"\n",
+ "numa_id:%"PRId32", flags:%"PRIx32"\n",
mz_idx,
mz->name,
mz->len,
diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c
index b2c0744447..a84af3b66b 100644
--- a/lib/eal/common/eal_common_options.c
+++ b/lib/eal/common/eal_common_options.c
@@ -1855,7 +1855,7 @@ eal_parse_log_options(void)
}
static int
-eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
+eal_parse_numa_arg(char *strval, volatile uint64_t *numa_arg)
{
char *arg[RTE_MAX_NUMA_NODES];
char *end;
@@ -1871,7 +1871,7 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
if (!isdigit(strval[len-1]))
return -1;
- /* split the optarg into separate socket values */
+ /* split the optarg into separate NUMA node values */
arg_num = rte_strsplit(strval, len,
arg, RTE_MAX_NUMA_NODES, ',');
@@ -1879,7 +1879,7 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
if (arg_num <= 0)
return -1;
- /* parse each defined socket option */
+ /* parse each defined NUMA node option */
errno = 0;
for (i = 0; i < arg_num; i++) {
uint64_t val;
@@ -1891,7 +1891,7 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
(arg[i][0] == '\0') || (end == NULL) || (*end != '\0'))
return -1;
val <<= 20;
- socket_arg[i] = val;
+ numa_arg[i] = val;
}
return 0;
@@ -2282,14 +2282,14 @@ eal_parse_args(void)
}
}
if (args.numa_mem != NULL) {
- if (eal_parse_socket_arg(args.numa_mem, int_cfg->numa_mem) < 0) {
+ if (eal_parse_numa_arg(args.numa_mem, int_cfg->numa_mem) < 0) {
EAL_LOG(ERR, "invalid numa-mem parameter: '%s'", args.numa_mem);
return -1;
}
int_cfg->force_numa = 1;
}
if (args.numa_limit != NULL) {
- if (eal_parse_socket_arg(args.numa_limit, int_cfg->numa_limit) < 0) {
+ if (eal_parse_numa_arg(args.numa_limit, int_cfg->numa_limit) < 0) {
EAL_LOG(ERR, "invalid numa-limit parameter: '%s'", args.numa_limit);
return -1;
}
diff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c
index dcd81f9e32..e654a57e9a 100644
--- a/lib/eal/common/eal_common_thread.c
+++ b/lib/eal/common/eal_common_thread.c
@@ -28,41 +28,47 @@ RTE_DEFINE_PER_LCORE(unsigned int, _lcore_id) = LCORE_ID_ANY;
RTE_EXPORT_SYMBOL(per_lcore__thread_id)
RTE_DEFINE_PER_LCORE(int, _thread_id) = -1;
static RTE_DEFINE_PER_LCORE(unsigned int, _numa_id) =
- (unsigned int)SOCKET_ID_ANY;
+ (unsigned int)RTE_NUMA_ID_ANY;
static RTE_DEFINE_PER_LCORE(rte_cpuset_t, _cpuset);
+RTE_EXPORT_SYMBOL(rte_numa_id)
+unsigned int rte_numa_id(void)
+{
+ return RTE_PER_LCORE(_numa_id);
+}
+
RTE_EXPORT_SYMBOL(rte_socket_id)
unsigned rte_socket_id(void)
{
- return RTE_PER_LCORE(_numa_id);
+ return rte_numa_id();
}
static int
-eal_cpuset_socket_id(rte_cpuset_t *cpusetp)
+eal_cpuset_numa_id(rte_cpuset_t *cpusetp)
{
unsigned cpu = 0;
- int socket_id = SOCKET_ID_ANY;
+ int numa_id = RTE_NUMA_ID_ANY;
int sid;
if (cpusetp == NULL)
- return SOCKET_ID_ANY;
+ return RTE_NUMA_ID_ANY;
do {
if (!CPU_ISSET(cpu, cpusetp))
continue;
- if (socket_id == SOCKET_ID_ANY)
- socket_id = eal_cpu_socket_id(cpu);
+ if (numa_id == RTE_NUMA_ID_ANY)
+ numa_id = eal_cpu_numa_id(cpu);
- sid = eal_cpu_socket_id(cpu);
- if (socket_id != sid) {
- socket_id = SOCKET_ID_ANY;
+ sid = eal_cpu_numa_id(cpu);
+ if (numa_id != sid) {
+ numa_id = RTE_NUMA_ID_ANY;
break;
}
} while (++cpu < CPU_SETSIZE);
- return socket_id;
+ return numa_id;
}
static void
@@ -72,7 +78,7 @@ thread_update_affinity(rte_cpuset_t *cpusetp)
/* store numa_id in TLS for quick access */
RTE_PER_LCORE(_numa_id) =
- eal_cpuset_socket_id(cpusetp);
+ eal_cpuset_numa_id(cpusetp);
/* store cpuset in TLS for quick access */
memmove(&RTE_PER_LCORE(_cpuset), cpusetp,
@@ -240,10 +246,10 @@ static int control_thread_init(void *arg)
struct control_thread_params *params = arg;
__rte_thread_init(rte_lcore_id(), cpuset);
- /* Set control thread socket ID to SOCKET_ID_ANY
+ /* Set control thread NUMA node ID to RTE_NUMA_ID_ANY
* as control threads may be scheduled on any NUMA node.
*/
- RTE_PER_LCORE(_numa_id) = SOCKET_ID_ANY;
+ RTE_PER_LCORE(_numa_id) = RTE_NUMA_ID_ANY;
params->ret = rte_thread_set_affinity_by_id(rte_thread_self(), cpuset);
if (params->ret != 0) {
rte_atomic_store_explicit(¶ms->status,
diff --git a/lib/eal/common/eal_hugepages.h b/lib/eal/common/eal_hugepages.h
index 1b560d3379..2b14ed3a86 100644
--- a/lib/eal/common/eal_hugepages.h
+++ b/lib/eal/common/eal_hugepages.h
@@ -20,7 +20,7 @@ struct hugepage_file {
void *final_va; /**< virtual addr of 2nd mmap() */
uint64_t physaddr; /**< physical addr */
size_t size; /**< the page size */
- int socket_id; /**< NUMA socket ID */
+ int numa_id; /**< NUMA node ID */
int file_id; /**< the '%d' in HUGEFILE_FMT */
char filepath[MAX_HUGEPAGE_PATH]; /**< path to backing file on filesystem */
};
diff --git a/lib/eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h
index 07cd35167d..b7727a4bcf 100644
--- a/lib/eal/common/eal_internal_cfg.h
+++ b/lib/eal/common/eal_internal_cfg.h
@@ -30,7 +30,7 @@ struct hugepage_info {
uint64_t hugepage_sz; /**< size of a huge page */
char hugedir[PATH_MAX]; /**< dir where hugetlbfs is mounted */
uint32_t num_pages[RTE_MAX_NUMA_NODES];
- /**< number of hugepages of that size on each socket */
+ /**< number of hugepages of that size on each NUMA node */
int lock_descriptor; /**< file descriptor for hugepage dir */
};
diff --git a/lib/eal/common/eal_memalloc.h b/lib/eal/common/eal_memalloc.h
index 0c267066d9..d176bbd21a 100644
--- a/lib/eal/common/eal_memalloc.h
+++ b/lib/eal/common/eal_memalloc.h
@@ -13,7 +13,7 @@
* Allocate segment of specified page size.
*/
struct rte_memseg *
-eal_memalloc_alloc_seg(size_t page_sz, int socket);
+eal_memalloc_alloc_seg(size_t page_sz, int numa_id);
/*
* Allocate `n_segs` segments.
@@ -26,7 +26,7 @@ eal_memalloc_alloc_seg(size_t page_sz, int socket);
*/
int
eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms, int n_segs, size_t page_sz,
- int socket, bool exact);
+ int numa_id, bool exact);
/*
* Deallocate segment
@@ -67,13 +67,13 @@ eal_memalloc_mem_event_notify(enum rte_mem_event event, const void *start,
int
eal_memalloc_mem_alloc_validator_register(const char *name,
- rte_mem_alloc_validator_t clb, int socket_id, size_t limit);
+ rte_mem_alloc_validator_t clb, int numa_id, size_t limit);
int
-eal_memalloc_mem_alloc_validator_unregister(const char *name, int socket_id);
+eal_memalloc_mem_alloc_validator_unregister(const char *name, int numa_id);
int
-eal_memalloc_mem_alloc_validate(int socket_id, size_t new_len);
+eal_memalloc_mem_alloc_validate(int numa_id, size_t new_len);
/* returns fd or -errno */
int
diff --git a/lib/eal/common/eal_memcfg.h b/lib/eal/common/eal_memcfg.h
index 2b3b3b62ba..6a0427b7b3 100644
--- a/lib/eal/common/eal_memcfg.h
+++ b/lib/eal/common/eal_memcfg.h
@@ -62,7 +62,7 @@ struct rte_mem_config {
struct malloc_heap malloc_heaps[RTE_MAX_HEAPS];
/**< DPDK malloc heaps */
- int next_socket_id; /**< Next socket ID for external malloc heap */
+ int next_numa_id; /**< Next NUMA node ID for external malloc heap */
/* rte_mem_config has to be mapped at the exact same address in all
* processes, so we need to store it.
diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h
index 8905464f64..72595930fd 100644
--- a/lib/eal/common/eal_private.h
+++ b/lib/eal/common/eal_private.h
@@ -32,7 +32,7 @@ struct lcore_config {
volatile RTE_ATOMIC(enum rte_lcore_state_t) state; /**< lcore state */
unsigned int numa_id; /**< NUMA node ID for this lcore */
- unsigned int core_id; /**< core number on socket for this lcore */
+ unsigned int core_id; /**< core number on NUMA node for this lcore */
int core_index; /**< relative index, starting from 0 */
uint8_t core_role; /**< role of core eg: OFF, RTE, SERVICE */
@@ -273,8 +273,8 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
* Size of segment pages in the MSL.
* @param n_segs
* Number of segments.
- * @param socket_id
- * Socket ID. Must not be SOCKET_ID_ANY.
+ * @param numa_id
+ * Socket ID. Must not be RTE_NUMA_ID_ANY.
* @param heap
* Mark MSL as pointing to a heap.
* @return
@@ -282,7 +282,7 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
*/
int
eal_memseg_list_init_named(struct rte_memseg_list *msl, const char *name,
- uint64_t page_sz, int n_segs, int socket_id, bool heap);
+ uint64_t page_sz, int n_segs, int numa_id, bool heap);
/**
* Initialize memory segment list and create its backing storage
@@ -295,7 +295,7 @@ eal_memseg_list_init_named(struct rte_memseg_list *msl, const char *name,
*/
int
eal_memseg_list_init(struct rte_memseg_list *msl, uint64_t page_sz,
- int n_segs, int socket_id, int msl_idx, bool heap);
+ int n_segs, int numa_id, int msl_idx, bool heap);
/**
* Reserve VA space for a memory segment list
@@ -372,7 +372,7 @@ eal_dynmem_hugepage_init(void);
* 0 on success, (-1) on failure.
*/
int
-eal_dynmem_calc_num_pages_per_socket(
+eal_dynmem_calc_num_pages_per_numa_node(
uint64_t *memory, struct hugepage_info *hp_info,
struct hugepage_info *hp_used, unsigned int num_hp_info);
diff --git a/lib/eal/common/eal_thread.h b/lib/eal/common/eal_thread.h
index 586de05081..dcd3af5d2a 100644
--- a/lib/eal/common/eal_thread.h
+++ b/lib/eal/common/eal_thread.h
@@ -17,15 +17,15 @@
__rte_noreturn uint32_t eal_thread_loop(void *arg);
/**
- * Get the NUMA socket id from cpu id.
+ * Get the NUMA node ID from CPU ID.
* This function is private to EAL.
*
* @param cpu_id
* The logical process id.
* @return
- * socket_id or SOCKET_ID_ANY
+ * numa_id or RTE_NUMA_ID_ANY
*/
-unsigned eal_cpu_socket_id(unsigned cpu_id);
+unsigned int eal_cpu_numa_id(unsigned int cpu_id);
/**
* Default buffer size to use with eal_thread_dump_affinity()
diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index 39240c261c..eb92ebc9b7 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -27,9 +27,9 @@
#include "malloc_heap.h"
#include "malloc_mp.h"
-/* start external socket ID's at a very high number */
+/* start external NUMA node IDs at a very high number */
#define CONST_MAX(a, b) (a > b ? a : b) /* RTE_MAX is not a constant */
-#define EXTERNAL_HEAP_MIN_SOCKET_ID (CONST_MAX((1 << 8), RTE_MAX_NUMA_NODES))
+#define EXTERNAL_HEAP_MIN_NUMA_ID (CONST_MAX((1 << 8), RTE_MAX_NUMA_NODES))
static unsigned
check_hugepage_sz(unsigned flags, uint64_t hugepage_sz)
@@ -69,7 +69,7 @@ check_hugepage_sz(unsigned flags, uint64_t hugepage_sz)
}
int
-malloc_socket_to_heap_id(unsigned int socket_id)
+malloc_numa_to_heap_id(unsigned int numa_id)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
int i;
@@ -77,7 +77,7 @@ malloc_socket_to_heap_id(unsigned int socket_id)
for (i = 0; i < RTE_MAX_HEAPS; i++) {
struct malloc_heap *heap = &mcfg->malloc_heaps[i];
- if (heap->socket_id == socket_id)
+ if (heap->numa_id == numa_id)
return i;
}
return -1;
@@ -115,9 +115,9 @@ malloc_add_seg(const struct rte_memseg_list *msl,
if (msl->external)
return 0;
- heap_idx = malloc_socket_to_heap_id(msl->socket_id);
+ heap_idx = malloc_numa_to_heap_id(msl->socket_id);
if (heap_idx < 0) {
- EAL_LOG(ERR, "Memseg list has invalid socket id");
+ EAL_LOG(ERR, "Memseg list has invalid NUMA node ID");
return -1;
}
heap = &mcfg->malloc_heaps[heap_idx];
@@ -135,7 +135,7 @@ malloc_add_seg(const struct rte_memseg_list *msl,
heap->total_size += len;
- EAL_LOG(DEBUG, "Added %zuM to heap on socket %i", len >> 20,
+ EAL_LOG(DEBUG, "Added %zuM to heap on NUMA node %i", len >> 20,
msl->socket_id);
return 0;
}
@@ -291,7 +291,7 @@ rollback_expand_heap(struct rte_memseg **ms, int n_segs,
/* this function is exposed in malloc_mp.h */
struct malloc_elem *
alloc_pages_on_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,
- int socket, unsigned int flags, size_t align, size_t bound,
+ int numa_id, unsigned int flags, size_t align, size_t bound,
bool contig, struct rte_memseg **ms, int n_segs)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
@@ -305,14 +305,14 @@ alloc_pages_on_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,
alloc_sz = (size_t)pg_sz * n_segs;
/* first, check if we're allowed to allocate this memory */
- if (eal_memalloc_mem_alloc_validate(socket,
+ if (eal_memalloc_mem_alloc_validate(numa_id,
heap->total_size + alloc_sz) < 0) {
EAL_LOG(DEBUG, "User has disallowed allocation");
return NULL;
}
allocd_pages = eal_memalloc_alloc_seg_bulk(ms, n_segs, pg_sz,
- socket, true);
+ numa_id, true);
/* make sure we've allocated our pages... */
if (allocd_pages < 0)
@@ -391,7 +391,7 @@ alloc_pages_on_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,
static int
try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz,
- size_t elt_size, int socket, unsigned int flags, size_t align,
+ size_t elt_size, int numa_id, unsigned int flags, size_t align,
size_t bound, bool contig)
{
struct malloc_elem *elem;
@@ -411,7 +411,7 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz,
return -1;
memset(ms, 0, sizeof(*ms) * n_segs);
- elem = alloc_pages_on_heap(heap, pg_sz, elt_size, socket, flags, align,
+ elem = alloc_pages_on_heap(heap, pg_sz, elt_size, numa_id, flags, align,
bound, contig, ms, n_segs);
if (elem == NULL)
@@ -439,8 +439,8 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz,
}
heap->total_size += alloc_sz;
- EAL_LOG(DEBUG, "Heap on socket %d was expanded by %zdMB",
- socket, alloc_sz >> 20ULL);
+ EAL_LOG(DEBUG, "Heap on NUMA node %d was expanded by %zdMB",
+ numa_id, alloc_sz >> 20ULL);
free(ms);
@@ -462,7 +462,7 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz,
static int
try_expand_heap_secondary(struct malloc_heap *heap, uint64_t pg_sz,
- size_t elt_size, int socket, unsigned int flags, size_t align,
+ size_t elt_size, int numa_id, unsigned int flags, size_t align,
size_t bound, bool contig)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
@@ -478,7 +478,7 @@ try_expand_heap_secondary(struct malloc_heap *heap, uint64_t pg_sz,
req.alloc_req.flags = flags;
req.alloc_req.elt_size = elt_size;
req.alloc_req.page_sz = pg_sz;
- req.alloc_req.socket = socket;
+ req.alloc_req.numa_id = numa_id;
req.alloc_req.malloc_heap_idx = heap - mcfg->malloc_heaps;
req_result = request_to_primary(&req);
@@ -494,7 +494,7 @@ try_expand_heap_secondary(struct malloc_heap *heap, uint64_t pg_sz,
static int
try_expand_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,
- int socket, unsigned int flags, size_t align, size_t bound,
+ int numa_id, unsigned int flags, size_t align, size_t bound,
bool contig)
{
int ret;
@@ -502,10 +502,10 @@ try_expand_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,
rte_mcfg_mem_write_lock();
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- ret = try_expand_heap_primary(heap, pg_sz, elt_size, socket,
+ ret = try_expand_heap_primary(heap, pg_sz, elt_size, numa_id,
flags, align, bound, contig);
} else {
- ret = try_expand_heap_secondary(heap, pg_sz, elt_size, socket,
+ ret = try_expand_heap_secondary(heap, pg_sz, elt_size, numa_id,
flags, align, bound, contig);
}
@@ -531,7 +531,7 @@ compare_pagesz(const void *a, const void *b)
}
static int
-alloc_more_mem_on_socket(struct malloc_heap *heap, size_t size, int socket,
+alloc_more_mem_on_socket(struct malloc_heap *heap, size_t size, int numa_id,
unsigned int flags, size_t align, size_t bound, bool contig)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
@@ -559,7 +559,7 @@ alloc_more_mem_on_socket(struct malloc_heap *heap, size_t size, int socket,
for (i = 0; i < RTE_MAX_MEMSEG_LISTS; i++) {
struct rte_memseg_list *msl = &mcfg->memsegs[i];
- if (msl->socket_id != socket)
+ if (msl->socket_id != numa_id)
continue;
if (msl->base_va == NULL)
@@ -611,7 +611,7 @@ alloc_more_mem_on_socket(struct malloc_heap *heap, size_t size, int socket,
* do not pass the size hint here, as user expects other page
* sizes first, before resorting to best effort allocation.
*/
- if (!try_expand_heap(heap, pg_sz, size, socket, size_flags,
+ if (!try_expand_heap(heap, pg_sz, size, numa_id, size_flags,
align, bound, contig))
return 0;
}
@@ -630,7 +630,7 @@ alloc_more_mem_on_socket(struct malloc_heap *heap, size_t size, int socket,
for (i = 0; i < n_other_pg_sz; i++) {
uint64_t pg_sz = other_pg_sz[i];
- if (!try_expand_heap(heap, pg_sz, size, socket, flags,
+ if (!try_expand_heap(heap, pg_sz, size, numa_id, flags,
align, bound, contig))
return 0;
}
@@ -645,7 +645,7 @@ malloc_heap_alloc_on_heap_id(size_t size, unsigned int heap_id, unsigned int fla
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
struct malloc_heap *heap = &mcfg->malloc_heaps[heap_id];
unsigned int size_flags = flags & ~RTE_MEMZONE_SIZE_HINT_ONLY;
- int socket_id;
+ int numa_id;
void *ret;
const struct internal_config *internal_conf =
eal_get_internal_configuration();
@@ -666,26 +666,26 @@ malloc_heap_alloc_on_heap_id(size_t size, unsigned int heap_id, unsigned int fla
* we just need to request more memory first.
*/
- socket_id = rte_socket_id_by_idx(heap_id);
+ numa_id = rte_numa_id_by_idx(heap_id);
/*
- * if socket ID is negative, we cannot find a socket ID for this heap -
+ * if NUMA node ID is negative, we cannot find a NUMA node ID for this heap -
* which means it's an external heap. those can have unexpected page
* sizes, so if the user asked to allocate from there - assume user
* knows what they're doing, and allow allocating from there with any
* page size flags.
*/
- if (socket_id < 0)
+ if (numa_id < 0)
size_flags |= RTE_MEMZONE_SIZE_HINT_ONLY;
ret = heap_alloc(heap, size, size_flags, align, bound, contig);
if (ret != NULL)
goto alloc_unlock;
- /* if socket ID is invalid, this is an external heap */
- if (socket_id < 0)
+ /* if NUMA node ID is invalid, this is an external heap */
+ if (numa_id < 0)
goto alloc_unlock;
- if (!alloc_more_mem_on_socket(heap, size, socket_id, flags, align,
+ if (!alloc_more_mem_on_socket(heap, size, numa_id, flags, align,
bound, contig)) {
ret = heap_alloc(heap, size, flags, align, bound, contig);
@@ -699,68 +699,66 @@ malloc_heap_alloc_on_heap_id(size_t size, unsigned int heap_id, unsigned int fla
}
static unsigned int
-malloc_get_numa_socket(void)
+malloc_get_default_numa_id(void)
{
const struct internal_config *conf = eal_get_internal_configuration();
- unsigned int socket_id = rte_socket_id();
+ unsigned int numa_id = rte_numa_id();
unsigned int idx;
- if (socket_id != (unsigned int)SOCKET_ID_ANY)
- return socket_id;
+ if (numa_id != (unsigned int)RTE_NUMA_ID_ANY)
+ return numa_id;
- /* for control threads, return first socket where memory is available */
- for (idx = 0; idx < rte_socket_count(); idx++) {
- int ret = rte_socket_id_by_idx(idx);
- socket_id = (unsigned int)ret;
- if (ret != -1 && conf->numa_mem[socket_id] != 0)
- return socket_id;
+ /* for control threads, return first numa_id where memory is available */
+ for (idx = 0; idx < rte_numa_count(); idx++) {
+ int ret = rte_numa_id_by_idx(idx);
+ numa_id = (unsigned int)ret;
+ if (ret != -1 && conf->numa_mem[numa_id] != 0)
+ return numa_id;
}
/* We couldn't quickly find a NUMA node where memory was available,
- * so fall back to using main lcore socket ID.
+ * so fall back to using main lcore NUMA node ID.
*/
- socket_id = rte_lcore_to_socket_id(rte_get_main_lcore());
- /* Main lcore socket ID may be SOCKET_ID_ANY
+ numa_id = rte_lcore_to_numa_id(rte_get_main_lcore());
+ /* Main lcore NUMA node ID may be RTE_NUMA_ID_ANY
* when main lcore thread is affinitized to multiple NUMA nodes.
*/
- if (socket_id != (unsigned int)SOCKET_ID_ANY)
- return socket_id;
- /* Failed to find meaningful socket ID, so use the first one available. */
- return rte_socket_id_by_idx(0);
+ if (numa_id != (unsigned int)RTE_NUMA_ID_ANY)
+ return numa_id;
+ /* Failed to find meaningful NUMA node ID, so use the first one available. */
+ return rte_numa_id_by_idx(0);
}
void *
-malloc_heap_alloc(size_t size, int socket_arg, unsigned int flags,
+malloc_heap_alloc(size_t size, int numa_id, unsigned int flags,
size_t align, size_t bound, bool contig)
{
- int socket, heap_id, i;
+ int heap_id, i;
void *ret;
/* return NULL if size is 0 or alignment is not power-of-2 */
if (size == 0 || (align && !rte_is_power_of_2(align)))
return NULL;
- if (!rte_eal_has_hugepages() && socket_arg < RTE_MAX_NUMA_NODES)
- socket_arg = SOCKET_ID_ANY;
+ if (!rte_eal_has_hugepages() && numa_id < RTE_MAX_NUMA_NODES)
+ numa_id = RTE_NUMA_ID_ANY;
- if (socket_arg == SOCKET_ID_ANY)
- socket = malloc_get_numa_socket();
- else
- socket = socket_arg;
+ if (numa_id == RTE_NUMA_ID_ANY)
+ numa_id = malloc_get_default_numa_id();
- /* turn socket ID into heap ID */
- heap_id = malloc_socket_to_heap_id(socket);
- /* if heap id is negative, socket ID was invalid */
+ /* turn NUMA node ID into heap ID */
+ heap_id = malloc_numa_to_heap_id(numa_id);
+ /* if heap id is negative, NUMA node ID was invalid */
if (heap_id < 0)
return NULL;
ret = malloc_heap_alloc_on_heap_id(size, heap_id, flags, align, bound, contig);
- if (ret != NULL || socket_arg != SOCKET_ID_ANY)
+ if (ret != NULL || numa_id != RTE_NUMA_ID_ANY)
return ret;
- /* try other heaps. we are only iterating through native DPDK sockets,
+ /* try other heaps. we are only iterating through native DPDK NUMA nodes,
* so external heaps won't be included.
*/
- for (i = 0; i < (int) rte_socket_count(); i++) {
+ for (i = 0; i < (int) rte_numa_count(); i++) {
if (i == heap_id)
continue;
ret = malloc_heap_alloc_on_heap_id(size, i, flags, align, bound, contig);
@@ -790,9 +788,9 @@ heap_alloc_biggest_on_heap_id(unsigned int heap_id,
}
void *
-malloc_heap_alloc_biggest(int socket_arg, unsigned int flags, size_t align, bool contig)
+malloc_heap_alloc_biggest(int numa_id, unsigned int flags, size_t align, bool contig)
{
- int socket, i, cur_socket, heap_id;
+ int i, cur_numa_id, heap_id;
void *ret;
/* return NULL if align is not power-of-2 */
@@ -800,27 +798,25 @@ malloc_heap_alloc_biggest(int socket_arg, unsigned int flags, size_t align, bool
return NULL;
if (!rte_eal_has_hugepages())
- socket_arg = SOCKET_ID_ANY;
+ numa_id = RTE_NUMA_ID_ANY;
- if (socket_arg == SOCKET_ID_ANY)
- socket = malloc_get_numa_socket();
- else
- socket = socket_arg;
+ if (numa_id == RTE_NUMA_ID_ANY)
+ numa_id = malloc_get_default_numa_id();
- /* turn socket ID into heap ID */
- heap_id = malloc_socket_to_heap_id(socket);
- /* if heap id is negative, socket ID was invalid */
+ /* turn NUMA node ID into heap ID */
+ heap_id = malloc_numa_to_heap_id(numa_id);
+ /* if heap id is negative, NUMA node ID was invalid */
if (heap_id < 0)
return NULL;
ret = heap_alloc_biggest_on_heap_id(heap_id, flags, align, contig);
- if (ret != NULL || socket_arg != SOCKET_ID_ANY)
+ if (ret != NULL || numa_id != RTE_NUMA_ID_ANY)
return ret;
/* try other heaps */
- for (i = 0; i < (int) rte_socket_count(); i++) {
- cur_socket = rte_socket_id_by_idx(i);
- if (cur_socket == socket)
+ for (i = 0; i < (int) rte_numa_count(); i++) {
+ cur_numa_id = rte_numa_id_by_idx(i);
+ if (cur_numa_id == numa_id)
continue;
ret = heap_alloc_biggest_on_heap_id(i, flags, align, contig);
if (ret != NULL)
@@ -1034,7 +1030,7 @@ malloc_heap_free(struct malloc_elem *elem)
/* we didn't exit early, meaning we have unmapped some pages */
unmapped = true;
- EAL_LOG(DEBUG, "Heap on socket %d was shrunk by %zdMB",
+ EAL_LOG(DEBUG, "Heap on NUMA node %d was shrunk by %zdMB",
msl->socket_id, aligned_len >> 20ULL);
rte_mcfg_mem_write_unlock();
@@ -1098,7 +1094,7 @@ malloc_heap_resize(struct malloc_elem *elem, size_t size)
*/
int
malloc_heap_get_stats(struct malloc_heap *heap,
- struct rte_malloc_socket_stats *socket_stats)
+ struct rte_malloc_numa_stats *numa_stats)
{
size_t idx;
struct malloc_elem *elem;
@@ -1106,26 +1102,26 @@ malloc_heap_get_stats(struct malloc_heap *heap,
rte_spinlock_lock(&heap->lock);
/* Initialise variables for heap */
- socket_stats->free_count = 0;
- socket_stats->heap_freesz_bytes = 0;
- socket_stats->greatest_free_size = 0;
+ numa_stats->free_count = 0;
+ numa_stats->heap_freesz_bytes = 0;
+ numa_stats->greatest_free_size = 0;
/* Iterate through free list */
for (idx = 0; idx < RTE_HEAP_NUM_FREELISTS; idx++) {
for (elem = LIST_FIRST(&heap->free_head[idx]);
!!elem; elem = LIST_NEXT(elem, free_list))
{
- socket_stats->free_count++;
- socket_stats->heap_freesz_bytes += elem->size;
- if (elem->size > socket_stats->greatest_free_size)
- socket_stats->greatest_free_size = elem->size;
+ numa_stats->free_count++;
+ numa_stats->heap_freesz_bytes += elem->size;
+ if (elem->size > numa_stats->greatest_free_size)
+ numa_stats->greatest_free_size = elem->size;
}
}
/* Get stats on overall heap and allocated memory on this heap */
- socket_stats->heap_totalsz_bytes = heap->total_size;
- socket_stats->heap_allocsz_bytes = (socket_stats->heap_totalsz_bytes -
- socket_stats->heap_freesz_bytes);
- socket_stats->alloc_count = heap->alloc_count;
+ numa_stats->heap_totalsz_bytes = heap->total_size;
+ numa_stats->heap_allocsz_bytes = (numa_stats->heap_totalsz_bytes -
+ numa_stats->heap_freesz_bytes);
+ numa_stats->alloc_count = heap->alloc_count;
rte_spinlock_unlock(&heap->lock);
return 0;
@@ -1175,7 +1171,7 @@ destroy_elem(struct malloc_elem *elem, size_t len)
struct rte_memseg_list *
malloc_heap_create_external_seg(void *va_addr, rte_iova_t iova_addrs[],
unsigned int n_pages, size_t page_sz, const char *seg_name,
- unsigned int socket_id)
+ unsigned int numa_id)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
char fbarray_name[RTE_FBARRAY_NAME_LEN];
@@ -1221,13 +1217,13 @@ malloc_heap_create_external_seg(void *va_addr, rte_iova_t iova_addrs[],
ms->len = page_sz;
ms->nchannel = rte_memory_get_nchannel();
ms->nrank = rte_memory_get_nrank();
- ms->socket_id = socket_id;
+ ms->socket_id = numa_id;
}
/* set up the memseg list */
msl->base_va = va_addr;
msl->page_sz = page_sz;
- msl->socket_id = socket_id;
+ msl->socket_id = numa_id;
msl->len = seg_len;
msl->version = 0;
msl->external = 1;
@@ -1346,11 +1342,11 @@ int
malloc_heap_create(struct malloc_heap *heap, const char *heap_name)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- uint32_t next_socket_id = mcfg->next_socket_id;
+ uint32_t next_numa_id = mcfg->next_numa_id;
/* prevent overflow. did you really create 2 billion heaps??? */
- if (next_socket_id > INT32_MAX) {
- EAL_LOG(ERR, "Cannot assign new socket ID's");
+ if (next_numa_id > INT32_MAX) {
+ EAL_LOG(ERR, "Cannot assign new NUMA node IDs");
rte_errno = ENOSPC;
return -1;
}
@@ -1362,10 +1358,10 @@ malloc_heap_create(struct malloc_heap *heap, const char *heap_name)
LIST_INIT(heap->free_head);
rte_spinlock_init(&heap->lock);
heap->total_size = 0;
- heap->socket_id = next_socket_id;
+ heap->numa_id = next_numa_id;
/* we hold a global mem hotplug writelock, so it's safe to increment */
- mcfg->next_socket_id++;
+ mcfg->next_numa_id++;
/* set up name */
strlcpy(heap->name, heap_name, RTE_HEAP_NAME_MAX_LEN);
@@ -1408,19 +1404,19 @@ rte_eal_malloc_heap_init(void)
EAL_LOG(DEBUG, "Hugepages will be freed exactly as allocated.");
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- /* assign min socket ID to external heaps */
- mcfg->next_socket_id = EXTERNAL_HEAP_MIN_SOCKET_ID;
+ /* assign min NUMA node ID to external heaps */
+ mcfg->next_numa_id = EXTERNAL_HEAP_MIN_NUMA_ID;
/* assign names to default DPDK heaps */
- for (i = 0; i < rte_socket_count(); i++) {
+ for (i = 0; i < rte_numa_count(); i++) {
struct malloc_heap *heap = &mcfg->malloc_heaps[i];
char heap_name[RTE_HEAP_NAME_MAX_LEN];
- int socket_id = rte_socket_id_by_idx(i);
+ int numa_id = rte_numa_id_by_idx(i);
snprintf(heap_name, sizeof(heap_name),
- "socket_%i", socket_id);
+ "numa_%i", numa_id);
strlcpy(heap->name, heap_name, RTE_HEAP_NAME_MAX_LEN);
- heap->socket_id = socket_id;
+ heap->numa_id = numa_id;
}
}
diff --git a/lib/eal/common/malloc_heap.h b/lib/eal/common/malloc_heap.h
index dfc56d4ae3..7a75cce7c4 100644
--- a/lib/eal/common/malloc_heap.h
+++ b/lib/eal/common/malloc_heap.h
@@ -28,17 +28,17 @@ struct __rte_cache_aligned malloc_heap {
struct malloc_elem *volatile last;
unsigned int alloc_count;
- unsigned int socket_id;
+ unsigned int numa_id;
size_t total_size;
char name[RTE_HEAP_NAME_MAX_LEN];
};
void *
-malloc_heap_alloc(size_t size, int socket, unsigned int flags, size_t align,
+malloc_heap_alloc(size_t size, int numa_id, unsigned int flags, size_t align,
size_t bound, bool contig);
void *
-malloc_heap_alloc_biggest(int socket, unsigned int flags, size_t align, bool contig);
+malloc_heap_alloc_biggest(int numa_id, unsigned int flags, size_t align, bool contig);
int
malloc_heap_create(struct malloc_heap *heap, const char *heap_name);
@@ -49,7 +49,7 @@ malloc_heap_destroy(struct malloc_heap *heap);
struct rte_memseg_list *
malloc_heap_create_external_seg(void *va_addr, rte_iova_t iova_addrs[],
unsigned int n_pages, size_t page_sz, const char *seg_name,
- unsigned int socket_id);
+ unsigned int numa_id);
struct rte_memseg_list *
malloc_heap_find_external_seg(void *va_addr, size_t len);
@@ -73,13 +73,13 @@ malloc_heap_resize(struct malloc_elem *elem, size_t size);
int
malloc_heap_get_stats(struct malloc_heap *heap,
- struct rte_malloc_socket_stats *socket_stats);
+ struct rte_malloc_numa_stats *numa_stats);
void
malloc_heap_dump(struct malloc_heap *heap, FILE *f);
int
-malloc_socket_to_heap_id(unsigned int socket_id);
+malloc_numa_to_heap_id(unsigned int numa_id);
int
rte_eal_malloc_heap_init(void);
diff --git a/lib/eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c
index 9765277f5d..e0086ec679 100644
--- a/lib/eal/common/malloc_mp.c
+++ b/lib/eal/common/malloc_mp.c
@@ -232,7 +232,7 @@ handle_alloc_request(const struct malloc_mp_req *m,
return -1;
}
- /* heap idx is index into the heap array, not socket ID */
+ /* heap idx is index into the heap array, not NUMA node ID */
if (ar->malloc_heap_idx >= RTE_MAX_HEAPS) {
EAL_LOG(ERR, "Attempting to allocate from invalid heap");
return -1;
@@ -242,11 +242,11 @@ handle_alloc_request(const struct malloc_mp_req *m,
/*
* for allocations, we must only use internal heaps, but since the
- * rte_malloc_heap_socket_is_external() is thread-safe and we're already
+ * rte_malloc_heap_numa_is_external() is thread-safe and we're already
* read-locked, we'll have to take advantage of the fact that internal
- * socket ID's are always lower than RTE_MAX_NUMA_NODES.
+ * NUMA node IDs are always lower than RTE_MAX_NUMA_NODES.
*/
- if (heap->socket_id >= RTE_MAX_NUMA_NODES) {
+ if (heap->numa_id >= RTE_MAX_NUMA_NODES) {
EAL_LOG(ERR, "Attempting to allocate from external heap");
return -1;
}
@@ -263,7 +263,7 @@ handle_alloc_request(const struct malloc_mp_req *m,
}
memset(ms, 0, sizeof(*ms) * n_segs);
- elem = alloc_pages_on_heap(heap, ar->page_sz, ar->elt_size, ar->socket,
+ elem = alloc_pages_on_heap(heap, ar->page_sz, ar->elt_size, ar->numa_id,
ar->flags, ar->align, ar->bound, ar->contig, ms,
n_segs);
diff --git a/lib/eal/common/malloc_mp.h b/lib/eal/common/malloc_mp.h
index 43dc2a81a2..a540ec627b 100644
--- a/lib/eal/common/malloc_mp.h
+++ b/lib/eal/common/malloc_mp.h
@@ -31,7 +31,7 @@ struct malloc_req_alloc {
uint32_t malloc_heap_idx;
uint64_t page_sz;
size_t elt_size;
- int socket;
+ int numa_id;
unsigned int flags;
size_t align;
size_t bound;
@@ -75,7 +75,7 @@ malloc_heap_free_pages(void *aligned_start, size_t aligned_len);
struct malloc_elem *
alloc_pages_on_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,
- int socket, unsigned int flags, size_t align, size_t bound,
+ int numa_id, unsigned int flags, size_t align, size_t bound,
bool contig, struct rte_memseg **ms, int n_segs);
void
diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
index 388e5a63b6..90ccded02d 100644
--- a/lib/eal/common/rte_malloc.c
+++ b/lib/eal/common/rte_malloc.c
@@ -70,8 +70,8 @@ eal_free_no_trace(void *addr)
}
static void *
-malloc_socket(const char *type, size_t size, unsigned int align,
- int socket_arg, const bool trace_ena)
+malloc_numa(const char *type, size_t size, unsigned int align,
+ int numa_id, const bool trace_ena)
{
void *ptr;
@@ -80,37 +80,45 @@ malloc_socket(const char *type, size_t size, unsigned int align,
return NULL;
/* if there are no hugepages and if we are not allocating from an
- * external heap, use memory from any socket available. checking for
- * socket being external may return -1 in case of invalid socket, but
+ * external heap, use memory from any NUMA node available. checking for
+ * NUMA node being external may return -1 in case of invalid NUMA node ID, but
* that's OK - if there are no hugepages, it doesn't matter.
*/
- if (rte_malloc_heap_socket_is_external(socket_arg) != 1 &&
+ if (rte_malloc_heap_numa_is_external(numa_id) != 1 &&
!rte_eal_has_hugepages())
- socket_arg = SOCKET_ID_ANY;
+ numa_id = RTE_NUMA_ID_ANY;
- ptr = malloc_heap_alloc(size, socket_arg, 0,
+ ptr = malloc_heap_alloc(size, numa_id, 0,
align == 0 ? 1 : align, 0, false);
if (trace_ena)
- rte_eal_trace_mem_malloc(type, size, align, socket_arg, ptr);
+ rte_eal_trace_mem_malloc(type, size, align, numa_id, ptr);
return ptr;
}
/*
* Allocate memory on specified heap.
*/
+RTE_EXPORT_SYMBOL(rte_malloc_numa)
+void *
+rte_malloc_numa(const char *type, size_t size, unsigned int align,
+ int numa_id)
+{
+ return malloc_numa(type, size, align, numa_id, true);
+}
+
RTE_EXPORT_SYMBOL(rte_malloc_socket)
void *
rte_malloc_socket(const char *type, size_t size, unsigned int align,
- int socket_arg)
+ int socket)
{
- return malloc_socket(type, size, align, socket_arg, true);
+ return rte_malloc_numa(type, size, align, socket);
}
void *
eal_malloc_no_trace(const char *type, size_t size, unsigned int align)
{
- return malloc_socket(type, size, align, SOCKET_ID_ANY, false);
+ return malloc_numa(type, size, align, RTE_NUMA_ID_ANY, false);
}
/*
@@ -120,17 +128,17 @@ RTE_EXPORT_SYMBOL(rte_malloc)
void *
rte_malloc(const char *type, size_t size, unsigned align)
{
- return rte_malloc_socket(type, size, align, SOCKET_ID_ANY);
+ return rte_malloc_numa(type, size, align, RTE_NUMA_ID_ANY);
}
/*
* Allocate zero'd memory on specified heap.
*/
-RTE_EXPORT_SYMBOL(rte_zmalloc_socket)
+RTE_EXPORT_SYMBOL(rte_zmalloc_numa)
void *
-rte_zmalloc_socket(const char *type, size_t size, unsigned align, int socket)
+rte_zmalloc_numa(const char *type, size_t size, unsigned int align, int numa_id)
{
- void *ptr = rte_malloc_socket(type, size, align, socket);
+ void *ptr = rte_malloc_numa(type, size, align, numa_id);
if (ptr != NULL) {
struct malloc_elem *elem = malloc_elem_from_data(ptr);
@@ -149,10 +157,17 @@ rte_zmalloc_socket(const char *type, size_t size, unsigned align, int socket)
}
}
- rte_eal_trace_mem_zmalloc(type, size, align, socket, ptr);
+ rte_eal_trace_mem_zmalloc(type, size, align, numa_id, ptr);
return ptr;
}
+RTE_EXPORT_SYMBOL(rte_zmalloc_socket)
+void *
+rte_zmalloc_socket(const char *type, size_t size, unsigned int align, int socket)
+{
+ return rte_zmalloc_numa(type, size, align, socket);
+}
+
/*
* Allocate zero'd memory on default heap.
*/
@@ -160,17 +175,24 @@ RTE_EXPORT_SYMBOL(rte_zmalloc)
void *
rte_zmalloc(const char *type, size_t size, unsigned align)
{
- return rte_zmalloc_socket(type, size, align, SOCKET_ID_ANY);
+ return rte_zmalloc_numa(type, size, align, RTE_NUMA_ID_ANY);
}
/*
* Allocate zero'd memory on specified heap.
*/
+RTE_EXPORT_SYMBOL(rte_calloc_numa)
+void *
+rte_calloc_numa(const char *type, size_t num, size_t size, unsigned int align, int numa_id)
+{
+ return rte_zmalloc_numa(type, num * size, align, numa_id);
+}
+
RTE_EXPORT_SYMBOL(rte_calloc_socket)
void *
-rte_calloc_socket(const char *type, size_t num, size_t size, unsigned align, int socket)
+rte_calloc_socket(const char *type, size_t num, size_t size, unsigned int align, int socket)
{
- return rte_zmalloc_socket(type, num * size, align, socket);
+ return rte_calloc_numa(type, num, size, align, socket);
}
/*
@@ -186,14 +208,14 @@ rte_calloc(const char *type, size_t num, size_t size, unsigned align)
/*
* Resize allocated memory on specified heap.
*/
-RTE_EXPORT_SYMBOL(rte_realloc_socket)
+RTE_EXPORT_SYMBOL(rte_realloc_numa)
void *
-rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
+rte_realloc_numa(void *ptr, size_t size, unsigned int align, int numa_id)
{
size_t user_size;
if (ptr == NULL)
- return rte_malloc_socket(NULL, size, align, socket);
+ return rte_malloc_numa(NULL, size, align, numa_id);
struct malloc_elem *elem = malloc_elem_from_data(ptr);
if (elem == NULL) {
@@ -205,25 +227,25 @@ rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
size = RTE_CACHE_LINE_ROUNDUP(size);
align = RTE_CACHE_LINE_ROUNDUP(align);
- /* check requested socket id and alignment matches first, and if ok,
+ /* check requested NUMA node ID and alignment matches first, and if ok,
* see if we can resize block
*/
- if ((socket == SOCKET_ID_ANY ||
- (unsigned int)socket == elem->heap->socket_id) &&
+ if ((numa_id == RTE_NUMA_ID_ANY ||
+ (unsigned int)numa_id == elem->heap->numa_id) &&
RTE_PTR_ALIGN(ptr, align) == ptr &&
malloc_heap_resize(elem, size) == 0) {
- rte_eal_trace_mem_realloc(size, align, socket, ptr);
+ rte_eal_trace_mem_realloc(size, align, numa_id, ptr);
asan_set_redzone(elem, user_size);
return ptr;
}
- /* either requested socket id doesn't match, alignment is off
+ /* either requested NUMA node ID does not match, alignment is off
* or we have no room to expand,
* so move the data.
*/
- void *new_ptr = rte_malloc_socket(NULL, size, align, socket);
+ void *new_ptr = rte_malloc_numa(NULL, size, align, numa_id);
if (new_ptr == NULL)
return NULL;
/* elem: |pad|data_elem|data|trailer| */
@@ -231,10 +253,17 @@ rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
rte_memcpy(new_ptr, ptr, old_size < size ? old_size : size);
rte_free(ptr);
- rte_eal_trace_mem_realloc(size, align, socket, new_ptr);
+ rte_eal_trace_mem_realloc(size, align, numa_id, new_ptr);
return new_ptr;
}
+RTE_EXPORT_SYMBOL(rte_realloc_socket)
+void *
+rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
+{
+ return rte_realloc_numa(ptr, size, align, socket);
+}
+
/*
* Resize allocated memory.
*/
@@ -242,7 +271,7 @@ RTE_EXPORT_SYMBOL(rte_realloc)
void *
rte_realloc(void *ptr, size_t size, unsigned int align)
{
- return rte_realloc_socket(ptr, size, align, SOCKET_ID_ANY);
+ return rte_realloc_numa(ptr, size, align, RTE_NUMA_ID_ANY);
}
RTE_EXPORT_SYMBOL(rte_malloc_validate)
@@ -258,22 +287,30 @@ rte_malloc_validate(const void *ptr, size_t *size)
}
/*
- * Function to retrieve data for heap on given socket
+ * Function to retrieve data for heap on given NUMA node
*/
-RTE_EXPORT_SYMBOL(rte_malloc_get_socket_stats)
+RTE_EXPORT_SYMBOL(rte_malloc_get_numa_stats)
int
-rte_malloc_get_socket_stats(int socket,
- struct rte_malloc_socket_stats *socket_stats)
+rte_malloc_get_numa_stats(int numa_id,
+ struct rte_malloc_numa_stats *numa_stats)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
int heap_idx;
- heap_idx = malloc_socket_to_heap_id(socket);
+ heap_idx = malloc_numa_to_heap_id(numa_id);
if (heap_idx < 0)
return -1;
return malloc_heap_get_stats(&mcfg->malloc_heaps[heap_idx],
- socket_stats);
+ numa_stats);
+}
+
+RTE_EXPORT_SYMBOL(rte_malloc_get_socket_stats)
+int
+rte_malloc_get_socket_stats(int socket,
+ struct rte_malloc_numa_stats *socket_stats)
+{
+ return rte_malloc_get_numa_stats(socket, socket_stats);
}
/*
@@ -292,9 +329,9 @@ rte_malloc_dump_heaps(FILE *f)
}
}
-RTE_EXPORT_SYMBOL(rte_malloc_heap_get_socket)
+RTE_EXPORT_SYMBOL(rte_malloc_heap_get_numa_id)
int
-rte_malloc_heap_get_socket(const char *name)
+rte_malloc_heap_get_numa_id(const char *name)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
struct malloc_heap *heap = NULL;
@@ -319,7 +356,7 @@ rte_malloc_heap_get_socket(const char *name)
}
if (heap != NULL) {
- ret = heap->socket_id;
+ ret = heap->numa_id;
} else {
rte_errno = ENOENT;
ret = -1;
@@ -329,24 +366,30 @@ rte_malloc_heap_get_socket(const char *name)
return ret;
}
-RTE_EXPORT_SYMBOL(rte_malloc_heap_socket_is_external)
+RTE_EXPORT_SYMBOL(rte_malloc_heap_get_socket)
int
-rte_malloc_heap_socket_is_external(int socket_id)
+rte_malloc_heap_get_socket(const char *name)
+{
+ return rte_malloc_heap_get_numa_id(name);
+}
+
+RTE_EXPORT_SYMBOL(rte_malloc_heap_numa_is_external)
+int
+rte_malloc_heap_numa_is_external(int numa_id)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
unsigned int idx;
int ret = -1;
- if (socket_id == SOCKET_ID_ANY)
+ if (numa_id == RTE_NUMA_ID_ANY)
return 0;
-
rte_mcfg_mem_read_lock();
for (idx = 0; idx < RTE_MAX_HEAPS; idx++) {
struct malloc_heap *tmp = &mcfg->malloc_heaps[idx];
- if ((int)tmp->socket_id == socket_id) {
- /* external memory always has large socket ID's */
- ret = tmp->socket_id >= RTE_MAX_NUMA_NODES;
+ if ((int)tmp->numa_id == numa_id) {
+ /* external memory always has large NUMA node IDs */
+ ret = tmp->numa_id >= RTE_MAX_NUMA_NODES;
break;
}
}
@@ -355,6 +398,13 @@ rte_malloc_heap_socket_is_external(int socket_id)
return ret;
}
+RTE_EXPORT_SYMBOL(rte_malloc_heap_socket_is_external)
+int
+rte_malloc_heap_socket_is_external(int socket_id)
+{
+ return rte_malloc_heap_numa_is_external(socket_id);
+}
+
/*
* Print stats on memory type. If type is NULL, info on all types is printed
*/
@@ -364,7 +414,7 @@ rte_malloc_dump_stats(FILE *f, __rte_unused const char *type)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
unsigned int heap_id;
- struct rte_malloc_socket_stats sock_stats;
+ struct rte_malloc_numa_stats sock_stats;
/* Iterate through all initialised heaps */
for (heap_id = 0; heap_id < RTE_MAX_HEAPS; heap_id++) {
@@ -456,7 +506,7 @@ rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,
ret = -1;
goto unlock;
}
- if (heap->socket_id < RTE_MAX_NUMA_NODES) {
+ if (heap->numa_id < RTE_MAX_NUMA_NODES) {
/* cannot add memory to internal heaps */
rte_errno = EPERM;
ret = -1;
@@ -465,7 +515,7 @@ rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,
n = len / page_sz;
msl = malloc_heap_create_external_seg(va_addr, iova_addrs, n, page_sz,
- heap_name, heap->socket_id);
+ heap_name, heap->numa_id);
if (msl == NULL) {
ret = -1;
goto unlock;
@@ -505,7 +555,7 @@ rte_malloc_heap_memory_remove(const char *heap_name, void *va_addr, size_t len)
ret = -1;
goto unlock;
}
- if (heap->socket_id < RTE_MAX_NUMA_NODES) {
+ if (heap->numa_id < RTE_MAX_NUMA_NODES) {
/* cannot remove memory from internal heaps */
rte_errno = EPERM;
ret = -1;
@@ -556,7 +606,7 @@ sync_memory(const char *heap_name, void *va_addr, size_t len, bool attach)
goto unlock;
}
/* we shouldn't be able to sync to internal heaps */
- if (heap->socket_id < RTE_MAX_NUMA_NODES) {
+ if (heap->numa_id < RTE_MAX_NUMA_NODES) {
rte_errno = EPERM;
ret = -1;
goto unlock;
@@ -680,7 +730,7 @@ rte_malloc_heap_destroy(const char *heap_name)
}
rte_mcfg_mem_write_lock();
- /* start from non-socket heaps */
+ /* start from non-external heaps */
heap = find_named_heap(heap_name);
if (heap == NULL) {
EAL_LOG(ERR, "Heap %s not found", heap_name);
@@ -689,7 +739,7 @@ rte_malloc_heap_destroy(const char *heap_name)
goto unlock;
}
/* we shouldn't be able to destroy internal heaps */
- if (heap->socket_id < RTE_MAX_NUMA_NODES) {
+ if (heap->numa_id < RTE_MAX_NUMA_NODES) {
rte_errno = EPERM;
ret = -1;
goto unlock;
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index faf5f0e911..de4918f954 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -351,12 +351,12 @@ eal_get_hugepage_mem_size(void)
static int
check_socket(const struct rte_memseg_list *msl, void *arg)
{
- int *socket_id = arg;
+ int *numa_id = arg;
if (msl->external)
return 0;
- if (msl->socket_id == *socket_id && msl->memseg_arr.count != 0)
+ if (msl->socket_id == *numa_id && msl->memseg_arr.count != 0)
return 1;
return 0;
@@ -365,13 +365,13 @@ check_socket(const struct rte_memseg_list *msl, void *arg)
static void
eal_check_mem_on_local_socket(void)
{
- int socket_id;
+ int numa_id;
const struct rte_config *config = rte_eal_get_configuration();
- socket_id = rte_lcore_to_socket_id(config->main_lcore);
+ numa_id = rte_lcore_to_numa_id(config->main_lcore);
- if (rte_memseg_list_walk(check_socket, &socket_id) == 0)
- EAL_LOG(WARNING, "WARNING: Main core has no memory on local socket!");
+ if (rte_memseg_list_walk(check_socket, &numa_id) == 0)
+ EAL_LOG(WARNING, "WARNING: Main lcore has no memory on local NUMA node!");
}
diff --git a/lib/eal/freebsd/eal_lcore.c b/lib/eal/freebsd/eal_lcore.c
index 1d3d1b67b9..a1a3b88bc9 100644
--- a/lib/eal/freebsd/eal_lcore.c
+++ b/lib/eal/freebsd/eal_lcore.c
@@ -36,7 +36,7 @@ eal_get_ncpus(void)
}
unsigned
-eal_cpu_socket_id(__rte_unused unsigned cpu_id)
+eal_cpu_numa_id(__rte_unused unsigned int cpu_id)
{
return 0;
}
diff --git a/lib/eal/freebsd/eal_memalloc.c b/lib/eal/freebsd/eal_memalloc.c
index 49faf0c6aa..bfaba725b5 100644
--- a/lib/eal/freebsd/eal_memalloc.c
+++ b/lib/eal/freebsd/eal_memalloc.c
@@ -14,14 +14,14 @@
int
eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms __rte_unused,
int __rte_unused n_segs, size_t __rte_unused page_sz,
- int __rte_unused socket, bool __rte_unused exact)
+ int __rte_unused numa_id, bool __rte_unused exact)
{
EAL_LOG(ERR, "Memory hotplug not supported on FreeBSD");
return -1;
}
struct rte_memseg *
-eal_memalloc_alloc_seg(size_t __rte_unused page_sz, int __rte_unused socket)
+eal_memalloc_alloc_seg(size_t __rte_unused page_sz, int __rte_unused numa_id)
{
EAL_LOG(ERR, "Memory hotplug not supported on FreeBSD");
return NULL;
diff --git a/lib/eal/freebsd/eal_memory.c b/lib/eal/freebsd/eal_memory.c
index d87e479863..f03e2ad44c 100644
--- a/lib/eal/freebsd/eal_memory.c
+++ b/lib/eal/freebsd/eal_memory.c
@@ -238,7 +238,7 @@ rte_eal_hugepage_init(void)
seg->len = page_sz;
seg->nchannel = mcfg->nchannel;
seg->nrank = mcfg->nrank;
- seg->socket_id = 0;
+ seg->numa_id = 0;
rte_fbarray_set_used(arr, ms_idx);
diff --git a/lib/eal/include/eal_trace_internal.h b/lib/eal/include/eal_trace_internal.h
index 50f91d0929..62c6811f90 100644
--- a/lib/eal/include/eal_trace_internal.h
+++ b/lib/eal/include/eal_trace_internal.h
@@ -93,32 +93,32 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT(
rte_eal_trace_mem_zmalloc,
RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,
- int socket, void *ptr),
+ int numa_id, void *ptr),
rte_trace_point_emit_string(type);
rte_trace_point_emit_size_t(size);
rte_trace_point_emit_u32(align);
- rte_trace_point_emit_int(socket);
+ rte_trace_point_emit_int(numa_id);
rte_trace_point_emit_ptr(ptr);
)
RTE_TRACE_POINT(
rte_eal_trace_mem_malloc,
RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,
- int socket, void *ptr),
+ int numa_id, void *ptr),
rte_trace_point_emit_string(type);
rte_trace_point_emit_size_t(size);
rte_trace_point_emit_u32(align);
- rte_trace_point_emit_int(socket);
+ rte_trace_point_emit_int(numa_id);
rte_trace_point_emit_ptr(ptr);
)
RTE_TRACE_POINT(
rte_eal_trace_mem_realloc,
- RTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int socket,
+ RTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int numa_id,
void *ptr),
rte_trace_point_emit_size_t(size);
rte_trace_point_emit_u32(align);
- rte_trace_point_emit_int(socket);
+ rte_trace_point_emit_int(numa_id);
rte_trace_point_emit_ptr(ptr);
)
@@ -131,12 +131,12 @@ RTE_TRACE_POINT(
/* Memzone */
RTE_TRACE_POINT(
rte_eal_trace_memzone_reserve,
- RTE_TRACE_POINT_ARGS(const char *name, size_t len, int socket_id,
+ RTE_TRACE_POINT_ARGS(const char *name, size_t len, int numa_id,
unsigned int flags, unsigned int align, unsigned int bound,
const void *mz),
rte_trace_point_emit_string(name);
rte_trace_point_emit_size_t(len);
- rte_trace_point_emit_int(socket_id);
+ rte_trace_point_emit_int(numa_id);
rte_trace_point_emit_u32(flags);
rte_trace_point_emit_u32(align);
rte_trace_point_emit_u32(bound);
diff --git a/lib/eal/include/rte_lcore.h b/lib/eal/include/rte_lcore.h
index 1b192a6727..904d80fe28 100644
--- a/lib/eal/include/rte_lcore.h
+++ b/lib/eal/include/rte_lcore.h
@@ -8,7 +8,7 @@
/**
* @file
*
- * API for lcore and socket manipulation
+ * API for lcore and NUMA node manipulation
*/
#include <stdio.h>
@@ -117,8 +117,21 @@ unsigned int rte_lcore_count(void);
*/
int rte_lcore_index(int lcore_id);
+/**
+ * Return the ID of the NUMA node of the logical core we are running on.
+ *
+ * For non EAL threads, RTE_NUMA_ID_ANY is returned.
+ *
+ * @return
+ * the ID of current lcore's NUMA node
+ */
+unsigned int rte_numa_id(void);
+
/**
* Return the ID of NUMA node of the logical core we are running on.
+ *
+ * This is a legacy alias of rte_numa_id().
+ *
* @return
* the ID of current lcoreid's NUMA node
*/
@@ -135,13 +148,24 @@ unsigned int rte_socket_id(void);
* the number of NUMA ID's as recognized by EAL
*/
unsigned int
+rte_numa_count(void);
+
+/**
+ * Return number of NUMA nodes detected on the system.
+ *
+ * This is a legacy alias of rte_numa_count().
+ *
+ * @return
+ * the number of NUMA ID's as recognized by EAL
+ */
+unsigned int
rte_socket_count(void);
/**
- * Return socket id with a particular index.
+ * Return NUMA node ID with a particular index.
*
- * This will return socket id at a particular position in list of all detected
- * NUMA node ID's.
+ * This will return NUMA node ID at a particular position in list of all
+ * detected NUMA node ID's.
* For example, on a machine with NUMA nodes [0, 8],
* passing 1 as a parameter will return 8.
*
@@ -153,6 +177,21 @@ rte_socket_count(void);
* - -1 on error, with errno set to EINVAL
*/
int
+rte_numa_id_by_idx(unsigned int idx);
+
+/**
+ * Return NUMA node ID with a particular index.
+ *
+ * This is a legacy alias of rte_numa_id_by_idx().
+ *
+ * @param idx
+ * index of NUMA node ID to return
+ *
+ * @return
+ * - NUMA node ID as recognized by EAL
+ * - -1 on error, with errno set to EINVAL
+ */
+int
rte_socket_id_by_idx(unsigned int idx);
/**
@@ -161,6 +200,19 @@ rte_socket_id_by_idx(unsigned int idx);
* @param lcore_id
* the targeted lcore, which MUST be between 0 and RTE_MAX_LCORE-1.
* @return
+ * the ID of lcore's NUMA node
+ */
+unsigned int
+rte_lcore_to_numa_id(unsigned int lcore_id);
+
+/**
+ * Get the ID of the NUMA node of the specified lcore
+ *
+ * This is a legacy alias of rte_lcore_to_numa_id().
+ *
+ * @param lcore_id
+ * the targeted lcore, which MUST be between 0 and RTE_MAX_LCORE-1.
+ * @return
* the ID of lcoreid's NUMA node
*/
unsigned int
@@ -177,13 +229,13 @@ rte_lcore_to_socket_id(unsigned int lcore_id);
*
* @param cpu_id
* The OS logical CPU ID. If cpu_id does not identify a detected CPU, the
- * function returns SOCKET_ID_ANY.
+ * function returns RTE_NUMA_ID_ANY.
* @return
- * The ID of cpu_id's NUMA node, or SOCKET_ID_ANY if cpu_id is not valid.
+ * The ID of cpu_id's NUMA node, or RTE_NUMA_ID_ANY if cpu_id is not valid.
*/
__rte_experimental
unsigned int
-rte_cpu_socket_id(unsigned int cpu_id);
+rte_cpu_numa_id(unsigned int cpu_id);
/**
* Return the id of the lcore on a socket starting from zero.
diff --git a/lib/eal/include/rte_malloc.h b/lib/eal/include/rte_malloc.h
index 0a397e7723..9d5d582e1a 100644
--- a/lib/eal/include/rte_malloc.h
+++ b/lib/eal/include/rte_malloc.h
@@ -20,9 +20,9 @@ extern "C" {
#endif
/**
- * Structure to hold heap statistics obtained from rte_malloc_get_socket_stats function.
+ * Structure to hold heap statistics obtained from rte_malloc_get_numa_stats function.
*/
-struct rte_malloc_socket_stats {
+struct rte_malloc_numa_stats {
size_t heap_totalsz_bytes; /**< Total bytes on heap */
size_t heap_freesz_bytes; /**< Total free bytes on heap */
size_t greatest_free_size; /**< Size in bytes of largest free block */
@@ -77,7 +77,7 @@ rte_free_sensitive(void *ptr);
/**
* This function allocates memory from the huge-page area of memory. The memory
* is not cleared. In NUMA systems, the memory allocated resides on the same
- * NUMA socket as the core that calls this function.
+ * NUMA node as the core that calls this function.
*
* @param type
* A string identifying the type of allocated objects (useful for tracing).
@@ -105,7 +105,7 @@ rte_malloc(const char *type, size_t size, unsigned align)
*
* Equivalent to rte_malloc() except that the memory zone is
* initialised with zeros. In NUMA systems, the memory allocated resides on the
- * same NUMA socket as the core that calls this function.
+ * same NUMA node as the core that calls this function.
*
* @param type
* A string identifying the type of allocated objects (useful for tracing).
@@ -131,7 +131,7 @@ rte_zmalloc(const char *type, size_t size, unsigned align)
/**
* Replacement function for calloc(), using huge-page memory. Memory area is
* initialised with zeros. In NUMA systems, the memory allocated resides on the
- * same NUMA socket as the core that calls this function.
+ * same NUMA node as the core that calls this function.
*
* @param type
* A string identifying the type of allocated objects (useful for tracing).
@@ -184,7 +184,36 @@ rte_realloc(void *ptr, size_t size, unsigned int align)
/**
* Replacement function for realloc(), using huge-page memory. Reserved area
* memory is resized, preserving contents. In NUMA systems, the new area
- * resides on requested NUMA socket.
+ * resides on requested NUMA node.
+ *
+ * @param ptr
+ * Pointer to already allocated memory
+ * @param size
+ * Size (in bytes) of new area. If this is 0, memory is freed.
+ * @param align
+ * If 0, the return is a pointer that is suitably aligned for any kind of
+ * variable (in the same manner as malloc()).
+ * Otherwise, the return is a pointer that is a multiple of *align*. In
+ * this case, it must obviously be a power of two. (Minimum alignment is the
+ * cacheline size, i.e. 64-bytes)
+ * @param numa_id
+ * NUMA node ID to allocate memory on.
+ * @return
+ * - NULL on error. Not enough memory, or invalid arguments (size is 0,
+ * align is not a power of two).
+ * - Otherwise, the pointer to the reallocated memory.
+ */
+void *
+rte_realloc_numa(void *ptr, size_t size, unsigned int align, int numa_id)
+ __rte_alloc_size(2) __rte_alloc_align(3)
+ __rte_malloc __rte_dealloc_free;
+
+/**
+ * Replacement function for realloc(), using huge-page memory. Reserved area
+ * memory is resized, preserving contents. In NUMA systems, the new area
+ * resides on requested NUMA node.
+ *
+ * This is a legacy alias of rte_realloc_numa().
*
* @param ptr
* Pointer to already allocated memory
@@ -223,8 +252,38 @@ rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
* Otherwise, the return is a pointer that is a multiple of *align*. In
* this case, it must be a power of two. (Minimum alignment is the
* cacheline size, i.e. 64-bytes)
+ * @param numa_id
+ * NUMA node ID to allocate memory on. If RTE_NUMA_ID_ANY is used, this
+ * function will behave the same as rte_malloc().
+ * @return
+ * - NULL on error. Not enough memory, or invalid arguments (size is 0,
+ * align is not a power of two).
+ * - Otherwise, the pointer to the allocated object.
+ */
+void *
+rte_malloc_numa(const char *type, size_t size, unsigned int align, int numa_id)
+ __rte_alloc_size(2) __rte_alloc_align(3)
+ __rte_malloc __rte_dealloc_free;
+
+/**
+ * This function allocates memory from the huge-page area of memory. The memory
+ * is not cleared.
+ *
+ * This is a legacy alias of rte_malloc_numa().
+ *
+ * @param type
+ * A string identifying the type of allocated objects (useful for tracing).
+ * Can be NULL.
+ * @param size
+ * Size (in bytes) to be allocated.
+ * @param align
+ * If 0, the return is a pointer that is suitably aligned for any kind of
+ * variable (in the same manner as malloc()).
+ * Otherwise, the return is a pointer that is a multiple of *align*. In
+ * this case, it must be a power of two. (Minimum alignment is the
+ * cacheline size, i.e. 64-bytes)
* @param socket
- * NUMA socket to allocate memory on. If SOCKET_ID_ANY is used, this function
+ * NUMA socket to allocate memory on. If RTE_NUMA_ID_ANY is used, this function
* will behave the same as rte_malloc().
* @return
* - NULL on error. Not enough memory, or invalid arguments (size is 0,
@@ -232,7 +291,37 @@ rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
* - Otherwise, the pointer to the allocated object.
*/
void *
-rte_malloc_socket(const char *type, size_t size, unsigned align, int socket)
+rte_malloc_socket(const char *type, size_t size, unsigned int align, int socket)
+ __rte_alloc_size(2) __rte_alloc_align(3)
+ __rte_malloc __rte_dealloc_free;
+
+/**
+ * Allocate zeroed memory from the heap.
+ *
+ * Equivalent to rte_malloc() except that the memory zone is
+ * initialised with zeros.
+ *
+ * @param type
+ * A string identifying the type of allocated objects (useful for tracing).
+ * Can be NULL.
+ * @param size
+ * Size (in bytes) to be allocated.
+ * @param align
+ * If 0, the return is a pointer that is suitably aligned for any kind of
+ * variable (in the same manner as malloc()).
+ * Otherwise, the return is a pointer that is a multiple of *align*. In
+ * this case, it must obviously be a power of two. (Minimum alignment is the
+ * cacheline size, i.e. 64-bytes)
+ * @param numa_id
+ * NUMA node ID to allocate memory on. If RTE_NUMA_ID_ANY is used, this
+ * function will behave the same as rte_zmalloc().
+ * @return
+ * - NULL on error. Not enough memory, or invalid arguments (size is 0,
+ * align is not a power of two).
+ * - Otherwise, the pointer to the allocated object.
+ */
+void *
+rte_zmalloc_numa(const char *type, size_t size, unsigned int align, int numa_id)
__rte_alloc_size(2) __rte_alloc_align(3)
__rte_malloc __rte_dealloc_free;
@@ -242,6 +331,8 @@ rte_malloc_socket(const char *type, size_t size, unsigned align, int socket)
* Equivalent to rte_malloc() except that the memory zone is
* initialised with zeros.
*
+ * This is a legacy alias of rte_zmalloc_numa().
+ *
* @param type
* A string identifying the type of allocated objects (useful for tracing).
* Can be NULL.
@@ -254,7 +345,7 @@ rte_malloc_socket(const char *type, size_t size, unsigned align, int socket)
* this case, it must obviously be a power of two. (Minimum alignment is the
* cacheline size, i.e. 64-bytes)
* @param socket
- * NUMA socket to allocate memory on. If SOCKET_ID_ANY is used, this function
+ * NUMA socket to allocate memory on. If RTE_NUMA_ID_ANY is used, this function
* will behave the same as rte_zmalloc().
* @return
* - NULL on error. Not enough memory, or invalid arguments (size is 0,
@@ -262,7 +353,7 @@ rte_malloc_socket(const char *type, size_t size, unsigned align, int socket)
* - Otherwise, the pointer to the allocated object.
*/
void *
-rte_zmalloc_socket(const char *type, size_t size, unsigned align, int socket)
+rte_zmalloc_socket(const char *type, size_t size, unsigned int align, int socket)
__rte_alloc_size(2) __rte_alloc_align(3)
__rte_malloc __rte_dealloc_free;
@@ -283,8 +374,40 @@ rte_zmalloc_socket(const char *type, size_t size, unsigned align, int socket)
* Otherwise, the return is a pointer that is a multiple of *align*. In
* this case, it must obviously be a power of two. (Minimum alignment is the
* cacheline size, i.e. 64-bytes)
+ * @param numa_id
+ * NUMA node ID to allocate memory on. If RTE_NUMA_ID_ANY is used, this
+ * function will behave the same as rte_calloc().
+ * @return
+ * - NULL on error. Not enough memory, or invalid arguments (size is 0,
+ * align is not a power of two).
+ * - Otherwise, the pointer to the allocated object.
+ */
+void *
+rte_calloc_numa(const char *type, size_t num, size_t size, unsigned int align, int numa_id)
+ __rte_alloc_size(2, 3) __rte_alloc_align(4)
+ __rte_malloc __rte_dealloc_free;
+
+/**
+ * Replacement function for calloc(), using huge-page memory. Memory area is
+ * initialised with zeros.
+ *
+ * This is a legacy alias of rte_calloc_numa().
+ *
+ * @param type
+ * A string identifying the type of allocated objects (useful for tracing).
+ * Can be NULL.
+ * @param num
+ * Number of elements to be allocated.
+ * @param size
+ * Size (in bytes) of a single element.
+ * @param align
+ * If 0, the return is a pointer that is suitably aligned for any kind of
+ * variable (in the same manner as malloc()).
+ * Otherwise, the return is a pointer that is a multiple of *align*. In
+ * this case, it must obviously be a power of two. (Minimum alignment is the
+ * cacheline size, i.e. 64-bytes)
* @param socket
- * NUMA socket to allocate memory on. If SOCKET_ID_ANY is used, this function
+ * NUMA socket to allocate memory on. If RTE_NUMA_ID_ANY is used, this function
* will behave the same as rte_calloc().
* @return
* - NULL on error. Not enough memory, or invalid arguments (size is 0,
@@ -292,7 +415,7 @@ rte_zmalloc_socket(const char *type, size_t size, unsigned align, int socket)
* - Otherwise, the pointer to the allocated object.
*/
void *
-rte_calloc_socket(const char *type, size_t num, size_t size, unsigned align, int socket)
+rte_calloc_socket(const char *type, size_t num, size_t size, unsigned int align, int socket)
__rte_alloc_size(2, 3) __rte_alloc_align(4)
__rte_malloc __rte_dealloc_free;
@@ -322,6 +445,23 @@ rte_malloc_validate(const void *ptr, size_t *size);
* @note This function is not thread-safe with respect to
* ``rte_malloc_heap_create()``/``rte_malloc_heap_destroy()`` functions.
*
+ * @param numa_id
+ * An unsigned integer specifying the NUMA node ID to get heap statistics for
+ * @param numa_stats
+ * A structure which provides memory to store statistics
+ * @return
+ * Null on error
+ * Pointer to structure storing statistics on success
+ */
+int
+rte_malloc_get_numa_stats(int numa_id,
+ struct rte_malloc_numa_stats *numa_stats);
+
+/**
+ * Get heap statistics for the specified heap.
+ *
+ * This is a legacy alias of rte_malloc_get_numa_stats().
+ *
* @param socket
* An unsigned integer specifying the socket to get heap statistics for
* @param socket_stats
@@ -332,7 +472,7 @@ rte_malloc_validate(const void *ptr, size_t *size);
*/
int
rte_malloc_get_socket_stats(int socket,
- struct rte_malloc_socket_stats *socket_stats);
+ struct rte_malloc_numa_stats *socket_stats);
/**
* Add memory chunk to a heap with specified name.
@@ -459,7 +599,7 @@ rte_malloc_heap_memory_detach(const char *heap_name, void *va_addr, size_t len);
* Creates a new empty malloc heap with a specified name.
*
* @note Heaps created via this call will automatically get assigned a unique
- * socket ID, which can be found using ``rte_malloc_heap_get_socket()``
+ * NUMA node ID, which can be found using ``rte_malloc_heap_get_numa_id()``
*
* @param heap_name
* Name of the heap to create.
@@ -497,9 +637,25 @@ rte_malloc_heap_create(const char *heap_name);
int
rte_malloc_heap_destroy(const char *heap_name);
+/**
+ * Find NUMA node ID corresponding to a named heap.
+ *
+ * @param name
+ * Heap name to find NUMA node ID for
+ * @return
+ * NUMA node ID in case of success (a non-negative number)
+ * -1 in case of error, with rte_errno set to one of the following:
+ * EINVAL - ``name`` was NULL
+ * ENOENT - heap identified by the name ``name`` was not found
+ */
+int
+rte_malloc_heap_get_numa_id(const char *name);
+
/**
* Find socket ID corresponding to a named heap.
*
+ * This is a legacy alias of rte_malloc_heap_get_numa_id().
+ *
* @param name
* Heap name to find socket ID for
* @return
@@ -511,10 +667,25 @@ rte_malloc_heap_destroy(const char *heap_name);
int
rte_malloc_heap_get_socket(const char *name);
+/**
+ * Check if a given NUMA node ID refers to externally allocated memory.
+ *
+ * @note Passing RTE_NUMA_ID_ANY will return 0.
+ *
+ * @param numa_id
+ * NUMA node ID to check
+ * @return
+ * 1 if NUMA node ID refers to externally allocated memory
+ * 0 if NUMA node ID refers to internal DPDK memory
+ * -1 if NUMA node ID is invalid
+ */
+int
+rte_malloc_heap_numa_is_external(int numa_id);
+
/**
* Check if a given socket ID refers to externally allocated memory.
*
- * @note Passing SOCKET_ID_ANY will return 0.
+ * This is a legacy alias of rte_malloc_heap_numa_is_external().
*
* @param socket_id
* Socket ID to check
diff --git a/lib/eal/include/rte_memory.h b/lib/eal/include/rte_memory.h
index 940770f1eb..2633550524 100644
--- a/lib/eal/include/rte_memory.h
+++ b/lib/eal/include/rte_memory.h
@@ -36,7 +36,13 @@ extern "C" {
#define RTE_PGSIZE_4G (1ULL << 32)
#define RTE_PGSIZE_16G (1ULL << 34)
-#define SOCKET_ID_ANY -1 /**< Any NUMA socket. */
+/** Any NUMA node ID. */
+#define RTE_NUMA_ID_ANY -1
+
+/**
+ * Legacy alias of RTE_NUMA_ID_ANY.
+ */
+#define SOCKET_ID_ANY RTE_NUMA_ID_ANY
/** Prevent this segment from being freed back to the OS. */
#define RTE_MEMSEG_FLAG_DO_NOT_FREE RTE_BIT32(0)
diff --git a/lib/eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h
index 5a0e1b8a15..125241c538 100644
--- a/lib/eal/include/rte_memzone.h
+++ b/lib/eal/include/rte_memzone.h
@@ -98,7 +98,7 @@ size_t rte_memzone_max_get(void);
* new allocations.
*
* @note: When reserving memzones with len set to 0, it is preferable to also
- * set a valid socket_id. Setting socket_id to SOCKET_ID_ANY is supported, but
+ * set a valid socket_id. Setting socket_id to RTE_NUMA_ID_ANY is supported, but
* will likely not yield expected results. Specifically, the resulting memzone
* may not necessarily be the biggest memzone available, but rather biggest
* memzone available on socket id corresponding to an lcore from which
@@ -112,7 +112,7 @@ size_t rte_memzone_max_get(void);
* is 0, the biggest contiguous zone will be reserved.
* @param socket_id
* The socket identifier in the case of
- * NUMA. The value can be SOCKET_ID_ANY if there is no NUMA
+ * NUMA. The value can be RTE_NUMA_ID_ANY if there is no NUMA
* constraint for the reserved zone.
* @param flags
* The flags parameter is used to request memzones to be
@@ -161,7 +161,7 @@ const struct rte_memzone *rte_memzone_reserve(const char *name,
* new allocations.
*
* @note: When reserving memzones with len set to 0, it is preferable to also
- * set a valid socket_id. Setting socket_id to SOCKET_ID_ANY is supported, but
+ * set a valid socket_id. Setting socket_id to RTE_NUMA_ID_ANY is supported, but
* will likely not yield expected results. Specifically, the resulting memzone
* may not necessarily be the biggest memzone available, but rather biggest
* memzone available on socket id corresponding to an lcore from which
@@ -175,7 +175,7 @@ const struct rte_memzone *rte_memzone_reserve(const char *name,
* is 0, the biggest contiguous zone will be reserved.
* @param socket_id
* The socket identifier in the case of
- * NUMA. The value can be SOCKET_ID_ANY if there is no NUMA
+ * NUMA. The value can be RTE_NUMA_ID_ANY if there is no NUMA
* constraint for the reserved zone.
* @param flags
* The flags parameter is used to request memzones to be
@@ -229,7 +229,7 @@ const struct rte_memzone *rte_memzone_reserve_aligned(const char *name,
* new allocations.
*
* @note: When reserving memzones with len set to 0, it is preferable to also
- * set a valid socket_id. Setting socket_id to SOCKET_ID_ANY is supported, but
+ * set a valid socket_id. Setting socket_id to RTE_NUMA_ID_ANY is supported, but
* will likely not yield expected results. Specifically, the resulting memzone
* may not necessarily be the biggest memzone available, but rather biggest
* memzone available on socket id corresponding to an lcore from which
@@ -243,7 +243,7 @@ const struct rte_memzone *rte_memzone_reserve_aligned(const char *name,
* is 0, the biggest contiguous zone will be reserved.
* @param socket_id
* The socket identifier in the case of
- * NUMA. The value can be SOCKET_ID_ANY if there is no NUMA
+ * NUMA. The value can be RTE_NUMA_ID_ANY if there is no NUMA
* constraint for the reserved zone.
* @param flags
* The flags parameter is used to request memzones to be
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 278504237d..0d26c780f2 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -434,24 +434,24 @@ eal_hugedirs_unlock(void)
static int
check_socket(const struct rte_memseg_list *msl, void *arg)
{
- int *socket_id = arg;
+ int *numa_id = arg;
if (msl->external)
return 0;
- return *socket_id == msl->socket_id;
+ return *numa_id == msl->socket_id;
}
static void
eal_check_mem_on_local_socket(void)
{
- int socket_id;
+ int numa_id;
const struct rte_config *config = rte_eal_get_configuration();
- socket_id = rte_lcore_to_socket_id(config->main_lcore);
+ numa_id = rte_lcore_to_numa_id(config->main_lcore);
- if (rte_memseg_list_walk(check_socket, &socket_id) == 0)
- EAL_LOG(WARNING, "WARNING: Main core has no memory on local socket!");
+ if (rte_memseg_list_walk(check_socket, &numa_id) == 0)
+ EAL_LOG(WARNING, "WARNING: Main lcore has no memory on local NUMA node!");
}
static int
@@ -526,8 +526,8 @@ eal_worker_thread_create(unsigned int lcore_id)
stack_size = eal_get_internal_configuration()->huge_worker_stack_size;
if (stack_size != 0) {
/* Allocate NUMA aware stack memory and set pthread attributes */
- stack_ptr = rte_zmalloc_socket("lcore_stack", stack_size,
- RTE_CACHE_LINE_SIZE, rte_lcore_to_socket_id(lcore_id));
+ stack_ptr = rte_zmalloc_numa("lcore_stack", stack_size,
+ RTE_CACHE_LINE_SIZE, rte_lcore_to_numa_id(lcore_id));
if (stack_ptr == NULL) {
rte_eal_init_alert("Cannot allocate worker lcore stack memory");
rte_errno = ENOMEM;
diff --git a/lib/eal/linux/eal_hugepage_info.c b/lib/eal/linux/eal_hugepage_info.c
index 05c5b3f613..9eec3789f0 100644
--- a/lib/eal/linux/eal_hugepage_info.c
+++ b/lib/eal/linux/eal_hugepage_info.c
@@ -136,29 +136,29 @@ get_num_hugepages(const char *subdir, size_t sz, unsigned int reusable_pages)
}
static uint32_t
-get_num_hugepages_on_node(const char *subdir, unsigned int socket, size_t sz)
+get_num_hugepages_on_node(const char *subdir, unsigned int numa_id, size_t sz)
{
- char *path = NULL, *socketpath = NULL;
- DIR *socketdir;
+ char *path = NULL, *numapath = NULL;
+ DIR *numadir;
unsigned long num_pages = 0;
const char *nr_hp_file = "free_hugepages";
- if (asprintf(&socketpath, "%s/node%u/hugepages", sys_pages_numa_dir_path, socket) < 0) {
+ if (asprintf(&numapath, "%s/node%u/hugepages", sys_pages_numa_dir_path, numa_id) < 0) {
EAL_LOG(ERR, "Can not format node huge page path");
- socketpath = NULL;
+ numapath = NULL;
goto nopages;
}
- socketdir = opendir(socketpath);
- if (socketdir) {
+ numadir = opendir(numapath);
+ if (numadir) {
/* Keep calm and carry on */
- closedir(socketdir);
+ closedir(numadir);
} else {
- /* Can't find socket dir, so ignore it */
+ /* Cannot find NUMA node dir, so ignore it */
goto nopages;
}
- if (asprintf(&path, "%s/%s/%s", socketpath, subdir, nr_hp_file) < 0) {
+ if (asprintf(&path, "%s/%s/%s", numapath, subdir, nr_hp_file) < 0) {
EAL_LOG(ERR, "Can not format free hugepages path");
path = NULL;
goto nopages;
@@ -169,7 +169,7 @@ get_num_hugepages_on_node(const char *subdir, unsigned int socket, size_t sz)
if (num_pages == 0)
EAL_LOG(WARNING, "No free %zu kB hugepages reported on node %u",
- sz >> 10, socket);
+ sz >> 10, numa_id);
/*
* we want to return a uint32_t and more than this looks suspicious
@@ -180,7 +180,7 @@ get_num_hugepages_on_node(const char *subdir, unsigned int socket, size_t sz)
nopages:
free(path);
- free(socketpath);
+ free(numapath);
return num_pages;
}
@@ -406,9 +406,9 @@ calc_num_pages(struct hugepage_info *hpi, struct dirent *dirent,
eal_get_internal_configuration();
/*
- * first, try to put all hugepages into relevant sockets, but
+ * first, try to put all hugepages into relevant NUMA nodes, but
* if first attempts fails, fall back to collecting all pages
- * in one socket and sorting them later
+ * in one NUMA node and sorting them later
*/
total_pages = 0;
@@ -420,13 +420,13 @@ calc_num_pages(struct hugepage_info *hpi, struct dirent *dirent,
* but it is precisely what hugepage file reuse is trying to avoid.
*/
if (!internal_conf->legacy_mem && reusable_pages == 0)
- for (i = 0; i < rte_socket_count(); i++) {
- int socket = rte_socket_id_by_idx(i);
+ for (i = 0; i < rte_numa_count(); i++) {
+ int numa_id = rte_numa_id_by_idx(i);
unsigned int num_pages =
get_num_hugepages_on_node(
- dirent->d_name, socket,
+ dirent->d_name, numa_id,
hpi->hugepage_sz);
- hpi->num_pages[socket] = num_pages;
+ hpi->num_pages[numa_id] = num_pages;
total_pages += num_pages;
}
/*
@@ -555,7 +555,7 @@ hugepage_info_init(void)
/* now we have all info, check we have at least one valid size */
for (i = 0; i < num_sizes; i++) {
- /* pages may no longer all be on socket 0, so check all */
+ /* pages may no longer all be on NUMA node 0, so check all */
unsigned int j, num_pages = 0;
struct hugepage_info *hpi = &internal_conf->hugepage_info[i];
@@ -571,7 +571,7 @@ hugepage_info_init(void)
/*
* when we initialize the hugepage info, everything goes
- * to socket 0 by default. it will later get sorted by memory
+ * to NUMA node 0 by default. it will later get sorted by memory
* initialization procedure.
*/
int
diff --git a/lib/eal/linux/eal_lcore.c b/lib/eal/linux/eal_lcore.c
index 29b36dd610..ce2c28b591 100644
--- a/lib/eal/linux/eal_lcore.c
+++ b/lib/eal/linux/eal_lcore.c
@@ -38,7 +38,7 @@ eal_cpu_detected(unsigned lcore_id)
* found on any numa node, returns zero.
*/
unsigned
-eal_cpu_socket_id(unsigned lcore_id)
+eal_cpu_numa_id(unsigned int lcore_id)
{
unsigned socket;
diff --git a/lib/eal/linux/eal_memalloc.c b/lib/eal/linux/eal_memalloc.c
index 8bfcbb1469..6003f04bd7 100644
--- a/lib/eal/linux/eal_memalloc.c
+++ b/lib/eal/linux/eal_memalloc.c
@@ -136,7 +136,7 @@ check_numa(void)
}
static void
-prepare_numa(int *oldpolicy, struct bitmask *oldmask, int socket_id)
+prepare_numa(int *oldpolicy, struct bitmask *oldmask, int numa_id)
{
EAL_LOG(DEBUG, "Trying to obtain current memory policy.");
if (get_mempolicy(oldpolicy, oldmask->maskp,
@@ -147,9 +147,9 @@ prepare_numa(int *oldpolicy, struct bitmask *oldmask, int socket_id)
*oldpolicy = MPOL_DEFAULT;
}
EAL_LOG(DEBUG,
- "Setting policy MPOL_PREFERRED for socket %d",
- socket_id);
- numa_set_preferred(socket_id);
+ "Setting policy MPOL_PREFERRED for NUMA node %d",
+ numa_id);
+ numa_set_preferred(numa_id);
}
static void
@@ -498,7 +498,7 @@ resize_hugefile(int fd, uint64_t fa_offset, uint64_t page_sz, bool grow,
}
static int
-alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
+alloc_seg(struct rte_memseg *ms, void *addr, int numa_id,
struct hugepage_info *hi, unsigned int list_idx,
unsigned int seg_idx)
{
@@ -615,7 +615,7 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
/*
* If the kernel has been built without NUMA support, get_mempolicy()
* will return an error. If check_numa() returns false, memory
- * allocation is not NUMA aware and the socket_id should not be
+ * allocation is not NUMA aware and the numa_id should not be
* checked.
*/
if (check_numa()) {
@@ -625,15 +625,15 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
EAL_LOG(DEBUG, "%s(): get_mempolicy: %s",
__func__, strerror(errno));
goto mapped;
- } else if (cur_socket_id != socket_id) {
+ } else if (cur_socket_id != numa_id) {
EAL_LOG(DEBUG,
- "%s(): allocation happened on wrong socket (wanted %d, got %d)",
- __func__, socket_id, cur_socket_id);
+ "%s(): allocation happened on wrong NUMA node (wanted %d, got %d)",
+ __func__, numa_id, cur_socket_id);
goto mapped;
}
}
#else
- if (rte_socket_count() > 1)
+ if (rte_numa_count() > 1)
EAL_LOG(DEBUG, "%s(): not checking hugepage NUMA node.",
__func__);
#endif
@@ -646,7 +646,7 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
ms->nchannel = rte_memory_get_nchannel();
ms->nrank = rte_memory_get_nrank();
ms->iova = iova;
- ms->socket_id = socket_id;
+ ms->socket_id = numa_id;
ms->flags = dirty ? RTE_MEMSEG_FLAG_DIRTY : 0;
return 0;
@@ -762,7 +762,7 @@ struct alloc_walk_param {
size_t page_sz;
unsigned int segs_allocated;
unsigned int n_segs;
- int socket;
+ int numa_id;
bool exact;
};
static int
@@ -779,7 +779,7 @@ alloc_seg_walk(const struct rte_memseg_list *msl, void *arg)
if (msl->page_sz != wa->page_sz)
return 0;
- if (msl->socket_id != wa->socket)
+ if (msl->socket_id != wa->numa_id)
return 0;
page_sz = (size_t)msl->page_sz;
@@ -854,7 +854,7 @@ alloc_seg_walk(const struct rte_memseg_list *msl, void *arg)
map_addr = RTE_PTR_ADD(cur_msl->base_va,
cur_idx * page_sz);
- if (alloc_seg(cur, map_addr, wa->socket, wa->hi,
+ if (alloc_seg(cur, map_addr, wa->numa_id, wa->hi,
msl_idx, cur_idx)) {
EAL_LOG(DEBUG, "attempted to allocate %i segments, but only %i were allocated",
need, i);
@@ -970,7 +970,7 @@ free_seg_walk(const struct rte_memseg_list *msl, void *arg)
int
eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms, int n_segs, size_t page_sz,
- int socket, bool exact)
+ int numa_id, bool exact)
{
int i, ret = -1;
#ifdef RTE_EAL_NUMA_AWARE_HUGEPAGES
@@ -1005,7 +1005,7 @@ eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms, int n_segs, size_t page_sz,
#ifdef RTE_EAL_NUMA_AWARE_HUGEPAGES
if (check_numa()) {
oldmask = numa_allocate_nodemask();
- prepare_numa(&oldpolicy, oldmask, socket);
+ prepare_numa(&oldpolicy, oldmask, numa_id);
have_numa = true;
}
#endif
@@ -1015,7 +1015,7 @@ eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms, int n_segs, size_t page_sz,
wa.ms = ms;
wa.n_segs = n_segs;
wa.page_sz = page_sz;
- wa.socket = socket;
+ wa.numa_id = numa_id;
wa.segs_allocated = 0;
/* memalloc is locked, so it's safe to use thread-unsafe version */
@@ -1036,10 +1036,10 @@ eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms, int n_segs, size_t page_sz,
}
struct rte_memseg *
-eal_memalloc_alloc_seg(size_t page_sz, int socket)
+eal_memalloc_alloc_seg(size_t page_sz, int numa_id)
{
struct rte_memseg *ms;
- if (eal_memalloc_alloc_seg_bulk(&ms, 1, page_sz, socket, true) < 0)
+ if (eal_memalloc_alloc_seg_bulk(&ms, 1, page_sz, numa_id, true) < 0)
return NULL;
/* return pointer to newly allocated memseg */
return ms;
diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c
index 614f31a308..601173c188 100644
--- a/lib/eal/linux/eal_memory.c
+++ b/lib/eal/linux/eal_memory.c
@@ -431,7 +431,7 @@ map_all_hugepages(struct hugepage_file *hugepg_tbl, struct hugepage_info *hpi,
static int
find_numasocket(struct hugepage_file *hugepg_tbl, struct hugepage_info *hpi)
{
- int socket_id;
+ int numa_id;
char *end, *nodestr;
unsigned i, hp_count = 0;
uint64_t virt_addr;
@@ -443,7 +443,7 @@ find_numasocket(struct hugepage_file *hugepg_tbl, struct hugepage_info *hpi)
f = fopen("/proc/self/numa_maps", "r");
if (f == NULL) {
EAL_LOG(NOTICE, "NUMA support not available"
- " consider that all memory is in socket_id 0");
+ " consider that all memory is in numa_id 0");
return 0;
}
@@ -487,22 +487,22 @@ find_numasocket(struct hugepage_file *hugepg_tbl, struct hugepage_info *hpi)
end[0] = '\0';
end = NULL;
- socket_id = strtoul(nodestr, &end, 0);
+ numa_id = strtoul(nodestr, &end, 0);
if ((nodestr[0] == '\0') || (end == NULL) || (*end != '\0')) {
EAL_LOG(ERR, "%s(): error in numa_maps parsing", __func__);
goto error;
}
- /* if we find this page in our mappings, set socket_id */
+ /* if we find this page in our mappings, set numa_id */
for (i = 0; i < hpi->num_pages[0]; i++) {
void *va = (void *)(unsigned long)virt_addr;
if (hugepg_tbl[i].orig_va == va) {
- hugepg_tbl[i].socket_id = socket_id;
+ hugepg_tbl[i].numa_id = numa_id;
hp_count++;
#ifdef RTE_EAL_NUMA_AWARE_HUGEPAGES
EAL_LOG(DEBUG,
"Hugepage %s is on socket %d",
- hugepg_tbl[i].filepath, socket_id);
+ hugepg_tbl[i].filepath, numa_id);
#endif
}
}
@@ -649,7 +649,7 @@ unmap_unneeded_hugepages(struct hugepage_file *hugepg_tbl,
/* find a page that matches the criteria */
if ((hp->size == hpi[size].hugepage_sz) &&
- (hp->socket_id == (int) socket)) {
+ (hp->numa_id == (int) socket)) {
/* if we skipped enough pages, unmap the rest */
if (pages_found == hpi[size].num_pages[socket]) {
@@ -691,17 +691,17 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
int ms_idx;
uint64_t page_sz;
size_t memseg_len;
- int socket_id;
+ int numa_id;
#ifndef RTE_ARCH_64
const struct internal_config *internal_conf =
eal_get_internal_configuration();
#endif
page_sz = hugepages[seg_start].size;
- socket_id = hugepages[seg_start].socket_id;
+ numa_id = hugepages[seg_start].numa_id;
seg_len = seg_end - seg_start;
EAL_LOG(DEBUG, "Attempting to map %" PRIu64 "M on socket %i",
- (seg_len * page_sz) >> 20ULL, socket_id);
+ (seg_len * page_sz) >> 20ULL, numa_id);
/* find free space in memseg lists */
for (msl_idx = 0; msl_idx < RTE_MAX_MEMSEG_LISTS; msl_idx++) {
@@ -712,7 +712,7 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
if (msl->page_sz != page_sz)
continue;
- if (msl->socket_id != socket_id)
+ if (msl->socket_id != numa_id)
continue;
/* leave space for a hole if array is not empty */
@@ -813,7 +813,7 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
ms->hugepage_sz = page_sz;
ms->len = memseg_len;
ms->iova = hfile->physaddr;
- ms->socket_id = hfile->socket_id;
+ ms->socket_id = hfile->numa_id;
ms->nchannel = rte_memory_get_nchannel();
ms->nrank = rte_memory_get_nrank();
@@ -825,7 +825,7 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
rte_strerror(rte_errno));
}
EAL_LOG(DEBUG, "Allocated %" PRIu64 "M on socket %i",
- (seg_len * page_sz) >> 20, socket_id);
+ (seg_len * page_sz) >> 20, numa_id);
return seg_len;
}
@@ -877,10 +877,10 @@ prealloc_segments(struct hugepage_file *hugepages, int n_pages)
uint64_t page_sz =
internal_conf->hugepage_info[hpi_idx].hugepage_sz;
- for (i = 0; i < rte_socket_count(); i++) {
+ for (i = 0; i < rte_numa_count(); i++) {
struct rte_memseg_list *msl;
- socket = rte_socket_id_by_idx(i);
+ socket = rte_numa_id_by_idx(i);
n_contig_segs = 0;
n_segs = 0;
seg_start_page = -1;
@@ -898,7 +898,7 @@ prealloc_segments(struct hugepage_file *hugepages, int n_pages)
if (cur->size == 0)
end_seg = 1;
- else if (cur->socket_id != (int) socket)
+ else if (cur->numa_id != (int) socket)
end_seg = 1;
else if (cur->size != page_sz)
end_seg = 1;
@@ -1024,7 +1024,7 @@ remap_needed_hugepages(struct hugepage_file *hugepages, int n_pages)
if (cur_page == 0)
new_memseg = 1;
- else if (cur->socket_id != prev->socket_id)
+ else if (cur->numa_id != prev->numa_id)
new_memseg = 1;
else if (cur->size != prev->size)
new_memseg = 1;
@@ -1362,7 +1362,7 @@ eal_legacy_hugepage_init(void)
/* get hugepages for each socket */
for (i = 0; i < nr_hugefiles; i++) {
- int socket = tmp_hp[i].socket_id;
+ int socket = tmp_hp[i].numa_id;
/* find a hugepage info with right size and increment num_pages */
const int nb_hpsizes = RTE_MIN(MAX_HUGEPAGE_SIZES,
@@ -1380,7 +1380,7 @@ eal_legacy_hugepage_init(void)
memory[i] = internal_conf->numa_mem[i];
/* calculate final number of pages */
- nr_hugepages = eal_dynmem_calc_num_pages_per_socket(memory,
+ nr_hugepages = eal_dynmem_calc_num_pages_per_numa_node(memory,
internal_conf->hugepage_info, used_hp,
internal_conf->num_hugepage_sizes);
@@ -1706,7 +1706,7 @@ memseg_primary_init_32(void)
const uint64_t mem32_max_mem = 2ULL << 30;
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
int active_sockets, hpi_idx, msl_idx = 0;
- unsigned int socket_id, i;
+ unsigned int numa_id, i;
struct rte_memseg_list *msl;
uint64_t extra_mem_per_socket, total_extra_mem, total_requested_mem;
struct internal_config *internal_conf =
@@ -1736,11 +1736,11 @@ memseg_primary_init_32(void)
active_sockets = 0;
total_requested_mem = 0;
if (internal_conf->force_numa)
- for (i = 0; i < rte_socket_count(); i++) {
+ for (i = 0; i < rte_numa_count(); i++) {
uint64_t mem;
- socket_id = rte_socket_id_by_idx(i);
- mem = internal_conf->numa_mem[socket_id];
+ numa_id = rte_numa_id_by_idx(i);
+ mem = internal_conf->numa_mem[numa_id];
if (mem == 0)
continue;
@@ -1774,7 +1774,7 @@ memseg_primary_init_32(void)
*/
/* create memseg lists */
- for (i = 0; i < rte_socket_count(); i++) {
+ for (i = 0; i < rte_numa_count(); i++) {
int hp_sizes = (int) internal_conf->num_hugepage_sizes;
uint64_t max_socket_mem, cur_socket_mem;
unsigned int main_lcore_socket;
@@ -1782,37 +1782,37 @@ memseg_primary_init_32(void)
bool skip;
int ret;
- ret = rte_socket_id_by_idx(i);
+ ret = rte_numa_id_by_idx(i);
if (ret == -1) {
EAL_LOG(ERR, "Cannot get socket ID for socket index %u", i);
return -1;
}
- socket_id = (unsigned int)ret;
+ numa_id = (unsigned int)ret;
#ifndef RTE_EAL_NUMA_AWARE_HUGEPAGES
/* we can still sort pages by socket in legacy mode */
- if (!internal_conf->legacy_mem && socket_id > 0)
+ if (!internal_conf->legacy_mem && numa_id > 0)
break;
#endif
/* if we didn't specifically request memory on this socket */
skip = active_sockets != 0 &&
- internal_conf->numa_mem[socket_id] == 0;
+ internal_conf->numa_mem[numa_id] == 0;
/* ...or if we didn't specifically request memory on *any*
* socket, and this is not main lcore
*/
- main_lcore_socket = rte_lcore_to_socket_id(cfg->main_lcore);
- skip |= active_sockets == 0 && socket_id != main_lcore_socket;
+ main_lcore_socket = rte_lcore_to_numa_id(cfg->main_lcore);
+ skip |= active_sockets == 0 && numa_id != main_lcore_socket;
if (skip) {
EAL_LOG(DEBUG, "Will not preallocate memory on socket %u",
- socket_id);
+ numa_id);
continue;
}
/* max amount of memory on this socket */
max_socket_mem = (active_sockets != 0 ?
- internal_conf->numa_mem[socket_id] :
+ internal_conf->numa_mem[numa_id] :
internal_conf->memory) +
extra_mem_per_socket;
cur_socket_mem = 0;
@@ -1827,7 +1827,7 @@ memseg_primary_init_32(void)
hugepage_sz = hpi->hugepage_sz;
/* check if pages are actually available */
- if (hpi->num_pages[socket_id] == 0)
+ if (hpi->num_pages[numa_id] == 0)
continue;
max_pagesz_mem = max_socket_mem - cur_socket_mem;
@@ -1843,7 +1843,7 @@ memseg_primary_init_32(void)
EAL_LOG(DEBUG, "Attempting to preallocate "
"%" PRIu64 "M on socket %i",
- max_pagesz_mem >> 20, socket_id);
+ max_pagesz_mem >> 20, numa_id);
while (cur_pagesz_mem < max_pagesz_mem) {
uint64_t rem_mem;
@@ -1862,7 +1862,7 @@ memseg_primary_init_32(void)
msl = &mcfg->memsegs[msl_idx];
if (eal_memseg_list_init(msl, hugepage_sz,
- n_segs, socket_id, msl_idx, true) < 0) {
+ n_segs, numa_id, msl_idx, true) < 0) {
/* failing to allocate a memseg list is a serious error. */
EAL_LOG(ERR, "Cannot allocate memseg list");
return -1;
@@ -1889,7 +1889,7 @@ memseg_primary_init_32(void)
}
if (cur_socket_mem == 0) {
EAL_LOG(ERR, "Cannot allocate VA space on socket %u",
- socket_id);
+ numa_id);
return -1;
}
}
@@ -1947,7 +1947,7 @@ memseg_secondary_init_dynmem(void)
return -1;
}
- EAL_LOG(DEBUG, "Attaching segment list: n_segs:%u socket_id:%d hugepage_sz:%" PRIu64,
+ EAL_LOG(DEBUG, "Attaching segment list: n_segs:%u numa_id:%d hugepage_sz:%" PRIu64,
msl->memseg_arr.len, msl->socket_id, msl->page_sz);
}
@@ -2025,7 +2025,7 @@ rte_eal_memseg_init(void)
EAL_LOG(ERR, "Cannot get current resource limits");
}
#ifndef RTE_EAL_NUMA_AWARE_HUGEPAGES
- if (!internal_conf->legacy_mem && rte_socket_count() > 1) {
+ if (!internal_conf->legacy_mem && rte_numa_count() > 1) {
EAL_LOG(WARNING, "DPDK is running on a NUMA system, but is compiled without NUMA support.");
EAL_LOG(WARNING, "This will have adverse consequences for performance and usability.");
EAL_LOG(WARNING, "Please use --legacy-mem option, or recompile with NUMA support.");
diff --git a/lib/eal/windows/eal_hugepages.c b/lib/eal/windows/eal_hugepages.c
index ff72b8ee38..c48c93da0c 100644
--- a/lib/eal/windows/eal_hugepages.c
+++ b/lib/eal/windows/eal_hugepages.c
@@ -60,7 +60,7 @@ static int
hugepage_info_init(void)
{
struct hugepage_info *hpi;
- unsigned int socket_id;
+ unsigned int numa_id;
int ret = 0;
struct internal_config *internal_conf =
eal_get_internal_configuration();
@@ -77,21 +77,21 @@ hugepage_info_init(void)
* because Windows neither advertises additional limits,
* nor provides an API to query them.
*/
- for (socket_id = 0; socket_id < rte_socket_count(); socket_id++) {
+ for (numa_id = 0; numa_id < rte_numa_count(); numa_id++) {
ULONGLONG bytes;
unsigned int numa_node;
- numa_node = eal_socket_numa_node(socket_id);
+ numa_node = eal_socket_numa_node(numa_id);
if (!GetNumaAvailableMemoryNodeEx(numa_node, &bytes)) {
RTE_LOG_WIN32_ERR("GetNumaAvailableMemoryNodeEx(%u)",
numa_node);
continue;
}
- hpi->num_pages[socket_id] = bytes / hpi->hugepage_sz;
+ hpi->num_pages[numa_id] = bytes / hpi->hugepage_sz;
EAL_LOG(DEBUG,
- "Found %u hugepages of %zu bytes on socket %u",
- hpi->num_pages[socket_id], hpi->hugepage_sz, socket_id);
+ "Found %u hugepages of %zu bytes on NUMA node %u",
+ hpi->num_pages[numa_id], hpi->hugepage_sz, numa_id);
}
/* No hugepage filesystem on Windows. */
diff --git a/lib/eal/windows/eal_lcore.c b/lib/eal/windows/eal_lcore.c
index d2a2c2d091..71c7cfccae 100644
--- a/lib/eal/windows/eal_lcore.c
+++ b/lib/eal/windows/eal_lcore.c
@@ -31,21 +31,21 @@
#endif
struct lcore_map {
- unsigned int socket_id;
+ unsigned int numa_id;
unsigned int core_id;
};
-struct socket_map {
+struct numa_map {
uint16_t node_id;
unsigned int lcore_count;
};
struct cpu_map {
unsigned int lcore_count;
- unsigned int socket_count;
+ unsigned int numa_count;
unsigned int cpu_count;
struct lcore_map lcores[RTE_MAX_LCORE];
- struct socket_map sockets[RTE_MAX_NUMA_NODES];
+ struct numa_map nodes[RTE_MAX_NUMA_NODES];
GROUP_AFFINITY cpus[CPU_SETSIZE];
};
@@ -128,7 +128,7 @@ eal_create_lcore_map(const SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info)
const unsigned int node_id = info->NumaNode.NodeNumber;
const GROUP_AFFINITY *group_masks = EAL_NUMA_GROUP_MASKS(info->NumaNode);
struct lcore_map *lcore;
- unsigned int socket_id;
+ unsigned int numa_id;
unsigned int group_count;
unsigned int group_no;
unsigned int i;
@@ -141,17 +141,17 @@ eal_create_lcore_map(const SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info)
* of a physical processor comprise one NUMA node, but two
* processor groups, because group size is limited by 32/64.
*/
- for (socket_id = 0; socket_id < cpu_map.socket_count; socket_id++)
- if (cpu_map.sockets[socket_id].node_id == node_id)
+ for (numa_id = 0; numa_id < cpu_map.numa_count; numa_id++)
+ if (cpu_map.nodes[numa_id].node_id == node_id)
break;
- if (socket_id == cpu_map.socket_count) {
- if (socket_id == RTE_DIM(cpu_map.sockets))
+ if (numa_id == cpu_map.numa_count) {
+ if (numa_id == RTE_DIM(cpu_map.nodes))
return true;
- cpu_map.sockets[socket_id].node_id = node_id;
- cpu_map.sockets[socket_id].lcore_count = 0;
- cpu_map.socket_count++;
+ cpu_map.nodes[numa_id].node_id = node_id;
+ cpu_map.nodes[numa_id].lcore_count = 0;
+ cpu_map.numa_count++;
}
/* Old Windows versions report NUMA nodes with GroupCount == 0 */
@@ -170,11 +170,11 @@ eal_create_lcore_map(const SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info)
return true;
lcore = &cpu_map.lcores[cpu_map.lcore_count];
- lcore->socket_id = socket_id;
+ lcore->numa_id = numa_id;
- /* core_id within the socket */
- lcore->core_id = cpu_map.sockets[socket_id].lcore_count;
- cpu_map.sockets[socket_id].lcore_count++;
+ /* core_id within the NUMA node */
+ lcore->core_id = cpu_map.nodes[numa_id].lcore_count;
+ cpu_map.nodes[numa_id].lcore_count++;
cpu_map.lcore_count++;
}
}
@@ -247,7 +247,7 @@ eal_create_cpu_map(void)
if (full) {
/* Not a fatal error, but important for troubleshooting. */
log_early("Enumerated maximum of %u NUMA nodes and %u cores\n",
- cpu_map.socket_count, cpu_map.lcore_count);
+ cpu_map.numa_count, cpu_map.lcore_count);
}
free(infos);
@@ -262,9 +262,9 @@ eal_cpu_detected(unsigned int lcore_id)
}
unsigned
-eal_cpu_socket_id(unsigned int lcore_id)
+eal_cpu_numa_id(unsigned int lcore_id)
{
- return cpu_map.lcores[lcore_id].socket_id;
+ return cpu_map.lcores[lcore_id].numa_id;
}
unsigned
@@ -274,9 +274,9 @@ eal_cpu_core_id(unsigned int lcore_id)
}
unsigned int
-eal_socket_numa_node(unsigned int socket_id)
+eal_socket_numa_node(unsigned int numa_id)
{
- return cpu_map.sockets[socket_id].node_id;
+ return cpu_map.nodes[numa_id].node_id;
}
PGROUP_AFFINITY
diff --git a/lib/eal/windows/eal_memalloc.c b/lib/eal/windows/eal_memalloc.c
index 232749573a..2f956adc1a 100644
--- a/lib/eal/windows/eal_memalloc.c
+++ b/lib/eal/windows/eal_memalloc.c
@@ -32,7 +32,7 @@ eal_memalloc_get_seg_fd_offset(int list_idx, int seg_idx, size_t *offset)
}
static int
-alloc_seg(struct rte_memseg *ms, void *requested_addr, int socket_id,
+alloc_seg(struct rte_memseg *ms, void *requested_addr, int numa_id,
struct hugepage_info *hi)
{
HANDLE current_process;
@@ -46,33 +46,33 @@ alloc_seg(struct rte_memseg *ms, void *requested_addr, int socket_id,
if (ms->len > 0) {
/* If a segment is already allocated as needed, return it. */
if ((ms->addr == requested_addr) &&
- (ms->socket_id == socket_id) &&
+ (ms->socket_id == numa_id) &&
(ms->hugepage_sz == hi->hugepage_sz)) {
return 0;
}
/* Bugcheck, should not happen. */
EAL_LOG(DEBUG, "Attempted to reallocate segment %p "
- "(size %zu) on socket %d", ms->addr,
+ "(size %zu) on NUMA node %d", ms->addr,
ms->len, ms->socket_id);
return -1;
}
current_process = GetCurrentProcess();
- numa_node = eal_socket_numa_node(socket_id);
+ numa_node = eal_socket_numa_node(numa_id);
alloc_sz = hi->hugepage_sz;
if (requested_addr == NULL) {
/* Request a new chunk of memory from OS. */
- addr = eal_mem_alloc_socket(alloc_sz, socket_id);
+ addr = eal_mem_alloc_socket(alloc_sz, numa_id);
if (addr == NULL) {
EAL_LOG(DEBUG, "Cannot allocate %zu bytes "
- "on socket %d", alloc_sz, socket_id);
+ "on NUMA node %d", alloc_sz, numa_id);
return -1;
}
} else {
/* Requested address is already reserved, commit memory. */
- addr = eal_mem_commit(requested_addr, alloc_sz, socket_id);
+ addr = eal_mem_commit(requested_addr, alloc_sz, numa_id);
/* During commitment, memory is temporary freed and might
* be allocated by different non-EAL thread. This is a fatal
@@ -87,8 +87,8 @@ alloc_seg(struct rte_memseg *ms, void *requested_addr, int socket_id,
if (addr == NULL) {
EAL_LOG(DEBUG, "Cannot commit reserved memory %p "
- "(size %zu) on socket %d",
- requested_addr, alloc_sz, socket_id);
+ "(size %zu) on NUMA node %d",
+ requested_addr, alloc_sz, numa_id);
return -1;
}
}
@@ -120,8 +120,8 @@ alloc_seg(struct rte_memseg *ms, void *requested_addr, int socket_id,
}
if (page->Node != numa_node) {
EAL_LOG(DEBUG,
- "NUMA node hint %u (socket %d) not respected, got %u",
- numa_node, socket_id, page->Node);
+ "NUMA node hint %u (numa_id %d) not respected, got %u",
+ numa_node, numa_id, page->Node);
goto error;
}
@@ -131,7 +131,7 @@ alloc_seg(struct rte_memseg *ms, void *requested_addr, int socket_id,
ms->nchannel = rte_memory_get_nchannel();
ms->nrank = rte_memory_get_nrank();
ms->iova = iova;
- ms->socket_id = socket_id;
+ ms->socket_id = numa_id;
return 0;
@@ -171,7 +171,7 @@ struct alloc_walk_param {
size_t page_sz;
unsigned int segs_allocated;
unsigned int n_segs;
- int socket;
+ int numa_id;
bool exact;
};
@@ -187,7 +187,7 @@ alloc_seg_walk(const struct rte_memseg_list *msl, void *arg)
if (msl->page_sz != wa->page_sz)
return 0;
- if (msl->socket_id != wa->socket)
+ if (msl->socket_id != wa->numa_id)
return 0;
page_sz = (size_t)msl->page_sz;
@@ -237,7 +237,7 @@ alloc_seg_walk(const struct rte_memseg_list *msl, void *arg)
cur = rte_fbarray_get(&cur_msl->memseg_arr, cur_idx);
map_addr = RTE_PTR_ADD(cur_msl->base_va, cur_idx * page_sz);
- if (alloc_seg(cur, map_addr, wa->socket, wa->hi)) {
+ if (alloc_seg(cur, map_addr, wa->numa_id, wa->hi)) {
EAL_LOG(DEBUG, "attempted to allocate %i segments, "
"but only %i were allocated", need, i);
@@ -313,7 +313,7 @@ free_seg_walk(const struct rte_memseg_list *msl, void *arg)
int
eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms, int n_segs,
- size_t page_sz, int socket, bool exact)
+ size_t page_sz, int numa_id, bool exact)
{
unsigned int i;
int ret = -1;
@@ -345,7 +345,7 @@ eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms, int n_segs,
wa.ms = ms;
wa.n_segs = n_segs;
wa.page_sz = page_sz;
- wa.socket = socket;
+ wa.numa_id = numa_id;
wa.segs_allocated = 0;
/* memalloc is locked, so it's safe to use thread-unsafe version */
@@ -361,10 +361,10 @@ eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms, int n_segs,
}
struct rte_memseg *
-eal_memalloc_alloc_seg(size_t page_sz, int socket)
+eal_memalloc_alloc_seg(size_t page_sz, int numa_id)
{
struct rte_memseg *ms = NULL;
- eal_memalloc_alloc_seg_bulk(&ms, 1, page_sz, socket, true);
+ eal_memalloc_alloc_seg_bulk(&ms, 1, page_sz, numa_id, true);
return ms;
}
diff --git a/lib/eal/windows/eal_memory.c b/lib/eal/windows/eal_memory.c
index 9f85191016..67aba17d24 100644
--- a/lib/eal/windows/eal_memory.c
+++ b/lib/eal/windows/eal_memory.c
@@ -317,21 +317,21 @@ eal_mem_reserve(void *requested_addr, size_t size, int flags)
}
void *
-eal_mem_alloc_socket(size_t size, int socket_id)
+eal_mem_alloc_socket(size_t size, int numa_id)
{
DWORD flags = MEM_RESERVE | MEM_COMMIT;
void *addr;
flags = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
addr = VirtualAllocExNuma(GetCurrentProcess(), NULL, size, flags,
- PAGE_READWRITE, eal_socket_numa_node(socket_id));
+ PAGE_READWRITE, eal_socket_numa_node(numa_id));
if (addr == NULL)
rte_errno = ENOMEM;
return addr;
}
void *
-eal_mem_commit(void *requested_addr, size_t size, int socket_id)
+eal_mem_commit(void *requested_addr, size_t size, int numa_id)
{
HANDLE process;
MEM_EXTENDED_PARAMETER param;
@@ -374,11 +374,11 @@ eal_mem_commit(void *requested_addr, size_t size, int socket_id)
}
}
- if (socket_id != SOCKET_ID_ANY) {
+ if (numa_id != RTE_NUMA_ID_ANY) {
param_count = 1;
memset(¶m, 0, sizeof(param));
param.Type = MemExtendedParameterNumaNode;
- param.ULong = eal_socket_numa_node(socket_id);
+ param.ULong = eal_socket_numa_node(numa_id);
}
flags = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
diff --git a/lib/eal/windows/eal_windows.h b/lib/eal/windows/eal_windows.h
index 91cf15eaaa..a07fc086c9 100644
--- a/lib/eal/windows/eal_windows.h
+++ b/lib/eal/windows/eal_windows.h
@@ -38,14 +38,14 @@
int eal_create_cpu_map(void);
/**
- * Get system NUMA node number for a socket ID.
+ * Get system NUMA node number for a NUMA node ID.
*
- * @param socket_id
- * Valid EAL socket ID.
+ * @param numa_id
+ * Valid EAL NUMA node ID.
* @return
* NUMA node number to use with Win32 API.
*/
-unsigned int eal_socket_numa_node(unsigned int socket_id);
+unsigned int eal_socket_numa_node(unsigned int numa_id);
/**
* Get pointer to the group affinity for the cpu.
@@ -98,12 +98,12 @@ int eal_mem_win32api_init(void);
*
* @param size
* Number of bytes to allocate. Must be a multiple of huge page size.
- * @param socket_id
+ * @param numa_id
* Socket ID.
* @return
* Address of the memory allocated on success or NULL on failure.
*/
-void *eal_mem_alloc_socket(size_t size, int socket_id);
+void *eal_mem_alloc_socket(size_t size, int numa_id);
/**
* Commit memory previously reserved with eal_mem_reserve()
@@ -113,13 +113,13 @@ void *eal_mem_alloc_socket(size_t size, int socket_id);
* Address within a reserved region. Must not be NULL.
* @param size
* Number of bytes to commit. Must be a multiple of page size.
- * @param socket_id
- * Socket ID to allocate on. Can be SOCKET_ID_ANY.
+ * @param numa_id
+ * Socket ID to allocate on. Can be RTE_NUMA_ID_ANY.
* @return
* On success, address of the committed memory, that is, requested_addr.
* On failure, NULL and rte_errno is set.
*/
-void *eal_mem_commit(void *requested_addr, size_t size, int socket_id);
+void *eal_mem_commit(void *requested_addr, size_t size, int numa_id);
/**
* Put allocated or committed memory back into reserved state.
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 002/227] mempool: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
2026-11-03 14:49 ` [PATCH 001/227] eal: add NUMA-aware APIs Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 003/227] ring: " Chengwen Feng
` (225 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, trace arguments, internal variables,
comments and telemetry keys to the NUMA node terminology, and switch
internal calls to the NUMA-named APIs (rte_zmalloc_numa(),
rte_malloc_heap_numa_is_external(), RTE_NUMA_ID_ANY).
No functional change.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/proc-info/main.c | 2 +-
doc/guides/rel_notes/deprecation.rst | 10 ++++
drivers/compress/nitrox/nitrox_comp_reqmgr.c | 8 +--
drivers/event/cnxk/cnxk_tim_evdev.c | 2 +-
drivers/mempool/bucket/rte_mempool_bucket.c | 10 ++--
.../mempool/octeontx/rte_mempool_octeontx.c | 4 +-
drivers/mempool/ring/rte_mempool_ring.c | 2 +-
drivers/mempool/stack/rte_mempool_stack.c | 2 +-
drivers/net/mlx4/mlx4_mr.c | 2 +-
lib/ethdev/rte_ethdev_telemetry.c | 2 +-
lib/eventdev/rte_eventdev.c | 2 +-
lib/mempool/mempool_trace.h | 4 +-
lib/mempool/rte_mempool.c | 60 +++++++++----------
lib/mempool/rte_mempool.h | 38 +++++++-----
14 files changed, 83 insertions(+), 65 deletions(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 9c22fb8f01..1e5eee6787 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -1121,7 +1121,7 @@ show_port(void)
printf(" mempool %s socket %d",
queue_info.mp->name,
- queue_info.mp->socket_id);
+ queue_info.mp->numa_id);
if (queue_info.conf.offloads != 0)
show_offloads(queue_info.conf.offloads, rte_eth_dev_rx_offload_name);
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 02b495f6a8..a6ff573d18 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -16,6 +16,16 @@ Other API and ABI deprecation notices are to be posted below.
Deprecation Notices
-------------------
+* lib: The public structures use ``socket_id`` to refer to a NUMA node,
+ which conflates CPU sockets with NUMA memory nodes.
+ The field is renamed to ``numa_id``, keeping ``socket_id``
+ as a deprecated union alias.
+ The following structures are affected: ``rte_hash_parameters``,
+ ``rte_fbk_hash_params``, ``rte_member_parameters`` /
+ ``rte_member_setsum`` and ``rte_mempool``
+ (more structures will follow in this release).
+ Applications should switch to ``numa_id``.
+
* kvargs: The function ``rte_kvargs_process`` will get a new parameter
for returning key match count. It will ease handling of no-match case.
diff --git a/drivers/compress/nitrox/nitrox_comp_reqmgr.c b/drivers/compress/nitrox/nitrox_comp_reqmgr.c
index e46faaf7e9..42358cd14f 100644
--- a/drivers/compress/nitrox/nitrox_comp_reqmgr.c
+++ b/drivers/compress/nitrox/nitrox_comp_reqmgr.c
@@ -620,7 +620,7 @@ static int softreq_init(struct nitrox_softreq *sr,
err = create_sglist_from_mbuf(&sr->src, sr->op->m_src,
sr->op->src.offset,
- sr->op->src.length, 0, mp->socket_id);
+ sr->op->src.length, 0, mp->numa_id);
if (unlikely(err))
return err;
@@ -630,7 +630,7 @@ static int softreq_init(struct nitrox_softreq *sr,
sr->op->dst.offset,
rte_pktmbuf_pkt_len(sr->op->m_dst) - sr->op->dst.offset,
need_decomp_threshold ? 1 : 0,
- mp->socket_id);
+ mp->numa_id);
if (unlikely(err))
return err;
@@ -1161,10 +1161,10 @@ static void req_pool_obj_init(struct rte_mempool *mp, void *arg, void *obj,
sr = obj;
sr->src.sgl = rte_zmalloc_socket(NULL,
sizeof(*sr->src.sgl) * NITROX_ZIP_SGL_COUNT,
- 8, mp->socket_id);
+ 8, mp->numa_id);
sr->dst.sgl = rte_zmalloc_socket(NULL,
sizeof(*sr->dst.sgl) * NITROX_ZIP_SGL_COUNT,
- 8, mp->socket_id);
+ 8, mp->numa_id);
if (sr->src.sgl == NULL || sr->dst.sgl == NULL) {
NITROX_LOG_LINE(ERR, "Failed to allocate zip_sgl memory");
*err = -ENOMEM;
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c b/drivers/event/cnxk/cnxk_tim_evdev.c
index 41f1d20cec..11945e0e6e 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -37,7 +37,7 @@ cnxk_tim_chnk_pool_populate_aligned(struct rte_mempool *mp, size_t align)
stride = (size_t)mp->header_size + mp->elt_size + mp->trailer_size;
len = stride * mp->size;
- mem = rte_zmalloc_socket("cnxk_tim_chunks", len, align, mp->socket_id);
+ mem = rte_zmalloc_socket("cnxk_tim_chunks", len, align, mp->numa_id);
if (mem == NULL)
return -ENOMEM;
diff --git a/drivers/mempool/bucket/rte_mempool_bucket.c b/drivers/mempool/bucket/rte_mempool_bucket.c
index 6fee10176b..d3f626e064 100644
--- a/drivers/mempool/bucket/rte_mempool_bucket.c
+++ b/drivers/mempool/bucket/rte_mempool_bucket.c
@@ -67,7 +67,7 @@ bucket_stack_create(const struct rte_mempool *mp, unsigned int n_elts)
sizeof(struct bucket_stack) +
n_elts * sizeof(void *),
RTE_CACHE_LINE_SIZE,
- mp->socket_id);
+ mp->numa_id);
if (stack == NULL)
return NULL;
stack->limit = n_elts;
@@ -429,7 +429,7 @@ bucket_init_per_lcore(unsigned int lcore_id, void *arg)
if (mp->flags & RTE_MEMPOOL_F_SP_PUT)
rg_flags |= RING_F_SP_ENQ;
bd->adoption_buffer_rings[lcore_id] = rte_ring_create(rg_name,
- rte_align32pow2(mp->size + 1), mp->socket_id, rg_flags);
+ rte_align32pow2(mp->size + 1), mp->numa_id, rg_flags);
if (bd->adoption_buffer_rings[lcore_id] == NULL)
goto error;
@@ -466,7 +466,7 @@ bucket_alloc(struct rte_mempool *mp)
return rc;
bd = rte_zmalloc_socket("bucket_pool", sizeof(*bd),
- RTE_CACHE_LINE_SIZE, mp->socket_id);
+ RTE_CACHE_LINE_SIZE, mp->numa_id);
if (bd == NULL) {
rc = -ENOMEM;
goto no_mem_for_data;
@@ -506,7 +506,7 @@ bucket_alloc(struct rte_mempool *mp)
}
bd->shared_orphan_ring =
rte_ring_create(rg_name, rte_align32pow2(mp->size + 1),
- mp->socket_id, rg_flags);
+ mp->numa_id, rg_flags);
if (bd->shared_orphan_ring == NULL) {
rc = -rte_errno;
goto cannot_create_shared_orphan_ring;
@@ -522,7 +522,7 @@ bucket_alloc(struct rte_mempool *mp)
rte_ring_create(rg_name,
rte_align32pow2((mp->size + 1) /
bd->obj_per_bucket),
- mp->socket_id, rg_flags);
+ mp->numa_id, rg_flags);
if (bd->shared_bucket_ring == NULL) {
rc = -rte_errno;
goto cannot_create_shared_bucket_ring;
diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx.c b/drivers/mempool/octeontx/rte_mempool_octeontx.c
index 631e521b58..7658731b04 100644
--- a/drivers/mempool/octeontx/rte_mempool_octeontx.c
+++ b/drivers/mempool/octeontx/rte_mempool_octeontx.c
@@ -21,7 +21,7 @@ octeontx_fpavf_alloc(struct rte_mempool *mp)
pool = octeontx_fpa_bufpool_create(object_size, memseg_count,
OCTEONTX_FPAVF_BUF_OFFSET,
- mp->socket_id);
+ mp->numa_id);
rc = octeontx_fpa_bufpool_block_size(pool);
if (rc < 0)
goto _end;
@@ -48,7 +48,7 @@ octeontx_fpavf_free(struct rte_mempool *mp)
uintptr_t pool;
pool = (uintptr_t)mp->pool_id;
- octeontx_fpa_bufpool_destroy(pool, mp->socket_id);
+ octeontx_fpa_bufpool_destroy(pool, mp->numa_id);
}
static __rte_always_inline void *
diff --git a/drivers/mempool/ring/rte_mempool_ring.c b/drivers/mempool/ring/rte_mempool_ring.c
index c6aa935eea..2c297e4856 100644
--- a/drivers/mempool/ring/rte_mempool_ring.c
+++ b/drivers/mempool/ring/rte_mempool_ring.c
@@ -96,7 +96,7 @@ ring_alloc(struct rte_mempool *mp, uint32_t rg_flags)
* in this function for that condition.
*/
r = rte_ring_create(rg_name, rte_align32pow2(mp->size + 1),
- mp->socket_id, rg_flags);
+ mp->numa_id, rg_flags);
if (r == NULL)
return -rte_errno;
diff --git a/drivers/mempool/stack/rte_mempool_stack.c b/drivers/mempool/stack/rte_mempool_stack.c
index 11c1243bec..eae85ef1fc 100644
--- a/drivers/mempool/stack/rte_mempool_stack.c
+++ b/drivers/mempool/stack/rte_mempool_stack.c
@@ -20,7 +20,7 @@ __stack_alloc(struct rte_mempool *mp, uint32_t flags)
return -rte_errno;
}
- s = rte_stack_create(name, mp->size, mp->socket_id, flags);
+ s = rte_stack_create(name, mp->size, mp->numa_id, flags);
if (s == NULL)
return -rte_errno;
diff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c
index e307029b15..5e2c2dbf85 100644
--- a/drivers/net/mlx4/mlx4_mr.c
+++ b/drivers/net/mlx4/mlx4_mr.c
@@ -1226,7 +1226,7 @@ mlx4_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,
mr = rte_zmalloc_socket(NULL,
RTE_ALIGN_CEIL(sizeof(*mr),
RTE_CACHE_LINE_SIZE),
- RTE_CACHE_LINE_SIZE, mp->socket_id);
+ RTE_CACHE_LINE_SIZE, mp->numa_id);
if (mr == NULL) {
WARN("port %u unable to allocate memory for a new MR of"
" mempool (%s).",
diff --git a/lib/ethdev/rte_ethdev_telemetry.c b/lib/ethdev/rte_ethdev_telemetry.c
index ca7f4681c9..146acec174 100644
--- a/lib/ethdev/rte_ethdev_telemetry.c
+++ b/lib/ethdev/rte_ethdev_telemetry.c
@@ -537,7 +537,7 @@ eth_dev_handle_port_rxq(const char *cmd __rte_unused,
rte_tel_data_start_dict(d);
rte_tel_data_add_dict_string(d, "mempool_name", qinfo.mp->name);
- rte_tel_data_add_dict_uint(d, "socket_id", qinfo.mp->socket_id);
+ rte_tel_data_add_dict_uint(d, "socket_id", qinfo.mp->numa_id);
rx_thresh = &qinfo.conf.rx_thresh;
rte_tel_data_add_dict_uint(d, "host_threshold", rx_thresh->hthresh);
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index 53d17d7a00..71de25a3ab 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -1513,7 +1513,7 @@ rte_event_vector_pool_create(const char *name, unsigned int n,
if (ret < 0)
goto err;
- rte_eventdev_trace_vector_pool_create(mp, mp->name, mp->socket_id,
+ rte_eventdev_trace_vector_pool_create(mp, mp->name, mp->numa_id,
mp->size, mp->cache_size, mp->elt_size);
return mp;
diff --git a/lib/mempool/mempool_trace.h b/lib/mempool/mempool_trace.h
index 60e47cf67b..4baec51427 100644
--- a/lib/mempool/mempool_trace.h
+++ b/lib/mempool/mempool_trace.h
@@ -113,10 +113,10 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT(
rte_mempool_trace_cache_create,
- RTE_TRACE_POINT_ARGS(uint32_t size, int socket_id,
+ RTE_TRACE_POINT_ARGS(uint32_t size, int numa_id,
struct rte_mempool_cache *cache),
rte_trace_point_emit_u32(size);
- rte_trace_point_emit_i32(socket_id);
+ rte_trace_point_emit_i32(numa_id);
rte_trace_point_emit_ptr(cache);
rte_trace_point_emit_u32(cache->len);
)
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index 069aabaa70..0e49cdfd1e 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -116,7 +116,7 @@ arch_mem_object_align(unsigned int obj_size)
#endif
struct pagesz_walk_arg {
- int socket_id;
+ int numa_id;
size_t min;
};
@@ -127,14 +127,14 @@ find_min_pagesz(const struct rte_memseg_list *msl, void *arg)
bool valid;
/*
- * we need to only look at page sizes available for a particular socket
- * ID. so, we either need an exact match on socket ID (can match both
- * native and external memory), or, if SOCKET_ID_ANY was specified as a
- * socket ID argument, we must only look at native memory and ignore any
- * page sizes associated with external memory.
+ * we need to only look at page sizes available for a particular NUMA
+ * node ID. So, we either need an exact match on NUMA node ID (can match
+ * both native and external memory), or, if RTE_NUMA_ID_ANY was specified
+ * as a NUMA node ID argument, we must only look at native memory and
+ * ignore any page sizes associated with external memory.
*/
- valid = msl->socket_id == wa->socket_id;
- valid |= wa->socket_id == SOCKET_ID_ANY && msl->external == 0;
+ valid = msl->socket_id == wa->numa_id;
+ valid |= wa->numa_id == RTE_NUMA_ID_ANY && msl->external == 0;
if (valid && msl->page_sz < wa->min)
wa->min = msl->page_sz;
@@ -143,12 +143,12 @@ find_min_pagesz(const struct rte_memseg_list *msl, void *arg)
}
static size_t
-get_min_page_size(int socket_id)
+get_min_page_size(int numa_id)
{
struct pagesz_walk_arg wa;
wa.min = SIZE_MAX;
- wa.socket_id = socket_id;
+ wa.numa_id = numa_id;
rte_memseg_list_walk(find_min_pagesz, &wa);
@@ -462,8 +462,8 @@ rte_mempool_get_page_size(struct rte_mempool *mp, size_t *pg_sz)
bool alloc_in_ext_mem;
int ret;
- /* check if we can retrieve a valid socket ID */
- ret = rte_malloc_heap_socket_is_external(mp->socket_id);
+ /* check if we can retrieve a valid NUMA node ID */
+ ret = rte_malloc_heap_numa_is_external(mp->numa_id);
if (ret < 0)
return -EINVAL;
alloc_in_ext_mem = (ret == 1);
@@ -472,7 +472,7 @@ rte_mempool_get_page_size(struct rte_mempool *mp, size_t *pg_sz)
if (!need_iova_contig_obj)
*pg_sz = 0;
else if (rte_eal_has_hugepages() || alloc_in_ext_mem)
- *pg_sz = get_min_page_size(mp->socket_id);
+ *pg_sz = get_min_page_size(mp->numa_id);
else
*pg_sz = rte_mem_page_size();
@@ -581,7 +581,7 @@ rte_mempool_populate_default(struct rte_mempool *mp)
do {
mz = rte_memzone_reserve_aligned(mz_name,
RTE_MIN((size_t)mem_size, max_alloc_size),
- mp->socket_id, mz_flags, align);
+ mp->numa_id, mz_flags, align);
if (mz != NULL || rte_errno != ENOMEM)
break;
@@ -763,7 +763,7 @@ mempool_cache_init(struct rte_mempool_cache *cache, uint32_t size)
*/
RTE_EXPORT_SYMBOL(rte_mempool_cache_create)
struct rte_mempool_cache *
-rte_mempool_cache_create(uint32_t size, int socket_id)
+rte_mempool_cache_create(uint32_t size, int numa_id)
{
struct rte_mempool_cache *cache;
size_t sizeof_cache = sizeof(struct rte_mempool_cache) + size * sizeof(void *);
@@ -773,8 +773,8 @@ rte_mempool_cache_create(uint32_t size, int socket_id)
return NULL;
}
- cache = rte_zmalloc_socket("MEMPOOL_CACHE", sizeof_cache,
- RTE_CACHE_LINE_SIZE, socket_id);
+ cache = rte_zmalloc_numa("MEMPOOL_CACHE", sizeof_cache,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (cache == NULL) {
RTE_MEMPOOL_LOG(ERR, "Cannot allocate mempool cache.");
rte_errno = ENOMEM;
@@ -783,7 +783,7 @@ rte_mempool_cache_create(uint32_t size, int socket_id)
mempool_cache_init(cache, size);
- rte_mempool_trace_cache_create(size, socket_id, cache);
+ rte_mempool_trace_cache_create(size, numa_id, cache);
return cache;
}
@@ -803,9 +803,9 @@ rte_mempool_cache_free(struct rte_mempool_cache *cache)
/* create an empty mempool */
RTE_EXPORT_SYMBOL(rte_mempool_create_empty)
struct rte_mempool *
-rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
- unsigned cache_size, unsigned private_data_size,
- int socket_id, unsigned flags)
+rte_mempool_create_empty(const char *name, unsigned int n, unsigned int elt_size,
+ unsigned int cache_size, unsigned int private_data_size,
+ int numa_id, unsigned int flags)
{
char mz_name[RTE_MEMZONE_NAMESIZE];
struct rte_mempool_list *mempool_list;
@@ -911,7 +911,7 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
goto exit_unlock;
}
- mz = rte_memzone_reserve(mz_name, mempool_size, socket_id, mz_flags);
+ mz = rte_memzone_reserve(mz_name, mempool_size, numa_id, mz_flags);
if (mz == NULL)
goto exit_unlock;
@@ -926,7 +926,7 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
mp->mz = mz;
mp->size = n;
mp->flags = flags;
- mp->socket_id = socket_id;
+ mp->numa_id = numa_id;
mp->elt_size = objsz.elt_size;
mp->header_size = objsz.header_size;
mp->trailer_size = objsz.trailer_size;
@@ -987,16 +987,16 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
/* create the mempool */
RTE_EXPORT_SYMBOL(rte_mempool_create)
struct rte_mempool *
-rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
- unsigned cache_size, unsigned private_data_size,
+rte_mempool_create(const char *name, unsigned int n, unsigned int elt_size,
+ unsigned int cache_size, unsigned int private_data_size,
rte_mempool_ctor_t *mp_init, void *mp_init_arg,
rte_mempool_obj_cb_t *obj_init, void *obj_init_arg,
- int socket_id, unsigned flags)
+ int numa_id, unsigned int flags)
{
struct rte_mempool *mp;
mp = rte_mempool_create_empty(name, n, elt_size, cache_size,
- private_data_size, socket_id, flags);
+ private_data_size, numa_id, flags);
if (mp == NULL)
return NULL;
@@ -1281,7 +1281,7 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
fprintf(f, "mempool <%s>@%p\n", mp->name, mp);
fprintf(f, " flags=%x\n", mp->flags);
- fprintf(f, " socket_id=%d\n", mp->socket_id);
+ fprintf(f, " numa_id=%d\n", mp->numa_id);
fprintf(f, " pool=%p\n", mp->pool_data);
fprintf(f, " iova=0x%" PRIx64 "\n", mp->mz->iova);
fprintf(f, " nb_mem_chunks=%u\n", mp->nb_mem_chunks);
@@ -1625,7 +1625,7 @@ mempool_info_cb(struct rte_mempool *mp, void *arg)
rte_tel_data_add_dict_string(info->d, "name", mp->name);
rte_tel_data_add_dict_uint(info->d, "pool_id", mp->pool_id);
rte_tel_data_add_dict_uint(info->d, "flags", mp->flags);
- rte_tel_data_add_dict_int(info->d, "socket_id", mp->socket_id);
+ rte_tel_data_add_dict_int(info->d, "numa_id", mp->numa_id);
rte_tel_data_add_dict_uint(info->d, "size", mp->size);
rte_tel_data_add_dict_uint(info->d, "cache_size", mp->cache_size);
rte_tel_data_add_dict_uint(info->d, "elt_size", mp->elt_size);
@@ -1655,7 +1655,7 @@ mempool_info_cb(struct rte_mempool *mp, void *arg)
rte_tel_data_add_dict_uint(info->d, "mz_len", mz->len);
rte_tel_data_add_dict_uint(info->d, "mz_hugepage_sz",
mz->hugepage_sz);
- rte_tel_data_add_dict_int(info->d, "mz_socket_id", mz->socket_id);
+ rte_tel_data_add_dict_int(info->d, "mz_numa_id", mz->socket_id);
rte_tel_data_add_dict_uint(info->d, "mz_flags", mz->flags);
}
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index b34cd893b1..9ede776a67 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -245,7 +245,15 @@ struct __rte_cache_aligned rte_mempool {
void *pool_config; /**< optional args for ops alloc. */
const struct rte_memzone *mz; /**< Memzone where pool is alloc'd. */
unsigned int flags; /**< Flags of the mempool. */
- int socket_id; /**< Socket id passed at create. */
+ union {
+ /** NUMA node ID passed at create. */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
uint32_t size; /**< Max size of the mempool. */
uint32_t cache_size; /**< Size of per-lcore default local cache. */
@@ -1084,9 +1092,9 @@ rte_mempool_free(struct rte_mempool *mp);
* @param obj_init_arg
* An opaque pointer to data that can be used as an argument for
* each call to the object constructor function.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in the case of
- * NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in the case of
+ * NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
* constraint for the reserved zone.
* @param flags
* The *flags* arguments is an OR of following flags:
@@ -1117,11 +1125,11 @@ rte_mempool_free(struct rte_mempool *mp);
* - ENOMEM - no appropriate memory area found in which to create memzone
*/
struct rte_mempool *
-rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
- unsigned cache_size, unsigned private_data_size,
+rte_mempool_create(const char *name, unsigned int n, unsigned int elt_size,
+ unsigned int cache_size, unsigned int private_data_size,
rte_mempool_ctor_t *mp_init, void *mp_init_arg,
rte_mempool_obj_cb_t *obj_init, void *obj_init_arg,
- int socket_id, unsigned int flags)
+ int numa_id, unsigned int flags)
__rte_malloc __rte_dealloc(rte_mempool_free, 1);
/**
@@ -1145,9 +1153,9 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
* The size of the private data appended after the mempool
* structure. This is useful for storing some private data after the
* mempool structure, as is done for rte_mbuf_pool for example.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in the case of
- * NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ * The *numa_id* argument is the socket identifier in the case of
+ * NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
* constraint for the reserved zone.
* @param flags
* Flags controlling the behavior of the mempool. See
@@ -1159,7 +1167,7 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
struct rte_mempool *
rte_mempool_create_empty(const char *name, unsigned int n, unsigned int elt_size,
unsigned int cache_size, unsigned int private_data_size,
- int socket_id, unsigned int flags)
+ int numa_id, unsigned int flags)
__rte_malloc __rte_dealloc(rte_mempool_free, 1);
/**
@@ -1351,12 +1359,12 @@ rte_mempool_cache_free(struct rte_mempool_cache *cache);
* The size of the mempool cache. See rte_mempool_create()'s cache_size
* parameter description for more information. The same limits and
* considerations apply here too.
- * @param socket_id
- * The socket identifier in the case of NUMA. The value can be
- * SOCKET_ID_ANY if there is no NUMA constraint for the reserved zone.
+ * @param numa_id
+ * The NUMA node ID in the case of NUMA. The value can be
+ * RTE_NUMA_ID_ANY if there is no NUMA constraint for the reserved zone.
*/
struct rte_mempool_cache *
-rte_mempool_cache_create(uint32_t size, int socket_id)
+rte_mempool_cache_create(uint32_t size, int numa_id)
__rte_malloc __rte_dealloc(rte_mempool_cache_free, 1);
/**
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 003/227] ring: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
2026-11-03 14:49 ` [PATCH 001/227] eal: add NUMA-aware APIs Chengwen Feng
2026-11-03 14:49 ` [PATCH 002/227] mempool: use NUMA node terminology Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 004/227] hash: " Chengwen Feng
` (224 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters and comments to numa_id, and update
telemetry keys to the NUMA node terminology.
No functional change.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/ring/rte_ring.c | 12 ++++++------
lib/ring/rte_ring.h | 8 ++++----
lib/ring/rte_ring_elem.h | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c
index 10b52dc679..c566592027 100644
--- a/lib/ring/rte_ring.c
+++ b/lib/ring/rte_ring.c
@@ -256,7 +256,7 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned int count,
RTE_EXPORT_SYMBOL(rte_ring_create_elem)
struct rte_ring *
rte_ring_create_elem(const char *name, unsigned int esize, unsigned int count,
- int socket_id, unsigned int flags)
+ int numa_id, unsigned int flags)
{
char mz_name[RTE_MEMZONE_NAMESIZE];
struct rte_ring *r;
@@ -300,7 +300,7 @@ rte_ring_create_elem(const char *name, unsigned int esize, unsigned int count,
* we are secondary process, the memzone_reserve function will set
* rte_errno for us appropriately - hence no check in this function
*/
- mz = rte_memzone_reserve_aligned(mz_name, ring_size, socket_id,
+ mz = rte_memzone_reserve_aligned(mz_name, ring_size, numa_id,
mz_flags, alignof(typeof(*r)));
if (mz != NULL) {
r = mz->addr;
@@ -325,10 +325,10 @@ rte_ring_create_elem(const char *name, unsigned int esize, unsigned int count,
/* create the ring */
RTE_EXPORT_SYMBOL(rte_ring_create)
struct rte_ring *
-rte_ring_create(const char *name, unsigned int count, int socket_id,
+rte_ring_create(const char *name, unsigned int count, int numa_id,
unsigned int flags)
{
- return rte_ring_create_elem(name, sizeof(void *), count, socket_id,
+ return rte_ring_create_elem(name, sizeof(void *), count, numa_id,
flags);
}
@@ -605,7 +605,7 @@ ring_info_cb(struct rte_ring *r, void *arg)
return;
rte_tel_data_add_dict_string(d, "name", r->name);
- rte_tel_data_add_dict_int(d, "socket", r->memzone->socket_id);
+ rte_tel_data_add_dict_int(d, "numa_id", r->memzone->socket_id);
rte_tel_data_add_dict_int(d, "flags", r->flags);
rte_tel_data_add_dict_string(d, "producer_type",
ring_prod_sync_type_to_name(r));
@@ -622,7 +622,7 @@ ring_info_cb(struct rte_ring *r, void *arg)
rte_tel_data_add_dict_string(d, "mz_name", mz->name);
rte_tel_data_add_dict_uint(d, "mz_len", mz->len);
rte_tel_data_add_dict_uint(d, "mz_hugepage_sz", mz->hugepage_sz);
- rte_tel_data_add_dict_int(d, "mz_socket_id", mz->socket_id);
+ rte_tel_data_add_dict_int(d, "mz_numa_id", mz->socket_id);
rte_tel_data_add_dict_uint_hex(d, "mz_flags", mz->flags, 0);
}
diff --git a/lib/ring/rte_ring.h b/lib/ring/rte_ring.h
index 3382a8e2f2..ff1f4ae90a 100644
--- a/lib/ring/rte_ring.h
+++ b/lib/ring/rte_ring.h
@@ -146,9 +146,9 @@ void rte_ring_free(struct rte_ring *r);
* @param count
* The size of the ring (must be a power of 2,
* unless RING_F_EXACT_SZ is set in flags).
- * @param socket_id
- * The *socket_id* argument is the socket identifier in case of
- * NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in case of
+ * NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
* constraint for the reserved zone.
* @param flags
* An OR of the following:
@@ -193,7 +193,7 @@ void rte_ring_free(struct rte_ring *r);
* - ENOMEM - no appropriate memory area found in which to create memzone
*/
struct rte_ring *rte_ring_create(const char *name, unsigned int count,
- int socket_id, unsigned int flags)
+ int numa_id, unsigned int flags)
__rte_malloc __rte_dealloc(rte_ring_free, 1);
/**
diff --git a/lib/ring/rte_ring_elem.h b/lib/ring/rte_ring_elem.h
index b96bfc003f..9397183538 100644
--- a/lib/ring/rte_ring_elem.h
+++ b/lib/ring/rte_ring_elem.h
@@ -58,9 +58,9 @@ ssize_t rte_ring_get_memsize_elem(unsigned int esize, unsigned int count);
* The size of ring element, in bytes. It must be a multiple of 4.
* @param count
* The number of elements in the ring (must be a power of 2).
- * @param socket_id
- * The *socket_id* argument is the socket identifier in case of
- * NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in case of
+ * NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
* constraint for the reserved zone.
* @param flags
* An OR of the following:
@@ -99,7 +99,7 @@ ssize_t rte_ring_get_memsize_elem(unsigned int esize, unsigned int count);
* - ENOMEM - no appropriate memory area found in which to create memzone
*/
struct rte_ring *rte_ring_create_elem(const char *name, unsigned int esize,
- unsigned int count, int socket_id, unsigned int flags);
+ unsigned int count, int numa_id, unsigned int flags);
/**
* Enqueue several objects on the ring (multi-producers safe).
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 004/227] hash: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (2 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 003/227] ring: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 005/227] member: " Chengwen Feng
` (223 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the numa_id field of rte_hash_parameters and
rte_fbk_hash_params (was socket_id), and update in-tree users
accordingly.
Also rename socket_id parameters, internal variables and comments
to the NUMA node terminology, and switch internal calls to the
NUMA-named APIs (rte_zmalloc_numa(), RTE_NUMA_ID_ANY).
No functional change.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test/test_func_reentrancy.c | 4 +-
app/test/test_hash.c | 52 ++++++++++----------
app/test/test_hash_multiwriter.c | 2 +-
app/test/test_hash_perf.c | 4 +-
app/test/test_hash_readwrite.c | 2 +-
app/test/test_hash_readwrite_lf_perf.c | 2 +-
app/test/test_rcu_qsbr.c | 2 +-
app/test/test_rcu_qsbr_perf.c | 2 +-
drivers/net/bnxt/bnxt_vnic.c | 2 +-
drivers/net/bnxt/tf_ulp/ulp_matcher.c | 4 +-
drivers/net/enic/enic_fm_flow.c | 2 +-
drivers/net/hinic/base/hinic_pmd_hwdev.c | 2 +-
drivers/net/hns3/hns3_fdir.c | 2 +-
drivers/net/intel/cpfl/cpfl_ethdev.c | 4 +-
drivers/net/intel/i40e/i40e_ethdev.c | 2 +-
drivers/net/intel/i40e/i40e_fdir.c | 2 +-
drivers/net/intel/i40e/i40e_flow_ethertype.c | 2 +-
drivers/net/intel/ice/ice_fdir_filter.c | 2 +-
drivers/net/intel/ixgbe/ixgbe_ethdev.c | 2 +-
drivers/net/memif/memif_socket.c | 2 +-
drivers/net/nfp/flower/nfp_conntrack.c | 2 +-
drivers/net/nfp/flower/nfp_flower_flow.c | 10 ++--
drivers/net/nfp/nfp_net_flow.c | 2 +-
drivers/net/sfc/sfc_tbl_meta_cache.c | 2 +-
drivers/net/txgbe/txgbe_ethdev.c | 4 +-
lib/hash/rte_cuckoo_hash.c | 28 +++++------
lib/hash/rte_fbk_hash.c | 2 +-
lib/hash/rte_fbk_hash.h | 10 +++-
lib/hash/rte_hash.h | 10 +++-
lib/ipsec/ipsec_sad.c | 2 +-
lib/lpm/rte_lpm6.c | 2 +-
lib/node/udp4_input.c | 4 +-
lib/vhost/vhost_crypto.c | 2 +-
33 files changed, 97 insertions(+), 81 deletions(-)
diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c
index ce55ab991e..ee65422054 100644
--- a/app/test/test_func_reentrancy.c
+++ b/app/test/test_func_reentrancy.c
@@ -238,7 +238,7 @@ hash_create_free(__rte_unused void *arg)
.key_len = 4,
.hash_func = (rte_hash_function)rte_jhash_32b,
.hash_func_init_val = 0,
- .socket_id = 0,
+ .numa_id = 0,
};
WAIT_SYNCHRO_FOR_WORKERS();
@@ -303,7 +303,7 @@ fbk_create_free(__rte_unused void *arg)
.name = NULL,
.entries = 4,
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
.hash_func = rte_jhash_1word,
.init_val = RTE_FBK_HASH_INIT_VAL_DEFAULT,
};
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 640a33e16c..de7fc414e3 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -188,7 +188,7 @@ static struct rte_hash_parameters ut_params = {
.key_len = sizeof(struct flow_key),
.hash_func = rte_jhash,
.hash_func_init_val = 0,
- .socket_id = 0,
+ .numa_id = 0,
};
#define CRC32_ITERATIONS (1U << 10)
@@ -835,7 +835,7 @@ static int test_full_bucket(void)
.key_len = sizeof(struct flow_key),
.hash_func = pseudo_hash,
.hash_func_init_val = 0,
- .socket_id = 0,
+ .numa_id = 0,
};
const void *key_array[KEY_PER_BUCKET+1] = {0};
struct rte_hash *handle;
@@ -962,7 +962,7 @@ static int test_extendable_bucket(void)
.key_len = sizeof(struct flow_key),
.hash_func = pseudo_hash,
.hash_func_init_val = 0,
- .socket_id = 0,
+ .numa_id = 0,
.extra_flag = RTE_HASH_EXTRA_FLAGS_EXT_TABLE
};
struct rte_hash *handle;
@@ -1069,63 +1069,63 @@ fbk_hash_unit_test(void)
.name = "fbk_hash_test",
.entries = LOCAL_FBK_HASH_ENTRIES_MAX,
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
};
struct rte_fbk_hash_params invalid_params_1 = {
.name = "invalid_1",
.entries = LOCAL_FBK_HASH_ENTRIES_MAX + 1, /* Not power of 2 */
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
};
struct rte_fbk_hash_params invalid_params_2 = {
.name = "invalid_2",
.entries = 4,
.entries_per_bucket = 3, /* Not power of 2 */
- .socket_id = 0,
+ .numa_id = 0,
};
struct rte_fbk_hash_params invalid_params_3 = {
.name = "invalid_3",
.entries = 0, /* Entries is 0 */
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
};
struct rte_fbk_hash_params invalid_params_4 = {
.name = "invalid_4",
.entries = LOCAL_FBK_HASH_ENTRIES_MAX,
.entries_per_bucket = 0, /* Entries per bucket is 0 */
- .socket_id = 0,
+ .numa_id = 0,
};
struct rte_fbk_hash_params invalid_params_5 = {
.name = "invalid_5",
.entries = 4,
.entries_per_bucket = 8, /* Entries per bucket > entries */
- .socket_id = 0,
+ .numa_id = 0,
};
struct rte_fbk_hash_params invalid_params_6 = {
.name = "invalid_6",
.entries = RTE_FBK_HASH_ENTRIES_MAX * 2, /* Entries > max allowed */
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
};
struct rte_fbk_hash_params invalid_params_7 = {
.name = "invalid_7",
.entries = RTE_FBK_HASH_ENTRIES_MAX,
.entries_per_bucket = RTE_FBK_HASH_ENTRIES_PER_BUCKET_MAX * 2, /* Entries > max allowed */
- .socket_id = 0,
+ .numa_id = 0,
};
struct rte_fbk_hash_params invalid_params_8 = {
.name = "invalid_7",
.entries = RTE_FBK_HASH_ENTRIES_MAX,
.entries_per_bucket = 4,
- .socket_id = RTE_MAX_NUMA_NODES + 1, /* invalid socket */
+ .numa_id = RTE_MAX_NUMA_NODES + 1, /* invalid NUMA node */
};
/* try and create hash with an excessively long name */
@@ -1133,7 +1133,7 @@ fbk_hash_unit_test(void)
.name = "four_byte_key_hash_name_length_32",
.entries = 4,
.entries_per_bucket = 2,
- .socket_id = 0,
+ .numa_id = 0,
};
/* try to create two hashes with identical names
@@ -1145,7 +1145,7 @@ fbk_hash_unit_test(void)
.name = "same_name", /* hash with identical name */
.entries = 4,
.entries_per_bucket = 2,
- .socket_id = 0,
+ .numa_id = 0,
};
/* trying to create this hash should return a pointer to an existing hash */
@@ -1153,7 +1153,7 @@ fbk_hash_unit_test(void)
.name = "same_name", /* hash with identical name */
.entries = RTE_FBK_HASH_ENTRIES_MAX,
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
};
/* this is a sanity check for "same name" test
@@ -1164,14 +1164,14 @@ fbk_hash_unit_test(void)
.name = "different_name", /* different name */
.entries = LOCAL_FBK_HASH_ENTRIES_MAX,
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
};
struct rte_fbk_hash_params params_jhash = {
.name = "valid",
.entries = LOCAL_FBK_HASH_ENTRIES_MAX,
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
.hash_func = rte_jhash_1word, /* Tests for different hash_func */
.init_val = RTE_FBK_HASH_INIT_VAL_DEFAULT,
};
@@ -1180,7 +1180,7 @@ fbk_hash_unit_test(void)
.name = "valid nohash",
.entries = LOCAL_FBK_HASH_ENTRIES_MAX,
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
.hash_func = NULL, /* Tests for null hash_func */
.init_val = RTE_FBK_HASH_INIT_VAL_DEFAULT,
};
@@ -1380,7 +1380,7 @@ static int test_fbk_hash_find_existing(void)
.name = "fbk_hash_find_existing",
.entries = LOCAL_FBK_HASH_ENTRIES_MAX,
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
};
struct rte_fbk_hash_table *handle = NULL, *result = NULL;
@@ -1450,7 +1450,7 @@ static int test_hash_creation_with_bad_parameters(void)
memcpy(¶ms, &ut_params, sizeof(params));
params.name = "creation_with_bad_parameters_4";
- params.socket_id = RTE_MAX_NUMA_NODES + 1;
+ params.numa_id = RTE_MAX_NUMA_NODES + 1;
handle = rte_hash_create(¶ms);
if (handle != NULL) {
rte_hash_free(handle);
@@ -1460,7 +1460,7 @@ static int test_hash_creation_with_bad_parameters(void)
memcpy(¶ms, &ut_params, sizeof(params));
params.name = "hash_creation_with_too_long_name";
- params.socket_id = SOCKET_ID_ANY;
+ params.numa_id = RTE_NUMA_ID_ANY;
handle = rte_hash_create(¶ms);
if (handle != NULL) {
rte_hash_free(handle);
@@ -1764,7 +1764,7 @@ static struct rte_hash_parameters hash_params_ex = {
.key_len = 0,
.hash_func = NULL,
.hash_func_init_val = 0,
- .socket_id = 0,
+ .numa_id = 0,
};
/*
@@ -2087,7 +2087,7 @@ test_hash_rcu_qsbr_dq_mode(uint8_t ext_bkt)
.key_len = sizeof(struct flow_key),
.hash_func = pseudo_hash,
.hash_func_init_val = 0,
- .socket_id = 0,
+ .numa_id = 0,
.extra_flag = hash_extra_flag,
};
int pos[HASH_RCU_QSBR_MAX_TOTAL_ENTRIES];
@@ -2257,7 +2257,7 @@ test_hash_rcu_qsbr_sync_mode(uint8_t ext_bkt)
.key_len = sizeof(struct flow_key),
.hash_func = pseudo_hash,
.hash_func_init_val = 0,
- .socket_id = 0,
+ .numa_id = 0,
.extra_flag = hash_extra_flag,
};
int pos[HASH_RCU_QSBR_MAX_TOTAL_ENTRIES];
@@ -2361,7 +2361,7 @@ test_hash_rcu_qsbr_dq_reclaim(void)
.key_len = sizeof(uint32_t),
.hash_func = NULL,
.hash_func_init_val = 0,
- .socket_id = 0,
+ .numa_id = 0,
};
hash_params.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF;
@@ -2462,7 +2462,7 @@ test_hash_rcu_qsbr_replace_auto_free(void)
.key_len = sizeof(uint32_t),
.hash_func = NULL,
.hash_func_init_val = 0,
- .socket_id = SOCKET_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF,
};
struct rte_hash *hash = NULL;
diff --git a/app/test/test_hash_multiwriter.c b/app/test/test_hash_multiwriter.c
index 0af3eb2c33..7c0b4434e6 100644
--- a/app/test/test_hash_multiwriter.c
+++ b/app/test/test_hash_multiwriter.c
@@ -119,7 +119,7 @@ test_hash_multiwriter(void)
.key_len = sizeof(uint32_t),
.hash_func = rte_jhash,
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
if (use_htm)
hash_params.extra_flag =
diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c
index d66b96e5ce..b3d78f4c6d 100644
--- a/app/test/test_hash_perf.c
+++ b/app/test/test_hash_perf.c
@@ -104,7 +104,7 @@ create_table(unsigned int with_data, unsigned int table_index,
ut_params.name = name;
ut_params.key_len = hashtest_key_lens[table_index];
- ut_params.socket_id = rte_socket_id();
+ ut_params.numa_id = rte_numa_id();
h[table_index] = rte_hash_find_existing(name);
rte_hash_free(h[table_index]);
h[table_index] = rte_hash_create(&ut_params);
@@ -653,7 +653,7 @@ fbk_hash_perf_test(void)
.name = "fbk_hash_test",
.entries = ENTRIES,
.entries_per_bucket = 4,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
struct rte_fbk_hash_table *handle = NULL;
uint32_t *keys = NULL;
diff --git a/app/test/test_hash_readwrite.c b/app/test/test_hash_readwrite.c
index 25fe072fc9..156edd84e2 100644
--- a/app/test/test_hash_readwrite.c
+++ b/app/test/test_hash_readwrite.c
@@ -149,7 +149,7 @@ init_params(int use_ext, int use_htm, int rw_lf, int use_jhash, bool perf)
.entries = TOTAL_ENTRY * (perf ? PERF_MULTIPLIER : 1),
.key_len = sizeof(uint32_t),
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
if (use_jhash)
hash_params.hash_func = rte_jhash;
diff --git a/app/test/test_hash_readwrite_lf_perf.c b/app/test/test_hash_readwrite_lf_perf.c
index bef987d29d..bcad2fc813 100644
--- a/app/test/test_hash_readwrite_lf_perf.c
+++ b/app/test/test_hash_readwrite_lf_perf.c
@@ -154,7 +154,7 @@ init_params(int rwc_lf, int use_jhash, int htm, int ext_bkt)
.entries = TOTAL_ENTRY,
.key_len = sizeof(uint32_t),
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
if (use_jhash)
diff --git a/app/test/test_rcu_qsbr.c b/app/test/test_rcu_qsbr.c
index 05ad1ab5dd..7f749d6d7f 100644
--- a/app/test/test_rcu_qsbr.c
+++ b/app/test/test_rcu_qsbr.c
@@ -1050,7 +1050,7 @@ init_hash(int hash_id)
.entries = TOTAL_ENTRY,
.key_len = sizeof(uint32_t),
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.hash_func = rte_hash_crc,
.extra_flag =
RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF,
diff --git a/app/test/test_rcu_qsbr_perf.c b/app/test/test_rcu_qsbr_perf.c
index bdffd64e60..d5cb3d90bb 100644
--- a/app/test/test_rcu_qsbr_perf.c
+++ b/app/test/test_rcu_qsbr_perf.c
@@ -339,7 +339,7 @@ static struct rte_hash *init_hash(void)
.entries = TOTAL_ENTRY,
.key_len = sizeof(uint32_t),
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.hash_func = rte_hash_crc,
.extra_flag =
RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF,
diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c
index f0ec87198f..31c6facef6 100644
--- a/drivers/net/bnxt/bnxt_vnic.c
+++ b/drivers/net/bnxt/bnxt_vnic.c
@@ -998,7 +998,7 @@ int32_t bnxt_vnic_queue_db_init(struct bnxt *bp)
hash_tbl_params.entries = RTE_HASH_BUCKET_ENTRIES;
hash_tbl_params.key_len = BNXT_VNIC_MAX_QUEUE_SZ_IN_8BITS;
- hash_tbl_params.socket_id = rte_socket_id();
+ hash_tbl_params.numa_id = rte_numa_id();
bp->vnic_queue_db.rss_q_db = rte_hash_create(&hash_tbl_params);
if (bp->vnic_queue_db.rss_q_db == NULL) {
PMD_DRV_LOG_LINE(ERR, "Failed to create rss hash tbl");
diff --git a/drivers/net/bnxt/tf_ulp/ulp_matcher.c b/drivers/net/bnxt/tf_ulp/ulp_matcher.c
index f739cdf2a3..5d799dd3da 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_matcher.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_matcher.c
@@ -358,7 +358,7 @@ int32_t ulp_matcher_init(struct bnxt_ulp_context *ulp_ctx)
RTE_HASH_BUCKET_ENTRIES;
hash_tbl_params.key_len = sizeof(struct ulp_matcher_hash_db_key);
- hash_tbl_params.socket_id = rte_socket_id();
+ hash_tbl_params.numa_id = rte_numa_id();
data->class_matcher_db = rte_hash_create(&hash_tbl_params);
if (data->class_matcher_db == NULL) {
BNXT_DRV_DBG(ERR, "Failed to create class matcher hash tbl\n");
@@ -380,7 +380,7 @@ int32_t ulp_matcher_init(struct bnxt_ulp_context *ulp_ctx)
/* The hash list size set to max support and not dependent on template*/
hash_tbl_params.entries = BNXT_ULP_ACT_HASH_LIST_SIZE;
hash_tbl_params.key_len = sizeof(struct ulp_matcher_action_hash_db_key);
- hash_tbl_params.socket_id = rte_socket_id();
+ hash_tbl_params.numa_id = rte_numa_id();
data->action_matcher_db = rte_hash_create(&hash_tbl_params);
if (data->action_matcher_db == NULL) {
BNXT_DRV_DBG(ERR, "Failed to create action matcher hash tbl\n");
diff --git a/drivers/net/enic/enic_fm_flow.c b/drivers/net/enic/enic_fm_flow.c
index 4b0a513977..ed328217e4 100644
--- a/drivers/net/enic/enic_fm_flow.c
+++ b/drivers/net/enic/enic_fm_flow.c
@@ -3144,7 +3144,7 @@ enic_fm_init_actions(struct enic_flowman *fm)
.key_len = sizeof(struct fm_action),
.hash_func = rte_jhash,
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
ENICPMD_FUNC_TRACE();
diff --git a/drivers/net/hinic/base/hinic_pmd_hwdev.c b/drivers/net/hinic/base/hinic_pmd_hwdev.c
index 9a1b126632..3aca40d17d 100644
--- a/drivers/net/hinic/base/hinic_pmd_hwdev.c
+++ b/drivers/net/hinic/base/hinic_pmd_hwdev.c
@@ -341,7 +341,7 @@ int hinic_osdep_init(struct hinic_hwdev *hwdev)
dh_params.key_len = HINIC_HASH_KEY_LEN;
dh_params.hash_func = HINIC_HASH_FUNC;
dh_params.hash_func_init_val = HINIC_HASH_FUNC_INIT_VAL;
- dh_params.socket_id = SOCKET_ID_ANY;
+ dh_params.numa_id = RTE_NUMA_ID_ANY;
paddr_hash = rte_hash_find_existing(dh_params.name);
if (paddr_hash == NULL) {
diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c
index 0096aa21e9..11f28be758 100644
--- a/drivers/net/hns3/hns3_fdir.c
+++ b/drivers/net/hns3/hns3_fdir.c
@@ -911,7 +911,7 @@ int hns3_fdir_filter_init(struct hns3_adapter *hns)
return ret;
}
- fdir_hash_params.socket_id = rte_socket_id();
+ fdir_hash_params.numa_id = rte_numa_id();
TAILQ_INIT(&fdir_info->fdir_list);
snprintf(fdir_hash_name, RTE_HASH_NAMESIZE, "%s", hns->hw.data->name);
fdir_info->hash_handle = rte_hash_create(&fdir_hash_params);
diff --git a/drivers/net/intel/cpfl/cpfl_ethdev.c b/drivers/net/intel/cpfl/cpfl_ethdev.c
index fd84d9b21e..d9465fcae2 100644
--- a/drivers/net/intel/cpfl/cpfl_ethdev.c
+++ b/drivers/net/intel/cpfl/cpfl_ethdev.c
@@ -2517,7 +2517,7 @@ cpfl_vport_map_init(struct cpfl_adapter_ext *adapter)
.entries = CPFL_VPORT_MAP_HASH_ENTRY_NUM,
.key_len = sizeof(struct cpfl_vport_id),
.hash_func = rte_hash_crc,
- .socket_id = SOCKET_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
};
adapter->vport_map_hash = rte_hash_create(¶ms);
@@ -2559,7 +2559,7 @@ cpfl_repr_allowlist_init(struct cpfl_adapter_ext *adapter)
.entries = CPFL_REPR_HASH_ENTRY_NUM,
.key_len = sizeof(struct cpfl_repr_id),
.hash_func = rte_hash_crc,
- .socket_id = SOCKET_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
};
adapter->repr_allowlist_hash = rte_hash_create(¶ms);
diff --git a/drivers/net/intel/i40e/i40e_ethdev.c b/drivers/net/intel/i40e/i40e_ethdev.c
index 498c5c7ec4..66db44aaa1 100644
--- a/drivers/net/intel/i40e/i40e_ethdev.c
+++ b/drivers/net/intel/i40e/i40e_ethdev.c
@@ -1000,7 +1000,7 @@ i40e_tunnel_state_attach(struct rte_eth_dev_data *dev_data)
.key_len = sizeof(struct i40e_tunnel_filter_match_key),
.hash_func = rte_hash_crc,
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
snprintf(tunnel_hash_name, RTE_HASH_NAMESIZE, "tunnel_%s", dev_data->name);
diff --git a/drivers/net/intel/i40e/i40e_fdir.c b/drivers/net/intel/i40e/i40e_fdir.c
index 69b3b763ba..11e11b6713 100644
--- a/drivers/net/intel/i40e/i40e_fdir.c
+++ b/drivers/net/intel/i40e/i40e_fdir.c
@@ -1078,7 +1078,7 @@ i40e_fdir_tmpl_store_init(struct rte_eth_dev *dev)
.key_len = sizeof(struct i40e_fdir_tmpl_key),
.hash_func = rte_hash_crc,
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
if (tmpls->hash_table != NULL)
diff --git a/drivers/net/intel/i40e/i40e_flow_ethertype.c b/drivers/net/intel/i40e/i40e_flow_ethertype.c
index 0b92c8dbfb..04787c937c 100644
--- a/drivers/net/intel/i40e/i40e_flow_ethertype.c
+++ b/drivers/net/intel/i40e/i40e_flow_ethertype.c
@@ -306,7 +306,7 @@ i40e_flow_ethertype_engine_init(const struct ci_flow_engine *engine __rte_unused
.key_len = sizeof(struct i40e_ethertype_key),
.hash_func = rte_hash_crc,
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
snprintf(ethertype_hash_name, RTE_HASH_NAMESIZE, "etype_%s", dev_data->name);
diff --git a/drivers/net/intel/ice/ice_fdir_filter.c b/drivers/net/intel/ice/ice_fdir_filter.c
index 2350bd5523..3a15abe422 100644
--- a/drivers/net/intel/ice/ice_fdir_filter.c
+++ b/drivers/net/intel/ice/ice_fdir_filter.c
@@ -395,7 +395,7 @@ ice_fdir_init_filter_list(struct ice_pf *pf)
.key_len = sizeof(struct ice_fdir_fltr_pattern),
.hash_func = rte_hash_crc,
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.extra_flag = RTE_HASH_EXTRA_FLAGS_EXT_TABLE,
};
diff --git a/drivers/net/intel/ixgbe/ixgbe_ethdev.c b/drivers/net/intel/ixgbe/ixgbe_ethdev.c
index 5137663a61..60a9dbf2c1 100644
--- a/drivers/net/intel/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/intel/ixgbe/ixgbe_ethdev.c
@@ -1330,7 +1330,7 @@ ixgbe_fdir_state_attach(struct rte_eth_dev_data *dev_data)
.key_len = sizeof(union ixgbe_atr_input),
.hash_func = rte_hash_crc,
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
snprintf(fdir_hash_name, RTE_HASH_NAMESIZE, "fdir_%s",
diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c
index 971964133c..5350133c29 100644
--- a/drivers/net/memif/memif_socket.c
+++ b/drivers/net/memif/memif_socket.c
@@ -1088,7 +1088,7 @@ memif_create_socket_hash(void)
params.key_len = MEMIF_SOCKET_UN_SIZE;
params.hash_func = rte_jhash;
params.hash_func_init_val = 0;
- params.socket_id = SOCKET_ID_ANY;
+ params.numa_id = RTE_NUMA_ID_ANY;
return rte_hash_create(¶ms);
}
diff --git a/drivers/net/nfp/flower/nfp_conntrack.c b/drivers/net/nfp/flower/nfp_conntrack.c
index 439a1a1b0e..f72bfd8d8b 100644
--- a/drivers/net/nfp/flower/nfp_conntrack.c
+++ b/drivers/net/nfp/flower/nfp_conntrack.c
@@ -865,7 +865,7 @@ nfp_ct_zone_entry_init(struct nfp_ct_zone_entry *ze,
struct rte_hash_parameters ct_merge_hash_params = {
.entries = 1000,
.hash_func = rte_jhash,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.key_len = sizeof(uint32_t),
.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
};
diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c
index ad0fe9a8ef..c494f0c7ed 100644
--- a/drivers/net/nfp/flower/nfp_flower_flow.c
+++ b/drivers/net/nfp/flower/nfp_flower_flow.c
@@ -5468,7 +5468,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
.name = mask_name,
.entries = NFP_MASK_TABLE_ENTRIES,
.hash_func = rte_jhash,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.key_len = sizeof(uint32_t),
.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
};
@@ -5476,7 +5476,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
struct rte_hash_parameters flow_hash_params = {
.name = flow_name,
.hash_func = rte_jhash,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.key_len = sizeof(uint32_t),
.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
};
@@ -5485,7 +5485,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
.name = pretun_name,
.entries = 32,
.hash_func = rte_jhash,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.key_len = sizeof(uint32_t),
.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
};
@@ -5494,7 +5494,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
.name = ct_zone_table_name,
.entries = 65536,
.hash_func = rte_jhash,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.key_len = sizeof(uint32_t),
.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
};
@@ -5502,7 +5502,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
struct rte_hash_parameters ct_map_hash_params = {
.name = ct_map_table_name,
.hash_func = rte_jhash,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.key_len = sizeof(uint32_t),
.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
};
diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c
index 0e5003ebe3..e04053f0e1 100644
--- a/drivers/net/nfp/nfp_net_flow.c
+++ b/drivers/net/nfp/nfp_net_flow.c
@@ -1082,7 +1082,7 @@ nfp_net_flow_priv_init(struct nfp_pf_dev *pf_dev,
struct rte_hash_parameters flow_hash_params = {
.name = flow_name,
.hash_func = rte_jhash,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.key_len = sizeof(uint32_t),
.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
};
diff --git a/drivers/net/sfc/sfc_tbl_meta_cache.c b/drivers/net/sfc/sfc_tbl_meta_cache.c
index bffbc4a158..78af60062e 100644
--- a/drivers/net/sfc/sfc_tbl_meta_cache.c
+++ b/drivers/net/sfc/sfc_tbl_meta_cache.c
@@ -22,7 +22,7 @@ sfc_tbl_meta_cache_ctor(struct rte_hash **ref_cache)
.name = "meta_hash_table",
.hash_func = rte_jhash,
.entries = cache_size,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.key_len = sizeof(efx_table_id_t),
};
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 9dbdbfa309..fe7fed704f 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -992,7 +992,7 @@ int txgbe_fdir_filter_init(struct rte_eth_dev *eth_dev)
.key_len = sizeof(struct txgbe_atr_input),
.hash_func = rte_hash_crc,
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
TAILQ_INIT(&fdir_info->fdir_list);
@@ -1028,7 +1028,7 @@ static int txgbe_l2_tn_filter_init(struct rte_eth_dev *eth_dev)
.key_len = sizeof(struct txgbe_l2_tn_key),
.hash_func = rte_hash_crc,
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
TAILQ_INIT(&l2_tn_info->l2_tn_list);
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index 5d495ae973..6968bab789 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -537,7 +537,7 @@ rte_hash_create(const struct rte_hash_parameters *params)
/* Create ring (Dummy slot index is not enqueued) */
r = rte_ring_create_elem(ring_name, sizeof(uint32_t),
- rte_align32pow2(num_key_slots), params->socket_id, 0);
+ rte_align32pow2(num_key_slots), params->numa_id, 0);
if (r == NULL) {
HASH_LOG(ERR, "ring creation failed: %s", rte_strerror(rte_errno));
goto err;
@@ -556,7 +556,7 @@ rte_hash_create(const struct rte_hash_parameters *params)
r_ext = rte_ring_create_elem(ext_ring_name, sizeof(uint32_t),
rte_align32pow2(num_buckets + 1),
- params->socket_id, 0);
+ params->numa_id, 0);
if (r_ext == NULL) {
HASH_LOG(ERR, "ext buckets ring create failed: %s",
rte_strerror(rte_errno));
@@ -590,17 +590,17 @@ rte_hash_create(const struct rte_hash_parameters *params)
goto err_unlock;
}
- h = (struct rte_hash *)rte_zmalloc_socket(hash_name, sizeof(struct rte_hash),
- RTE_CACHE_LINE_SIZE, params->socket_id);
+ h = (struct rte_hash *)rte_zmalloc_numa(hash_name, sizeof(struct rte_hash),
+ RTE_CACHE_LINE_SIZE, params->numa_id);
if (h == NULL) {
HASH_LOG(ERR, "memory allocation failed");
goto err_unlock;
}
- buckets = rte_zmalloc_socket(NULL,
+ buckets = rte_zmalloc_numa(NULL,
num_buckets * sizeof(struct rte_hash_bucket),
- RTE_CACHE_LINE_SIZE, params->socket_id);
+ RTE_CACHE_LINE_SIZE, params->numa_id);
if (buckets == NULL) {
HASH_LOG(ERR, "buckets memory allocation failed");
@@ -609,9 +609,9 @@ rte_hash_create(const struct rte_hash_parameters *params)
/* Allocate same number of extendable buckets */
if (ext_table_support) {
- buckets_ext = rte_zmalloc_socket(NULL,
+ buckets_ext = rte_zmalloc_numa(NULL,
num_buckets * sizeof(struct rte_hash_bucket),
- RTE_CACHE_LINE_SIZE, params->socket_id);
+ RTE_CACHE_LINE_SIZE, params->numa_id);
if (buckets_ext == NULL) {
HASH_LOG(ERR, "ext buckets memory allocation "
"failed");
@@ -641,16 +641,16 @@ rte_hash_create(const struct rte_hash_parameters *params)
KEY_ALIGNMENT);
const uint64_t key_tbl_size = (uint64_t) key_entry_size * num_key_slots;
- k = rte_zmalloc_socket(NULL, key_tbl_size,
- RTE_CACHE_LINE_SIZE, params->socket_id);
+ k = rte_zmalloc_numa(NULL, key_tbl_size,
+ RTE_CACHE_LINE_SIZE, params->numa_id);
if (k == NULL) {
HASH_LOG(ERR, "memory allocation failed");
goto err_unlock;
}
- tbl_chng_cnt = rte_zmalloc_socket(NULL, sizeof(uint32_t),
- RTE_CACHE_LINE_SIZE, params->socket_id);
+ tbl_chng_cnt = rte_zmalloc_numa(NULL, sizeof(uint32_t),
+ RTE_CACHE_LINE_SIZE, params->numa_id);
if (tbl_chng_cnt == NULL) {
HASH_LOG(ERR, "memory allocation failed");
@@ -669,9 +669,9 @@ rte_hash_create(const struct rte_hash_parameters *params)
}
if (use_local_cache) {
- local_free_slots = rte_zmalloc_socket(NULL,
+ local_free_slots = rte_zmalloc_numa(NULL,
sizeof(struct lcore_cache) * RTE_MAX_LCORE,
- RTE_CACHE_LINE_SIZE, params->socket_id);
+ RTE_CACHE_LINE_SIZE, params->numa_id);
if (local_free_slots == NULL) {
HASH_LOG(ERR, "local free slots memory allocation failed");
goto err_unlock;
diff --git a/lib/hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c
index 45d4a13427..112a2ae958 100644
--- a/lib/hash/rte_fbk_hash.c
+++ b/lib/hash/rte_fbk_hash.c
@@ -135,7 +135,7 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
}
/* Allocate memory for table. */
- ht = rte_zmalloc_socket(hash_name, mem_size, 0, params->socket_id);
+ ht = rte_zmalloc_numa(hash_name, mem_size, 0, params->numa_id);
if (ht == NULL) {
HASH_LOG(ERR, "Failed to allocate fbk hash table");
rte_free(te);
diff --git a/lib/hash/rte_fbk_hash.h b/lib/hash/rte_fbk_hash.h
index 6b70cfaa0b..57ecca2527 100644
--- a/lib/hash/rte_fbk_hash.h
+++ b/lib/hash/rte_fbk_hash.h
@@ -50,7 +50,15 @@ struct rte_fbk_hash_params {
const char *name; /**< Name of the hash table. */
uint32_t entries; /**< Total number of entries. */
uint32_t entries_per_bucket; /**< Number of entries in a bucket. */
- int socket_id; /**< Socket to allocate memory on. */
+ union {
+ /** NUMA node ID to allocate memory on. */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
rte_fbk_hash_fn hash_func; /**< The hash function. */
uint32_t init_val; /**< For initialising hash function. */
};
diff --git a/lib/hash/rte_hash.h b/lib/hash/rte_hash.h
index e33f0aea0f..c03c90cc32 100644
--- a/lib/hash/rte_hash.h
+++ b/lib/hash/rte_hash.h
@@ -86,7 +86,15 @@ struct rte_hash_parameters {
uint32_t key_len; /**< Length of hash key. */
rte_hash_function hash_func; /**< Primary Hash function used to calculate hash. */
uint32_t hash_func_init_val; /**< Init value used by hash_func. */
- int socket_id; /**< NUMA Socket ID for memory. */
+ union {
+ /** NUMA node ID for memory. */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
uint8_t extra_flag; /**< Indicate if additional parameters are present. */
};
diff --git a/lib/ipsec/ipsec_sad.c b/lib/ipsec/ipsec_sad.c
index 15ea868f77..df2d1b4877 100644
--- a/lib/ipsec/ipsec_sad.c
+++ b/lib/ipsec/ipsec_sad.c
@@ -302,7 +302,7 @@ rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
hash_params.hash_func = DEFAULT_HASH_FUNC;
hash_params.hash_func_init_val = rte_rand();
sad->init_val = hash_params.hash_func_init_val;
- hash_params.socket_id = conf->socket_id;
+ hash_params.numa_id = conf->socket_id;
hash_params.name = hash_name;
if (conf->flags & RTE_IPSEC_SAD_FLAG_RW_CONCURRENCY)
hash_params.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY;
diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
index e23c886766..5eb2f3761d 100644
--- a/lib/lpm/rte_lpm6.c
+++ b/lib/lpm/rte_lpm6.c
@@ -246,7 +246,7 @@ rte_lpm6_create(const char *name, int socket_id,
.hash_func_init_val = 0,
.name = mem_name,
.reserved = 0,
- .socket_id = socket_id,
+ .numa_id = socket_id,
.extra_flag = 0
};
diff --git a/lib/node/udp4_input.c b/lib/node/udp4_input.c
index 5a74e28c85..47aad42022 100644
--- a/lib/node/udp4_input.c
+++ b/lib/node/udp4_input.c
@@ -53,7 +53,7 @@ static struct rte_hash_parameters udp4_params = {
.key_len = sizeof(uint32_t),
.hash_func = rte_jhash,
.hash_func_init_val = 0,
- .socket_id = 0,
+ .numa_id = 0,
};
RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_node_udp4_dst_port_add, 23.11)
@@ -109,7 +109,7 @@ setup_udp4_dstprt_hash(struct udp4_input_node_main *nm, int socket)
/* create Hash table */
snprintf(s, sizeof(s), "UDP4_INPUT_HASH_%d", socket);
hash_udp4->name = s;
- hash_udp4->socket_id = socket;
+ hash_udp4->numa_id = socket;
nm->hash_tbl[socket] = rte_hash_create(hash_udp4);
if (nm->hash_tbl[socket] == NULL)
return -rte_errno;
diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c
index 38a7bd75d6..6c851c173a 100644
--- a/lib/vhost/vhost_crypto.c
+++ b/lib/vhost/vhost_crypto.c
@@ -1837,7 +1837,7 @@ rte_vhost_crypto_create(int vid, uint8_t cryptodev_id,
params.entries = VHOST_CRYPTO_SESSION_MAP_ENTRIES;
params.hash_func = rte_jhash;
params.key_len = sizeof(uint64_t);
- params.socket_id = socket_id;
+ params.numa_id = socket_id;
vcrypto->session_map = rte_hash_create(¶ms);
if (!vcrypto->session_map) {
VC_LOG_ERR("Failed to creath session map");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 005/227] member: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (3 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 004/227] hash: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 006/227] ethdev: rename device socket API to NUMA node API Chengwen Feng
` (222 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id fields of rte_member_parameters and
rte_member_setsum to numa_id, keeping socket_id as a deprecated
union alias, and update in-tree users accordingly.
Also rename socket parameters and comments to the NUMA node
terminology, and switch internal calls to rte_zmalloc_numa().
No functional change.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test/test_member.c | 6 +++---
app/test/test_member_perf.c | 4 ++--
lib/member/rte_member.c | 8 ++++----
lib/member/rte_member.h | 20 ++++++++++++++++++--
lib/member/rte_member_heap.h | 18 +++++++++---------
lib/member/rte_member_ht.c | 4 ++--
lib/member/rte_member_sketch.c | 24 ++++++++++++------------
lib/member/rte_member_vbf.c | 4 ++--
8 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/app/test/test_member.c b/app/test/test_member.c
index 23447196c3..1ba4156367 100644
--- a/app/test/test_member.c
+++ b/app/test/test_member.c
@@ -107,7 +107,7 @@ static struct rte_member_parameters params = {
.false_positive_rate = 0.03,
.prim_hash_seed = 1,
.sec_hash_seed = 11,
- .socket_id = 0 /* NUMA Socket ID for memory. */
+ .numa_id = 0 /* NUMA Socket ID for memory. */
};
/* for sketch definitions */
@@ -146,7 +146,7 @@ test_member_find_existing(void)
.false_positive_rate = 0.03,
.prim_hash_seed = 1,
.sec_hash_seed = 11,
- .socket_id = 0 /* NUMA Socket ID for memory. */
+ .numa_id = 0 /* NUMA Socket ID for memory. */
};
/* Create */
@@ -182,7 +182,7 @@ test_member_create_bad_param(void)
.false_positive_rate = 0.03,
.prim_hash_seed = 1,
.sec_hash_seed = 11,
- .socket_id = 0 /* NUMA Socket ID for memory. */
+ .numa_id = 0 /* NUMA Socket ID for memory. */
};
printf("Expected error section begin...\n");
diff --git a/app/test/test_member_perf.c b/app/test/test_member_perf.c
index db6b8a18ef..5bf75bf8d4 100644
--- a/app/test/test_member_perf.c
+++ b/app/test/test_member_perf.c
@@ -140,7 +140,7 @@ struct rte_member_parameters member_params = {
.false_positive_rate = 0.03,
.prim_hash_seed = 0,
.sec_hash_seed = 1,
- .socket_id = 0, /* NUMA Socket ID for memory. */
+ .numa_id = 0, /* NUMA Socket ID for memory. */
};
static int
@@ -220,7 +220,7 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
}
member_params.false_positive_rate = VBF_FALSE_RATE;
member_params.key_len = params->key_size;
- member_params.socket_id = test_socket_id;
+ member_params.numa_id = test_socket_id;
member_params.num_keys = entry_cnt;
member_params.name = "test_member_ht";
member_params.is_cache = 0;
diff --git a/lib/member/rte_member.c b/lib/member/rte_member.c
index 5ff32f1e45..a213504425 100644
--- a/lib/member/rte_member.c
+++ b/lib/member/rte_member.c
@@ -115,7 +115,7 @@ rte_member_create(const struct rte_member_parameters *params)
if (params->type == RTE_MEMBER_TYPE_SKETCH) {
snprintf(ring_name, sizeof(ring_name), "SK_%s", params->name);
sketch_key_ring = rte_ring_create_elem(ring_name, sizeof(uint32_t),
- rte_align32pow2(params->top_k), params->socket_id, 0);
+ rte_align32pow2(params->top_k), params->numa_id, 0);
if (sketch_key_ring == NULL) {
MEMBER_LOG(ERR, "Sketch Ring Memory allocation failed");
return NULL;
@@ -145,16 +145,16 @@ rte_member_create(const struct rte_member_parameters *params)
}
/* Create a new setsum structure */
- setsum = rte_zmalloc_socket(params->name,
+ setsum = rte_zmalloc_numa(params->name,
sizeof(struct rte_member_setsum), RTE_CACHE_LINE_SIZE,
- params->socket_id);
+ params->numa_id);
if (setsum == NULL) {
MEMBER_LOG(ERR, "Create setsummary failed");
goto error_unlock_exit;
}
strlcpy(setsum->name, params->name, sizeof(setsum->name));
setsum->type = params->type;
- setsum->socket_id = params->socket_id;
+ setsum->numa_id = params->numa_id;
setsum->key_len = params->key_len;
setsum->num_set = params->num_set;
setsum->prim_hash_seed = params->prim_hash_seed;
diff --git a/lib/member/rte_member.h b/lib/member/rte_member.h
index 6d9740e0f1..9f9b74b421 100644
--- a/lib/member/rte_member.h
+++ b/lib/member/rte_member.h
@@ -171,7 +171,15 @@ struct __rte_cache_aligned rte_member_setsum {
/* Second cache line should start here. */
- uint32_t socket_id; /* NUMA Socket ID for memory. */
+ union {
+ /** NUMA node ID for memory. */
+ uint32_t numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ uint32_t socket_id;
+ };
char name[RTE_MEMBER_NAMESIZE]; /* Name of this set summary. */
#ifdef RTE_ARCH_X86
bool use_avx512;
@@ -316,7 +324,15 @@ struct __rte_cache_aligned rte_member_parameters {
*/
uint32_t extra_flag;
- int socket_id; /**< NUMA Socket ID for memory. */
+ union {
+ /** NUMA node ID for memory. */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
};
/**
diff --git a/lib/member/rte_member_heap.h b/lib/member/rte_member_heap.h
index d551c85a75..40e4991e38 100644
--- a/lib/member/rte_member_heap.h
+++ b/lib/member/rte_member_heap.h
@@ -38,7 +38,7 @@ struct node {
struct minheap {
uint32_t key_len;
uint32_t size;
- uint32_t socket;
+ uint32_t numa_id;
struct hash *hashtable;
struct node *elem;
};
@@ -134,9 +134,9 @@ resize_hash_table(struct minheap *hp)
hp->hashtable->num_item / ((float)hp->hashtable->bkt_cnt * HASH_BKT_SIZE));
MEMBER_LOG(ERR, "Sketch Minheap HT resize happen!");
rte_free(hp->hashtable);
- hp->hashtable = rte_zmalloc_socket(NULL, sizeof(struct hash) +
+ hp->hashtable = rte_zmalloc_numa(NULL, sizeof(struct hash) +
new_bkt_cnt * sizeof(struct hash_bkt),
- RTE_CACHE_LINE_SIZE, hp->socket);
+ RTE_CACHE_LINE_SIZE, hp->numa_id);
if (hp->hashtable == NULL) {
MEMBER_LOG(ERR, "Sketch Minheap HT allocation failed");
@@ -170,10 +170,10 @@ rte_member_minheap_find(struct minheap *hp, const void *key)
static int
rte_member_minheap_init(struct minheap *heap, int size,
- uint32_t socket, uint32_t seed)
+ uint32_t numa_id, uint32_t seed)
{
- heap->elem = rte_zmalloc_socket(NULL, sizeof(struct node) * size,
- RTE_CACHE_LINE_SIZE, socket);
+ heap->elem = rte_zmalloc_numa(NULL, sizeof(struct node) * size,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (heap->elem == NULL) {
MEMBER_LOG(ERR, "Sketch Minheap elem allocation failed");
return -ENOMEM;
@@ -184,9 +184,9 @@ rte_member_minheap_init(struct minheap *heap, int size,
if (hash_bkt_cnt == 0)
hash_bkt_cnt = 1;
- heap->hashtable = rte_zmalloc_socket(NULL, sizeof(struct hash) +
+ heap->hashtable = rte_zmalloc_numa(NULL, sizeof(struct hash) +
hash_bkt_cnt * sizeof(struct hash_bkt),
- RTE_CACHE_LINE_SIZE, socket);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (heap->hashtable == NULL) {
MEMBER_LOG(ERR, "Sketch Minheap HT allocation failed");
@@ -196,7 +196,7 @@ rte_member_minheap_init(struct minheap *heap, int size,
heap->hashtable->seed = seed;
heap->hashtable->bkt_cnt = hash_bkt_cnt;
- heap->socket = socket;
+ heap->numa_id = numa_id;
return 0;
}
diff --git a/lib/member/rte_member_ht.c b/lib/member/rte_member_ht.c
index 8c89a949c8..1f82d0fe16 100644
--- a/lib/member/rte_member_ht.c
+++ b/lib/member/rte_member_ht.c
@@ -95,9 +95,9 @@ rte_member_create_ht(struct rte_member_setsum *ss,
size_bucket_t = sizeof(struct member_ht_bucket);
- struct member_ht_bucket *buckets = rte_zmalloc_socket(NULL,
+ struct member_ht_bucket *buckets = rte_zmalloc_numa(NULL,
num_buckets * size_bucket_t,
- RTE_CACHE_LINE_SIZE, ss->socket_id);
+ RTE_CACHE_LINE_SIZE, ss->numa_id);
if (buckets == NULL) {
MEMBER_LOG(ERR, "memory allocation failed for HT "
diff --git a/lib/member/rte_member_sketch.c b/lib/member/rte_member_sketch.c
index b753bac1bd..0d551f4bd7 100644
--- a/lib/member/rte_member_sketch.c
+++ b/lib/member/rte_member_sketch.c
@@ -160,7 +160,7 @@ rte_member_create_sketch(struct rte_member_setsum *ss,
ss->sketch_delete = sketch_delete_scalar;
}
- ss->socket_id = params->socket_id;
+ ss->numa_id = params->numa_id;
if (ss->count_byte == 0)
num_col = 4.0 / params->error_rate / params->sample_rate;
@@ -171,23 +171,23 @@ rte_member_create_sketch(struct rte_member_setsum *ss,
else
num_col = 4.0 / params->error_rate;
- ss->table = rte_zmalloc_socket(NULL,
+ ss->table = rte_zmalloc_numa(NULL,
sizeof(uint64_t) * num_col * ss->num_row,
- RTE_CACHE_LINE_SIZE, ss->socket_id);
+ RTE_CACHE_LINE_SIZE, ss->numa_id);
if (ss->table == NULL) {
MEMBER_LOG(ERR, "Sketch Table memory allocation failed");
return -ENOMEM;
}
- ss->hash_seeds = rte_zmalloc_socket(NULL, sizeof(uint64_t) * ss->num_row,
- RTE_CACHE_LINE_SIZE, ss->socket_id);
+ ss->hash_seeds = rte_zmalloc_numa(NULL, sizeof(uint64_t) * ss->num_row,
+ RTE_CACHE_LINE_SIZE, ss->numa_id);
if (ss->hash_seeds == NULL) {
MEMBER_LOG(ERR, "Sketch Hashseeds memory allocation failed");
return -ENOMEM;
}
- ss->runtime_var = rte_zmalloc_socket(NULL, sizeof(struct sketch_runtime),
- RTE_CACHE_LINE_SIZE, ss->socket_id);
+ ss->runtime_var = rte_zmalloc_numa(NULL, sizeof(struct sketch_runtime),
+ RTE_CACHE_LINE_SIZE, ss->numa_id);
if (ss->runtime_var == NULL) {
MEMBER_LOG(ERR, "Sketch Runtime memory allocation failed");
rte_free(ss);
@@ -204,8 +204,8 @@ rte_member_create_sketch(struct rte_member_setsum *ss,
ss->key_len = params->key_len;
runtime->heap.key_len = ss->key_len;
- runtime->key_slots = rte_zmalloc_socket(NULL, ss->key_len * ss->topk,
- RTE_CACHE_LINE_SIZE, ss->socket_id);
+ runtime->key_slots = rte_zmalloc_numa(NULL, ss->key_len * ss->topk,
+ RTE_CACHE_LINE_SIZE, ss->numa_id);
if (runtime->key_slots == NULL) {
MEMBER_LOG(ERR, "Sketch Key Slots allocation failed");
goto error;
@@ -217,13 +217,13 @@ rte_member_create_sketch(struct rte_member_setsum *ss,
&i, sizeof(uint32_t));
if (rte_member_minheap_init(&(runtime->heap), params->top_k,
- ss->socket_id, params->prim_hash_seed) < 0) {
+ ss->numa_id, params->prim_hash_seed) < 0) {
MEMBER_LOG(ERR, "Sketch Minheap allocation failed");
goto error_runtime;
}
- runtime->report_array = rte_zmalloc_socket(NULL, sizeof(struct node) * ss->topk,
- RTE_CACHE_LINE_SIZE, ss->socket_id);
+ runtime->report_array = rte_zmalloc_numa(NULL, sizeof(struct node) * ss->topk,
+ RTE_CACHE_LINE_SIZE, ss->numa_id);
if (runtime->report_array == NULL) {
MEMBER_LOG(ERR, "Sketch Runtime Report Array allocation failed");
goto error_runtime;
diff --git a/lib/member/rte_member_vbf.c b/lib/member/rte_member_vbf.c
index 5ad9487fad..9eb3f4a6f3 100644
--- a/lib/member/rte_member_vbf.c
+++ b/lib/member/rte_member_vbf.c
@@ -118,8 +118,8 @@ rte_member_create_vbf(struct rte_member_setsum *ss,
"The new calculated vBF false positive rate is %.5f",
num_keys_per_bf, ss->bits, ss->num_hashes, fp_one_bf, new_fp);
- ss->table = rte_zmalloc_socket(NULL, ss->num_set * (ss->bits >> 3),
- RTE_CACHE_LINE_SIZE, ss->socket_id);
+ ss->table = rte_zmalloc_numa(NULL, ss->num_set * (ss->bits >> 3),
+ RTE_CACHE_LINE_SIZE, ss->numa_id);
if (ss->table == NULL)
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 006/227] ethdev: rename device socket API to NUMA node API
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (4 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 005/227] member: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 007/227] cryptodev: " Chengwen Feng
` (221 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the exported function rte_eth_dev_socket_id() to
rte_eth_dev_numa_id(), keeping the old name as a functional
alias to be deprecated once the in-tree migration completes.
Rename socket_id parameters, trace point name and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/ethdev/ethdev_driver.c | 10 ++++----
lib/ethdev/ethdev_driver.h | 10 ++++----
lib/ethdev/ethdev_pci.h | 8 +++----
lib/ethdev/ethdev_private.c | 2 +-
lib/ethdev/ethdev_trace.h | 6 ++---
lib/ethdev/ethdev_trace_points.c | 4 ++--
lib/ethdev/ethdev_vdev.h | 2 +-
lib/ethdev/rte_ethdev.c | 31 +++++++++++++++----------
lib/ethdev/rte_ethdev.h | 38 ++++++++++++++++++++++---------
lib/ethdev/rte_ethdev_telemetry.c | 2 +-
10 files changed, 68 insertions(+), 45 deletions(-)
diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c
index e6f8d6fe85..92310c94be 100644
--- a/lib/ethdev/ethdev_driver.c
+++ b/lib/ethdev/ethdev_driver.c
@@ -327,11 +327,11 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
if (priv_data_size) {
/* try alloc private data on device-local node. */
- ethdev->data->dev_private = rte_zmalloc_socket(
+ ethdev->data->dev_private = rte_zmalloc_numa(
name, priv_data_size, RTE_CACHE_LINE_SIZE,
device->numa_node);
- /* fall back to alloc on any socket on failure */
+ /* fall back to alloc on any NUMA node on failure */
if (ethdev->data->dev_private == NULL) {
ethdev->data->dev_private = rte_zmalloc(name,
priv_data_size, RTE_CACHE_LINE_SIZE);
@@ -741,7 +741,7 @@ RTE_EXPORT_INTERNAL_SYMBOL(rte_eth_dma_zone_reserve)
const struct rte_memzone *
rte_eth_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,
uint16_t queue_id, size_t size, unsigned int align,
- int socket_id)
+ int numa_id)
{
char z_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz;
@@ -757,7 +757,7 @@ rte_eth_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,
mz = rte_memzone_lookup(z_name);
if (mz) {
- if ((socket_id != SOCKET_ID_ANY && socket_id != mz->socket_id) ||
+ if ((numa_id != RTE_NUMA_ID_ANY && numa_id != mz->socket_id) ||
size > mz->len ||
((uintptr_t)mz->addr & (align - 1)) != 0) {
RTE_ETHDEV_LOG_LINE(ERR,
@@ -769,7 +769,7 @@ rte_eth_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,
return mz;
}
- return rte_memzone_reserve_aligned(z_name, size, socket_id,
+ return rte_memzone_reserve_aligned(z_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, align);
}
diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index ac6f850a7e..28f0e8b2b4 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -616,7 +616,7 @@ typedef int (*eth_queue_stop_t)(struct rte_eth_dev *dev,
typedef int (*eth_rx_queue_setup_t)(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
@@ -624,7 +624,7 @@ typedef int (*eth_rx_queue_setup_t)(struct rte_eth_dev *dev,
typedef int (*eth_tx_queue_setup_t)(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
/** @internal Enable interrupt of a receive queue of an Ethernet device. */
@@ -1813,14 +1813,14 @@ void rte_eth_dev_probing_finish(struct rte_eth_dev *dev);
* The sizeof of the memory area
* @param align
* Alignment for resulting memzone. Must be a power of 2.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in case of NUMA.
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in case of NUMA.
*/
__rte_internal
const struct rte_memzone *
rte_eth_dma_zone_reserve(const struct rte_eth_dev *eth_dev, const char *name,
uint16_t queue_id, size_t size,
- unsigned align, int socket_id);
+ unsigned int align, int numa_id);
/**
* Free previously allocated memzone for HW rings.
diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h
index ce3e293818..36482e606c 100644
--- a/lib/ethdev/ethdev_pci.h
+++ b/lib/ethdev/ethdev_pci.h
@@ -96,13 +96,13 @@ rte_eth_dev_pci_allocate(struct rte_pci_device *dev, size_t private_data_size)
return NULL;
if (private_data_size) {
- /* Try and alloc the private-data structure on socket local to the device */
- eth_dev->data->dev_private = rte_zmalloc_socket(name,
+ /* Try and alloc private-data on the device NUMA node */
+ eth_dev->data->dev_private = rte_zmalloc_numa(name,
private_data_size, RTE_CACHE_LINE_SIZE,
dev->device.numa_node);
- /* if cannot allocate memory on the socket local to the device
- * use rte_malloc to allocate memory on some other socket, if available.
+ /* if cannot allocate memory on the NUMA node local to the device
+ * use rte_malloc to allocate memory on some other NUMA node, if available.
*/
if (eth_dev->data->dev_private == NULL) {
eth_dev->data->dev_private = rte_zmalloc(name,
diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
index 70cc6ae63c..0a642bf242 100644
--- a/lib/ethdev/ethdev_private.c
+++ b/lib/ethdev/ethdev_private.c
@@ -359,7 +359,7 @@ eth_dev_shared_data_prepare(void)
/* Allocate port data and ownership shared memory. */
mz = rte_memzone_reserve(MZ_RTE_ETH_DEV_DATA,
sizeof(*eth_dev_shared_data),
- SOCKET_ID_ANY, flags);
+ RTE_NUMA_ID_ANY, flags);
if (mz == NULL) {
RTE_ETHDEV_LOG_LINE(ERR, "Cannot allocate ethdev shared data");
goto out;
diff --git a/lib/ethdev/ethdev_trace.h b/lib/ethdev/ethdev_trace.h
index ebf5279a84..633cfb2efe 100644
--- a/lib/ethdev/ethdev_trace.h
+++ b/lib/ethdev/ethdev_trace.h
@@ -143,10 +143,10 @@ RTE_TRACE_POINT(
)
RTE_TRACE_POINT(
- rte_ethdev_trace_socket_id,
- RTE_TRACE_POINT_ARGS(uint16_t port_id, int socket_id),
+ rte_ethdev_trace_numa_id,
+ RTE_TRACE_POINT_ARGS(uint16_t port_id, int numa_id),
rte_trace_point_emit_u16(port_id);
- rte_trace_point_emit_int(socket_id);
+ rte_trace_point_emit_int(numa_id);
)
RTE_TRACE_POINT(
diff --git a/lib/ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c
index b0644ea489..5cdbb1b27a 100644
--- a/lib/ethdev/ethdev_trace_points.c
+++ b/lib/ethdev/ethdev_trace_points.c
@@ -92,8 +92,8 @@ RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_owner_delete,
RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_owner_get,
lib.ethdev.owner_get)
-RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_socket_id,
- lib.ethdev.socket_id)
+RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_numa_id,
+ lib.ethdev.numa_id)
RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_get_sec_ctx,
lib.ethdev.get_sec_ctx)
diff --git a/lib/ethdev/ethdev_vdev.h b/lib/ethdev/ethdev_vdev.h
index 010ec75a00..9c039778d4 100644
--- a/lib/ethdev/ethdev_vdev.h
+++ b/lib/ethdev/ethdev_vdev.h
@@ -40,7 +40,7 @@ rte_eth_vdev_allocate(struct rte_vdev_device *dev, size_t private_data_size)
return NULL;
if (private_data_size) {
- eth_dev->data->dev_private = rte_zmalloc_socket(name,
+ eth_dev->data->dev_private = rte_zmalloc_numa(name,
private_data_size, RTE_CACHE_LINE_SIZE,
dev->device.numa_node);
if (!eth_dev->data->dev_private) {
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 8f91a353d9..23fcf2d2e8 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -642,30 +642,37 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)
return ret;
}
-RTE_EXPORT_SYMBOL(rte_eth_dev_socket_id)
+RTE_EXPORT_SYMBOL(rte_eth_dev_numa_id)
int
-rte_eth_dev_socket_id(uint16_t port_id)
+rte_eth_dev_numa_id(uint16_t port_id)
{
- int socket_id = SOCKET_ID_ANY;
+ int numa_id = RTE_NUMA_ID_ANY;
struct rte_eth_dev *ethdev;
if (port_id >= RTE_MAX_ETHPORTS) {
rte_errno = EINVAL;
- return socket_id;
+ return numa_id;
}
ethdev = &rte_eth_devices[port_id];
if (!eth_dev_is_allocated(ethdev)) {
rte_errno = EINVAL;
} else {
- socket_id = rte_eth_devices[port_id].data->numa_node;
- if (socket_id == SOCKET_ID_ANY)
+ numa_id = rte_eth_devices[port_id].data->numa_node;
+ if (numa_id == RTE_NUMA_ID_ANY)
rte_errno = 0;
}
- rte_ethdev_trace_socket_id(port_id, socket_id);
+ rte_ethdev_trace_numa_id(port_id, numa_id);
+
+ return numa_id;
+}
- return socket_id;
+RTE_EXPORT_SYMBOL(rte_eth_dev_socket_id)
+int
+rte_eth_dev_socket_id(uint16_t port_id)
+{
+ return rte_eth_dev_numa_id(port_id);
}
RTE_EXPORT_SYMBOL(rte_eth_dev_get_sec_ctx)
@@ -2344,7 +2351,7 @@ rte_eth_rx_queue_check_mempools(struct rte_mempool **rx_mempools,
RTE_EXPORT_SYMBOL(rte_eth_rx_queue_setup)
int
rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -2554,7 +2561,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
}
ret = dev->dev_ops->rx_queue_setup(dev, rx_queue_id, nb_rx_desc,
- socket_id, &local_conf, mp);
+ numa_id, &local_conf, mp);
if (!ret) {
if (!dev->data->min_rx_buf_size ||
dev->data->min_rx_buf_size > mbp_buf_size)
@@ -2675,7 +2682,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
RTE_EXPORT_SYMBOL(rte_eth_tx_queue_setup)
int
rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct rte_eth_dev *dev;
@@ -2781,7 +2788,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
rte_ethdev_trace_txq_setup(port_id, tx_queue_id, nb_tx_desc, tx_conf);
return eth_err(port_id, dev->dev_ops->tx_queue_setup(dev,
- tx_queue_id, nb_tx_desc, socket_id, &local_conf));
+ tx_queue_id, nb_tx_desc, numa_id, &local_conf));
}
RTE_EXPORT_SYMBOL(rte_eth_tx_hairpin_queue_setup)
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 1924483689..83a4dfb337 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -2424,7 +2424,7 @@ rte_eth_dev_is_removed(uint16_t port_id);
* Allocate and set up a receive queue for an Ethernet device.
*
* The function allocates a contiguous block of memory for *nb_rx_desc*
- * receive descriptors from a memory zone associated with *socket_id*
+ * receive descriptors from a memory zone associated with *numa_id*
* and initializes each receive descriptor with a network buffer allocated
* from the memory pool *mb_pool*.
*
@@ -2436,9 +2436,9 @@ rte_eth_dev_is_removed(uint16_t port_id);
* to rte_eth_dev_configure().
* @param nb_rx_desc
* The number of receive descriptors to allocate for the receive ring.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in case of NUMA.
- * The value can be *SOCKET_ID_ANY* if there is no NUMA constraint for
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in case of NUMA.
+ * The value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraint for
* the DMA memory allocated for the receive descriptors of the ring.
* @param rx_conf
* The pointer to the configuration data to be used for the receive queue.
@@ -2483,7 +2483,7 @@ rte_eth_dev_is_removed(uint16_t port_id);
* initializing receive descriptors.
*/
int rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
@@ -2526,9 +2526,9 @@ int rte_eth_rx_hairpin_queue_setup
* to rte_eth_dev_configure().
* @param nb_tx_desc
* The number of transmit descriptors to allocate for the transmit ring.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in case of NUMA.
- * Its value can be *SOCKET_ID_ANY* if there is no NUMA constraint for
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in case of NUMA.
+ * Its value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraint for
* the DMA memory allocated for the transmit descriptors of the ring.
* @param tx_conf
* The pointer to the configuration data to be used for the transmit queue.
@@ -2564,7 +2564,7 @@ int rte_eth_rx_hairpin_queue_setup
* - -ENOMEM: Unable to allocate the transmit ring descriptors.
*/
int rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
/**
@@ -2704,14 +2704,30 @@ int rte_eth_dev_count_aggr_ports(uint16_t port_id);
int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id,
uint8_t affinity);
+/**
+ * Return the NUMA node to which an Ethernet device is connected
+ *
+ * @param port_id
+ * The port identifier of the Ethernet device
+ * @return
+ * - The NUMA node ID which the Ethernet device is connected to.
+ * - RTE_NUMA_ID_ANY if the NUMA node could not be
+ * determined. rte_errno is then set to:
+ * - EINVAL is the port_id is invalid,
+ * - 0 is the NUMA node could not be determined,
+ */
+int rte_eth_dev_numa_id(uint16_t port_id);
+
/**
* Return the NUMA socket to which an Ethernet device is connected
*
+ * This is a legacy alias of rte_eth_dev_numa_id().
+ *
* @param port_id
* The port identifier of the Ethernet device
* @return
* - The NUMA socket ID which the Ethernet device is connected to.
- * - -1 (which translates to SOCKET_ID_ANY) if the socket could not be
+ * - -1 (which translates to RTE_NUMA_ID_ANY) if the socket could not be
* determined. rte_errno is then set to:
* - EINVAL is the port_id is invalid,
* - 0 is the socket could not be determined,
@@ -4064,7 +4080,7 @@ enum rte_eth_event_type {
/**
* The port is being probed, i.e. allocated and not yet available.
* It is too early to check validity, query infos, and configure
- * the port. But some functions, like rte_eth_dev_socket_id() and
+ * the port. But some functions, like rte_eth_dev_numa_id() and
* rte_eth_dev_owner_*() are available to the application.
*/
RTE_ETH_EVENT_NEW,
diff --git a/lib/ethdev/rte_ethdev_telemetry.c b/lib/ethdev/rte_ethdev_telemetry.c
index 146acec174..1749e86421 100644
--- a/lib/ethdev/rte_ethdev_telemetry.c
+++ b/lib/ethdev/rte_ethdev_telemetry.c
@@ -537,7 +537,7 @@ eth_dev_handle_port_rxq(const char *cmd __rte_unused,
rte_tel_data_start_dict(d);
rte_tel_data_add_dict_string(d, "mempool_name", qinfo.mp->name);
- rte_tel_data_add_dict_uint(d, "socket_id", qinfo.mp->numa_id);
+ rte_tel_data_add_dict_uint(d, "numa_id", qinfo.mp->numa_id);
rx_thresh = &qinfo.conf.rx_thresh;
rte_tel_data_add_dict_uint(d, "host_threshold", rx_thresh->hthresh);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 007/227] cryptodev: rename device socket API to NUMA node API
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (5 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 006/227] ethdev: rename device socket API to NUMA node API Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 008/227] compressdev: " Chengwen Feng
` (220 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the exported function rte_cryptodev_socket_id() to
rte_cryptodev_numa_id(), keeping the old name as a functional
alias to be deprecated once the in-tree migration completes.
Rename the numa_id field of rte_cryptodev_config (was socket_id),
keeping socket_id as a deprecated union alias, and update in-tree
users accordingly.
Also rename internal parameters, the device data field, trace
points and comments to the NUMA node terminology. The legacy
devarg key value is kept unchanged for CLI compatibility.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test/test_cryptodev.c | 4 +-
app/test/test_cryptodev_asym.c | 4 +-
app/test/test_cryptodev_crosscheck.c | 2 +-
drivers/crypto/bcmfs/bcmfs_sym_pmd.c | 2 +-
drivers/crypto/ccp/rte_ccp_pmd.c | 2 +-
drivers/crypto/cnxk/cn10k_cryptodev.c | 2 +-
drivers/crypto/cnxk/cn20k_cryptodev.c | 2 +-
drivers/crypto/cnxk/cn9k_cryptodev.c | 2 +-
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +-
drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +-
drivers/crypto/ipsec_mb/ipsec_mb_private.c | 2 +-
drivers/crypto/mlx5/mlx5_crypto_gcm.c | 2 +-
drivers/crypto/mlx5/mlx5_crypto_xts.c | 2 +-
drivers/crypto/mvsam/rte_mrvl_pmd.c | 4 +-
drivers/crypto/nitrox/nitrox_sym.c | 2 +-
drivers/crypto/scheduler/scheduler_pmd.c | 2 +-
drivers/crypto/virtio/virtio_cryptodev.c | 2 +-
drivers/crypto/virtio/virtio_user_cryptodev.c | 2 +-
drivers/crypto/zsda/zsda_crypto_pmd.c | 2 +-
lib/cryptodev/cryptodev_pmd.c | 14 ++---
lib/cryptodev/cryptodev_pmd.h | 24 +++----
lib/cryptodev/cryptodev_trace.h | 18 +++---
lib/cryptodev/cryptodev_trace_points.c | 4 +-
lib/cryptodev/rte_crypto.h | 4 +-
lib/cryptodev/rte_cryptodev.c | 63 ++++++++++---------
lib/cryptodev/rte_cryptodev.h | 55 +++++++++++-----
26 files changed, 128 insertions(+), 98 deletions(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index fd02107baf..aa689b297a 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -716,7 +716,7 @@ testsuite_setup(void)
rte_cryptodev_info_get(dev_id, &info);
ts_params->conf.nb_queue_pairs = info.max_nb_queue_pairs;
- ts_params->conf.socket_id = SOCKET_ID_ANY;
+ ts_params->conf.numa_id = SOCKET_ID_ANY;
ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
unsigned int session_size =
@@ -1512,7 +1512,7 @@ dev_configure_and_start(uint64_t ff_disable)
memset(ut_params, 0, sizeof(*ut_params));
/* Reconfigure device to default parameters */
- ts_params->conf.socket_id = SOCKET_ID_ANY;
+ ts_params->conf.numa_id = SOCKET_ID_ANY;
ts_params->conf.ff_disable = ff_disable;
ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
ts_params->qp_conf.mp_session = ts_params->session_mpool;
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index d9807f34e0..d68fe84cde 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -1185,7 +1185,7 @@ testsuite_setup(void)
/* configure device with num qp */
ts_params->conf.nb_queue_pairs = info.max_nb_queue_pairs;
- ts_params->conf.socket_id = SOCKET_ID_ANY;
+ ts_params->conf.numa_id = RTE_NUMA_ID_ANY;
ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY |
RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO;
TEST_ASSERT_SUCCESS(rte_cryptodev_configure(dev_id,
@@ -1251,7 +1251,7 @@ ut_setup_asym(void)
);
/* Reconfigure device to default parameters */
- ts_params->conf.socket_id = SOCKET_ID_ANY;
+ ts_params->conf.numa_id = RTE_NUMA_ID_ANY;
TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
&ts_params->conf),
diff --git a/app/test/test_cryptodev_crosscheck.c b/app/test/test_cryptodev_crosscheck.c
index bb21c3bc50..d0ff3e0b35 100644
--- a/app/test/test_cryptodev_crosscheck.c
+++ b/app/test/test_cryptodev_crosscheck.c
@@ -425,7 +425,7 @@ crosscheck_init(void)
/* Setup queue pair conf params */
ts_params->conf.nb_queue_pairs = nb_queue_pairs;
- ts_params->conf.socket_id = SOCKET_ID_ANY;
+ ts_params->conf.numa_id = SOCKET_ID_ANY;
ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
ts_params->qp_conf.mp_session = ts_params->session_mpool;
diff --git a/drivers/crypto/bcmfs/bcmfs_sym_pmd.c b/drivers/crypto/bcmfs/bcmfs_sym_pmd.c
index d3b1e25d57..3f2ff40cd8 100644
--- a/drivers/crypto/bcmfs/bcmfs_sym_pmd.c
+++ b/drivers/crypto/bcmfs/bcmfs_sym_pmd.c
@@ -355,7 +355,7 @@ bcmfs_sym_dev_create(struct bcmfs_device *fsdev)
{
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.private_data_size = sizeof(struct bcmfs_sym_dev_private)
};
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c
index 700e141667..ab19f8fd9c 100644
--- a/drivers/crypto/ccp/rte_ccp_pmd.c
+++ b/drivers/crypto/ccp/rte_ccp_pmd.c
@@ -288,7 +288,7 @@ cryptodev_ccp_probe(struct rte_pci_driver *pci_drv __rte_unused,
init_params.def_p.max_nb_queue_pairs = CCP_PMD_MAX_QUEUE_PAIRS;
CCP_LOG_INFO("Initialising %s on NUMA node %d", name,
- init_params.def_p.socket_id);
+ init_params.def_p.numa_id);
CCP_LOG_INFO("Max number of queue pairs = %d",
init_params.def_p.max_nb_queue_pairs);
CCP_LOG_INFO("Authentication offload to %s",
diff --git a/drivers/crypto/cnxk/cn10k_cryptodev.c b/drivers/crypto/cnxk/cn10k_cryptodev.c
index 598def51a5..1c1478ad80 100644
--- a/drivers/crypto/cnxk/cn10k_cryptodev.c
+++ b/drivers/crypto/cnxk/cn10k_cryptodev.c
@@ -34,7 +34,7 @@ cn10k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
{
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.private_data_size = sizeof(struct cnxk_cpt_vf)
};
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
diff --git a/drivers/crypto/cnxk/cn20k_cryptodev.c b/drivers/crypto/cnxk/cn20k_cryptodev.c
index 7b8293cc05..36f2a615dd 100644
--- a/drivers/crypto/cnxk/cn20k_cryptodev.c
+++ b/drivers/crypto/cnxk/cn20k_cryptodev.c
@@ -31,7 +31,7 @@ static int
cn20k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, struct rte_pci_device *pci_dev)
{
struct rte_cryptodev_pmd_init_params init_params = {.name = "",
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.private_data_size =
sizeof(struct cnxk_cpt_vf)};
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
diff --git a/drivers/crypto/cnxk/cn9k_cryptodev.c b/drivers/crypto/cnxk/cn9k_cryptodev.c
index 818458bd6f..bb5c837b0a 100644
--- a/drivers/crypto/cnxk/cn9k_cryptodev.c
+++ b/drivers/crypto/cnxk/cn9k_cryptodev.c
@@ -39,7 +39,7 @@ cn9k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
{
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.private_data_size = sizeof(struct cnxk_cpt_vf)
};
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index d83698f1ad..7bcb472838 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -4551,7 +4551,7 @@ cryptodev_dpaa2_sec_probe(struct rte_dpaa2_driver *dpaa2_drv __rte_unused,
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
.private_data_size = sizeof(struct dpaa2_sec_dev_private),
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.max_nb_queue_pairs =
RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS,
/* setting default, will be updated in init. */
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index f03efb316d..65b3573a1a 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -3777,7 +3777,7 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused,
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
.private_data_size = sizeof(struct dpaa_sec_dev_private),
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.max_nb_queue_pairs =
RTE_DPAA_MAX_NB_SEC_QPS,
};
diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_private.c b/drivers/crypto/ipsec_mb/ipsec_mb_private.c
index 468d77fead..23ec99004b 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_private.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_private.c
@@ -101,7 +101,7 @@ ipsec_mb_create(struct rte_vdev_device *vdev,
pmd_data->internals_priv_size;
init_params.max_nb_queue_pairs =
RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS;
- init_params.socket_id = rte_socket_id();
+ init_params.numa_id = rte_socket_id();
name = rte_vdev_device_name(vdev);
if (name == NULL)
diff --git a/drivers/crypto/mlx5/mlx5_crypto_gcm.c b/drivers/crypto/mlx5/mlx5_crypto_gcm.c
index 1a2600655a..d0f01dab4a 100644
--- a/drivers/crypto/mlx5/mlx5_crypto_gcm.c
+++ b/drivers/crypto/mlx5/mlx5_crypto_gcm.c
@@ -342,7 +342,7 @@ mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
qp->priv = priv;
qp->entries_n = entries;
if (mlx5_mr_ctrl_init(&qp->mr_ctrl, &priv->cdev->mr_scache.dev_gen,
- priv->dev_config.socket_id)) {
+ priv->dev_config.numa_id)) {
DRV_LOG(ERR, "Cannot allocate MR Btree for qp %u.",
(uint32_t)qp_id);
rte_errno = ENOMEM;
diff --git a/drivers/crypto/mlx5/mlx5_crypto_xts.c b/drivers/crypto/mlx5/mlx5_crypto_xts.c
index 1c914caa85..badde267a7 100644
--- a/drivers/crypto/mlx5/mlx5_crypto_xts.c
+++ b/drivers/crypto/mlx5/mlx5_crypto_xts.c
@@ -515,7 +515,7 @@ mlx5_crypto_xts_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
goto error;
}
if (mlx5_mr_ctrl_init(&qp->mr_ctrl, &priv->cdev->mr_scache.dev_gen,
- priv->dev_config.socket_id) != 0) {
+ priv->dev_config.numa_id) != 0) {
DRV_LOG(ERR, "Cannot allocate MR Btree for qp %u.",
(uint32_t)qp_id);
rte_errno = ENOMEM;
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd.c b/drivers/crypto/mvsam/rte_mrvl_pmd.c
index 65a63c9d62..c69f526c52 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd.c
@@ -1178,7 +1178,7 @@ mrvl_pmd_parse_input_args(struct mrvl_pmd_init_params *params,
ret = rte_kvargs_process(kvlist,
RTE_CRYPTODEV_PMD_SOCKET_ID_ARG,
&parse_integer_arg,
- ¶ms->common.socket_id);
+ ¶ms->common.numa_id);
if (ret < 0)
goto free_kvlist;
@@ -1219,7 +1219,7 @@ cryptodev_mrvl_crypto_init(struct rte_vdev_device *vdev)
sizeof(struct mrvl_crypto_private),
.max_nb_queue_pairs =
sam_get_num_inst() * sam_get_num_cios(0),
- .socket_id = rte_socket_id()
+ .numa_id = rte_numa_id()
},
.max_nb_sessions = MRVL_PMD_DEFAULT_MAX_NB_SESSIONS
};
diff --git a/drivers/crypto/nitrox/nitrox_sym.c b/drivers/crypto/nitrox/nitrox_sym.c
index 7c2dc98a4b..510d6059b1 100644
--- a/drivers/crypto/nitrox/nitrox_sym.c
+++ b/drivers/crypto/nitrox/nitrox_sym.c
@@ -749,7 +749,7 @@ nitrox_sym_pmd_create(struct nitrox_device *ndev)
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
- .socket_id = ndev->pdev->device.numa_node,
+ .numa_id = ndev->pdev->device.numa_node,
.private_data_size = sizeof(struct nitrox_sym_device)
};
struct rte_cryptodev *cdev;
diff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c
index ceaefa329b..8ca09ba3d0 100644
--- a/drivers/crypto/scheduler/scheduler_pmd.c
+++ b/drivers/crypto/scheduler/scheduler_pmd.c
@@ -533,7 +533,7 @@ scheduler_parse_init_params(struct scheduler_init_params *params,
ret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_SOCKET_ID,
&parse_integer_arg,
- ¶ms->def_p.socket_id);
+ ¶ms->def_p.numa_id);
if (ret < 0)
goto free_kvlist;
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c b/drivers/crypto/virtio/virtio_cryptodev.c
index d70651646e..d0fe21947c 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -1691,7 +1691,7 @@ crypto_virtio_pci_probe(
{
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
- .socket_id = pci_dev->device.numa_node,
+ .numa_id = pci_dev->device.numa_node,
.private_data_size = sizeof(struct virtio_crypto_hw)
};
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
diff --git a/drivers/crypto/virtio/virtio_user_cryptodev.c b/drivers/crypto/virtio/virtio_user_cryptodev.c
index 4daa188e1d..4cddb964e2 100644
--- a/drivers/crypto/virtio/virtio_user_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_user_cryptodev.c
@@ -374,7 +374,7 @@ virtio_user_cryptodev_alloc(struct rte_vdev_device *vdev)
struct virtio_user_dev *dev;
struct virtio_crypto_hw *hw;
- init_params.socket_id = vdev->device.numa_node;
+ init_params.numa_id = vdev->device.numa_node;
init_params.private_data_size = sizeof(struct virtio_user_dev);
cryptodev = rte_cryptodev_pmd_create(vdev->device.name, &vdev->device, &init_params);
if (cryptodev == NULL) {
diff --git a/drivers/crypto/zsda/zsda_crypto_pmd.c b/drivers/crypto/zsda/zsda_crypto_pmd.c
index 181e19f9f2..d1cdfcce0b 100644
--- a/drivers/crypto/zsda/zsda_crypto_pmd.c
+++ b/drivers/crypto/zsda/zsda_crypto_pmd.c
@@ -260,7 +260,7 @@ zsda_crypto_dev_create(struct zsda_pci_device *zsda_pci_dev)
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
- .socket_id = (int)rte_socket_id(),
+ .numa_id = (int)rte_numa_id(),
.private_data_size = sizeof(struct zsda_crypto_dev_private)
};
diff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c
index d79d561bf6..d82128ce26 100644
--- a/lib/cryptodev/cryptodev_pmd.c
+++ b/lib/cryptodev/cryptodev_pmd.c
@@ -81,9 +81,9 @@ rte_cryptodev_pmd_parse_input_args(
goto free_kvlist;
ret = rte_kvargs_process(kvlist,
- RTE_CRYPTODEV_PMD_SOCKET_ID_ARG,
+ RTE_CRYPTODEV_PMD_NUMA_ID_ARG,
&rte_cryptodev_pmd_parse_uint_arg,
- ¶ms->socket_id);
+ ¶ms->numa_id);
if (ret < 0)
goto free_kvlist;
@@ -116,11 +116,11 @@ rte_cryptodev_pmd_create(const char *name,
CDEV_LOG_INFO("Creating cryptodev %s", name);
CDEV_LOG_INFO("Initialisation parameters - name: %s,"
- "socket id: %d, max queue pairs: %u",
- name, params->socket_id, params->max_nb_queue_pairs);
+ "NUMA node id: %d, max queue pairs: %u",
+ name, params->numa_id, params->max_nb_queue_pairs);
/* allocate device structure */
- cryptodev = rte_cryptodev_pmd_allocate(name, params->socket_id);
+ cryptodev = rte_cryptodev_pmd_allocate(name, params->numa_id);
if (cryptodev == NULL) {
CDEV_LOG_ERR("Failed to allocate crypto device for %s", name);
return NULL;
@@ -129,10 +129,10 @@ rte_cryptodev_pmd_create(const char *name,
/* allocate private device structure */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
cryptodev->data->dev_private =
- rte_zmalloc_socket("cryptodev device private",
+ rte_zmalloc_numa("cryptodev device private",
params->private_data_size,
RTE_CACHE_LINE_SIZE,
- params->socket_id);
+ params->numa_id);
if (cryptodev->data->dev_private == NULL) {
CDEV_LOG_ERR("Cannot allocate memory for cryptodev %s"
diff --git a/lib/cryptodev/cryptodev_pmd.h b/lib/cryptodev/cryptodev_pmd.h
index 929c6defe9..1677fbf3c2 100644
--- a/lib/cryptodev/cryptodev_pmd.h
+++ b/lib/cryptodev/cryptodev_pmd.h
@@ -33,13 +33,13 @@ extern "C" {
#define RTE_CRYPTODEV_PMD_NAME_ARG ("name")
#define RTE_CRYPTODEV_PMD_MAX_NB_QP_ARG ("max_nb_queue_pairs")
-#define RTE_CRYPTODEV_PMD_SOCKET_ID_ARG ("socket_id")
+#define RTE_CRYPTODEV_PMD_NUMA_ID_ARG ("numa_id")
static const char * const cryptodev_pmd_valid_params[] = {
RTE_CRYPTODEV_PMD_NAME_ARG,
RTE_CRYPTODEV_PMD_MAX_NB_QP_ARG,
- RTE_CRYPTODEV_PMD_SOCKET_ID_ARG,
+ RTE_CRYPTODEV_PMD_NUMA_ID_ARG,
NULL
};
@@ -50,7 +50,7 @@ static const char * const cryptodev_pmd_valid_params[] = {
struct rte_cryptodev_pmd_init_params {
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
size_t private_data_size;
- int socket_id;
+ int numa_id;
unsigned int max_nb_queue_pairs;
};
@@ -65,7 +65,7 @@ struct __rte_cache_aligned rte_cryptodev_data {
/** Device ID for this instance */
uint8_t dev_id;
/** Socket ID where memory is allocated */
- int socket_id;
+ int numa_id;
/** Unique identifier name */
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
@@ -269,13 +269,13 @@ typedef void (*cryptodev_info_get_t)(struct rte_cryptodev *dev,
* @param dev Crypto device pointer
* @param qp_id Queue Pair Index
* @param qp_conf Queue configuration structure
- * @param socket_id Socket Index
+ * @param numa_id Socket Index
*
* @return Returns 0 on success.
*/
typedef int (*cryptodev_queue_pair_setup_t)(struct rte_cryptodev *dev,
uint16_t qp_id, const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id);
+ int numa_id);
/**
* Release memory resources allocated by given queue pair.
@@ -296,7 +296,7 @@ typedef int (*cryptodev_queue_pair_release_t)(struct rte_cryptodev *dev,
* @param dev Crypto device pointer
* @param qp_id Queue pair index
* @param qp_conf Queue configuration structure
- * @param socket_id Socket index
+ * @param numa_id Socket index
*
* @return
* - 0: on success.
@@ -304,7 +304,7 @@ typedef int (*cryptodev_queue_pair_release_t)(struct rte_cryptodev *dev,
*/
typedef int (*cryptodev_queue_pair_reset_t)(struct rte_cryptodev *dev,
uint16_t qp_id, const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id);
+ int numa_id);
/**
* Create a session mempool to allocate sessions from
@@ -312,7 +312,7 @@ typedef int (*cryptodev_queue_pair_reset_t)(struct rte_cryptodev *dev,
* @param dev Crypto device pointer
* @param nb_objs number of sessions objects in mempool
* @param obj_cache_size l-core object cache size, see *rte_ring_create*
- * @param socket_id Socket Id to allocate mempool on.
+ * @param numa_id Socket Id to allocate mempool on.
*
* @return
* - On success returns a pointer to a rte_mempool
@@ -320,7 +320,7 @@ typedef int (*cryptodev_queue_pair_reset_t)(struct rte_cryptodev *dev,
*/
typedef int (*cryptodev_sym_create_session_pool_t)(
struct rte_cryptodev *dev, unsigned nb_objs,
- unsigned obj_cache_size, int socket_id);
+ unsigned int obj_cache_size, int numa_id);
/**
@@ -534,13 +534,13 @@ struct rte_cryptodev_ops {
* to that slot for the driver to use.
*
* @param name Unique identifier name for each device
- * @param socket_id Socket to allocate resources on.
+ * @param numa_id Socket to allocate resources on.
* @return
* - Slot in the rte_dev_devices array for a new device;
*/
__rte_internal
struct rte_cryptodev *
-rte_cryptodev_pmd_allocate(const char *name, int socket_id);
+rte_cryptodev_pmd_allocate(const char *name, int numa_id);
/**
* Function for internal use by dummy drivers primarily, e.g. ring-based
diff --git a/lib/cryptodev/cryptodev_trace.h b/lib/cryptodev/cryptodev_trace.h
index 788790432a..0a16c5a824 100644
--- a/lib/cryptodev/cryptodev_trace.h
+++ b/lib/cryptodev/cryptodev_trace.h
@@ -61,11 +61,11 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT(
rte_cryptodev_trace_queue_pair_reset,
RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint16_t queue_pair_id,
- const struct rte_cryptodev_qp_conf *conf, int socket_id),
+ const struct rte_cryptodev_qp_conf *conf, int numa_id),
rte_trace_point_emit_u8(dev_id);
rte_trace_point_emit_u16(queue_pair_id);
rte_trace_point_emit_u32(conf->nb_descriptors);
- rte_trace_point_emit_int(socket_id);
+ rte_trace_point_emit_int(numa_id);
)
RTE_TRACE_POINT(
@@ -267,20 +267,20 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT(
rte_cryptodev_trace_queue_pair_count,
RTE_TRACE_POINT_ARGS(const void *dev, const char *name,
- uint8_t socket_id, uint8_t dev_id, uint16_t nb_queue_pairs),
+ uint8_t numa_id, uint8_t dev_id, uint16_t nb_queue_pairs),
rte_trace_point_emit_ptr(dev);
rte_trace_point_emit_string(name);
- rte_trace_point_emit_u8(socket_id);
+ rte_trace_point_emit_u8(numa_id);
rte_trace_point_emit_u8(dev_id);
rte_trace_point_emit_u16(nb_queue_pairs);
)
RTE_TRACE_POINT(
- rte_cryptodev_trace_socket_id,
- RTE_TRACE_POINT_ARGS(uint8_t dev_id, const char *name, int socket_id),
+ rte_cryptodev_trace_numa_id,
+ RTE_TRACE_POINT_ARGS(uint8_t dev_id, const char *name, int numa_id),
rte_trace_point_emit_u8(dev_id);
rte_trace_point_emit_string(name);
- rte_trace_point_emit_int(socket_id);
+ rte_trace_point_emit_int(numa_id);
)
RTE_TRACE_POINT(
@@ -512,10 +512,10 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT(
rte_cryptodev_trace_op_pool_create,
- RTE_TRACE_POINT_ARGS(const char *name, int socket_id, int type,
+ RTE_TRACE_POINT_ARGS(const char *name, int numa_id, int type,
uint32_t nb_elts, const void *mp),
rte_trace_point_emit_string(name);
- rte_trace_point_emit_int(socket_id);
+ rte_trace_point_emit_int(numa_id);
rte_trace_point_emit_int(type);
rte_trace_point_emit_u32(nb_elts);
rte_trace_point_emit_ptr(mp);
diff --git a/lib/cryptodev/cryptodev_trace_points.c b/lib/cryptodev/cryptodev_trace_points.c
index 69737adcbe..cecd203634 100644
--- a/lib/cryptodev/cryptodev_trace_points.c
+++ b/lib/cryptodev/cryptodev_trace_points.c
@@ -108,8 +108,8 @@ RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_name_get,
RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_queue_pair_count,
lib.cryptodev.queue.pair.count)
-RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_socket_id,
- lib.cryptodev.socket.id)
+RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_numa_id,
+ lib.cryptodev.numa_id)
RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_stats_get,
lib.cryptodev.stats.get)
diff --git a/lib/cryptodev/rte_crypto.h b/lib/cryptodev/rte_crypto.h
index dcf4a36fb2..fced5d99cf 100644
--- a/lib/cryptodev/rte_crypto.h
+++ b/lib/cryptodev/rte_crypto.h
@@ -254,7 +254,7 @@ __rte_crypto_op_get_priv_data_size(struct rte_mempool *mempool)
* cache size
* @param priv_size Size of private data to allocate with each
* operation
- * @param socket_id Socket to allocate memory on
+ * @param numa_id Socket to allocate memory on
*
* @return
* - On success pointer to mempool
@@ -263,7 +263,7 @@ __rte_crypto_op_get_priv_data_size(struct rte_mempool *mempool)
struct rte_mempool *
rte_crypto_op_pool_create(const char *name, enum rte_crypto_op_type type,
unsigned nb_elts, unsigned cache_size, uint16_t priv_size,
- int socket_id);
+ int numa_id);
/**
* Bulk allocate raw element from mempool and return as crypto operations
diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index 829a5d0846..2362d72dec 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -1088,9 +1088,9 @@ rte_cryptodev_get_sec_ctx(uint8_t dev_id)
return sec_ctx;
}
-RTE_EXPORT_SYMBOL(rte_cryptodev_socket_id)
+RTE_EXPORT_SYMBOL(rte_cryptodev_numa_id)
int
-rte_cryptodev_socket_id(uint8_t dev_id)
+rte_cryptodev_numa_id(uint8_t dev_id)
{
struct rte_cryptodev *dev;
@@ -1099,14 +1099,21 @@ rte_cryptodev_socket_id(uint8_t dev_id)
dev = rte_cryptodev_pmd_get_dev(dev_id);
- rte_cryptodev_trace_socket_id(dev_id, dev->data->name,
- dev->data->socket_id);
- return dev->data->socket_id;
+ rte_cryptodev_trace_numa_id(dev_id, dev->data->name,
+ dev->data->numa_id);
+ return dev->data->numa_id;
+}
+
+RTE_EXPORT_SYMBOL(rte_cryptodev_socket_id)
+int
+rte_cryptodev_socket_id(uint8_t dev_id)
+{
+ return rte_cryptodev_numa_id(dev_id);
}
static inline int
rte_cryptodev_data_alloc(uint8_t dev_id, struct rte_cryptodev_data **data,
- int socket_id)
+ int numa_id)
{
char mz_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz;
@@ -1120,7 +1127,7 @@ rte_cryptodev_data_alloc(uint8_t dev_id, struct rte_cryptodev_data **data,
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
mz = rte_memzone_reserve(mz_name,
sizeof(struct rte_cryptodev_data),
- socket_id, 0);
+ numa_id, 0);
CDEV_LOG_DEBUG("PRIMARY:reserved memzone for %s (%p)",
mz_name, mz);
} else {
@@ -1206,7 +1213,7 @@ rte_cryptodev_find_device_by_name(const char *name)
RTE_EXPORT_INTERNAL_SYMBOL(rte_cryptodev_pmd_allocate)
struct rte_cryptodev *
-rte_cryptodev_pmd_allocate(const char *name, int socket_id)
+rte_cryptodev_pmd_allocate(const char *name, int numa_id)
{
struct rte_cryptodev *cryptodev;
uint8_t dev_id;
@@ -1238,7 +1245,7 @@ rte_cryptodev_pmd_allocate(const char *name, int socket_id)
&cryptodev_globals.data[dev_id];
int retval = rte_cryptodev_data_alloc(dev_id, cryptodev_data,
- socket_id);
+ numa_id);
if (retval < 0 || *cryptodev_data == NULL)
return NULL;
@@ -1250,7 +1257,7 @@ rte_cryptodev_pmd_allocate(const char *name, int socket_id)
RTE_CRYPTODEV_NAME_MAX_LEN);
cryptodev->data->dev_id = dev_id;
- cryptodev->data->socket_id = socket_id;
+ cryptodev->data->numa_id = numa_id;
cryptodev->data->dev_started = 0;
CDEV_LOG_DEBUG("PRIMARY:init data");
}
@@ -1258,7 +1265,7 @@ rte_cryptodev_pmd_allocate(const char *name, int socket_id)
CDEV_LOG_DEBUG("Data for %s: dev_id %d, socket %d, started %d",
cryptodev->data->name,
cryptodev->data->dev_id,
- cryptodev->data->socket_id,
+ cryptodev->data->numa_id,
cryptodev->data->dev_started);
/* init user callbacks */
@@ -1315,7 +1322,7 @@ rte_cryptodev_queue_pair_count(uint8_t dev_id)
dev = &rte_crypto_devices[dev_id];
rte_cryptodev_trace_queue_pair_count(dev, dev->data->name,
- dev->data->socket_id, dev->data->dev_id,
+ dev->data->numa_id, dev->data->dev_id,
dev->data->nb_queue_pairs);
return dev->data->nb_queue_pairs;
@@ -1323,7 +1330,7 @@ rte_cryptodev_queue_pair_count(uint8_t dev_id)
static int
rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs,
- int socket_id)
+ int numa_id)
{
struct rte_cryptodev_info dev_info;
void **qp;
@@ -1351,11 +1358,11 @@ rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs,
}
if (dev->data->queue_pairs == NULL) { /* first time configuration */
- dev->data->queue_pairs = rte_zmalloc_socket(
+ dev->data->queue_pairs = rte_zmalloc_numa(
"cryptodev->queue_pairs",
sizeof(dev->data->queue_pairs[0]) *
dev_info.max_nb_queue_pairs,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (dev->data->queue_pairs == NULL) {
dev->data->nb_queue_pairs = 0;
@@ -1388,7 +1395,7 @@ rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs,
RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_cryptodev_queue_pair_reset, 24.11)
int
rte_cryptodev_queue_pair_reset(uint8_t dev_id, uint16_t queue_pair_id,
- const struct rte_cryptodev_qp_conf *qp_conf, int socket_id)
+ const struct rte_cryptodev_qp_conf *qp_conf, int numa_id)
{
struct rte_cryptodev *dev;
@@ -1406,8 +1413,8 @@ rte_cryptodev_queue_pair_reset(uint8_t dev_id, uint16_t queue_pair_id,
if (dev->dev_ops->queue_pair_reset == NULL)
return -ENOTSUP;
- rte_cryptodev_trace_queue_pair_reset(dev_id, queue_pair_id, qp_conf, socket_id);
- return dev->dev_ops->queue_pair_reset(dev, queue_pair_id, qp_conf, socket_id);
+ rte_cryptodev_trace_queue_pair_reset(dev_id, queue_pair_id, qp_conf, numa_id);
+ return dev->dev_ops->queue_pair_reset(dev, queue_pair_id, qp_conf, numa_id);
}
RTE_EXPORT_SYMBOL(rte_cryptodev_configure)
@@ -1439,7 +1446,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)
/* Setup new number of queue pairs and reconfigure device. */
diag = rte_cryptodev_queue_pairs_config(dev, config->nb_queue_pairs,
- config->socket_id);
+ config->numa_id);
if (diag != 0) {
CDEV_LOG_ERR("dev%d rte_crypto_dev_queue_pairs_config = %d",
dev_id, diag);
@@ -1627,7 +1634,7 @@ rte_cryptodev_sym_is_valid_session_pool(struct rte_mempool *mp,
RTE_EXPORT_SYMBOL(rte_cryptodev_queue_pair_setup)
int
rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
- const struct rte_cryptodev_qp_conf *qp_conf, int socket_id)
+ const struct rte_cryptodev_qp_conf *qp_conf, int numa_id)
{
struct rte_cryptodev *dev;
@@ -1675,7 +1682,7 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
return -ENOTSUP;
rte_cryptodev_trace_queue_pair_setup(dev_id, queue_pair_id, qp_conf);
- return dev->dev_ops->queue_pair_setup(dev, queue_pair_id, qp_conf, socket_id);
+ return dev->dev_ops->queue_pair_setup(dev, queue_pair_id, qp_conf, numa_id);
}
RTE_EXPORT_SYMBOL(rte_cryptodev_add_enq_callback)
@@ -2190,7 +2197,7 @@ RTE_EXPORT_SYMBOL(rte_cryptodev_sym_session_pool_create)
struct rte_mempool *
rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts,
uint32_t elt_size, uint32_t cache_size, uint16_t user_data_size,
- int socket_id)
+ int numa_id)
{
struct rte_mempool *mp;
struct rte_cryptodev_sym_session_pool_private_data *pool_priv;
@@ -2202,7 +2209,7 @@ rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts,
mp = rte_mempool_create(name, nb_elts, obj_sz, cache_size,
(uint32_t)(sizeof(*pool_priv)), NULL, NULL,
NULL, NULL,
- socket_id, 0);
+ numa_id, 0);
if (mp == NULL) {
CDEV_LOG_ERR("%s(name=%s) failed, rte_errno=%d",
__func__, name, rte_errno);
@@ -2228,7 +2235,7 @@ rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts,
RTE_EXPORT_SYMBOL(rte_cryptodev_asym_session_pool_create)
struct rte_mempool *
rte_cryptodev_asym_session_pool_create(const char *name, uint32_t nb_elts,
- uint32_t cache_size, uint16_t user_data_size, int socket_id)
+ uint32_t cache_size, uint16_t user_data_size, int numa_id)
{
struct rte_mempool *mp;
struct rte_cryptodev_asym_session_pool_private_data *pool_priv;
@@ -2254,7 +2261,7 @@ rte_cryptodev_asym_session_pool_create(const char *name, uint32_t nb_elts,
mp = rte_mempool_create(name, nb_elts, obj_sz_aligned, cache_size,
(uint32_t)(sizeof(*pool_priv)),
NULL, NULL, NULL, NULL,
- socket_id, 0);
+ numa_id, 0);
if (mp == NULL) {
CDEV_LOG_ERR("%s(name=%s) failed, rte_errno=%d",
__func__, name, rte_errno);
@@ -2820,7 +2827,7 @@ RTE_EXPORT_SYMBOL(rte_crypto_op_pool_create)
struct rte_mempool *
rte_crypto_op_pool_create(const char *name, enum rte_crypto_op_type type,
unsigned nb_elts, unsigned cache_size, uint16_t priv_size,
- int socket_id)
+ int numa_id)
{
struct rte_crypto_op_pool_private *priv;
@@ -2868,7 +2875,7 @@ rte_crypto_op_pool_create(const char *name, enum rte_crypto_op_type type,
NULL,
rte_crypto_op_init,
&type,
- socket_id,
+ numa_id,
0);
if (mp == NULL) {
@@ -2882,7 +2889,7 @@ rte_crypto_op_pool_create(const char *name, enum rte_crypto_op_type type,
priv->priv_size = priv_size;
priv->type = type;
- rte_cryptodev_trace_op_pool_create(name, socket_id, type, nb_elts, mp);
+ rte_cryptodev_trace_op_pool_create(name, numa_id, type, nb_elts, mp);
return mp;
}
diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
index bdbd11ace5..a1afb7e927 100644
--- a/lib/cryptodev/rte_cryptodev.h
+++ b/lib/cryptodev/rte_cryptodev.h
@@ -833,8 +833,23 @@ uint8_t
rte_cryptodev_devices_get(const char *driver_name, uint8_t *devices,
uint8_t nb_devices);
/*
+ * Return the NUMA node to which a device is connected
+ *
+ * @param dev_id
+ * The identifier of the device
+ * @return
+ * The NUMA node ID to which the device is connected or
+ * a default of zero if the NUMA node could not be determined.
+ * -1 if returned is the dev_id value is out of range.
+ */
+int
+rte_cryptodev_numa_id(uint8_t dev_id);
+
+/**
* Return the NUMA socket to which a device is connected
*
+ * This is a legacy alias of rte_cryptodev_numa_id().
+ *
* @param dev_id
* The identifier of the device
* @return
@@ -848,7 +863,15 @@ rte_cryptodev_socket_id(uint8_t dev_id);
/** Crypto device configuration structure */
/* Structure rte_cryptodev_config 8< */
struct rte_cryptodev_config {
- int socket_id; /**< Socket to allocate resources on */
+ union {
+ /** NUMA node to allocate resources on */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
uint16_t nb_queue_pairs;
/**< Number of queue pairs to configure on device */
uint64_t ff_disable;
@@ -928,9 +951,9 @@ rte_cryptodev_close(uint8_t dev_id);
* rte_cryptodev_configure().
* @param qp_conf The pointer to the configuration data to be
* used for the queue pair.
- * @param socket_id The *socket_id* argument is the socket
- * identifier in case of NUMA. The value can be
- * *SOCKET_ID_ANY* if there is no NUMA constraint
+ * @param numa_id The *numa_id* argument is the NUMA node
+ * ID in case of NUMA. The value can be
+ * *RTE_NUMA_ID_ANY* if there is no NUMA constraint
* for the DMA memory allocated for the receive
* queue pair.
*
@@ -940,7 +963,7 @@ rte_cryptodev_close(uint8_t dev_id);
*/
int
rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
- const struct rte_cryptodev_qp_conf *qp_conf, int socket_id);
+ const struct rte_cryptodev_qp_conf *qp_conf, int numa_id);
/**
* @warning
@@ -957,8 +980,8 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
* rte_cryptodev_configure().
* @param qp_conf The pointer to configuration data to be used for the queue pair.
* It should be NULL, if the API is called from an interrupt context.
- * @param socket_id The *socket_id* argument is the socket identifier in case of NUMA.
- * The value can be *SOCKET_ID_ANY* if there is no NUMA constraint
+ * @param numa_id The *numa_id* argument is the NUMA node ID in case of NUMA.
+ * The value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraint
* for the DMA memory allocated for the queue pair.
*
* @return
@@ -969,7 +992,7 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
__rte_experimental
int
rte_cryptodev_queue_pair_reset(uint8_t dev_id, uint16_t queue_pair_id,
- const struct rte_cryptodev_qp_conf *qp_conf, int socket_id);
+ const struct rte_cryptodev_qp_conf *qp_conf, int numa_id);
/**
* Get the status of queue pairs setup on a specific crypto device
@@ -1153,9 +1176,9 @@ rte_cryptodev_get_sec_ctx(uint8_t dev_id);
* The number of per-lcore cache elements
* @param priv_size
* The private data size of each session.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in the case of
- * NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in the case of
+ * NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
* constraint for the reserved zone.
*
* @return
@@ -1165,7 +1188,7 @@ rte_cryptodev_get_sec_ctx(uint8_t dev_id);
struct rte_mempool *
rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts,
uint32_t elt_size, uint32_t cache_size, uint16_t priv_size,
- int socket_id);
+ int numa_id);
/**
@@ -1179,9 +1202,9 @@ rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts,
* The number of per-lcore cache elements
* @param user_data_size
* The size of user data to be placed after session private data.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in the case of
- * NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in the case of
+ * NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
* constraint for the reserved zone.
*
* @return
@@ -1190,7 +1213,7 @@ rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts,
*/
struct rte_mempool *
rte_cryptodev_asym_session_pool_create(const char *name, uint32_t nb_elts,
- uint32_t cache_size, uint16_t user_data_size, int socket_id);
+ uint32_t cache_size, uint16_t user_data_size, int numa_id);
/**
* Create symmetric crypto session and fill out private data for the device id,
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 008/227] compressdev: rename device socket API to NUMA node API
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (6 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 007/227] cryptodev: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 009/227] rawdev: " Chengwen Feng
` (219 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the exported function rte_compressdev_socket_id() to
rte_compressdev_numa_id(), keeping the old name as a functional
alias to be deprecated once the in-tree migration completes.
Rename the numa_id field of rte_compressdev_config (was socket_id),
keeping socket_id as a deprecated union alias, and update in-tree
users accordingly.
Also rename internal parameters and comments to the NUMA node
terminology.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
doc/guides/rel_notes/deprecation.rst | 2 +-
drivers/compress/isal/isal_compress_pmd_ops.c | 2 +-
drivers/compress/mlx5/mlx5_compress.c | 4 +--
drivers/compress/nitrox/nitrox_comp.c | 8 ++---
drivers/compress/qat/qat_comp_pmd.c | 16 ++++-----
drivers/compress/zlib/zlib_pmd_ops.c | 4 +--
drivers/compress/zsda/zsda_comp_pmd.c | 4 +--
lib/compressdev/rte_comp.c | 4 +--
lib/compressdev/rte_comp.h | 4 +--
lib/compressdev/rte_compressdev.c | 35 +++++++++++--------
lib/compressdev/rte_compressdev.h | 34 ++++++++++++++----
lib/compressdev/rte_compressdev_internal.h | 2 +-
lib/compressdev/rte_compressdev_pmd.c | 10 +++---
lib/compressdev/rte_compressdev_pmd.h | 12 +++----
14 files changed, 85 insertions(+), 56 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index a6ff573d18..297ce8415c 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -22,7 +22,7 @@ Deprecation Notices
as a deprecated union alias.
The following structures are affected: ``rte_hash_parameters``,
``rte_fbk_hash_params``, ``rte_member_parameters`` /
- ``rte_member_setsum`` and ``rte_mempool``
+ ``rte_member_setsum``, ``rte_mempool`` and ``rte_compressdev_config``
(more structures will follow in this release).
Applications should switch to ``numa_id``.
diff --git a/drivers/compress/isal/isal_compress_pmd_ops.c b/drivers/compress/isal/isal_compress_pmd_ops.c
index 9b42147a0b..be32a4c998 100644
--- a/drivers/compress/isal/isal_compress_pmd_ops.c
+++ b/drivers/compress/isal/isal_compress_pmd_ops.c
@@ -73,7 +73,7 @@ isal_comp_pmd_config(struct rte_compressdev *dev,
NULL, /* obj initialization constructor arg */
NULL, /**< obj constructor*/
NULL, /* obj constructor arg */
- config->socket_id, /* socket id */
+ config->numa_id, /* socket id */
0); /* flags */
}
diff --git a/drivers/compress/mlx5/mlx5_compress.c b/drivers/compress/mlx5/mlx5_compress.c
index 1361dab630..d122715672 100644
--- a/drivers/compress/mlx5/mlx5_compress.c
+++ b/drivers/compress/mlx5/mlx5_compress.c
@@ -179,7 +179,7 @@ mlx5_compress_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
}
dev->data->queue_pairs[qp_id] = qp;
if (mlx5_mr_ctrl_init(&qp->mr_ctrl, &priv->cdev->mr_scache.dev_gen,
- priv->dev_config.socket_id)) {
+ priv->dev_config.numa_id)) {
DRV_LOG(ERR, "Cannot allocate MR Btree for qp %u.",
(uint32_t)qp_id);
rte_errno = ENOMEM;
@@ -369,7 +369,7 @@ mlx5_compress_xform_create(struct rte_compressdev *dev,
if (ret < 0)
return ret;
xfrm = rte_zmalloc_socket(__func__, sizeof(*xfrm), 0,
- priv->dev_config.socket_id);
+ priv->dev_config.numa_id);
if (xfrm == NULL)
return -ENOMEM;
xfrm->opcode = MLX5_OPCODE_MMO;
diff --git a/drivers/compress/nitrox/nitrox_comp.c b/drivers/compress/nitrox/nitrox_comp.c
index 41a3ee0de8..56a90a35c5 100644
--- a/drivers/compress/nitrox/nitrox_comp.c
+++ b/drivers/compress/nitrox/nitrox_comp.c
@@ -68,7 +68,7 @@ static int nitrox_comp_dev_configure(struct rte_compressdev *dev,
comp_dev->xform_pool = rte_mempool_create(name,
xform_cnt, sizeof(struct nitrox_comp_xform),
0, 0, NULL, NULL, NULL, NULL,
- config->socket_id, 0);
+ config->numa_id, 0);
if (comp_dev->xform_pool == NULL) {
NITROX_LOG_LINE(ERR, "Failed to create xform pool, err %d",
rte_errno);
@@ -411,7 +411,7 @@ static int nitrox_comp_stream_create(struct rte_compressdev *dev,
}
nxform->history_window = rte_zmalloc_socket(NULL, nxform->window_size,
- 8, comp_dev->xform_pool->socket_id);
+ 8, comp_dev->xform_pool->numa_id);
if (unlikely(nxform->history_window == NULL)) {
err = -ENOMEM;
goto err_exit;
@@ -422,7 +422,7 @@ static int nitrox_comp_stream_create(struct rte_compressdev *dev,
nxform->context = rte_zmalloc_socket(NULL,
NITROX_DECOMP_CTX_SIZE, 8,
- comp_dev->xform_pool->socket_id);
+ comp_dev->xform_pool->numa_id);
if (unlikely(nxform->context == NULL)) {
err = -ENOMEM;
goto err_exit;
@@ -553,7 +553,7 @@ nitrox_comp_pmd_create(struct nitrox_device *ndev)
char name[RTE_COMPRESSDEV_NAME_MAX_LEN];
struct rte_compressdev_pmd_init_params init_params = {
.name = "",
- .socket_id = ndev->pdev->device.numa_node,
+ .numa_id = ndev->pdev->device.numa_node,
};
struct rte_compressdev *cdev;
diff --git a/drivers/compress/qat/qat_comp_pmd.c b/drivers/compress/qat/qat_comp_pmd.c
index 92dac79423..5ac49318da 100644
--- a/drivers/compress/qat/qat_comp_pmd.c
+++ b/drivers/compress/qat/qat_comp_pmd.c
@@ -160,13 +160,13 @@ qat_comp_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
sizeof(struct qat_sgl) +
sizeof(struct qat_flat_buf) *
QAT_PMD_COMP_SGL_DEF_SEGMENTS,
- 64, dev->data->socket_id);
+ 64, dev->data->numa_id);
cookie->qat_sgl_dst_d = rte_zmalloc_socket(NULL,
sizeof(struct qat_sgl) +
sizeof(struct qat_flat_buf) *
QAT_PMD_COMP_SGL_DEF_SEGMENTS,
- 64, dev->data->socket_id);
+ 64, dev->data->numa_id);
if (cookie->qat_sgl_src_d == NULL ||
cookie->qat_sgl_dst_d == NULL) {
@@ -185,7 +185,7 @@ qat_comp_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
cookie->dst_nb_elems = cookie->src_nb_elems =
QAT_PMD_COMP_SGL_DEF_SEGMENTS;
- cookie->socket_id = dev->data->socket_id;
+ cookie->socket_id = dev->data->numa_id;
cookie->error = 0;
}
@@ -240,7 +240,7 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
memzone = rte_memzone_reserve_aligned(inter_buff_mz_name,
size_of_ptr_array,
- comp_dev->compressdev->data->socket_id,
+ comp_dev->compressdev->data->numa_id,
RTE_MEMZONE_IOVA_CONTIG, QAT_64_BYTE_ALIGN);
if (memzone == NULL) {
QAT_LOG(ERR,
@@ -268,7 +268,7 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
if (mz == NULL) {
mz = rte_memzone_reserve_aligned(inter_buff_mz_name,
full_size,
- comp_dev->compressdev->data->socket_id,
+ comp_dev->compressdev->data->numa_id,
RTE_MEMZONE_IOVA_CONTIG,
QAT_64_BYTE_ALIGN);
if (mz == NULL) {
@@ -355,7 +355,7 @@ qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev,
mp = rte_mempool_create(xform_pool_name,
num_elements,
qat_comp_xform_size(), 0, 0,
- NULL, NULL, NULL, NULL, config->socket_id,
+ NULL, NULL, NULL, NULL, config->numa_id,
0);
if (mp == NULL) {
QAT_LOG(ERR, "Err creating mempool %s w %d elements of size %d",
@@ -534,7 +534,7 @@ qat_comp_dev_config(struct rte_compressdev *dev,
if (config->max_nb_streams) {
comp_dev->streampool = qat_comp_create_stream_pool(comp_dev,
- config->socket_id, config->max_nb_streams);
+ config->numa_id, config->max_nb_streams);
if (comp_dev->streampool == NULL) {
ret = -ENOMEM;
goto error_out;
@@ -678,7 +678,7 @@ qat_comp_dev_create(struct qat_pci_device *qat_pci_dev)
&qat_pci_devs[qat_pci_dev->qat_dev_id];
struct rte_compressdev_pmd_init_params init_params = {
.name = "",
- .socket_id = qat_dev_instance->pci_dev->device.numa_node,
+ .numa_id = qat_dev_instance->pci_dev->device.numa_node,
};
char name[RTE_COMPRESSDEV_NAME_MAX_LEN];
char capa_memz_name[RTE_COMPRESSDEV_NAME_MAX_LEN];
diff --git a/drivers/compress/zlib/zlib_pmd_ops.c b/drivers/compress/zlib/zlib_pmd_ops.c
index a530d15119..fb9cec8488 100644
--- a/drivers/compress/zlib/zlib_pmd_ops.c
+++ b/drivers/compress/zlib/zlib_pmd_ops.c
@@ -45,11 +45,11 @@ zlib_pmd_config(struct rte_compressdev *dev,
config->max_nb_streams,
sizeof(struct zlib_priv_xform),
0, 0, NULL, NULL, NULL,
- NULL, config->socket_id,
+ NULL, config->numa_id,
0);
if (mp == NULL) {
ZLIB_PMD_ERR("Cannot create private xform pool on socket %d",
- config->socket_id);
+ config->numa_id);
return -ENOMEM;
}
internals->mp = mp;
diff --git a/drivers/compress/zsda/zsda_comp_pmd.c b/drivers/compress/zsda/zsda_comp_pmd.c
index 80d92a47dd..6d857be2f0 100644
--- a/drivers/compress/zsda/zsda_comp_pmd.c
+++ b/drivers/compress/zsda/zsda_comp_pmd.c
@@ -55,7 +55,7 @@ zsda_comp_xform_pool_create(struct zsda_comp_dev_private *comp_dev,
} else {
mp = rte_mempool_create(xform_pool_name, num_elements,
zsda_comp_xform_size(), 0, 0, NULL,
- NULL, NULL, NULL, config->socket_id, 0);
+ NULL, NULL, NULL, config->numa_id, 0);
if (mp == NULL) {
ZSDA_LOG(ERR, "Failed! mp is NULL");
return NULL;
@@ -332,7 +332,7 @@ zsda_comp_dev_create(struct zsda_pci_device *zsda_pci_dev)
struct rte_compressdev_pmd_init_params init_params = {
.name = "",
- .socket_id = (int)rte_socket_id(),
+ .numa_id = (int)rte_numa_id(),
};
char name[RTE_COMPRESSDEV_NAME_MAX_LEN];
diff --git a/lib/compressdev/rte_comp.c b/lib/compressdev/rte_comp.c
index 662691796a..d15af0aac3 100644
--- a/lib/compressdev/rte_comp.c
+++ b/lib/compressdev/rte_comp.c
@@ -129,7 +129,7 @@ RTE_EXPORT_SYMBOL(rte_comp_op_pool_create)
struct rte_mempool *
rte_comp_op_pool_create(const char *name,
unsigned int nb_elts, unsigned int cache_size,
- uint16_t user_size, int socket_id)
+ uint16_t user_size, int numa_id)
{
struct rte_comp_op_pool_private *priv;
@@ -165,7 +165,7 @@ rte_comp_op_pool_create(const char *name,
NULL,
rte_comp_op_init,
NULL,
- socket_id,
+ numa_id,
0);
if (mp == NULL) {
diff --git a/lib/compressdev/rte_comp.h b/lib/compressdev/rte_comp.h
index 6384a388d4..92ce76e0da 100644
--- a/lib/compressdev/rte_comp.h
+++ b/lib/compressdev/rte_comp.h
@@ -527,7 +527,7 @@ rte_comp_op_free(struct rte_comp_op *op);
* *rte_mempool_create* for further details about cache size
* @param user_size
* Size of private data to allocate for user with each operation
- * @param socket_id
+ * @param numa_id
* Socket to identifier allocate memory on
* @return
* - On success pointer to mempool
@@ -536,7 +536,7 @@ rte_comp_op_free(struct rte_comp_op *op);
struct rte_mempool *
rte_comp_op_pool_create(const char *name,
unsigned int nb_elts, unsigned int cache_size,
- uint16_t user_size, int socket_id)
+ uint16_t user_size, int numa_id)
__rte_malloc __rte_dealloc(rte_comp_op_free, 1);
/**
diff --git a/lib/compressdev/rte_compressdev.c b/lib/compressdev/rte_compressdev.c
index 790b2cd658..b23f83a103 100644
--- a/lib/compressdev/rte_compressdev.c
+++ b/lib/compressdev/rte_compressdev.c
@@ -184,9 +184,9 @@ rte_compressdev_devices_get(const char *driver_name, uint8_t *devices,
return count;
}
-RTE_EXPORT_SYMBOL(rte_compressdev_socket_id)
+RTE_EXPORT_SYMBOL(rte_compressdev_numa_id)
int
-rte_compressdev_socket_id(uint8_t dev_id)
+rte_compressdev_numa_id(uint8_t dev_id)
{
struct rte_compressdev *dev;
@@ -195,12 +195,19 @@ rte_compressdev_socket_id(uint8_t dev_id)
dev = rte_compressdev_get_dev(dev_id);
- return dev->data->socket_id;
+ return dev->data->numa_id;
+}
+
+RTE_EXPORT_SYMBOL(rte_compressdev_socket_id)
+int
+rte_compressdev_socket_id(uint8_t dev_id)
+{
+ return rte_compressdev_numa_id(dev_id);
}
static inline int
rte_compressdev_data_alloc(uint8_t dev_id, struct rte_compressdev_data **data,
- int socket_id)
+ int numa_id)
{
char mz_name[RTE_COMPRESSDEV_NAME_MAX_LEN];
const struct rte_memzone *mz;
@@ -215,7 +222,7 @@ rte_compressdev_data_alloc(uint8_t dev_id, struct rte_compressdev_data **data,
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
mz = rte_memzone_reserve(mz_name,
sizeof(struct rte_compressdev_data),
- socket_id, 0);
+ numa_id, 0);
} else
mz = rte_memzone_lookup(mz_name);
@@ -244,7 +251,7 @@ rte_compressdev_find_free_device_index(void)
RTE_EXPORT_SYMBOL(rte_compressdev_pmd_allocate)
struct rte_compressdev *
-rte_compressdev_pmd_allocate(const char *name, int socket_id)
+rte_compressdev_pmd_allocate(const char *name, int numa_id)
{
struct rte_compressdev *compressdev;
uint8_t dev_id;
@@ -267,7 +274,7 @@ rte_compressdev_pmd_allocate(const char *name, int socket_id)
compressdev_globals.data[dev_id];
int retval = rte_compressdev_data_alloc(dev_id,
- &compressdev_data, socket_id);
+ &compressdev_data, numa_id);
if (retval < 0 || compressdev_data == NULL)
return NULL;
@@ -278,7 +285,7 @@ rte_compressdev_pmd_allocate(const char *name, int socket_id)
RTE_COMPRESSDEV_NAME_MAX_LEN);
compressdev->data->dev_id = dev_id;
- compressdev->data->socket_id = socket_id;
+ compressdev->data->numa_id = numa_id;
compressdev->data->dev_started = 0;
compressdev->attached = RTE_COMPRESSDEV_ATTACHED;
@@ -322,7 +329,7 @@ rte_compressdev_queue_pair_count(uint8_t dev_id)
static int
rte_compressdev_queue_pairs_config(struct rte_compressdev *dev,
- uint16_t nb_qpairs, int socket_id)
+ uint16_t nb_qpairs, int numa_id)
{
struct rte_compressdev_info dev_info;
void **qp;
@@ -351,10 +358,10 @@ rte_compressdev_queue_pairs_config(struct rte_compressdev *dev,
}
if (dev->data->queue_pairs == NULL) { /* first time configuration */
- dev->data->queue_pairs = rte_zmalloc_socket(
+ dev->data->queue_pairs = rte_zmalloc_numa(
"compressdev->queue_pairs",
sizeof(dev->data->queue_pairs[0]) * nb_qpairs,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (dev->data->queue_pairs == NULL) {
dev->data->nb_queue_pairs = 0;
@@ -461,7 +468,7 @@ rte_compressdev_configure(uint8_t dev_id, struct rte_compressdev_config *config)
/* Setup new number of queue pairs and reconfigure device. */
diag = rte_compressdev_queue_pairs_config(dev, config->nb_queue_pairs,
- config->socket_id);
+ config->numa_id);
if (diag != 0) {
COMPRESSDEV_LOG(ERR,
"dev%d rte_comp_dev_queue_pairs_config = %d",
@@ -572,7 +579,7 @@ rte_compressdev_close(uint8_t dev_id)
RTE_EXPORT_SYMBOL(rte_compressdev_queue_pair_setup)
int
rte_compressdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
- uint32_t max_inflight_ops, int socket_id)
+ uint32_t max_inflight_ops, int numa_id)
{
struct rte_compressdev *dev;
@@ -602,7 +609,7 @@ rte_compressdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
if (dev->dev_ops->queue_pair_setup == NULL)
return -ENOTSUP;
- return dev->dev_ops->queue_pair_setup(dev, queue_pair_id, max_inflight_ops, socket_id);
+ return dev->dev_ops->queue_pair_setup(dev, queue_pair_id, max_inflight_ops, numa_id);
}
RTE_EXPORT_SYMBOL(rte_compressdev_dequeue_burst)
diff --git a/lib/compressdev/rte_compressdev.h b/lib/compressdev/rte_compressdev.h
index ec0dc09e5f..e96d2b328a 100644
--- a/lib/compressdev/rte_compressdev.h
+++ b/lib/compressdev/rte_compressdev.h
@@ -169,8 +169,23 @@ rte_compressdev_devices_get(const char *driver_name, uint8_t *devices,
uint8_t nb_devices);
/*
+ * Return the NUMA node to which a device is connected.
+ *
+ * @param dev_id
+ * Compress device identifier
+ * @return
+ * The NUMA node ID to which the device is connected or
+ * a default of zero if the NUMA node could not be determined.
+ * -1 if returned is the dev_id value is out of range.
+ */
+int
+rte_compressdev_numa_id(uint8_t dev_id);
+
+/**
* Return the NUMA socket to which a device is connected.
*
+ * This is a legacy alias of rte_compressdev_numa_id().
+ *
* @param dev_id
* Compress device identifier
* @return
@@ -183,8 +198,15 @@ rte_compressdev_socket_id(uint8_t dev_id);
/** Compress device configuration structure */
struct rte_compressdev_config {
- int socket_id;
- /**< Socket on which to allocate resources */
+ union {
+ /** NUMA node on which to allocate resources */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
uint16_t nb_queue_pairs;
/**< Total number of queue pairs to configure on a device */
uint16_t max_nb_priv_xforms;
@@ -270,9 +292,9 @@ rte_compressdev_close(uint8_t dev_id);
* @param max_inflight_ops
* Max number of ops which the qp will have to
* accommodate simultaneously
- * @param socket_id
- * The *socket_id* argument is the socket identifier
- * in case of NUMA. The value can be *SOCKET_ID_ANY*
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID
+ * in case of NUMA. The value can be *RTE_NUMA_ID_ANY*
* if there is no NUMA constraint for the DMA memory
* allocated for the receive queue pair
* @return
@@ -281,7 +303,7 @@ rte_compressdev_close(uint8_t dev_id);
*/
int
rte_compressdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
- uint32_t max_inflight_ops, int socket_id);
+ uint32_t max_inflight_ops, int numa_id);
/**
* Get the number of queue pairs on a specific comp device
diff --git a/lib/compressdev/rte_compressdev_internal.h b/lib/compressdev/rte_compressdev_internal.h
index a980d74cbf..54224c164f 100644
--- a/lib/compressdev/rte_compressdev_internal.h
+++ b/lib/compressdev/rte_compressdev_internal.h
@@ -99,7 +99,7 @@ struct __rte_cache_aligned rte_compressdev {
struct __rte_cache_aligned rte_compressdev_data {
uint8_t dev_id;
/**< Compress device identifier */
- int socket_id;
+ int numa_id;
/**< Socket identifier where memory is allocated */
char name[RTE_COMPRESSDEV_NAME_MAX_LEN];
/**< Unique identifier name */
diff --git a/lib/compressdev/rte_compressdev_pmd.c b/lib/compressdev/rte_compressdev_pmd.c
index 7e11ad7148..df03722f33 100644
--- a/lib/compressdev/rte_compressdev_pmd.c
+++ b/lib/compressdev/rte_compressdev_pmd.c
@@ -76,7 +76,7 @@ rte_compressdev_pmd_parse_input_args(
ret = rte_kvargs_process(kvlist,
RTE_COMPRESSDEV_PMD_SOCKET_ID_ARG,
&rte_compressdev_pmd_parse_uint_arg,
- ¶ms->socket_id);
+ ¶ms->numa_id);
if (ret < 0)
goto free_kvlist;
@@ -111,10 +111,10 @@ rte_compressdev_pmd_create(const char *name,
COMPRESSDEV_LOG(INFO, "Creating compressdev %s", name);
COMPRESSDEV_LOG(INFO, "Init parameters - name: %s, socket id: %d",
- name, params->socket_id);
+ name, params->numa_id);
/* allocate device structure */
- compressdev = rte_compressdev_pmd_allocate(name, params->socket_id);
+ compressdev = rte_compressdev_pmd_allocate(name, params->numa_id);
if (compressdev == NULL) {
COMPRESSDEV_LOG(ERR, "Failed to allocate comp device %s", name);
return NULL;
@@ -123,10 +123,10 @@ rte_compressdev_pmd_create(const char *name,
/* allocate private device structure */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
compressdev->data->dev_private =
- rte_zmalloc_socket("compressdev device private",
+ rte_zmalloc_numa("compressdev device private",
private_data_size,
RTE_CACHE_LINE_SIZE,
- params->socket_id);
+ params->numa_id);
if (compressdev->data->dev_private == NULL) {
COMPRESSDEV_LOG(ERR,
diff --git a/lib/compressdev/rte_compressdev_pmd.h b/lib/compressdev/rte_compressdev_pmd.h
index ea721f014d..ce30262ec0 100644
--- a/lib/compressdev/rte_compressdev_pmd.h
+++ b/lib/compressdev/rte_compressdev_pmd.h
@@ -25,7 +25,7 @@ extern "C" {
#endif
#define RTE_COMPRESSDEV_PMD_NAME_ARG ("name")
-#define RTE_COMPRESSDEV_PMD_SOCKET_ID_ARG ("socket_id")
+#define RTE_COMPRESSDEV_PMD_SOCKET_ID_ARG ("numa_id")
static const char * const compressdev_pmd_valid_params[] = {
RTE_COMPRESSDEV_PMD_NAME_ARG,
@@ -38,7 +38,7 @@ static const char * const compressdev_pmd_valid_params[] = {
*/
struct rte_compressdev_pmd_init_params {
char name[RTE_COMPRESSDEV_NAME_MAX_LEN];
- int socket_id;
+ int numa_id;
};
/** Global structure used for maintaining state of allocated comp devices */
@@ -151,13 +151,13 @@ typedef void (*compressdev_info_get_t)(struct rte_compressdev *dev,
* Queue pair identifier
* @param max_inflight_ops
* Max inflight ops which qp must accommodate
- * @param socket_id
+ * @param numa_id
* Socket identifier
* @return
* Returns 0 on success.
*/
typedef int (*compressdev_queue_pair_setup_t)(struct rte_compressdev *dev,
- uint16_t qp_id, uint32_t max_inflight_ops, int socket_id);
+ uint16_t qp_id, uint32_t max_inflight_ops, int numa_id);
/**
* Release memory resources allocated by given queue pair.
@@ -285,13 +285,13 @@ struct rte_compressdev_ops {
*
* @param name
* Unique identifier name for each device
- * @param socket_id
+ * @param numa_id
* Socket to allocate resources on
* @return
* - Slot in the rte_dev_devices array for a new device;
*/
struct rte_compressdev *
-rte_compressdev_pmd_allocate(const char *name, int socket_id);
+rte_compressdev_pmd_allocate(const char *name, int numa_id);
/**
* @internal
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 009/227] rawdev: rename device socket API to NUMA node API
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (7 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 008/227] compressdev: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 010/227] mldev: " Chengwen Feng
` (218 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the exported function rte_rawdev_socket_id() to
rte_rawdev_numa_id(), keeping the old name as a functional
alias to be deprecated once the in-tree migration completes.
Rename the numa_id fields of rte_rawdev and rte_rawdev_info
(was socket_id), keeping socket_id as a deprecated union alias,
and update in-tree users accordingly.
Also rename internal parameters and comments to the NUMA node
terminology.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/raw/ntb/ntb.c | 8 ++++----
lib/rawdev/rte_rawdev.c | 25 ++++++++++++++++---------
lib/rawdev/rte_rawdev.h | 37 +++++++++++++++++++++++++++++++++----
lib/rawdev/rte_rawdev_pmd.h | 8 ++++----
4 files changed, 57 insertions(+), 21 deletions(-)
diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c
index fe10782ecf..9f29d409e4 100644
--- a/drivers/raw/ntb/ntb.c
+++ b/drivers/raw/ntb/ntb.c
@@ -190,7 +190,7 @@ ntb_rxq_setup(struct rte_rawdev *dev,
rxq = rte_zmalloc_socket("ntb rx queue",
sizeof(struct ntb_rx_queue),
RTE_CACHE_LINE_SIZE,
- dev->socket_id);
+ dev->numa_id);
if (!rxq) {
NTB_LOG(ERR, "Failed to allocate memory for "
"rx queue data structure.");
@@ -213,7 +213,7 @@ ntb_rxq_setup(struct rte_rawdev *dev,
sizeof(struct ntb_rx_entry) *
rxq->nb_rx_desc,
RTE_CACHE_LINE_SIZE,
- dev->socket_id);
+ dev->numa_id);
if (!rxq->sw_ring) {
ntb_rxq_release(rxq);
rxq = NULL;
@@ -276,7 +276,7 @@ ntb_txq_setup(struct rte_rawdev *dev,
txq = rte_zmalloc_socket("ntb tx queue",
sizeof(struct ntb_tx_queue),
RTE_CACHE_LINE_SIZE,
- dev->socket_id);
+ dev->numa_id);
if (!txq) {
NTB_LOG(ERR, "Failed to allocate memory for "
"tx queue structure");
@@ -294,7 +294,7 @@ ntb_txq_setup(struct rte_rawdev *dev,
sizeof(struct ntb_tx_entry) *
txq->nb_tx_desc,
RTE_CACHE_LINE_SIZE,
- dev->socket_id);
+ dev->numa_id);
if (!txq->sw_ring) {
ntb_txq_release(txq);
txq = NULL;
diff --git a/lib/rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c
index d193061842..b1c8db54ca 100644
--- a/lib/rawdev/rte_rawdev.c
+++ b/lib/rawdev/rte_rawdev.c
@@ -56,16 +56,23 @@ rte_rawdev_get_dev_id(const char *name)
return -ENODEV;
}
-RTE_EXPORT_SYMBOL(rte_rawdev_socket_id)
+RTE_EXPORT_SYMBOL(rte_rawdev_numa_id)
int
-rte_rawdev_socket_id(uint16_t dev_id)
+rte_rawdev_numa_id(uint16_t dev_id)
{
struct rte_rawdev *dev;
RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
dev = &rte_rawdevs[dev_id];
- return dev->socket_id;
+ return dev->numa_id;
+}
+
+RTE_EXPORT_SYMBOL(rte_rawdev_socket_id)
+int
+rte_rawdev_socket_id(uint16_t dev_id)
+{
+ return rte_rawdev_numa_id(dev_id);
}
RTE_EXPORT_SYMBOL(rte_rawdev_info_get)
@@ -92,7 +99,7 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info,
dev_info->driver_name = rawdev->driver_name;
dev_info->device = rawdev->device;
- dev_info->socket_id = rawdev->socket_id;
+ dev_info->numa_id = rawdev->numa_id;
return ret;
}
@@ -526,7 +533,7 @@ rte_rawdev_find_free_device_index(void)
RTE_EXPORT_SYMBOL(rte_rawdev_pmd_allocate)
struct rte_rawdev *
-rte_rawdev_pmd_allocate(const char *name, size_t dev_priv_size, int socket_id)
+rte_rawdev_pmd_allocate(const char *name, size_t dev_priv_size, int numa_id)
{
struct rte_rawdev *rawdev;
uint16_t dev_id;
@@ -545,10 +552,10 @@ rte_rawdev_pmd_allocate(const char *name, size_t dev_priv_size, int socket_id)
rawdev = &rte_rawdevs[dev_id];
if (dev_priv_size > 0) {
- rawdev->dev_private = rte_zmalloc_socket("rawdev private",
+ rawdev->dev_private = rte_zmalloc_numa("rawdev private",
dev_priv_size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rawdev->dev_private) {
RTE_RDEV_ERR("Unable to allocate memory for rawdev");
return NULL;
@@ -556,7 +563,7 @@ rte_rawdev_pmd_allocate(const char *name, size_t dev_priv_size, int socket_id)
}
rawdev->dev_id = dev_id;
- rawdev->socket_id = socket_id;
+ rawdev->numa_id = numa_id;
rawdev->started = 0;
strlcpy(rawdev->name, name, RTE_RAWDEV_NAME_MAX_LEN);
@@ -583,7 +590,7 @@ rte_rawdev_pmd_release(struct rte_rawdev *rawdev)
rawdev_globals.nb_devs--;
rawdev->dev_id = 0;
- rawdev->socket_id = 0;
+ rawdev->numa_id = 0;
rawdev->dev_ops = NULL;
if (rawdev->dev_private) {
rte_free(rawdev->dev_private);
diff --git a/lib/rawdev/rte_rawdev.h b/lib/rawdev/rte_rawdev.h
index ad849e5bea..0ca7b5e111 100644
--- a/lib/rawdev/rte_rawdev.h
+++ b/lib/rawdev/rte_rawdev.h
@@ -47,9 +47,24 @@ rte_rawdev_count(void);
int
rte_rawdev_get_dev_id(const char *name);
+/**
+ * Return the NUMA node to which a device is connected.
+ *
+ * @param dev_id
+ * The identifier of the device.
+ * @return
+ * The NUMA node ID to which the device is connected or
+ * a default of zero if the NUMA node could not be determined.
+ * -(-EINVAL) dev_id value is out of range.
+ */
+int
+rte_rawdev_numa_id(uint16_t dev_id);
+
/**
* Return the NUMA socket to which a device is connected.
*
+ * This is a legacy alias of rte_rawdev_numa_id().
+ *
* @param dev_id
* The identifier of the device.
* @return
@@ -280,8 +295,15 @@ rte_rawdev_reset(uint16_t dev_id);
* related to framework.
*/
struct __rte_cache_aligned rte_rawdev {
- /**< Socket ID where memory is allocated */
- int socket_id;
+ union {
+ /** NUMA node ID where memory is allocated */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
/**< Device ID for this instance */
uint16_t dev_id;
/**< Functions exported by PMD */
@@ -311,8 +333,15 @@ struct rte_rawdev_info {
const char *driver_name;
/**< Device encapsulation */
struct rte_device *device;
- /**< Socket ID where memory is allocated */
- int socket_id;
+ union {
+ /** NUMA node ID where memory is allocated */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
/**< PMD-specific private data */
rte_rawdev_obj_t dev_private;
};
diff --git a/lib/rawdev/rte_rawdev_pmd.h b/lib/rawdev/rte_rawdev_pmd.h
index 02351a2a29..639fa0de87 100644
--- a/lib/rawdev/rte_rawdev_pmd.h
+++ b/lib/rawdev/rte_rawdev_pmd.h
@@ -604,14 +604,14 @@ struct rte_rawdev_ops {
* Size of private data memory allocated within rte_rawdev object.
* Set to 0 to disable internal memory allocation and allow for
* self-allocation.
- * @param socket_id
+ * @param numa_id
* Socket to allocate resources on.
* @return
* - Slot in the rte_dev_devices array for a new device;
*/
struct rte_rawdev *
rte_rawdev_pmd_allocate(const char *name, size_t dev_private_size,
- int socket_id);
+ int numa_id);
/**
* Release the specified rawdev device.
@@ -631,7 +631,7 @@ rte_rawdev_pmd_release(struct rte_rawdev *rawdev);
* Pointer to a character array containing name of the device
* @param dev_private_size
* Size of raw PMDs private data
- * @param socket_id
+ * @param numa_id
* Socket to allocate resources on.
*
* @return
@@ -640,7 +640,7 @@ rte_rawdev_pmd_release(struct rte_rawdev *rawdev);
*/
struct rte_rawdev *
rte_rawdev_pmd_init(const char *name, size_t dev_private_size,
- int socket_id);
+ int numa_id);
/**
* Destroy a raw device
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 010/227] mldev: rename device socket API to NUMA node API
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (8 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 009/227] rawdev: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 011/227] bbdev: " Chengwen Feng
` (217 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the experimental function rte_ml_dev_socket_id() to
rte_ml_dev_numa_id() (experimental API may change without
compatibility alias), and rename the device data field to
numa_id.
Rename the numa_id field of rte_ml_dev_config (was socket_id),
keeping socket_id as a deprecated union alias, and update
in-tree users accordingly.
Also rename internal parameters and comments to the NUMA node
terminology.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-mldev/test_common.c | 4 ++--
app/test-mldev/test_device_ops.c | 2 +-
drivers/ml/cnxk/cn10k_ml_dev.c | 2 +-
drivers/ml/cnxk/mvtvm_ml_dev.c | 2 +-
lib/mldev/rte_mldev.c | 24 +++++++++++------------
lib/mldev/rte_mldev.h | 33 +++++++++++++++++++-------------
lib/mldev/rte_mldev_core.h | 10 +++++-----
lib/mldev/rte_mldev_pmd.c | 10 +++++-----
lib/mldev/rte_mldev_pmd.h | 10 +++++-----
9 files changed, 52 insertions(+), 45 deletions(-)
diff --git a/app/test-mldev/test_common.c b/app/test-mldev/test_common.c
index 90e591f205..2f5e6156cf 100644
--- a/app/test-mldev/test_common.c
+++ b/app/test-mldev/test_common.c
@@ -101,7 +101,7 @@ ml_test_opt_check(struct ml_options *opt)
return -EINVAL;
}
- socket_id = rte_ml_dev_socket_id(opt->dev_id);
+ socket_id = rte_ml_dev_numa_id(opt->dev_id);
if ((opt->socket_id != SOCKET_ID_ANY) && (opt->socket_id != socket_id)) {
ml_err("Invalid option, socket_id = %d\n", opt->socket_id);
return -EINVAL;
@@ -140,7 +140,7 @@ ml_test_device_configure(struct ml_test *test, struct ml_options *opt)
}
/* configure device */
- dev_config.socket_id = opt->socket_id;
+ dev_config.numa_id = opt->socket_id;
dev_config.nb_models = t->dev_info.max_models;
dev_config.nb_queue_pairs = opt->queue_pairs;
ret = rte_ml_dev_configure(opt->dev_id, &dev_config);
diff --git a/app/test-mldev/test_device_ops.c b/app/test-mldev/test_device_ops.c
index dacc0232a2..6111bb106b 100644
--- a/app/test-mldev/test_device_ops.c
+++ b/app/test-mldev/test_device_ops.c
@@ -128,7 +128,7 @@ test_device_reconfigure(struct ml_test *test, struct ml_options *opt)
}
/* reconfigure device based on dev_info */
- dev_config.socket_id = opt->socket_id;
+ dev_config.numa_id = opt->socket_id;
dev_config.nb_models = t->cmn.dev_info.max_models;
dev_config.nb_queue_pairs = t->cmn.dev_info.max_queue_pairs;
ret = rte_ml_dev_configure(opt->dev_id, &dev_config);
diff --git a/drivers/ml/cnxk/cn10k_ml_dev.c b/drivers/ml/cnxk/cn10k_ml_dev.c
index c35895dc14..cda8cee330 100644
--- a/drivers/ml/cnxk/cn10k_ml_dev.c
+++ b/drivers/ml/cnxk/cn10k_ml_dev.c
@@ -324,7 +324,7 @@ cn10k_ml_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_de
}
init_params = (struct rte_ml_dev_pmd_init_params){
- .socket_id = rte_socket_id(), .private_data_size = sizeof(struct cnxk_ml_dev)};
+ .numa_id = rte_numa_id(), .private_data_size = sizeof(struct cnxk_ml_dev)};
ret = roc_plt_init();
if (ret < 0) {
diff --git a/drivers/ml/cnxk/mvtvm_ml_dev.c b/drivers/ml/cnxk/mvtvm_ml_dev.c
index 74959a12fc..7b490d000a 100644
--- a/drivers/ml/cnxk/mvtvm_ml_dev.c
+++ b/drivers/ml/cnxk/mvtvm_ml_dev.c
@@ -131,7 +131,7 @@ mvtvm_ml_vdev_probe(struct rte_vdev_device *vdev)
}
init_params = (struct rte_ml_dev_pmd_init_params){
- .socket_id = rte_socket_id(), .private_data_size = sizeof(struct cnxk_ml_dev)};
+ .numa_id = rte_numa_id(), .private_data_size = sizeof(struct cnxk_ml_dev)};
name = rte_vdev_device_name(vdev);
if (name == NULL)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index 7fae867882..16f3087580 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -51,7 +51,7 @@ rte_ml_dev_pmd_get_named_dev(const char *name)
RTE_EXPORT_INTERNAL_SYMBOL(rte_ml_dev_pmd_allocate)
struct rte_ml_dev *
-rte_ml_dev_pmd_allocate(const char *name, uint8_t socket_id)
+rte_ml_dev_pmd_allocate(const char *name, uint8_t numa_id)
{
char mz_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz;
@@ -85,7 +85,7 @@ rte_ml_dev_pmd_allocate(const char *name, uint8_t socket_id)
/* Reserve memzone name */
sprintf(mz_name, "rte_ml_dev_data_%d", dev_id);
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- mz = rte_memzone_reserve(mz_name, sizeof(struct rte_ml_dev_data), socket_id,
+ mz = rte_memzone_reserve(mz_name, sizeof(struct rte_ml_dev_data), numa_id,
0);
RTE_MLDEV_LOG(DEBUG, "PRIMARY: reserved memzone for %s (%p)", mz_name, mz);
} else {
@@ -105,13 +105,13 @@ rte_ml_dev_pmd_allocate(const char *name, uint8_t socket_id)
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
strlcpy(dev->data->name, name, RTE_ML_STR_MAX);
dev->data->dev_id = dev_id;
- dev->data->socket_id = socket_id;
+ dev->data->numa_id = numa_id;
dev->data->dev_started = 0;
RTE_MLDEV_LOG(DEBUG, "PRIMARY: init mldev data");
}
- RTE_MLDEV_LOG(DEBUG, "Data for %s: dev_id %d, socket %u", dev->data->name,
- dev->data->dev_id, dev->data->socket_id);
+ RTE_MLDEV_LOG(DEBUG, "Data for %s: dev_id %d, numa node %u", dev->data->name,
+ dev->data->dev_id, dev->data->numa_id);
dev->attached = ML_DEV_ATTACHED;
ml_dev_globals.nb_devs++;
@@ -218,9 +218,9 @@ rte_ml_dev_is_valid_dev(int16_t dev_id)
return 1;
}
-RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_ml_dev_socket_id, 22.11)
+RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_ml_dev_numa_id, 22.11)
int
-rte_ml_dev_socket_id(int16_t dev_id)
+rte_ml_dev_numa_id(int16_t dev_id)
{
struct rte_ml_dev *dev;
@@ -231,7 +231,7 @@ rte_ml_dev_socket_id(int16_t dev_id)
dev = rte_ml_dev_pmd_get_dev(dev_id);
- return dev->data->socket_id;
+ return dev->data->numa_id;
}
RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_ml_dev_info_get, 22.11)
@@ -397,7 +397,7 @@ rte_ml_dev_queue_pair_count(int16_t dev_id)
RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_ml_dev_queue_pair_setup, 22.11)
int
rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t queue_pair_id,
- const struct rte_ml_dev_qp_conf *qp_conf, int socket_id)
+ const struct rte_ml_dev_qp_conf *qp_conf, int numa_id)
{
struct rte_ml_dev *dev;
@@ -425,7 +425,7 @@ rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t queue_pair_id,
return -EBUSY;
}
- return dev->dev_ops->dev_queue_pair_setup(dev, queue_pair_id, qp_conf, socket_id);
+ return dev->dev_ops->dev_queue_pair_setup(dev, queue_pair_id, qp_conf, numa_id);
}
RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_ml_dev_stats_get, 22.11)
@@ -808,7 +808,7 @@ ml_op_init(struct rte_mempool *mempool, __rte_unused void *opaque_arg, void *_op
RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_ml_op_pool_create, 22.11)
struct rte_mempool *
rte_ml_op_pool_create(const char *name, unsigned int nb_elts, unsigned int cache_size,
- uint16_t user_size, int socket_id)
+ uint16_t user_size, int numa_id)
{
struct rte_ml_op_pool_private *priv;
struct rte_mempool *mp;
@@ -833,7 +833,7 @@ rte_ml_op_pool_create(const char *name, unsigned int nb_elts, unsigned int cache
mp = rte_mempool_create(name, nb_elts, elt_size, cache_size,
sizeof(struct rte_ml_op_pool_private), NULL, NULL, ml_op_init, NULL,
- socket_id, 0);
+ numa_id, 0);
if (mp == NULL) {
RTE_MLDEV_LOG(ERR, "Failed to create mempool %s", name);
return NULL;
diff --git a/lib/mldev/rte_mldev.h b/lib/mldev/rte_mldev.h
index 594c46cf72..2f90f45499 100644
--- a/lib/mldev/rte_mldev.h
+++ b/lib/mldev/rte_mldev.h
@@ -199,19 +199,19 @@ int
rte_ml_dev_is_valid_dev(int16_t dev_id);
/**
- * Return the NUMA socket to which a device is connected.
+ * Return the NUMA node to which a device is connected.
*
* @param dev_id
* The identifier of the device.
*
* @return
- * - The NUMA socket id to which the device is connected
- * - 0 If the socket could not be determined.
+ * - The NUMA node ID to which the device is connected
+ * - 0 If the NUMA node could not be determined.
* - -EINVAL: if the dev_id value is not valid.
*/
__rte_experimental
int
-rte_ml_dev_socket_id(int16_t dev_id);
+rte_ml_dev_numa_id(int16_t dev_id);
/** ML device information */
struct rte_ml_dev_info {
@@ -257,8 +257,15 @@ rte_ml_dev_info_get(int16_t dev_id, struct rte_ml_dev_info *dev_info);
/** ML device configuration structure */
struct rte_ml_dev_config {
- int socket_id;
- /**< Socket to allocate resources on. */
+ union {
+ /** NUMA node to allocate resources on. */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
uint16_t nb_models;
/**< Number of models to be loaded on the device.
* This value cannot exceed the max_models which is previously provided in
@@ -340,9 +347,9 @@ rte_ml_dev_queue_pair_count(int16_t dev_id);
* previously supplied to rte_ml_dev_configure().
* @param qp_conf
* The pointer to the configuration data to be used for the queue pair.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in case of NUMA.
- * The value can be *SOCKET_ID_ANY* if there is no NUMA constraint for the memory allocated
+ * @param numa_id
+ * The *numa_id* argument is the socket identifier in case of NUMA.
+ * The value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraint for the memory allocated
* for the queue pair.
*
* @return
@@ -352,7 +359,7 @@ rte_ml_dev_queue_pair_count(int16_t dev_id);
__rte_experimental
int
rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t queue_pair_id,
- const struct rte_ml_dev_qp_conf *qp_conf, int socket_id);
+ const struct rte_ml_dev_qp_conf *qp_conf, int numa_id);
/**
* Start an ML device.
@@ -1555,8 +1562,8 @@ rte_ml_io_dequantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg *
* *rte_mempool_create* for further details about cache size
* @param user_size
* Size of private data to allocate for user with each operation
- * @param socket_id
- * Socket to identifier allocate memory on
+ * @param numa_id
+ * NUMA node ID to allocate memory on
* @return
* - On success pointer to mempool
* - On failure NULL
@@ -1564,7 +1571,7 @@ rte_ml_io_dequantize(int16_t dev_id, uint16_t model_id, struct rte_ml_buff_seg *
__rte_experimental
struct rte_mempool *
rte_ml_op_pool_create(const char *name, unsigned int nb_elts, unsigned int cache_size,
- uint16_t user_size, int socket_id);
+ uint16_t user_size, int numa_id);
/**
* Free an ML operation pool
diff --git a/lib/mldev/rte_mldev_core.h b/lib/mldev/rte_mldev_core.h
index 75d3466bc7..1fdb061a18 100644
--- a/lib/mldev/rte_mldev_core.h
+++ b/lib/mldev/rte_mldev_core.h
@@ -179,8 +179,8 @@ typedef int (*mldev_stop_t)(struct rte_ml_dev *dev);
* Queue pair index.
* @param queue_pair_conf
* Queue pair configuration structure.
- * @param socket_id
- * Socket index.
+ * @param numa_id
+ * NUMA node index.
*
* @return
* - 0 on success.
@@ -188,7 +188,7 @@ typedef int (*mldev_stop_t)(struct rte_ml_dev *dev);
*/
typedef int (*mldev_queue_pair_setup_t)(struct rte_ml_dev *dev, uint16_t queue_pair_id,
const struct rte_ml_dev_qp_conf *queue_pair_conf,
- int socket_id);
+ int numa_id);
/**
* @internal
@@ -592,8 +592,8 @@ struct rte_ml_dev_data {
/** Device ID for this instance. */
int16_t dev_id;
- /** Socket ID where memory is allocated. */
- int16_t socket_id;
+ /** NUMA node ID where memory is allocated. */
+ int16_t numa_id;
/** Device state: STOPPED(0) / STARTED(1) */
__extension__ uint8_t dev_started : 1;
diff --git a/lib/mldev/rte_mldev_pmd.c b/lib/mldev/rte_mldev_pmd.c
index 434360f2d3..50d7224064 100644
--- a/lib/mldev/rte_mldev_pmd.c
+++ b/lib/mldev/rte_mldev_pmd.c
@@ -16,11 +16,11 @@ rte_ml_dev_pmd_create(const char *name, struct rte_device *device,
{
struct rte_ml_dev *dev;
- RTE_MLDEV_LOG(INFO, "ML device initialisation - name: %s, socket_id: %u", name,
- params->socket_id);
+ RTE_MLDEV_LOG(INFO, "ML device initialisation - name: %s, numa_id: %u", name,
+ params->numa_id);
/* Allocate device structure */
- dev = rte_ml_dev_pmd_allocate(name, params->socket_id);
+ dev = rte_ml_dev_pmd_allocate(name, params->numa_id);
if (dev == NULL) {
RTE_MLDEV_LOG(ERR, "Failed to allocate ML device for %s", name);
return NULL;
@@ -29,8 +29,8 @@ rte_ml_dev_pmd_create(const char *name, struct rte_device *device,
/* Allocate private device structure */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
dev->data->dev_private =
- rte_zmalloc_socket("ml_dev_private", params->private_data_size,
- RTE_CACHE_LINE_SIZE, params->socket_id);
+ rte_zmalloc_numa("ml_dev_private", params->private_data_size,
+ RTE_CACHE_LINE_SIZE, params->numa_id);
if (dev->data->dev_private == NULL) {
RTE_MLDEV_LOG(ERR, "Cannot allocate memory for mldev %s private data",
diff --git a/lib/mldev/rte_mldev_pmd.h b/lib/mldev/rte_mldev_pmd.h
index 47c0f23223..674e4b7a3a 100644
--- a/lib/mldev/rte_mldev_pmd.h
+++ b/lib/mldev/rte_mldev_pmd.h
@@ -31,8 +31,8 @@ extern "C" {
* Initialisation parameters for ML devices.
*/
struct rte_ml_dev_pmd_init_params {
- /** Socket to use for memory allocation. */
- uint8_t socket_id;
+ /** NUMA node to use for memory allocation. */
+ uint8_t numa_id;
/** Size of device private data. */
uint64_t private_data_size;
@@ -78,15 +78,15 @@ rte_ml_dev_pmd_get_named_dev(const char *name);
*
* @param name
* Unique identifier name for each device.
- * @param socket_id
- * Socket to allocate resources.
+ * @param numa_id
+ * NUMA node to allocate resources.
*
* @return
* Slot in the rte_ml_dev_devices array for a new device.
*/
__rte_internal
struct rte_ml_dev *
-rte_ml_dev_pmd_allocate(const char *name, uint8_t socket_id);
+rte_ml_dev_pmd_allocate(const char *name, uint8_t numa_id);
/**
* @internal
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 011/227] bbdev: rename device socket API to NUMA node API
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (9 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 010/227] mldev: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 012/227] eventdev: " Chengwen Feng
` (216 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the numa_id fields of rte_bbdev_info, rte_bbdev_data and
rte_bbdev_queue_conf (were socket_id and socket), keeping the old
names as deprecated union aliases, and update in-tree users
accordingly.
Also rename socket_id parameters, trace arguments, internal
variables, log messages and comments to the NUMA node
terminology, and switch internal calls to rte_calloc_numa(),
rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-bbdev/test_bbdev.c | 12 +++----
app/test-bbdev/test_bbdev_perf.c | 6 ++--
drivers/baseband/acc/rte_acc100_pmd.c | 8 ++---
drivers/baseband/acc/rte_vrb_pmd.c | 8 ++---
.../fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 4 +--
drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 4 +--
drivers/baseband/la12xx/bbdev_la12xx.c | 2 +-
drivers/baseband/null/bbdev_null.c | 4 +--
.../baseband/turbo_sw/bbdev_turbo_software.c | 4 +--
examples/bbdev_app/main.c | 4 +--
lib/bbdev/bbdev_trace.h | 4 +--
lib/bbdev/rte_bbdev.c | 26 +++++++-------
lib/bbdev/rte_bbdev.h | 36 +++++++++++++++----
lib/bbdev/rte_bbdev_op.h | 6 ++--
lib/bbdev/rte_bbdev_pmd.h | 2 +-
15 files changed, 77 insertions(+), 53 deletions(-)
diff --git a/app/test-bbdev/test_bbdev.c b/app/test-bbdev/test_bbdev.c
index 2422312f6b..1f4246a6fa 100644
--- a/app/test-bbdev/test_bbdev.c
+++ b/app/test-bbdev/test_bbdev.c
@@ -66,7 +66,7 @@ ut_setup(void)
/* Valid queue configuration */
ts_params->qconf.priority = 0;
- ts_params->qconf.socket = SOCKET_ID_ANY;
+ ts_params->qconf.numa_id = RTE_NUMA_ID_ANY;
ts_params->qconf.deferred_start = 1;
num_queues = 1;
@@ -316,9 +316,9 @@ test_bbdev_configure_stop_queue(void)
"invalid return value from "
"rte_bbdev_queue_info_get function: %i", return_value);
- TEST_ASSERT(qinfo.conf.socket == ts_params->qconf.socket,
+ TEST_ASSERT(qinfo.conf.numa_id == ts_params->qconf.numa_id,
"Failed test for rte_bbdev_queue_info_get: "
- "invalid queue_size:%u", qinfo.conf.socket);
+ "invalid queue_size:%u", qinfo.conf.numa_id);
TEST_ASSERT(qinfo.conf.queue_size == ts_params->qconf.queue_size,
"Failed test for rte_bbdev_queue_info_get: "
@@ -426,13 +426,13 @@ test_bbdev_configure_invalid_queue_configure(void)
"Failed test for rte_bbdev_queue_configure: "
"NULL qconf structure ");
- ts_params->qconf.socket = RTE_MAX_NUMA_NODES;
+ ts_params->qconf.numa_id = RTE_MAX_NUMA_NODES;
TEST_ASSERT_FAIL(rte_bbdev_queue_configure(dev_id, queue_id,
&ts_params->qconf),
"Failed test for rte_bbdev_queue_configure: "
"invalid socket number ");
- ts_params->qconf.socket = SOCKET_ID_ANY;
+ ts_params->qconf.numa_id = RTE_NUMA_ID_ANY;
TEST_ASSERT_SUCCESS(rte_bbdev_queue_configure(dev_id, queue_id,
&ts_params->qconf),
"Failed test for rte_bbdev_queue_configure: "
@@ -1125,7 +1125,7 @@ test_bbdev_invalid_driver(void)
"NULL queue_release ");
dev2->dev_ops = dev1.dev_ops;
- dev2->data->socket_id = SOCKET_ID_ANY;
+ dev2->data->numa_id = RTE_NUMA_ID_ANY;
TEST_ASSERT_SUCCESS(rte_bbdev_setup_queues(dev_id, 1,
SOCKET_ID_ANY), "Failed to configure bbdev %u", dev_id);
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index b75d8387bd..8e2a26905d 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -897,10 +897,10 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
nb_queues = RTE_MIN(nb_queues, (unsigned int) MAX_QUEUES);
/* setup device */
- ret = rte_bbdev_setup_queues(dev_id, nb_queues, info->socket_id);
+ ret = rte_bbdev_setup_queues(dev_id, nb_queues, info->numa_id);
if (ret < 0) {
printf("rte_bbdev_setup_queues(%u, %u, %d) ret %i\n",
- dev_id, nb_queues, info->socket_id, ret);
+ dev_id, nb_queues, info->numa_id, ret);
return TEST_FAILED;
}
@@ -915,7 +915,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
}
/* setup device queues */
- qconf.socket = info->socket_id;
+ qconf.numa_id = info->numa_id;
qconf.queue_size = info->drv.default_queue_conf.queue_size;
qconf.priority = 0;
qconf.deferred_start = 0;
diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c
index cbcacc7aa3..67b969fc71 100644
--- a/drivers/baseband/acc/rte_acc100_pmd.c
+++ b/drivers/baseband/acc/rte_acc100_pmd.c
@@ -413,7 +413,7 @@ allocate_info_ring(struct rte_bbdev *dev)
d->info_ring = rte_zmalloc_socket("Info Ring",
ACC_INFO_RING_NUM_ENTRIES *
sizeof(*d->info_ring), RTE_CACHE_LINE_SIZE,
- dev->data->socket_id);
+ dev->data->numa_id);
if (d->info_ring == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate Info Ring for %s:%u",
@@ -543,7 +543,7 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
if (d->harq_layout == NULL)
d->harq_layout = rte_zmalloc_socket("HARQ Layout",
ACC_HARQ_LAYOUT * sizeof(*d->harq_layout),
- RTE_CACHE_LINE_SIZE, dev->data->socket_id);
+ RTE_CACHE_LINE_SIZE, dev->data->numa_id);
if (d->harq_layout == NULL) {
rte_bbdev_log(ERR, "Failed to allocate harq_layout for %s:%u",
dev->device->driver->name,
@@ -978,7 +978,7 @@ acc100_dev_info_get(struct rte_bbdev *dev,
};
static struct rte_bbdev_queue_conf default_queue_conf;
- default_queue_conf.socket = dev->data->socket_id;
+ default_queue_conf.numa_id = dev->data->numa_id;
default_queue_conf.queue_size = ACC_MAX_QUEUE_DEPTH;
dev_info->driver_name = dev->device->driver->name;
@@ -4058,7 +4058,7 @@ static int acc100_pci_probe(struct rte_pci_driver *pci_drv,
/* Fill HW specific part of device structure */
bbdev->device = &pci_dev->device;
bbdev->intr_handle = pci_dev->intr_handle;
- bbdev->data->socket_id = pci_dev->device.numa_node;
+ bbdev->data->numa_id = pci_dev->device.numa_node;
/* Invoke ACC100 device initialization function */
acc100_bbdev_init(bbdev, pci_drv);
diff --git a/drivers/baseband/acc/rte_vrb_pmd.c b/drivers/baseband/acc/rte_vrb_pmd.c
index 1f85e33462..8d86694b80 100644
--- a/drivers/baseband/acc/rte_vrb_pmd.c
+++ b/drivers/baseband/acc/rte_vrb_pmd.c
@@ -513,7 +513,7 @@ allocate_info_ring(struct rte_bbdev *dev)
/* Allocate InfoRing */
d->info_ring = rte_zmalloc_socket("Info Ring", ACC_INFO_RING_NUM_ENTRIES *
- sizeof(*d->info_ring), RTE_CACHE_LINE_SIZE, dev->data->socket_id);
+ sizeof(*d->info_ring), RTE_CACHE_LINE_SIZE, dev->data->numa_id);
if (d->info_ring == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate Info Ring for %s:%u",
@@ -721,7 +721,7 @@ vrb_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
if (d->harq_layout == NULL)
d->harq_layout = rte_zmalloc_socket("HARQ Layout",
ACC_HARQ_LAYOUT * sizeof(*d->harq_layout),
- RTE_CACHE_LINE_SIZE, dev->data->socket_id);
+ RTE_CACHE_LINE_SIZE, dev->data->numa_id);
if (d->harq_layout == NULL) {
rte_bbdev_log(ERR, "Failed to allocate harq_layout for %s:%u",
dev->device->driver->name,
@@ -1429,7 +1429,7 @@ vrb_dev_info_get(struct rte_bbdev *dev, struct rte_bbdev_driver_info *dev_info)
};
static struct rte_bbdev_queue_conf default_queue_conf;
- default_queue_conf.socket = dev->data->socket_id;
+ default_queue_conf.numa_id = dev->data->numa_id;
default_queue_conf.queue_size = ACC_MAX_QUEUE_DEPTH;
dev_info->driver_name = dev->device->driver->name;
@@ -4436,7 +4436,7 @@ static int vrb_pci_probe(struct rte_pci_driver *pci_drv,
/* Fill HW specific part of device structure. */
bbdev->device = &pci_dev->device;
bbdev->intr_handle = pci_dev->intr_handle;
- bbdev->data->socket_id = pci_dev->device.numa_node;
+ bbdev->data->numa_id = pci_dev->device.numa_node;
/* Invoke device initialization function. */
vrb_bbdev_init(bbdev, pci_drv);
diff --git a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
index e804be4cea..e14581cd48 100644
--- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
+++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
@@ -589,7 +589,7 @@ fpga_5gnr_dev_info_get(struct rte_bbdev *dev, struct rte_bbdev_driver_info *dev_
FPGA_5GNR_FEC_HARQ_BUF_SIZE_REGS);
static struct rte_bbdev_queue_conf default_queue_conf;
- default_queue_conf.socket = dev->data->socket_id;
+ default_queue_conf.numa_id = dev->data->numa_id;
default_queue_conf.queue_size = FPGA_5GNR_RING_MAX_SIZE;
dev_info->driver_name = dev->device->driver->name;
@@ -2949,7 +2949,7 @@ fpga_5gnr_fec_probe(struct rte_pci_driver *pci_drv,
/* Fill HW specific part of device structure */
bbdev->device = &pci_dev->device;
bbdev->intr_handle = pci_dev->intr_handle;
- bbdev->data->socket_id = pci_dev->device.numa_node;
+ bbdev->data->numa_id = pci_dev->device.numa_node;
/* Invoke FPGA 5GNR FEC device initialization function */
fpga_5gnr_fec_init(bbdev, pci_drv);
diff --git a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
index cb3f29c10b..dc1394930f 100644
--- a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
+++ b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
@@ -631,7 +631,7 @@ fpga_dev_info_get(struct rte_bbdev *dev,
};
static struct rte_bbdev_queue_conf default_queue_conf;
- default_queue_conf.socket = dev->data->socket_id;
+ default_queue_conf.numa_id = dev->data->numa_id;
default_queue_conf.queue_size = FPGA_RING_MAX_SIZE;
@@ -2372,7 +2372,7 @@ fpga_lte_fec_probe(struct rte_pci_driver *pci_drv,
/* Fill HW specific part of device structure */
bbdev->device = &pci_dev->device;
bbdev->intr_handle = pci_dev->intr_handle;
- bbdev->data->socket_id = pci_dev->device.numa_node;
+ bbdev->data->numa_id = pci_dev->device.numa_node;
/* Invoke FEC FPGA device initialization function */
fpga_lte_fec_init(bbdev, pci_drv);
diff --git a/drivers/baseband/la12xx/bbdev_la12xx.c b/drivers/baseband/la12xx/bbdev_la12xx.c
index 1116dacc4b..6db9192d1d 100644
--- a/drivers/baseband/la12xx/bbdev_la12xx.c
+++ b/drivers/baseband/la12xx/bbdev_la12xx.c
@@ -1037,7 +1037,7 @@ la12xx_bbdev_create(struct rte_vdev_device *vdev,
}
bbdev->dev_ops = &pmd_ops;
bbdev->device = &vdev->device;
- bbdev->data->socket_id = 0;
+ bbdev->data->numa_id = 0;
bbdev->intr_handle = NULL;
/* register rx/tx burst functions for data path */
diff --git a/drivers/baseband/null/bbdev_null.c b/drivers/baseband/null/bbdev_null.c
index d359bdcb5e..10d02da856 100644
--- a/drivers/baseband/null/bbdev_null.c
+++ b/drivers/baseband/null/bbdev_null.c
@@ -66,7 +66,7 @@ info_get(struct rte_bbdev *dev, struct rte_bbdev_driver_info *dev_info)
.queue_size = RTE_BBDEV_QUEUE_SIZE_LIMIT,
};
- default_queue_conf.socket = dev->data->socket_id;
+ default_queue_conf.numa_id = dev->data->numa_id;
dev_info->driver_name = RTE_STR(DRIVER_NAME);
dev_info->max_num_queues = internals->max_nb_queues;
@@ -280,7 +280,7 @@ null_bbdev_create(struct rte_vdev_device *vdev,
bbdev->dev_ops = &pmd_ops;
bbdev->device = &vdev->device;
- bbdev->data->socket_id = init_params->socket_id;
+ bbdev->data->numa_id = init_params->socket_id;
bbdev->intr_handle = NULL;
/* register rx/tx burst functions for data path */
diff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
index 9d5c505943..12d168666c 100644
--- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c
+++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
@@ -244,7 +244,7 @@ info_get(struct rte_bbdev *dev, struct rte_bbdev_driver_info *dev_info)
#else
dev_info->cpu_flag_reqs = NULL;
#endif
- default_queue_conf.socket = dev->data->socket_id;
+ default_queue_conf.numa_id = dev->data->numa_id;
dev_info->driver_name = RTE_STR(DRIVER_NAME);
dev_info->max_num_queues = internals->max_nb_queues;
@@ -1912,7 +1912,7 @@ turbo_sw_bbdev_create(struct rte_vdev_device *vdev,
bbdev->dev_ops = &pmd_ops;
bbdev->device = &vdev->device;
- bbdev->data->socket_id = init_params->socket_id;
+ bbdev->data->numa_id = init_params->socket_id;
bbdev->intr_handle = NULL;
/* register rx/tx burst functions for data path */
diff --git a/examples/bbdev_app/main.c b/examples/bbdev_app/main.c
index 5ac70dab59..8c16d7c556 100644
--- a/examples/bbdev_app/main.c
+++ b/examples/bbdev_app/main.c
@@ -941,14 +941,14 @@ prepare_bbdev_device(unsigned int dev_id, struct rte_bbdev_info *info,
uint16_t enc_qs_nb = app_params->num_enc_cores;
uint16_t tot_qs = dec_qs_nb + enc_qs_nb;
- ret = rte_bbdev_setup_queues(dev_id, tot_qs, info->socket_id);
+ ret = rte_bbdev_setup_queues(dev_id, tot_qs, info->numa_id);
if (ret < 0)
rte_exit(EXIT_FAILURE,
"ERROR(%d): BBDEV %u not configured properly\n",
ret, dev_id);
/* setup device DEC queues */
- qconf.socket = info->socket_id;
+ qconf.numa_id = info->numa_id;
qconf.queue_size = info->drv.queue_size_lim;
qconf.op_type = RTE_BBDEV_OP_TURBO_DEC;
diff --git a/lib/bbdev/bbdev_trace.h b/lib/bbdev/bbdev_trace.h
index 0b640a4b3d..ca769fea46 100644
--- a/lib/bbdev/bbdev_trace.h
+++ b/lib/bbdev/bbdev_trace.h
@@ -21,10 +21,10 @@ extern "C" {
RTE_TRACE_POINT(
rte_bbdev_trace_setup_queues,
- RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint16_t num_queues, int socket_id),
+ RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint16_t num_queues, int numa_id),
rte_trace_point_emit_u8(dev_id);
rte_trace_point_emit_u16(num_queues);
- rte_trace_point_emit_int(socket_id);
+ rte_trace_point_emit_int(numa_id);
)
RTE_TRACE_POINT(
rte_bbdev_trace_queue_configure,
diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
index ab570f2b0d..31ef9c6b4a 100644
--- a/lib/bbdev/rte_bbdev.c
+++ b/lib/bbdev/rte_bbdev.c
@@ -124,7 +124,7 @@ rte_bbdev_data_alloc(void)
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
mz = rte_memzone_reserve(MZ_RTE_BBDEV_DATA,
RTE_BBDEV_MAX_DEVS * sizeof(*rte_bbdev_data),
- rte_socket_id(), flags);
+ rte_numa_id(), flags);
} else
mz = rte_memzone_lookup(MZ_RTE_BBDEV_DATA);
if (mz == NULL) {
@@ -322,7 +322,7 @@ rte_bbdev_find_next(uint16_t dev_id)
RTE_EXPORT_SYMBOL(rte_bbdev_setup_queues)
int
-rte_bbdev_setup_queues(uint16_t dev_id, uint16_t num_queues, int socket_id)
+rte_bbdev_setup_queues(uint16_t dev_id, uint16_t num_queues, int numa_id)
{
unsigned int i;
int ret;
@@ -332,7 +332,7 @@ rte_bbdev_setup_queues(uint16_t dev_id, uint16_t num_queues, int socket_id)
VALID_DEV_OPS_OR_RET_ERR(dev, dev_id);
- rte_bbdev_trace_setup_queues(dev_id, num_queues, socket_id);
+ rte_bbdev_trace_setup_queues(dev_id, num_queues, numa_id);
if (dev->data->started) {
rte_bbdev_log(ERR,
@@ -379,13 +379,13 @@ rte_bbdev_setup_queues(uint16_t dev_id, uint16_t num_queues, int socket_id)
}
/* Allocate queue pointers */
- dev->data->queues = rte_calloc_socket(DEV_NAME, num_queues,
+ dev->data->queues = rte_calloc_numa(DEV_NAME, num_queues,
sizeof(dev->data->queues[0]), RTE_CACHE_LINE_SIZE,
- dev->data->socket_id);
+ dev->data->numa_id);
if (dev->data->queues == NULL) {
rte_bbdev_log(ERR,
- "calloc of %u queues for device %u on socket %i failed",
- num_queues, dev_id, dev->data->socket_id);
+ "calloc of %u queues for device %u on NUMA node %i failed",
+ num_queues, dev_id, dev->data->numa_id);
return -ENOMEM;
}
@@ -393,7 +393,7 @@ rte_bbdev_setup_queues(uint16_t dev_id, uint16_t num_queues, int socket_id)
/* Call optional device configuration */
if (dev->dev_ops->setup_queues) {
- ret = dev->dev_ops->setup_queues(dev, num_queues, socket_id);
+ ret = dev->dev_ops->setup_queues(dev, num_queues, numa_id);
if (ret < 0) {
rte_bbdev_log(ERR,
"Device %u memory configuration failed",
@@ -854,7 +854,7 @@ rte_bbdev_info_get(uint16_t dev_id, struct rte_bbdev_info *dev_info)
dev_info->dev_name = dev->data->name;
dev_info->num_queues = dev->data->num_queues;
dev_info->device = dev->device;
- dev_info->socket_id = dev->data->socket_id;
+ dev_info->numa_id = dev->data->numa_id;
dev_info->started = dev->data->started;
/* Copy data maintained by device driver layer */
@@ -955,7 +955,7 @@ RTE_EXPORT_SYMBOL(rte_bbdev_op_pool_create)
struct rte_mempool *
rte_bbdev_op_pool_create(const char *name, enum rte_bbdev_op_type type,
unsigned int num_elements, unsigned int cache_size,
- int socket_id)
+ int numa_id)
{
struct rte_bbdev_op_pool_private *priv;
struct rte_mempool *mp;
@@ -975,7 +975,7 @@ rte_bbdev_op_pool_create(const char *name, enum rte_bbdev_op_type type,
mp = rte_mempool_create(name, num_elements, get_bbdev_op_size(type),
cache_size, sizeof(struct rte_bbdev_op_pool_private),
- NULL, NULL, bbdev_op_init, &type, socket_id, 0);
+ NULL, NULL, bbdev_op_init, &type, numa_id, 0);
if (mp == NULL) {
rte_bbdev_log(ERR,
"Failed to create op pool %s (num ops=%u, op size=%u) with error: %s",
@@ -989,8 +989,8 @@ rte_bbdev_op_pool_create(const char *name, enum rte_bbdev_op_type type,
return NULL;
rte_bbdev_log_debug(
- "Op pool %s created for %u ops (type=%s, cache=%u, socket=%u, size=%u)",
- name, num_elements, op_type_str, cache_size, socket_id,
+ "Op pool %s created for %u ops (type=%s, cache=%u, numa node=%u, size=%u)",
+ name, num_elements, op_type_str, cache_size, numa_id,
get_bbdev_op_size(type));
priv = (struct rte_bbdev_op_pool_private *)rte_mempool_get_priv(mp);
diff --git a/lib/bbdev/rte_bbdev.h b/lib/bbdev/rte_bbdev.h
index 9fcfbf4c69..4c55d174d7 100644
--- a/lib/bbdev/rte_bbdev.h
+++ b/lib/bbdev/rte_bbdev.h
@@ -101,8 +101,8 @@ rte_bbdev_find_next(uint16_t dev_id);
* The identifier of the device.
* @param num_queues
* Number of queues to configure on device.
- * @param socket_id
- * ID of a socket which will be used to allocate memory.
+ * @param numa_id
+ * ID of a NUMA node which will be used to allocate memory.
*
* @return
* - 0 on success
@@ -112,7 +112,7 @@ rte_bbdev_find_next(uint16_t dev_id);
* - -ENOMEM if unable to allocate memory
*/
int
-rte_bbdev_setup_queues(uint16_t dev_id, uint16_t num_queues, int socket_id);
+rte_bbdev_setup_queues(uint16_t dev_id, uint16_t num_queues, int numa_id);
/**
* Enable interrupts.
@@ -133,7 +133,15 @@ rte_bbdev_intr_enable(uint16_t dev_id);
/** Device queue configuration structure */
struct rte_bbdev_queue_conf {
- int socket; /**< NUMA socket used for memory allocation */
+ union {
+ /** NUMA node used for memory allocation */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket;
+ };
uint32_t queue_size; /**< Size of queue */
uint8_t priority; /**< Queue priority */
bool deferred_start; /**< Do not start queue when device is started. */
@@ -391,7 +399,15 @@ struct rte_bbdev_driver_info {
/* Structure rte_bbdev_info 8< */
struct rte_bbdev_info {
- int socket_id; /**< NUMA socket that device is on */
+ union {
+ /** NUMA node that device is on */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
const char *dev_name; /**< Unique device name */
const struct rte_device *device; /**< Device Information */
uint16_t num_queues; /**< Number of queues currently configured */
@@ -510,7 +526,15 @@ struct rte_bbdev_data {
uint16_t num_queues; /**< Number of currently configured queues */
struct rte_bbdev_queue_data *queues; /**< Queue structures */
uint16_t dev_id; /**< Device ID */
- int socket_id; /**< NUMA socket that device is on */
+ union {
+ /** NUMA node that device is on */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
bool started; /**< Device run-time state */
RTE_ATOMIC(uint16_t) process_cnt; /** Counter of processes using the device */
};
diff --git a/lib/bbdev/rte_bbdev_op.h b/lib/bbdev/rte_bbdev_op.h
index 02d157ada8..45e8ad6e9a 100644
--- a/lib/bbdev/rte_bbdev_op.h
+++ b/lib/bbdev/rte_bbdev_op.h
@@ -1046,8 +1046,8 @@ rte_bbdev_op_type_str(enum rte_bbdev_op_type op_type);
* @param cache_size
* Number of elements to cache on an lcore, see rte_mempool_create() for
* further details about cache size.
- * @param socket_id
- * Socket to allocate memory on.
+ * @param numa_id
+ * NUMA node ID to allocate memory on.
*
* @return
* - Pointer to a mempool on success,
@@ -1056,7 +1056,7 @@ rte_bbdev_op_type_str(enum rte_bbdev_op_type op_type);
struct rte_mempool *
rte_bbdev_op_pool_create(const char *name, enum rte_bbdev_op_type type,
unsigned int num_elements, unsigned int cache_size,
- int socket_id);
+ int numa_id);
/**
* Bulk allocate encode operations from a mempool with parameter defaults reset.
diff --git a/lib/bbdev/rte_bbdev_pmd.h b/lib/bbdev/rte_bbdev_pmd.h
index 4f14909e22..0fc94c86c5 100644
--- a/lib/bbdev/rte_bbdev_pmd.h
+++ b/lib/bbdev/rte_bbdev_pmd.h
@@ -76,7 +76,7 @@ rte_bbdev_get_named_dev(const char *name);
/** @internal Function used to configure device memory. */
typedef int (*rte_bbdev_setup_queues_t)(struct rte_bbdev *dev,
- uint16_t num_queues, int socket_id);
+ uint16_t num_queues, int numa_id);
/** @internal Function used to configure interrupts for a device. */
typedef int (*rte_bbdev_intr_enable_t)(struct rte_bbdev *dev);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 012/227] eventdev: rename device socket API to NUMA node API
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (10 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 011/227] bbdev: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 013/227] acl: use NUMA node terminology Chengwen Feng
` (215 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the exported function rte_event_dev_socket_id() to
rte_event_dev_numa_id(), keeping the old name as a functional
alias to be deprecated once the in-tree migration completes.
Rename the numa_id fields of the timer and vector adapter
configuration structures (were socket_id), keeping socket_id as
a deprecated union alias, and the eventdev data field to
numa_id, and update in-tree users accordingly.
Also rename socket_id parameters, trace points, internal
variables, log messages and comments to the NUMA node
terminology, and switch internal calls to rte_zmalloc_numa(),
rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-eventdev/test_perf_common.c | 4 +-
drivers/event/dlb2/pf/dlb2_pf.c | 2 +-
drivers/event/dsw/dsw_evdev.c | 4 +-
drivers/event/octeontx/ssovf_evdev.c | 2 +-
drivers/event/skeleton/skeleton_eventdev.c | 4 +-
drivers/event/sw/sw_evdev.c | 8 +--
drivers/event/sw/sw_evdev_xstats.c | 2 +-
lib/eventdev/event_timer_adapter_pmd.h | 4 +-
lib/eventdev/event_vector_adapter_pmd.h | 4 +-
lib/eventdev/eventdev_pmd.h | 10 ++--
lib/eventdev/eventdev_pmd_pci.h | 4 +-
lib/eventdev/eventdev_pmd_vdev.h | 12 ++--
lib/eventdev/eventdev_trace.h | 14 ++---
lib/eventdev/eventdev_trace_points.c | 4 +-
lib/eventdev/rte_event_crypto_adapter.c | 30 +++++-----
lib/eventdev/rte_event_dma_adapter.c | 38 ++++++------
lib/eventdev/rte_event_eth_rx_adapter.c | 68 +++++++++++-----------
lib/eventdev/rte_event_eth_tx_adapter.c | 30 +++++-----
lib/eventdev/rte_event_ring.c | 6 +-
lib/eventdev/rte_event_ring.h | 8 +--
lib/eventdev/rte_event_timer_adapter.c | 16 ++---
lib/eventdev/rte_event_timer_adapter.h | 11 +++-
lib/eventdev/rte_event_vector_adapter.c | 12 ++--
lib/eventdev/rte_event_vector_adapter.h | 11 +++-
lib/eventdev/rte_eventdev.c | 31 ++++++----
lib/eventdev/rte_eventdev.h | 24 ++++++--
26 files changed, 200 insertions(+), 163 deletions(-)
diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index a7858854eb..cb69ed7f1b 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -1649,7 +1649,7 @@ perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
conf.event_dev_id = opt->dev_id;
conf.vector_sz = opt->vector_size;
conf.vector_timeout_ns = opt->vector_tmo_nsec;
- conf.socket_id = opt->socket_id;
+ conf.numa_id = opt->socket_id;
conf.vector_mp = t->pool;
conf.ev.sched_type = opt->sched_type_list[0];
@@ -2082,7 +2082,7 @@ perf_cryptodev_setup(struct evt_test *test, struct evt_options *opt)
}
conf.nb_queue_pairs = nb_qps;
- conf.socket_id = SOCKET_ID_ANY;
+ conf.numa_id = RTE_NUMA_ID_ANY;
conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
ret = rte_cryptodev_configure(cdev_id, &conf);
diff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c
index c78783e59d..aaa55bbe00 100644
--- a/drivers/event/dlb2/pf/dlb2_pf.c
+++ b/drivers/event/dlb2/pf/dlb2_pf.c
@@ -777,7 +777,7 @@ dlb2_eventdev_pci_init(struct rte_eventdev *eventdev)
const void *probe_args = NULL;
DLB2_LOG_LINE_DBG("Enter with dev_id=%d socket_id=%d",
- eventdev->data->dev_id, eventdev->data->socket_id);
+ eventdev->data->dev_id, eventdev->data->numa_id);
for (q = 0; q < DLB2_MAX_NUM_PORTS_ALL; q++)
dlb2_args.port_cos.cos_id[q] = DLB2_COS_DEFAULT;
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index e819412639..55e3a2045c 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -43,7 +43,7 @@ dsw_port_setup(struct rte_eventdev *dev, uint8_t port_id,
port_id);
in_ring = rte_event_ring_create(ring_name, DSW_IN_RING_SIZE,
- dev->data->socket_id,
+ dev->data->numa_id,
RING_F_SC_DEQ|RING_F_EXACT_SZ);
if (in_ring == NULL)
@@ -55,7 +55,7 @@ dsw_port_setup(struct rte_eventdev *dev, uint8_t port_id,
ctl_in_ring = rte_ring_create_elem(ring_name,
sizeof(struct dsw_ctl_msg),
DSW_CTL_IN_RING_SIZE,
- dev->data->socket_id,
+ dev->data->numa_id,
RING_F_SC_DEQ|RING_F_EXACT_SZ);
if (ctl_in_ring == NULL) {
diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c
index 957fcab04e..1e5818569b 100644
--- a/drivers/event/octeontx/ssovf_evdev.c
+++ b/drivers/event/octeontx/ssovf_evdev.c
@@ -256,7 +256,7 @@ ssovf_port_setup(struct rte_eventdev *dev, uint8_t port_id,
/* Allocate event port memory */
ws = rte_zmalloc_socket("eventdev ssows",
sizeof(struct ssows), RTE_CACHE_LINE_SIZE,
- dev->data->socket_id);
+ dev->data->numa_id);
if (ws == NULL) {
ssovf_log_err("Failed to alloc memory for port=%d", port_id);
return -ENOMEM;
diff --git a/drivers/event/skeleton/skeleton_eventdev.c b/drivers/event/skeleton/skeleton_eventdev.c
index c0e06e4aa0..9eccf61cad 100644
--- a/drivers/event/skeleton/skeleton_eventdev.c
+++ b/drivers/event/skeleton/skeleton_eventdev.c
@@ -222,7 +222,7 @@ skeleton_eventdev_port_setup(struct rte_eventdev *dev, uint8_t port_id,
/* Allocate event port memory */
sp = rte_zmalloc_socket("eventdev port",
sizeof(struct skeleton_port), RTE_CACHE_LINE_SIZE,
- dev->data->socket_id);
+ dev->data->numa_id);
if (sp == NULL) {
PMD_DRV_ERR("Failed to allocate sp port_id=%d", port_id);
return -ENOMEM;
@@ -352,7 +352,7 @@ skeleton_eventdev_init(struct rte_eventdev *eventdev)
pci_dev->addr.devid, pci_dev->addr.function);
PMD_DRV_LOG(INFO, "dev_id=%d socket_id=%d (%x:%x)",
- eventdev->data->dev_id, eventdev->data->socket_id,
+ eventdev->data->dev_id, eventdev->data->numa_id,
skel->vendor_id, skel->device_id);
fail:
diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index adff02bf3e..d6bc23a220 100644
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -178,7 +178,7 @@ sw_port_setup(struct rte_eventdev *dev, uint8_t port_id,
rte_event_ring_free(existing_ring);
p->rx_worker_ring = rte_event_ring_create(buf, MAX_SW_PROD_Q_DEPTH,
- dev->data->socket_id,
+ dev->data->numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ | RING_F_EXACT_SZ);
if (p->rx_worker_ring == NULL) {
SW_LOG_ERR("Error creating RX worker ring for port %d",
@@ -197,7 +197,7 @@ sw_port_setup(struct rte_eventdev *dev, uint8_t port_id,
rte_event_ring_free(existing_ring);
p->cq_worker_ring = rte_event_ring_create(buf, conf->dequeue_depth,
- dev->data->socket_id,
+ dev->data->numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ | RING_F_EXACT_SZ);
if (p->cq_worker_ring == NULL) {
rte_event_ring_free(p->rx_worker_ring);
@@ -237,7 +237,7 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type,
const struct rte_event_queue_conf *queue_conf)
{
unsigned int i;
- int socket_id = sw->data->socket_id;
+ int socket_id = sw->data->numa_id;
struct sw_qid *qid = &sw->qids[idx];
/* Initialize the FID structures to no pinning (-1), and zero packets */
@@ -537,7 +537,7 @@ sw_dev_configure(const struct rte_eventdev *dev)
sizeof(struct sw_queue_chunk) *
num_chunks,
0,
- sw->data->socket_id);
+ sw->data->numa_id);
if (!sw->chunks)
return -ENOMEM;
diff --git a/drivers/event/sw/sw_evdev_xstats.c b/drivers/event/sw/sw_evdev_xstats.c
index 076b982ab8..611a7ce94a 100644
--- a/drivers/event/sw/sw_evdev_xstats.c
+++ b/drivers/event/sw/sw_evdev_xstats.c
@@ -262,7 +262,7 @@ sw_xstats_init(struct sw_evdev *sw)
unsigned int i, port, qid, iq, bkt, stat = 0;
sw->xstats = rte_zmalloc_socket(NULL, sizeof(sw->xstats[0]) * count, 0,
- sw->data->socket_id);
+ sw->data->numa_id);
if (sw->xstats == NULL)
return -ENOMEM;
diff --git a/lib/eventdev/event_timer_adapter_pmd.h b/lib/eventdev/event_timer_adapter_pmd.h
index f06e85dc0b..6b75ee304b 100644
--- a/lib/eventdev/event_timer_adapter_pmd.h
+++ b/lib/eventdev/event_timer_adapter_pmd.h
@@ -87,8 +87,8 @@ struct __rte_cache_aligned rte_event_timer_adapter_data {
/**< Event timer adapter ID */
uint8_t event_dev_id;
/**< Event device ID */
- uint32_t socket_id;
- /**< Socket ID where memory is allocated */
+ uint32_t numa_id;
+ /**< NUMA node ID where memory is allocated */
uint8_t event_port_id;
/**< Optional: event port ID used when the inbuilt port is absent */
const struct rte_memzone *mz;
diff --git a/lib/eventdev/event_vector_adapter_pmd.h b/lib/eventdev/event_vector_adapter_pmd.h
index 7fe2c53639..614833d691 100644
--- a/lib/eventdev/event_vector_adapter_pmd.h
+++ b/lib/eventdev/event_vector_adapter_pmd.h
@@ -56,8 +56,8 @@ struct __rte_cache_aligned rte_event_vector_adapter_data {
/**< Event vector adapter ID */
uint8_t event_dev_id;
/**< Event device ID */
- uint32_t socket_id;
- /**< Socket ID where memory is allocated */
+ uint32_t numa_id;
+ /**< NUMA node ID where memory is allocated */
uint8_t event_port_id;
/**< Optional: event port ID used when the inbuilt port is absent */
const struct rte_memzone *mz;
diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
index 9309dce5e1..2d40e4ff0c 100644
--- a/lib/eventdev/eventdev_pmd.h
+++ b/lib/eventdev/eventdev_pmd.h
@@ -110,8 +110,8 @@ struct rte_eventdev_global {
* different processes in a multi-process configuration.
*/
struct __rte_cache_aligned rte_eventdev_data {
- int socket_id;
- /**< Socket ID where memory is allocated */
+ int numa_id;
+ /**< NUMA node ID where memory is allocated */
uint8_t dev_id;
/**< Device ID for this instance */
uint8_t nb_queues;
@@ -1744,14 +1744,14 @@ struct eventdev_ops {
*
* @param name
* Unique identifier name for each device
- * @param socket_id
- * Socket to allocate resources on.
+ * @param numa_id
+ * NUMA node to allocate resources on.
* @return
* - Slot in the rte_dev_devices array for a new device;
*/
__rte_internal
struct rte_eventdev *
-rte_event_pmd_allocate(const char *name, int socket_id);
+rte_event_pmd_allocate(const char *name, int numa_id);
/**
* Release the specified eventdev device.
diff --git a/lib/eventdev/eventdev_pmd_pci.h b/lib/eventdev/eventdev_pmd_pci.h
index ebc7d12b1d..3994c3b42e 100644
--- a/lib/eventdev/eventdev_pmd_pci.h
+++ b/lib/eventdev/eventdev_pmd_pci.h
@@ -57,11 +57,11 @@ rte_event_pmd_pci_probe_named(struct rte_pci_driver *pci_drv,
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
eventdev->data->dev_private =
- rte_zmalloc_socket(
+ rte_zmalloc_numa(
"eventdev private structure",
private_data_size,
RTE_CACHE_LINE_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (eventdev->data->dev_private == NULL)
rte_panic("Cannot allocate memzone for private "
diff --git a/lib/eventdev/eventdev_pmd_vdev.h b/lib/eventdev/eventdev_pmd_vdev.h
index ae1c950bed..da0b3acd99 100644
--- a/lib/eventdev/eventdev_pmd_vdev.h
+++ b/lib/eventdev/eventdev_pmd_vdev.h
@@ -35,8 +35,8 @@ extern "C" {
* PMD type name
* @param dev_private_size
* Size of event PMDs private data
- * @param socket_id
- * Socket to allocate resources on.
+ * @param numa_id
+ * NUMA node to allocate resources on.
*
* @return
* - Eventdev pointer if device is successfully created.
@@ -45,23 +45,23 @@ extern "C" {
__rte_internal
static inline struct rte_eventdev *
rte_event_pmd_vdev_init(const char *name, size_t dev_private_size,
- int socket_id, struct rte_vdev_device *vdev)
+ int numa_id, struct rte_vdev_device *vdev)
{
struct rte_eventdev *eventdev;
/* Allocate device structure */
- eventdev = rte_event_pmd_allocate(name, socket_id);
+ eventdev = rte_event_pmd_allocate(name, numa_id);
if (eventdev == NULL)
return NULL;
/* Allocate private device structure */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
eventdev->data->dev_private =
- rte_zmalloc_socket("eventdev device private",
+ rte_zmalloc_numa("eventdev device private",
dev_private_size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (eventdev->data->dev_private == NULL)
rte_panic("Cannot allocate memzone for private device"
diff --git a/lib/eventdev/eventdev_trace.h b/lib/eventdev/eventdev_trace.h
index 6b334d8bd1..45d53bb853 100644
--- a/lib/eventdev/eventdev_trace.h
+++ b/lib/eventdev/eventdev_trace.h
@@ -388,11 +388,11 @@ RTE_TRACE_POINT(
)
RTE_TRACE_POINT(
- rte_eventdev_trace_socket_id,
- RTE_TRACE_POINT_ARGS(uint8_t dev_id, const void *dev, int socket_id),
+ rte_eventdev_trace_numa_id,
+ RTE_TRACE_POINT_ARGS(uint8_t dev_id, const void *dev, int numa_id),
rte_trace_point_emit_u8(dev_id);
rte_trace_point_emit_ptr(dev);
- rte_trace_point_emit_int(socket_id);
+ rte_trace_point_emit_int(numa_id);
)
RTE_TRACE_POINT(
@@ -569,10 +569,10 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT(
rte_eventdev_trace_ring_create,
RTE_TRACE_POINT_ARGS(const char *name, unsigned int count,
- int socket_id, unsigned int flags),
+ int numa_id, unsigned int flags),
rte_trace_point_emit_string(name);
rte_trace_point_emit_u32(count);
- rte_trace_point_emit_int(socket_id);
+ rte_trace_point_emit_int(numa_id);
rte_trace_point_emit_u32(flags);
)
@@ -633,11 +633,11 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT(
rte_eventdev_trace_vector_pool_create,
- RTE_TRACE_POINT_ARGS(const void *mp, const char *name, int socket_id,
+ RTE_TRACE_POINT_ARGS(const void *mp, const char *name, int numa_id,
uint32_t size, uint32_t cache_size, uint32_t elt_size),
rte_trace_point_emit_ptr(mp);
rte_trace_point_emit_string(name);
- rte_trace_point_emit_int(socket_id);
+ rte_trace_point_emit_int(numa_id);
rte_trace_point_emit_u32(size);
rte_trace_point_emit_u32(cache_size);
rte_trace_point_emit_u32(elt_size);
diff --git a/lib/eventdev/eventdev_trace_points.c b/lib/eventdev/eventdev_trace_points.c
index ade6723b7b..f5f6be3a7b 100644
--- a/lib/eventdev/eventdev_trace_points.c
+++ b/lib/eventdev/eventdev_trace_points.c
@@ -176,8 +176,8 @@ RTE_TRACE_POINT_REGISTER(rte_eventdev_trace_info_get,
RTE_TRACE_POINT_REGISTER(rte_eventdev_trace_service_id_get,
lib.eventdev.service_id_get)
-RTE_TRACE_POINT_REGISTER(rte_eventdev_trace_socket_id,
- lib.eventdev.socket.id)
+RTE_TRACE_POINT_REGISTER(rte_eventdev_trace_numa_id,
+ lib.eventdev.numa_id)
RTE_TRACE_POINT_REGISTER(rte_eventdev_trace_stop_flush_callback_register,
lib.eventdev.stop.flush.callback.register)
diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c
index 6ac64cafb1..a8e29f2b32 100644
--- a/lib/eventdev/rte_event_crypto_adapter.c
+++ b/lib/eventdev/rte_event_crypto_adapter.c
@@ -91,8 +91,8 @@ struct __rte_cache_aligned event_crypto_adapter {
uint8_t service_inited;
/* Memory allocation name */
char mem_name[CRYPTO_ADAPTER_MEM_NAME_LEN];
- /* Socket identifier cached from eventdev */
- int socket_id;
+ /* NUMA node identifier cached from eventdev */
+ int numa_id;
/* Per adapter EAL service */
uint32_t service_id;
/* No. of queue pairs configured */
@@ -180,7 +180,7 @@ eca_init(void)
mz = rte_memzone_lookup(ECA_ADAPTER_ARRAY);
if (mz == NULL) {
mz = rte_memzone_reserve_aligned(ECA_ADAPTER_ARRAY, sz,
- rte_socket_id(), 0,
+ rte_numa_id(), 0,
RTE_CACHE_LINE_SIZE);
if (mz == NULL) {
RTE_EDEV_LOG_ERR("failed to reserve memzone err = %"
@@ -372,7 +372,7 @@ rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t dev_id,
{
struct event_crypto_adapter *adapter;
char mem_name[CRYPTO_ADAPTER_NAME_LEN];
- int socket_id;
+ int numa_id;
uint8_t i;
int ret;
@@ -393,12 +393,12 @@ rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t dev_id,
return -EEXIST;
}
- socket_id = rte_event_dev_socket_id(dev_id);
+ numa_id = rte_event_dev_numa_id(dev_id);
snprintf(mem_name, CRYPTO_ADAPTER_MEM_NAME_LEN,
"rte_event_crypto_adapter_%d", id);
- adapter = rte_zmalloc_socket(mem_name, sizeof(*adapter),
- RTE_CACHE_LINE_SIZE, socket_id);
+ adapter = rte_zmalloc_numa(mem_name, sizeof(*adapter),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (adapter == NULL) {
RTE_EDEV_LOG_ERR("Failed to get mem for event crypto adapter!");
return -ENOMEM;
@@ -413,15 +413,15 @@ rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t dev_id,
}
adapter->eventdev_id = dev_id;
- adapter->socket_id = socket_id;
+ adapter->numa_id = numa_id;
adapter->conf_cb = conf_cb;
adapter->conf_arg = conf_arg;
adapter->mode = mode;
strcpy(adapter->mem_name, mem_name);
- adapter->cdevs = rte_zmalloc_socket(adapter->mem_name,
+ adapter->cdevs = rte_zmalloc_numa(adapter->mem_name,
rte_cryptodev_count() *
sizeof(struct crypto_device_info), 0,
- socket_id);
+ numa_id);
if (adapter->cdevs == NULL) {
RTE_EDEV_LOG_ERR("Failed to get mem for crypto devices");
eca_circular_buffer_free(&adapter->ebuf);
@@ -920,7 +920,7 @@ eca_init_service(struct event_crypto_adapter *adapter, uint8_t id)
memset(&service, 0, sizeof(service));
snprintf(service.name, CRYPTO_ADAPTER_NAME_LEN,
"rte_event_crypto_adapter_%d", id);
- service.socket_id = adapter->socket_id;
+ service.socket_id = adapter->numa_id;
service.callback = eca_service_func;
service.callback_userdata = adapter;
/* Service function handles locking for queue add/del updates */
@@ -1011,10 +1011,10 @@ eca_add_queue_pair(struct event_crypto_adapter *adapter, uint8_t cdev_id,
if (dev_info->qpairs == NULL) {
dev_info->qpairs =
- rte_zmalloc_socket(adapter->mem_name,
+ rte_zmalloc_numa(adapter->mem_name,
dev_info->dev->data->nb_queue_pairs *
sizeof(struct crypto_queue_pair_info),
- 0, adapter->socket_id);
+ 0, adapter->numa_id);
if (dev_info->qpairs == NULL)
return -ENOMEM;
@@ -1141,10 +1141,10 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id,
return -ENOTSUP;
if (dev_info->qpairs == NULL) {
dev_info->qpairs =
- rte_zmalloc_socket(adapter->mem_name,
+ rte_zmalloc_numa(adapter->mem_name,
dev_info->dev->data->nb_queue_pairs *
sizeof(struct crypto_queue_pair_info),
- 0, adapter->socket_id);
+ 0, adapter->numa_id);
if (dev_info->qpairs == NULL)
return -ENOMEM;
}
diff --git a/lib/eventdev/rte_event_dma_adapter.c b/lib/eventdev/rte_event_dma_adapter.c
index da785483c2..1dc752141d 100644
--- a/lib/eventdev/rte_event_dma_adapter.c
+++ b/lib/eventdev/rte_event_dma_adapter.c
@@ -97,8 +97,8 @@ struct __rte_cache_aligned event_dma_adapter {
/* Memory allocation name */
char mem_name[DMA_ADAPTER_NAME_LEN];
- /* Socket identifier cached from eventdev */
- int socket_id;
+ /* NUMA node identifier cached from eventdev */
+ int numa_id;
/* Lock to serialize config updates with service function */
rte_spinlock_t lock;
@@ -173,7 +173,7 @@ edma_array_init(void)
sz = sizeof(struct event_dma_adapter *) * RTE_EVENT_DMA_ADAPTER_MAX_INSTANCE;
sz = RTE_ALIGN(sz, RTE_CACHE_LINE_SIZE);
- mz = rte_memzone_reserve_aligned(DMA_ADAPTER_ARRAY, sz, rte_socket_id(), 0,
+ mz = rte_memzone_reserve_aligned(DMA_ADAPTER_ARRAY, sz, rte_numa_id(), 0,
RTE_CACHE_LINE_SIZE);
if (mz == NULL) {
RTE_EDEV_LOG_ERR("Failed to reserve memzone : %s, err = %d",
@@ -352,7 +352,7 @@ rte_event_dma_adapter_create_ext(uint8_t id, uint8_t evdev_id,
char name[DMA_ADAPTER_NAME_LEN];
struct rte_dma_info info;
uint16_t num_dma_dev;
- int socket_id;
+ int numa_id;
uint8_t i;
int ret;
@@ -374,10 +374,10 @@ rte_event_dma_adapter_create_ext(uint8_t id, uint8_t evdev_id,
return -EEXIST;
}
- socket_id = rte_event_dev_socket_id(evdev_id);
+ numa_id = rte_event_dev_numa_id(evdev_id);
snprintf(name, DMA_ADAPTER_NAME_LEN, "rte_event_dma_adapter_%d", id);
- adapter = rte_zmalloc_socket(name, sizeof(struct event_dma_adapter), RTE_CACHE_LINE_SIZE,
- socket_id);
+ adapter = rte_zmalloc_numa(name, sizeof(struct event_dma_adapter), RTE_CACHE_LINE_SIZE,
+ numa_id);
if (adapter == NULL) {
RTE_EDEV_LOG_ERR("Failed to get mem for event ML adapter!");
return -ENOMEM;
@@ -404,12 +404,12 @@ rte_event_dma_adapter_create_ext(uint8_t id, uint8_t evdev_id,
adapter->eventdev_id = evdev_id;
adapter->mode = mode;
rte_strscpy(adapter->mem_name, name, DMA_ADAPTER_NAME_LEN);
- adapter->socket_id = socket_id;
+ adapter->numa_id = numa_id;
adapter->conf_cb = conf_cb;
adapter->conf_arg = conf_arg;
- adapter->dma_devs = rte_zmalloc_socket(adapter->mem_name,
+ adapter->dma_devs = rte_zmalloc_numa(adapter->mem_name,
num_dma_dev * sizeof(struct dma_device_info), 0,
- socket_id);
+ numa_id);
if (adapter->dma_devs == NULL) {
RTE_EDEV_LOG_ERR("Failed to get memory for DMA devices");
edma_circular_buffer_free(&adapter->ebuf);
@@ -867,7 +867,7 @@ edma_init_service(struct event_dma_adapter *adapter, uint8_t id)
memset(&service, 0, sizeof(service));
snprintf(service.name, DMA_ADAPTER_NAME_LEN, "rte_event_dma_adapter_%d", id);
- service.socket_id = adapter->socket_id;
+ service.socket_id = adapter->numa_id;
service.callback = edma_service_func;
service.callback_userdata = adapter;
@@ -946,15 +946,15 @@ edma_add_vchan(struct event_dma_adapter *adapter, int16_t dma_dev_id, uint16_t v
if (dev_info->vchanq == NULL) {
nb_vchans = dev_info->num_dma_dev_vchan;
- dev_info->vchanq = rte_zmalloc_socket(adapter->mem_name,
+ dev_info->vchanq = rte_zmalloc_numa(adapter->mem_name,
nb_vchans * sizeof(struct dma_vchan_info),
- 0, adapter->socket_id);
+ 0, adapter->numa_id);
if (dev_info->vchanq == NULL)
return -ENOMEM;
- dev_info->tqmap = rte_zmalloc_socket(adapter->mem_name,
+ dev_info->tqmap = rte_zmalloc_numa(adapter->mem_name,
nb_vchans * sizeof(struct dma_vchan_info),
- 0, adapter->socket_id);
+ 0, adapter->numa_id);
if (dev_info->tqmap == NULL)
return -ENOMEM;
@@ -1039,10 +1039,10 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan,
if (dev->dev_ops->dma_adapter_vchan_add == NULL)
return -ENOTSUP;
if (dev_info->vchanq == NULL) {
- dev_info->vchanq = rte_zmalloc_socket(adapter->mem_name,
+ dev_info->vchanq = rte_zmalloc_numa(adapter->mem_name,
dev_info->num_dma_dev_vchan *
sizeof(struct dma_vchan_info),
- 0, adapter->socket_id);
+ 0, adapter->numa_id);
if (dev_info->vchanq == NULL) {
RTE_EDEV_LOG_ERR("Queue pair add not supported");
return -ENOMEM;
@@ -1050,10 +1050,10 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t dma_dev_id, uint16_t vchan,
}
if (dev_info->tqmap == NULL) {
- dev_info->tqmap = rte_zmalloc_socket(adapter->mem_name,
+ dev_info->tqmap = rte_zmalloc_numa(adapter->mem_name,
dev_info->num_dma_dev_vchan *
sizeof(struct dma_vchan_info),
- 0, adapter->socket_id);
+ 0, adapter->numa_id);
if (dev_info->tqmap == NULL) {
RTE_EDEV_LOG_ERR("tq pair add not supported");
return -ENOMEM;
diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
index 26c0a26db1..e87a6eca78 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -181,8 +181,8 @@ struct __rte_cache_aligned event_eth_rx_adapter {
uint32_t nb_queues;
/* Memory allocation name */
char mem_name[ETH_RX_ADAPTER_MEM_NAME_LEN];
- /* Socket identifier cached from eventdev */
- int socket_id;
+ /* NUMA node identifier cached from eventdev */
+ int numa_id;
/* Per adapter EAL service */
uint32_t service_id;
/* Adapter started flag */
@@ -586,10 +586,10 @@ rxa_alloc_poll(struct event_eth_rx_adapter *rx_adapter, uint32_t num_rx_polled)
len = RTE_ALIGN(num_rx_polled * sizeof(*rx_adapter->eth_rx_poll),
RTE_CACHE_LINE_SIZE);
- return rte_zmalloc_socket(rx_adapter->mem_name,
+ return rte_zmalloc_numa(rx_adapter->mem_name,
len,
RTE_CACHE_LINE_SIZE,
- rx_adapter->socket_id);
+ rx_adapter->numa_id);
}
/*
@@ -602,10 +602,10 @@ rxa_alloc_wrr(struct event_eth_rx_adapter *rx_adapter, int nb_wrr)
len = RTE_ALIGN(nb_wrr * sizeof(*rx_adapter->wrr_sched),
RTE_CACHE_LINE_SIZE);
- return rte_zmalloc_socket(rx_adapter->mem_name,
+ return rte_zmalloc_numa(rx_adapter->mem_name,
len,
RTE_CACHE_LINE_SIZE,
- rx_adapter->socket_id);
+ rx_adapter->numa_id);
}
static int
@@ -1458,7 +1458,7 @@ rxa_memzone_array_get(const char *name, unsigned int elt_size, int nb_elems)
mz = rte_memzone_lookup(name);
if (mz == NULL) {
- mz = rte_memzone_reserve_aligned(name, sz, rte_socket_id(), 0,
+ mz = rte_memzone_reserve_aligned(name, sz, rte_numa_id(), 0,
RTE_CACHE_LINE_SIZE);
if (mz == NULL) {
RTE_EDEV_LOG_ERR("failed to reserve memzone"
@@ -1604,15 +1604,15 @@ rxa_create_intr_thread(struct event_eth_rx_adapter *rx_adapter)
rx_adapter->intr_ring = rte_ring_create("intr_ring",
RTE_EVENT_ETH_INTR_RING_SIZE,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (!rx_adapter->intr_ring)
return -ENOMEM;
- rx_adapter->epoll_events = rte_zmalloc_socket(rx_adapter->mem_name,
+ rx_adapter->epoll_events = rte_zmalloc_numa(rx_adapter->mem_name,
RTE_EVENT_ETH_INTR_RING_SIZE *
sizeof(struct rte_epoll_event),
RTE_CACHE_LINE_SIZE,
- rx_adapter->socket_id);
+ rx_adapter->numa_id);
if (!rx_adapter->epoll_events) {
err = -ENOMEM;
goto error;
@@ -1782,11 +1782,11 @@ rxa_config_intr(struct event_eth_rx_adapter *rx_adapter,
size_t len =
dev_info->dev->data->nb_rx_queues * sizeof(uint16_t);
dev_info->intr_queue =
- rte_zmalloc_socket(
+ rte_zmalloc_numa(
rx_adapter->mem_name,
len,
0,
- rx_adapter->socket_id);
+ rx_adapter->numa_id);
if (dev_info->intr_queue == NULL)
return -ENOMEM;
}
@@ -1922,7 +1922,7 @@ rxa_init_service(struct event_eth_rx_adapter *rx_adapter, uint8_t id)
memset(&service, 0, sizeof(service));
snprintf(service.name, ETH_RX_ADAPTER_SERVICE_NAME_LEN,
"rte_event_eth_rx_adapter_%d", id);
- service.socket_id = rx_adapter->socket_id;
+ service.socket_id = rx_adapter->numa_id;
service.callback = rxa_service_func;
service.callback_userdata = rx_adapter;
/* Service function handles locking for queue add/del updates */
@@ -2148,9 +2148,9 @@ rxa_add_queue(struct event_eth_rx_adapter *rx_adapter,
if (!rx_adapter->use_queue_event_buf)
return 0;
- new_rx_buf = rte_zmalloc_socket("rx_buffer_meta",
+ new_rx_buf = rte_zmalloc_numa("rx_buffer_meta",
sizeof(*new_rx_buf), 0,
- rte_eth_dev_socket_id(eth_dev_id));
+ rte_eth_dev_numa_id(eth_dev_id));
if (new_rx_buf == NULL) {
RTE_EDEV_LOG_ERR("Failed to allocate event buffer meta for "
"dev_id: %d queue_id: %d",
@@ -2160,10 +2160,10 @@ rxa_add_queue(struct event_eth_rx_adapter *rx_adapter,
new_rx_buf->events_size = RTE_ALIGN(conf->event_buf_size, BATCH_SIZE);
new_rx_buf->events_size += (2 * BATCH_SIZE);
- new_rx_buf->events = rte_zmalloc_socket("rx_buffer",
+ new_rx_buf->events = rte_zmalloc_numa("rx_buffer",
sizeof(struct rte_event) *
new_rx_buf->events_size, 0,
- rte_eth_dev_socket_id(eth_dev_id));
+ rte_eth_dev_numa_id(eth_dev_id));
if (new_rx_buf->events == NULL) {
rte_free(new_rx_buf);
RTE_EDEV_LOG_ERR("Failed to allocate event buffer for "
@@ -2175,9 +2175,9 @@ rxa_add_queue(struct event_eth_rx_adapter *rx_adapter,
queue_info->event_buf = new_rx_buf;
/* Allocate storage for adapter queue stats */
- stats = rte_zmalloc_socket("rx_queue_stats",
+ stats = rte_zmalloc_numa("rx_queue_stats",
sizeof(*stats), 0,
- rte_eth_dev_socket_id(eth_dev_id));
+ rte_eth_dev_numa_id(eth_dev_id));
if (stats == NULL) {
rte_free(new_rx_buf->events);
rte_free(new_rx_buf);
@@ -2236,10 +2236,10 @@ rxa_sw_add(struct event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id,
if (dev_info->rx_queue == NULL) {
dev_info->rx_queue =
- rte_zmalloc_socket(rx_adapter->mem_name,
+ rte_zmalloc_numa(rx_adapter->mem_name,
nb_rx_queues *
sizeof(struct eth_rx_queue_info), 0,
- rx_adapter->socket_id);
+ rx_adapter->numa_id);
if (dev_info->rx_queue == NULL)
return -ENOMEM;
}
@@ -2386,7 +2386,7 @@ rxa_create(uint8_t id, uint8_t dev_id,
struct eth_event_enqueue_buffer *buf;
struct rte_event *events;
int ret;
- int socket_id;
+ int numa_id;
uint16_t i;
char mem_name[ETH_RX_ADAPTER_SERVICE_NAME_LEN];
const uint8_t default_rss_key[] = {
@@ -2415,29 +2415,29 @@ rxa_create(uint8_t id, uint8_t dev_id,
return -EEXIST;
}
- socket_id = rte_event_dev_socket_id(dev_id);
+ numa_id = rte_event_dev_numa_id(dev_id);
snprintf(mem_name, ETH_RX_ADAPTER_MEM_NAME_LEN,
"rte_event_eth_rx_adapter_%d",
id);
- rx_adapter = rte_zmalloc_socket(mem_name, sizeof(*rx_adapter),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rx_adapter = rte_zmalloc_numa(mem_name, sizeof(*rx_adapter),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rx_adapter == NULL) {
RTE_EDEV_LOG_ERR("failed to get mem for rx adapter");
return -ENOMEM;
}
rx_adapter->eventdev_id = dev_id;
- rx_adapter->socket_id = socket_id;
+ rx_adapter->numa_id = numa_id;
rx_adapter->conf_cb = conf_cb;
rx_adapter->conf_arg = conf_arg;
rx_adapter->id = id;
TAILQ_INIT(&rx_adapter->vector_list);
strcpy(rx_adapter->mem_name, mem_name);
- rx_adapter->eth_devices = rte_zmalloc_socket(rx_adapter->mem_name,
+ rx_adapter->eth_devices = rte_zmalloc_numa(rx_adapter->mem_name,
RTE_MAX_ETHPORTS *
sizeof(struct eth_device_info), 0,
- socket_id);
+ numa_id);
rte_convert_rss_key((const uint32_t *)default_rss_key,
(uint32_t *)rx_adapter->rss_key_be,
RTE_DIM(default_rss_key));
@@ -2460,9 +2460,9 @@ rxa_create(uint8_t id, uint8_t dev_id,
buf = &rx_adapter->event_enqueue_buffer;
buf->events_size = rxa_params->event_buf_size;
- events = rte_zmalloc_socket(rx_adapter->mem_name,
+ events = rte_zmalloc_numa(rx_adapter->mem_name,
buf->events_size * sizeof(*events),
- 0, socket_id);
+ 0, numa_id);
if (events == NULL) {
RTE_EDEV_LOG_ERR("Failed to allocate memory "
"for adapter event buffer");
@@ -2757,10 +2757,10 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id,
return -ENOTSUP;
if (dev_info->rx_queue == NULL) {
dev_info->rx_queue =
- rte_zmalloc_socket(rx_adapter->mem_name,
+ rte_zmalloc_numa(rx_adapter->mem_name,
dev_info->dev->data->nb_rx_queues *
sizeof(struct eth_rx_queue_info), 0,
- rx_adapter->socket_id);
+ rx_adapter->numa_id);
if (dev_info->rx_queue == NULL)
return -ENOMEM;
}
@@ -2913,10 +2913,10 @@ rte_event_eth_rx_adapter_queues_add(uint8_t id, uint16_t eth_dev_id, int32_t rx_
if (dev_info->rx_queue == NULL) {
dev_info->rx_queue =
- rte_zmalloc_socket(rx_adapter->mem_name,
+ rte_zmalloc_numa(rx_adapter->mem_name,
dev_info->dev->data->nb_rx_queues *
sizeof(struct eth_rx_queue_info),
- 0, rx_adapter->socket_id);
+ 0, rx_adapter->numa_id);
if (dev_info->rx_queue == NULL)
return -ENOMEM;
}
diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
index b3edd9f6fb..c57d6b868c 100644
--- a/lib/eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/eventdev/rte_event_eth_tx_adapter.c
@@ -139,8 +139,8 @@ struct __rte_cache_aligned txa_service_data {
rte_event_eth_tx_adapter_conf_cb conf_cb;
/* Configuration callback argument */
void *conf_arg;
- /* socket id */
- int socket_id;
+ /* NUMA node id */
+ int numa_id;
/* Per adapter EAL service */
int64_t service_id;
/* Memory allocation name */
@@ -197,7 +197,7 @@ txa_memzone_array_get(const char *name, unsigned int elt_size, int nb_elems)
mz = rte_memzone_lookup(name);
if (mz == NULL) {
- mz = rte_memzone_reserve_aligned(name, sz, rte_socket_id(), 0,
+ mz = rte_memzone_reserve_aligned(name, sz, rte_numa_id(), 0,
RTE_CACHE_LINE_SIZE);
if (mz == NULL) {
RTE_EDEV_LOG_ERR("failed to reserve memzone"
@@ -361,10 +361,10 @@ txa_service_ethdev_alloc(struct txa_service_data *txa)
if (txa->txa_ethdev && dev_count == txa->dev_count)
return 0;
- txa_ethdev = rte_zmalloc_socket(txa->mem_name,
+ txa_ethdev = rte_zmalloc_numa(txa->mem_name,
dev_count * sizeof(*txa_ethdev),
0,
- txa->socket_id);
+ txa->numa_id);
if (txa_ethdev == NULL) {
RTE_EDEV_LOG_ERR("Failed to alloc txa::txa_ethdev ");
return -ENOMEM;
@@ -401,10 +401,10 @@ txa_service_queue_array_alloc(struct txa_service_data *txa,
return 0;
nb_queue = txa->txa_ethdev[port_id].dev->data->nb_tx_queues;
- tqi = rte_zmalloc_socket(txa->mem_name,
+ tqi = rte_zmalloc_numa(txa->mem_name,
nb_queue *
sizeof(struct txa_service_queue_info), 0,
- txa->socket_id);
+ txa->numa_id);
if (tqi == NULL)
return -ENOMEM;
txa->txa_ethdev[port_id].queues = tqi;
@@ -456,7 +456,7 @@ txa_service_register(struct txa_service_data *txa)
memset(&service, 0, sizeof(service));
snprintf(service.name, TXA_SERVICE_NAME_LEN, "txa_%d", txa->id);
- service.socket_id = txa->socket_id;
+ service.socket_id = txa->numa_id;
service.callback = txa_service_func;
service.callback_userdata = txa;
service.capabilities = RTE_SERVICE_CAP_MT_SAFE;
@@ -488,10 +488,10 @@ txa_service_tx_buf_alloc(struct txa_service_data *txa,
uint16_t port_id;
port_id = dev->data->port_id;
- tb = rte_zmalloc_socket(txa->mem_name,
+ tb = rte_zmalloc_numa(txa->mem_name,
RTE_ETH_TX_BUFFER_SIZE(TXA_BATCH_SIZE),
0,
- rte_eth_dev_socket_id(port_id));
+ rte_eth_dev_numa_id(port_id));
if (tb == NULL)
RTE_EDEV_LOG_ERR("Failed to allocate memory for tx buffer");
return tb;
@@ -740,14 +740,14 @@ txa_service_adapter_create_ext(uint8_t id, struct rte_eventdev *dev,
void *conf_arg)
{
struct txa_service_data *txa;
- int socket_id;
+ int numa_id;
char mem_name[TXA_SERVICE_NAME_LEN];
int ret;
if (conf_cb == NULL)
return -EINVAL;
- socket_id = dev->data->socket_id;
+ numa_id = dev->data->numa_id;
snprintf(mem_name, sizeof(mem_name),
"rte_event_eth_txa_%d",
id);
@@ -756,9 +756,9 @@ txa_service_adapter_create_ext(uint8_t id, struct rte_eventdev *dev,
if (ret != 0)
return ret;
- txa = rte_zmalloc_socket(mem_name,
+ txa = rte_zmalloc_numa(mem_name,
sizeof(*txa),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txa == NULL) {
RTE_EDEV_LOG_ERR("failed to get mem for tx adapter");
return -ENOMEM;
@@ -766,7 +766,7 @@ txa_service_adapter_create_ext(uint8_t id, struct rte_eventdev *dev,
txa->id = id;
txa->eventdev_id = dev->data->dev_id;
- txa->socket_id = socket_id;
+ txa->numa_id = numa_id;
strlcpy(txa->mem_name, mem_name, sizeof(txa->mem_name));
txa->conf_cb = conf_cb;
txa->conf_arg = conf_arg;
diff --git a/lib/eventdev/rte_event_ring.c b/lib/eventdev/rte_event_ring.c
index 5718985486..2fc54e4948 100644
--- a/lib/eventdev/rte_event_ring.c
+++ b/lib/eventdev/rte_event_ring.c
@@ -26,14 +26,14 @@ rte_event_ring_init(struct rte_event_ring *r, const char *name,
/* create the ring */
RTE_EXPORT_SYMBOL(rte_event_ring_create)
struct rte_event_ring *
-rte_event_ring_create(const char *name, unsigned int count, int socket_id,
+rte_event_ring_create(const char *name, unsigned int count, int numa_id,
unsigned int flags)
{
- rte_eventdev_trace_ring_create(name, count, socket_id, flags);
+ rte_eventdev_trace_ring_create(name, count, numa_id, flags);
return (struct rte_event_ring *)rte_ring_create_elem(name,
sizeof(struct rte_event),
- count, socket_id, flags);
+ count, numa_id, flags);
}
diff --git a/lib/eventdev/rte_event_ring.h b/lib/eventdev/rte_event_ring.h
index 2196022798..52a7f34416 100644
--- a/lib/eventdev/rte_event_ring.h
+++ b/lib/eventdev/rte_event_ring.h
@@ -271,9 +271,9 @@ rte_event_ring_free(struct rte_event_ring *r);
* usable space in the ring will be ``count - 1`` entries. If the flag
* ``RING_F_EXACT_SZ`` is set, the this can be any value up to the ring size
* limit - 1, and the usable space will be exactly that requested.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in case of
- * NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in case of
+ * NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
* constraint for the reserved zone.
* @param flags
* An OR of the following:
@@ -298,7 +298,7 @@ rte_event_ring_free(struct rte_event_ring *r);
* - ENOMEM - no appropriate memory area found in which to create memzone
*/
struct rte_event_ring *
-rte_event_ring_create(const char *name, unsigned int count, int socket_id, unsigned int flags)
+rte_event_ring_create(const char *name, unsigned int count, int numa_id, unsigned int flags)
__rte_malloc __rte_dealloc(rte_event_ring_free, 1);
/**
diff --git a/lib/eventdev/rte_event_timer_adapter.c b/lib/eventdev/rte_event_timer_adapter.c
index a76d10f505..de33fd9f95 100644
--- a/lib/eventdev/rte_event_timer_adapter.c
+++ b/lib/eventdev/rte_event_timer_adapter.c
@@ -201,7 +201,7 @@ rte_event_timer_adapter_create_ext(
}
mz = rte_memzone_reserve(mz_name,
sizeof(struct rte_event_timer_adapter_data),
- conf->socket_id, 0);
+ conf->numa_id, 0);
if (mz == NULL)
/* rte_errno set by rte_memzone_reserve */
return NULL;
@@ -212,7 +212,7 @@ rte_event_timer_adapter_create_ext(
adapter->data->mz = mz;
adapter->data->event_dev_id = conf->event_dev_id;
adapter->data->id = adapter_id;
- adapter->data->socket_id = conf->socket_id;
+ adapter->data->numa_id = conf->numa_id;
adapter->data->conf = *conf; /* copy conf structure */
/* Query eventdev PMD for timer adapter capabilities and ops */
@@ -931,8 +931,8 @@ swtim_init(struct rte_event_timer_adapter *adapter)
char swtim_name[SWTIM_NAMESIZE];
snprintf(swtim_name, SWTIM_NAMESIZE, "swtim_%"PRIu8,
adapter->data->id);
- sw = rte_zmalloc_socket(swtim_name, sizeof(*sw), RTE_CACHE_LINE_SIZE,
- adapter->data->socket_id);
+ sw = rte_zmalloc_numa(swtim_name, sizeof(*sw), RTE_CACHE_LINE_SIZE,
+ adapter->data->numa_id);
if (sw == NULL) {
EVTIM_LOG_ERR("failed to allocate space for private data");
rte_errno = ENOMEM;
@@ -958,7 +958,7 @@ swtim_init(struct rte_event_timer_adapter *adapter)
flags = 0; /* pool is multi-producer, multi-consumer */
sw->tim_pool = rte_mempool_create(pool_name, pool_size,
sizeof(struct rte_timer), cache_size, 0, NULL, NULL,
- NULL, NULL, adapter->data->socket_id, flags);
+ NULL, NULL, adapter->data->numa_id, flags);
if (sw->tim_pool == NULL) {
EVTIM_LOG_ERR("failed to create timer object mempool");
rte_errno = ENOMEM;
@@ -995,7 +995,7 @@ swtim_init(struct rte_event_timer_adapter *adapter)
memset(&service, 0, sizeof(service));
snprintf(service.name, RTE_SERVICE_NAME_MAX,
"swtim_svc_%"PRIu8, adapter->data->id);
- service.socket_id = adapter->data->socket_id;
+ service.socket_id = adapter->data->numa_id;
service.callback = swtim_service_func;
service.callback_userdata = adapter;
service.capabilities &= ~(RTE_SERVICE_CAP_MT_SAFE);
@@ -1429,8 +1429,8 @@ handle_ta_info(const char *cmd __rte_unused, const char *params,
rte_tel_data_add_dict_uint(d, "max_tmo_ns", adapter_info.max_tmo_ns);
rte_tel_data_add_dict_uint(d, "event_dev_id",
adapter_info.conf.event_dev_id);
- rte_tel_data_add_dict_uint(d, "socket_id",
- adapter_info.conf.socket_id);
+ rte_tel_data_add_dict_uint(d, "numa_id",
+ adapter_info.conf.numa_id);
rte_tel_data_add_dict_uint(d, "clk_src", adapter_info.conf.clk_src);
rte_tel_data_add_dict_uint(d, "timer_tick_ns",
adapter_info.conf.timer_tick_ns);
diff --git a/lib/eventdev/rte_event_timer_adapter.h b/lib/eventdev/rte_event_timer_adapter.h
index 215584b10b..8f9fae5f2e 100644
--- a/lib/eventdev/rte_event_timer_adapter.h
+++ b/lib/eventdev/rte_event_timer_adapter.h
@@ -165,8 +165,15 @@ struct rte_event_timer_adapter_conf {
/**< Event device identifier */
uint16_t timer_adapter_id;
/**< Event timer adapter identifier */
- uint32_t socket_id;
- /**< Identifier of socket from which to allocate memory for adapter */
+ union {
+ /** NUMA node ID from which to allocate memory for adapter */
+ uint32_t numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ uint32_t socket_id;
+ };
enum rte_event_timer_adapter_clk_src clk_src;
/**< Clock source for timer adapter */
uint64_t timer_tick_ns;
diff --git a/lib/eventdev/rte_event_vector_adapter.c b/lib/eventdev/rte_event_vector_adapter.c
index 9a839517c8..6222f1c907 100644
--- a/lib/eventdev/rte_event_vector_adapter.c
+++ b/lib/eventdev/rte_event_vector_adapter.c
@@ -253,7 +253,7 @@ rte_event_vector_adapter_create_ext(const struct rte_event_vector_adapter_conf *
goto error;
}
mz = rte_memzone_reserve(mz_name, sizeof(struct rte_event_vector_adapter_data),
- conf->socket_id, 0);
+ conf->numa_id, 0);
if (mz == NULL) {
adapter->ops = NULL;
EVVEC_LOG_DBG("failed to reserve memzone for vector adapter");
@@ -267,7 +267,7 @@ rte_event_vector_adapter_create_ext(const struct rte_event_vector_adapter_conf *
adapter->data->mz = mz;
adapter->data->event_dev_id = conf->event_dev_id;
adapter->data->id = adapter->adapter_id;
- adapter->data->socket_id = conf->socket_id;
+ adapter->data->numa_id = conf->numa_id;
adapter->data->conf = *conf;
if (!(caps & RTE_EVENT_VECTOR_ADAPTER_CAP_INTERNAL_PORT)) {
@@ -641,7 +641,7 @@ sw_vector_adapter_service_init(struct sw_vector_adapter_data *sw)
if (mz == NULL) {
mz = rte_memzone_reserve(SW_VECTOR_ADAPTER_SERVICE_FMT,
sizeof(struct sw_vector_adapter_service_data),
- sw->adapter->data->socket_id, 0);
+ sw->adapter->data->numa_id, 0);
if (mz == NULL) {
EVVEC_LOG_DBG("failed to reserve memzone for service");
return -ENOMEM;
@@ -650,7 +650,7 @@ sw_vector_adapter_service_init(struct sw_vector_adapter_data *sw)
memset(service_data, 0, sizeof(*service_data));
ring = rte_ring_create(SW_VECTOR_ADAPTER_SERVICE_FMT, SERVICE_RING_SZ,
- sw->adapter->data->socket_id, 0);
+ sw->adapter->data->numa_id, 0);
if (ring == NULL) {
EVVEC_LOG_ERR("failed to create ring for service");
rte_memzone_free(mz);
@@ -662,7 +662,7 @@ sw_vector_adapter_service_init(struct sw_vector_adapter_data *sw)
snprintf(service.name, RTE_SERVICE_NAME_MAX, "%s", SW_VECTOR_ADAPTER_SERVICE_FMT);
service.callback = sw_vector_adapter_service_func;
service.callback_userdata = service_data;
- service.socket_id = sw->adapter->data->socket_id;
+ service.socket_id = sw->adapter->data->numa_id;
ret = rte_service_component_register(&service, &service_data->service_id);
if (ret < 0) {
@@ -696,7 +696,7 @@ sw_vector_adapter_create(struct rte_event_vector_adapter *adapter)
struct rte_event ev;
snprintf(name, SW_VECTOR_ADAPTER_NAME, "sw_vector_%" PRIx32, adapter->data->id);
- sw = rte_zmalloc_socket(name, sizeof(*sw), RTE_CACHE_LINE_SIZE, adapter->data->socket_id);
+ sw = rte_zmalloc_numa(name, sizeof(*sw), RTE_CACHE_LINE_SIZE, adapter->data->numa_id);
if (sw == NULL) {
EVVEC_LOG_ERR("failed to allocate space for private data");
rte_errno = ENOMEM;
diff --git a/lib/eventdev/rte_event_vector_adapter.h b/lib/eventdev/rte_event_vector_adapter.h
index e85c79010e..cc29aa4baa 100644
--- a/lib/eventdev/rte_event_vector_adapter.h
+++ b/lib/eventdev/rte_event_vector_adapter.h
@@ -136,8 +136,15 @@ extern "C" {
struct rte_event_vector_adapter_conf {
uint8_t event_dev_id;
/**< Event device identifier */
- uint32_t socket_id;
- /**< Identifier of socket from which to allocate memory for adapter */
+ union {
+ /** NUMA node ID from which to allocate memory for adapter */
+ uint32_t numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ uint32_t socket_id;
+ };
struct rte_event ev;
/**<
* The values from the following event fields will be used when
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index 71de25a3ab..7426fa9e7f 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -80,18 +80,25 @@ rte_event_dev_get_dev_id(const char *name)
return -ENODEV;
}
-RTE_EXPORT_SYMBOL(rte_event_dev_socket_id)
+RTE_EXPORT_SYMBOL(rte_event_dev_numa_id)
int
-rte_event_dev_socket_id(uint8_t dev_id)
+rte_event_dev_numa_id(uint8_t dev_id)
{
struct rte_eventdev *dev;
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
dev = &rte_eventdevs[dev_id];
- rte_eventdev_trace_socket_id(dev_id, dev, dev->data->socket_id);
+ rte_eventdev_trace_numa_id(dev_id, dev, dev->data->numa_id);
+
+ return dev->data->numa_id;
+}
- return dev->data->socket_id;
+RTE_EXPORT_SYMBOL(rte_event_dev_socket_id)
+int
+rte_event_dev_socket_id(uint8_t dev_id)
+{
+ return rte_event_dev_numa_id(dev_id);
}
RTE_EXPORT_SYMBOL(rte_event_dev_info_get)
@@ -1481,7 +1488,7 @@ RTE_EXPORT_SYMBOL(rte_event_vector_pool_create)
struct rte_mempool *
rte_event_vector_pool_create(const char *name, unsigned int n,
unsigned int cache_size, uint16_t nb_elem,
- int socket_id)
+ int numa_id)
{
const char *mp_ops_name;
struct rte_mempool *mp;
@@ -1497,7 +1504,7 @@ rte_event_vector_pool_create(const char *name, unsigned int n,
elt_sz =
sizeof(struct rte_event_vector) + (nb_elem * sizeof(uintptr_t));
- mp = rte_mempool_create_empty(name, n, elt_sz, cache_size, 0, socket_id,
+ mp = rte_mempool_create_empty(name, n, elt_sz, cache_size, 0, numa_id,
0);
if (mp == NULL)
return NULL;
@@ -1626,7 +1633,7 @@ rte_event_dev_close(uint8_t dev_id)
static inline int
eventdev_data_alloc(uint8_t dev_id, struct rte_eventdev_data **data,
- int socket_id)
+ int numa_id)
{
char mz_name[RTE_EVENTDEV_NAME_MAX_LEN];
const struct rte_memzone *mz;
@@ -1640,7 +1647,7 @@ eventdev_data_alloc(uint8_t dev_id, struct rte_eventdev_data **data,
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
mz = rte_memzone_reserve(mz_name,
sizeof(struct rte_eventdev_data),
- socket_id, 0);
+ numa_id, 0);
} else
mz = rte_memzone_lookup(mz_name);
@@ -1674,7 +1681,7 @@ eventdev_find_free_device_index(void)
RTE_EXPORT_INTERNAL_SYMBOL(rte_event_pmd_allocate)
struct rte_eventdev *
-rte_event_pmd_allocate(const char *name, int socket_id)
+rte_event_pmd_allocate(const char *name, int numa_id)
{
struct rte_eventdev *eventdev;
uint8_t dev_id;
@@ -1697,7 +1704,7 @@ rte_event_pmd_allocate(const char *name, int socket_id)
struct rte_eventdev_data *eventdev_data = NULL;
int retval =
- eventdev_data_alloc(dev_id, &eventdev_data, socket_id);
+ eventdev_data_alloc(dev_id, &eventdev_data, numa_id);
if (retval < 0 || eventdev_data == NULL)
return NULL;
@@ -1710,7 +1717,7 @@ rte_event_pmd_allocate(const char *name, int socket_id)
RTE_EVENTDEV_NAME_MAX_LEN);
eventdev->data->dev_id = dev_id;
- eventdev->data->socket_id = socket_id;
+ eventdev->data->numa_id = numa_id;
eventdev->data->dev_started = 0;
}
@@ -1838,7 +1845,7 @@ handle_dev_info(const char *cmd __rte_unused,
rte_tel_data_add_dict_string(d, "dev_driver", dev->device->driver->name);
rte_tel_data_add_dict_string(d, "state",
dev->data->dev_started ? "started" : "stopped");
- rte_tel_data_add_dict_int(d, "socket_id", dev->data->socket_id);
+ rte_tel_data_add_dict_int(d, "numa_id", dev->data->numa_id);
rte_tel_data_add_dict_int(d, "nb_queues", dev->data->nb_queues);
rte_tel_data_add_dict_int(d, "nb_ports", dev->data->nb_ports);
rte_tel_data_add_dict_uint_hex(d, "capabilities", dev->data->event_dev_cap,
diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
index 34b1804285..1aaae6469b 100644
--- a/lib/eventdev/rte_eventdev.h
+++ b/lib/eventdev/rte_eventdev.h
@@ -580,9 +580,25 @@ rte_event_dev_count(void);
int
rte_event_dev_get_dev_id(const char *name);
+/**
+ * Return the NUMA node to which a device is connected.
+ *
+ * @param dev_id
+ * The identifier of the device.
+ * @return
+ * The NUMA node ID to which the device is connected or
+ * a default of zero if the NUMA node could not be determined.
+ * -EINVAL on error, where the given dev_id value does not
+ * correspond to any event device.
+ */
+int
+rte_event_dev_numa_id(uint8_t dev_id);
+
/**
* Return the NUMA socket to which a device is connected.
*
+ * This is a legacy alias of rte_event_dev_numa_id().
+ *
* @param dev_id
* The identifier of the device.
* @return
@@ -2554,9 +2570,9 @@ int rte_event_dev_selftest(uint8_t dev_id);
* details.
* @param nb_elem
* The number of elements that a single event vector should be able to hold.
- * @param socket_id
- * The socket identifier where the memory should be allocated. The
- * value can be *SOCKET_ID_ANY* if there is no NUMA constraint for the
+ * @param numa_id
+ * The NUMA node ID where the memory should be allocated. The
+ * value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraint for the
* reserved zone
*
* @return
@@ -2573,7 +2589,7 @@ int rte_event_dev_selftest(uint8_t dev_id);
struct rte_mempool *
rte_event_vector_pool_create(const char *name, unsigned int n,
unsigned int cache_size, uint16_t nb_elem,
- int socket_id);
+ int numa_id);
#include <rte_eventdev_core.h>
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 013/227] acl: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (11 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 012/227] eventdev: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 014/227] ipsec: " Chengwen Feng
` (214 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the numa_id field of rte_acl_param (was socket_id),
keeping socket_id as a deprecated union alias, and update
in-tree users accordingly.
Also rename socket_id parameters, the internal context field,
memory hook callback parameter, log messages and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-acl/main.c | 6 +++---
lib/acl/acl.h | 4 ++--
lib/acl/acl_gen.c | 10 +++++-----
lib/acl/rte_acl.c | 14 +++++++-------
lib/acl/rte_acl.h | 14 +++++++++++---
5 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/app/test-acl/main.c b/app/test-acl/main.c
index ad0bc89644..605a8b81bd 100644
--- a/app/test-acl/main.c
+++ b/app/test-acl/main.c
@@ -138,7 +138,7 @@ static struct {
static struct rte_acl_param prm = {
.name = APP_NAME,
- .socket_id = SOCKET_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
};
/*
@@ -546,8 +546,8 @@ tracef_init(void)
struct ipv6_5tuple *w;
sz = config.nb_traces * (config.ipv6 ? sizeof(*w) : sizeof(*v));
- config.traces = rte_zmalloc_socket(name, sz, RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ config.traces = rte_zmalloc_numa(name, sz, RTE_CACHE_LINE_SIZE,
+ RTE_NUMA_ID_ANY);
if (config.traces == NULL)
rte_exit(EXIT_FAILURE, "Cannot allocate %zu bytes for "
"requested %u number of trace records\n",
diff --git a/lib/acl/acl.h b/lib/acl/acl.h
index e1ecd1567b..33d7aeac34 100644
--- a/lib/acl/acl.h
+++ b/lib/acl/acl.h
@@ -166,8 +166,8 @@ struct rte_acl_bld_trie {
struct rte_acl_ctx {
char name[RTE_ACL_NAMESIZE];
/** Name of the ACL context. */
- int32_t socket_id;
- /** Socket ID to allocate memory from. */
+ int32_t numa_id;
+ /** NUMA node ID to allocate memory from. */
enum rte_acl_classify_alg alg;
uint32_t first_load_sz;
void *rules;
diff --git a/lib/acl/acl_gen.c b/lib/acl/acl_gen.c
index 77f19dd13a..83ace1b0f5 100644
--- a/lib/acl/acl_gen.c
+++ b/lib/acl/acl_gen.c
@@ -38,14 +38,14 @@ acl_gen_log_stats(const struct rte_acl_ctx *ctx,
size_t max_size)
{
RTE_LOG(DEBUG, ACL, "Gen phase for ACL \"%s\":\n"
- "runtime memory footprint on socket %d:\n"
+ "runtime memory footprint on NUMA node %d:\n"
"single nodes/bytes used: %d/%zu\n"
"quad nodes/vectors/bytes used: %d/%d/%zu\n"
"DFA nodes/group64/bytes used: %d/%d/%zu\n"
"match nodes/bytes used: %d/%zu\n"
"total: %zu bytes\n"
"max limit: %zu bytes\n",
- ctx->name, ctx->socket_id,
+ ctx->name, ctx->numa_id,
counts->single, counts->single * sizeof(uint64_t),
counts->quad, counts->quad_vectors,
(indices->quad_index - indices->dfa_index) * sizeof(uint64_t),
@@ -479,11 +479,11 @@ rte_acl_gen(struct rte_acl_ctx *ctx, struct rte_acl_trie *trie,
}
mem = ctx->mem_hook.zalloc(ctx->name, total_size,
- RTE_CACHE_LINE_SIZE, ctx->socket_id, ctx->mem_hook.udata);
+ RTE_CACHE_LINE_SIZE, ctx->numa_id, ctx->mem_hook.udata);
if (mem == NULL) {
ACL_LOG(ERR,
- "allocation of %zu bytes on socket %d for %s failed",
- total_size, ctx->socket_id, ctx->name);
+ "allocation of %zu bytes on NUMA node %d for %s failed",
+ total_size, ctx->numa_id, ctx->name);
return -ENOMEM;
}
diff --git a/lib/acl/rte_acl.c b/lib/acl/rte_acl.c
index f87435c49a..74b37bac68 100644
--- a/lib/acl/rte_acl.c
+++ b/lib/acl/rte_acl.c
@@ -299,10 +299,10 @@ acl_get_best_alg(void)
}
static void *
-acl_mem_default_zalloc(char *name, size_t size, size_t align, int32_t socket_id, void *udata)
+acl_mem_default_zalloc(char *name, size_t size, size_t align, int32_t numa_id, void *udata)
{
RTE_SET_USED(udata);
- return rte_zmalloc_socket(name, size, align, socket_id);
+ return rte_zmalloc_numa(name, size, align, numa_id);
}
static void
@@ -458,12 +458,12 @@ rte_acl_create(const struct rte_acl_param *param)
goto exit;
}
- ctx = rte_zmalloc_socket(name, sz, RTE_CACHE_LINE_SIZE, param->socket_id);
+ ctx = rte_zmalloc_numa(name, sz, RTE_CACHE_LINE_SIZE, param->numa_id);
if (ctx == NULL) {
ACL_LOG(ERR,
- "allocation of %zu bytes on socket %d for %s failed",
- sz, param->socket_id, name);
+ "allocation of %zu bytes on NUMA node %d for %s failed",
+ sz, param->numa_id, name);
rte_free(te);
goto exit;
}
@@ -471,7 +471,7 @@ rte_acl_create(const struct rte_acl_param *param)
ctx->rules = ctx + 1;
ctx->max_rules = param->max_rule_num;
ctx->rule_sz = param->rule_size;
- ctx->socket_id = param->socket_id;
+ ctx->numa_id = param->numa_id;
ctx->alg = acl_get_best_alg();
ctx->mem_hook.zalloc = acl_mem_default_zalloc;
ctx->mem_hook.free = acl_mem_default_free;
@@ -576,7 +576,7 @@ rte_acl_dump(const struct rte_acl_ctx *ctx)
if (!ctx)
return;
printf("acl context <%s>@%p\n", ctx->name, ctx);
- printf(" socket_id=%"PRId32"\n", ctx->socket_id);
+ printf(" numa_id=%"PRId32"\n", ctx->numa_id);
printf(" alg=%"PRId32"\n", ctx->alg);
printf(" first_load_sz=%"PRIu32"\n", ctx->first_load_sz);
printf(" max_rules=%"PRIu32"\n", ctx->max_rules);
diff --git a/lib/acl/rte_acl.h b/lib/acl/rte_acl.h
index 8d6a1e2f7e..84559c566c 100644
--- a/lib/acl/rte_acl.h
+++ b/lib/acl/rte_acl.h
@@ -128,7 +128,15 @@ RTE_ACL_RULE_DEF(rte_acl_rule,);
*/
struct rte_acl_param {
const char *name; /**< Name of the ACL context. */
- int socket_id; /**< Socket ID to allocate memory for. */
+ union {
+ /** NUMA node ID to allocate memory for. */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
uint32_t rule_size; /**< Size of each rule. */
uint32_t max_rule_num; /**< Maximum number of rules. */
};
@@ -141,7 +149,7 @@ struct rte_acl_ctx;
*/
struct rte_acl_mem_hook {
/** Allocate zero-initialized memory used during runtime. */
- void *(*zalloc)(char *name, size_t size, size_t align, int32_t socket_id, void *udata);
+ void *(*zalloc)(char *name, size_t size, size_t align, int32_t numa_id, void *udata);
/** Free memory previously allocated by zalloc(). */
void (*free)(void *ptr, void *udata);
@@ -156,7 +164,7 @@ struct rte_acl_mem_hook {
* Applications may use these hooks to allocate memory
* from custom pools or pre-allocated buffers.
* If no memory hook is provided,
- * the ACL library uses rte_zmalloc_socket() internally.
+ * the ACL library uses rte_zmalloc_numa() internally.
*
* This function must be called **before** rte_acl_build().
* If the hook needs to be changed after a build,
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 014/227] ipsec: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (12 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 013/227] acl: use NUMA node terminology Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 015/227] graph: " Chengwen Feng
` (213 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the numa_id field of rte_ipsec_sad_conf (was socket_id),
keeping socket_id as a deprecated union alias, and update
in-tree users accordingly.
Also rename socket_id parameters and comments to the NUMA node
terminology, and switch internal calls to rte_zmalloc_numa()
and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-sad/main.c | 2 +-
app/test/test_ipsec_sad.c | 24 ++++++++++++------------
lib/ipsec/ipsec_sad.c | 6 +++---
lib/ipsec/rte_ipsec_sad.h | 11 +++++++++--
4 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/app/test-sad/main.c b/app/test-sad/main.c
index 54e3fa0c91..6a65e637b8 100644
--- a/app/test-sad/main.c
+++ b/app/test-sad/main.c
@@ -638,7 +638,7 @@ main(int argc, char **argv)
config.fract_rnd_tuples = 0;
config.nb_tuples_rnd = 0;
}
- conf.socket_id = -1;
+ conf.numa_id = -1;
conf.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = config.nb_rules_32 * 5 / 4;
conf.max_sa[RTE_IPSEC_SAD_SPI_DIP] = config.nb_rules_64 * 5 / 4;
conf.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = config.nb_rules_96 * 5 / 4;
diff --git a/app/test/test_ipsec_sad.c b/app/test/test_ipsec_sad.c
index 5e9dfb0f94..7c368d5f70 100644
--- a/app/test/test_ipsec_sad.c
+++ b/app/test/test_ipsec_sad.c
@@ -56,7 +56,7 @@ test_create_invalid(void)
config.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = MAX_SA;
- config.socket_id = SOCKET_ID_ANY;
+ config.numa_id = RTE_NUMA_ID_ANY;
config.flags = 0;
/* name == NULL */
@@ -75,13 +75,13 @@ test_create_invalid(void)
config.max_sa[RTE_IPSEC_SAD_SPI_DIP] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = MAX_SA;
- /* socket_id < -1 is invalid */
+ /* numa_id < -1 is invalid */
config.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = MAX_SA;
- config.socket_id = -2;
+ config.numa_id = -2;
sad = rte_ipsec_sad_create(__func__, &config);
RTE_TEST_ASSERT(sad == NULL,
"Call succeeded with invalid parameters\n");
- config.socket_id = SOCKET_ID_ANY;
+ config.numa_id = RTE_NUMA_ID_ANY;
return TEST_SUCCESS;
}
@@ -98,7 +98,7 @@ test_find_existing(void)
struct rte_ipsec_sad *one, *two, *tmp;
struct rte_ipsec_sad_conf config;
- config.socket_id = SOCKET_ID_ANY;
+ config.numa_id = RTE_NUMA_ID_ANY;
config.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP] = 0;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = 0;
@@ -136,7 +136,7 @@ test_multiple_create(void)
struct rte_ipsec_sad *sad = NULL;
struct rte_ipsec_sad_conf config;
- config.socket_id = SOCKET_ID_ANY;
+ config.numa_id = RTE_NUMA_ID_ANY;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = MAX_SA;
@@ -167,7 +167,7 @@ __test_add_invalid(int ipv6, union rte_ipsec_sad_key *tuple)
config.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = MAX_SA;
- config.socket_id = SOCKET_ID_ANY;
+ config.numa_id = RTE_NUMA_ID_ANY;
config.flags = 0;
if (ipv6)
config.flags = RTE_IPSEC_SAD_FLAG_IPV6;
@@ -240,7 +240,7 @@ __test_delete_invalid(int ipv6, union rte_ipsec_sad_key *tuple)
config.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = MAX_SA;
- config.socket_id = SOCKET_ID_ANY;
+ config.numa_id = RTE_NUMA_ID_ANY;
config.flags = 0;
if (ipv6)
config.flags = RTE_IPSEC_SAD_FLAG_IPV6;
@@ -300,7 +300,7 @@ __test_lookup_invalid(int ipv6, union rte_ipsec_sad_key *tuple)
config.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = MAX_SA;
- config.socket_id = SOCKET_ID_ANY;
+ config.numa_id = RTE_NUMA_ID_ANY;
config.flags = 0;
if (ipv6)
config.flags = RTE_IPSEC_SAD_FLAG_IPV6;
@@ -359,7 +359,7 @@ __test_lookup_basic(int ipv6, union rte_ipsec_sad_key *tuple,
config.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = MAX_SA;
- config.socket_id = SOCKET_ID_ANY;
+ config.numa_id = RTE_NUMA_ID_ANY;
config.flags = 0;
if (ipv6)
config.flags = RTE_IPSEC_SAD_FLAG_IPV6;
@@ -437,7 +437,7 @@ __test_lookup_adv(int ipv6, union rte_ipsec_sad_key *tuple,
config.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = MAX_SA;
- config.socket_id = SOCKET_ID_ANY;
+ config.numa_id = RTE_NUMA_ID_ANY;
config.flags = 0;
if (ipv6)
config.flags = RTE_IPSEC_SAD_FLAG_IPV6;
@@ -702,7 +702,7 @@ __test_lookup_order(int ipv6, union rte_ipsec_sad_key *tuple,
config.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP] = MAX_SA;
config.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = MAX_SA;
- config.socket_id = SOCKET_ID_ANY;
+ config.numa_id = RTE_NUMA_ID_ANY;
config.flags = 0;
if (ipv6)
config.flags = RTE_IPSEC_SAD_FLAG_IPV6;
diff --git a/lib/ipsec/ipsec_sad.c b/lib/ipsec/ipsec_sad.c
index df2d1b4877..19ac196c7b 100644
--- a/lib/ipsec/ipsec_sad.c
+++ b/lib/ipsec/ipsec_sad.c
@@ -290,9 +290,9 @@ rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
conf->max_sa[RTE_IPSEC_SAD_SPI_DIP]) +
RTE_MAX(MIN_HASH_ENTRIES,
conf->max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP]);
- sad = rte_zmalloc_socket(NULL, sizeof(*sad) +
+ sad = rte_zmalloc_numa(NULL, sizeof(*sad) +
(sizeof(struct hash_cnt) * sa_sum),
- RTE_CACHE_LINE_SIZE, conf->socket_id);
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (sad == NULL) {
rte_errno = ENOMEM;
return NULL;
@@ -302,7 +302,7 @@ rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
hash_params.hash_func = DEFAULT_HASH_FUNC;
hash_params.hash_func_init_val = rte_rand();
sad->init_val = hash_params.hash_func_init_val;
- hash_params.numa_id = conf->socket_id;
+ hash_params.numa_id = conf->numa_id;
hash_params.name = hash_name;
if (conf->flags & RTE_IPSEC_SAD_FLAG_RW_CONCURRENCY)
hash_params.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY;
diff --git a/lib/ipsec/rte_ipsec_sad.h b/lib/ipsec/rte_ipsec_sad.h
index 8547630ae4..c48357e116 100644
--- a/lib/ipsec/rte_ipsec_sad.h
+++ b/lib/ipsec/rte_ipsec_sad.h
@@ -56,8 +56,15 @@ union rte_ipsec_sad_key {
/** IPsec SAD configuration structure */
struct rte_ipsec_sad_conf {
- /** CPU socket ID where rte_ipsec_sad should be allocated */
- int socket_id;
+ union {
+ /** NUMA node ID where rte_ipsec_sad should be allocated */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
/** maximum number of SA for each type of key */
uint32_t max_sa[RTE_IPSEC_SAD_KEY_TYPE_MASK];
/** RTE_IPSEC_SAD_FLAG_* flags */
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 015/227] graph: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (13 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 014/227] ipsec: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 016/227] gro: " Chengwen Feng
` (212 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the numa_id fields of rte_graph_param,
rte_graph_cluster_stats_param and rte_graph (were socket_id and
socket), keeping the old names as deprecated union aliases, and
update in-tree users accordingly.
Also rename socket_id parameters, internal variables, dump
output and comments to the NUMA node terminology, and switch
internal calls to rte_zmalloc_numa(), rte_realloc_numa(),
rte_numa_id(), rte_lcore_to_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/graph/graph.c | 4 ++--
app/graph/l2fwd.c | 2 +-
app/graph/l3fwd.c | 10 +++++-----
app/test/test_graph.c | 6 +++---
app/test/test_graph_feature_arc.c | 2 +-
lib/graph/graph.c | 14 +++++++-------
lib/graph/graph_debug.c | 2 +-
lib/graph/graph_feature_arc.c | 4 ++--
lib/graph/graph_pcap.c | 2 +-
lib/graph/graph_populate.c | 4 ++--
lib/graph/graph_private.h | 4 ++--
lib/graph/graph_stats.c | 18 +++++++++---------
lib/graph/rte_graph.h | 21 ++++++++++++++++++---
lib/graph/rte_graph_model_mcore_dispatch.c | 4 ++--
lib/graph/rte_graph_worker_common.h | 10 +++++++++-
15 files changed, 65 insertions(+), 42 deletions(-)
diff --git a/app/graph/graph.c b/app/graph/graph.c
index 77f1e7cd71..5afed64421 100644
--- a/app/graph/graph.c
+++ b/app/graph/graph.c
@@ -218,7 +218,7 @@ graph_stats_print_to_file(void)
memset(&s_param, 0, sizeof(s_param));
s_param.f = fp;
- s_param.socket_id = SOCKET_ID_ANY;
+ s_param.numa_id = RTE_NUMA_ID_ANY;
s_param.graph_patterns = &pattern;
s_param.nb_graph_patterns = 1;
@@ -372,7 +372,7 @@ graph_stats_print(void)
/* Prepare stats object */
memset(&s_param, 0, sizeof(s_param));
s_param.f = stdout;
- s_param.socket_id = SOCKET_ID_ANY;
+ s_param.numa_id = RTE_NUMA_ID_ANY;
s_param.graph_patterns = &pattern;
s_param.nb_graph_patterns = 1;
diff --git a/app/graph/l2fwd.c b/app/graph/l2fwd.c
index 20894b64fe..3011c70fa4 100644
--- a/app/graph/l2fwd.c
+++ b/app/graph/l2fwd.c
@@ -65,7 +65,7 @@ l2fwd_pattern_configure(void)
}
graph_conf.nb_node_patterns = nb_patterns + i;
- graph_conf.socket_id = rte_lcore_to_socket_id(lcore_id);
+ graph_conf.numa_id = rte_lcore_to_numa_id(lcore_id);
snprintf(qconf->name, sizeof(qconf->name), "worker_%u",
lcore_id);
diff --git a/app/graph/l3fwd.c b/app/graph/l3fwd.c
index fe25e43da8..9dc84b7338 100644
--- a/app/graph/l3fwd.c
+++ b/app/graph/l3fwd.c
@@ -129,23 +129,23 @@ l3fwd_pattern_configure(void)
}
graph_conf.nb_node_patterns = nb_patterns + i;
- graph_conf.socket_id = rte_lcore_to_socket_id(lcore_id);
+ graph_conf.numa_id = rte_lcore_to_numa_id(lcore_id);
snprintf(qconf->name, sizeof(qconf->name), "worker_%u",
lcore_id);
if (ip4_lookup_m == IP4_LOOKUP_FIB) {
- rc = setup_fib(graph_conf.socket_id);
+ rc = setup_fib(graph_conf.numa_id);
if (rc < 0)
rte_exit(EXIT_FAILURE, "Unable to setup fib for socket %u\n",
- graph_conf.socket_id);
+ graph_conf.numa_id);
}
if (ip6_lookup_m == IP6_LOOKUP_FIB) {
- rc = setup_fib6(graph_conf.socket_id);
+ rc = setup_fib6(graph_conf.numa_id);
if (rc < 0)
rte_exit(EXIT_FAILURE, "Unable to setup fib6 for socket %u\n",
- graph_conf.socket_id);
+ graph_conf.numa_id);
}
graph_id = rte_graph_create(qconf->name, &graph_conf);
diff --git a/app/test/test_graph.c b/app/test/test_graph.c
index 042fc9d3a2..c082aab3a6 100644
--- a/app/test/test_graph.c
+++ b/app/test/test_graph.c
@@ -694,7 +694,7 @@ test_create_graph(void)
"test_node00-test_node33", "test_node00-dummy_node",
};
struct rte_graph_param gconf = {
- .socket_id = SOCKET_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
.nb_node_patterns = 6,
.node_patterns = node_patterns_dummy,
};
@@ -764,7 +764,7 @@ test_graph_id_collisions(void)
{
static const char *node_patterns[] = {"test_node_source1", "test_node00"};
struct rte_graph_param gconf = {
- .socket_id = SOCKET_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
.nb_node_patterns = 2,
.node_patterns = node_patterns,
};
@@ -1045,7 +1045,7 @@ test_print_stats(void)
/* Prepare stats object */
memset(&s_param, 0, sizeof(s_param));
s_param.f = stdout;
- s_param.socket_id = SOCKET_ID_ANY;
+ s_param.numa_id = RTE_NUMA_ID_ANY;
s_param.graph_patterns = &pattern;
s_param.nb_graph_patterns = 1;
s_param.fn = graph_cluster_stats_cb_t;
diff --git a/app/test/test_graph_feature_arc.c b/app/test/test_graph_feature_arc.c
index 1a4bdeee49..114268c85c 100644
--- a/app/test/test_graph_feature_arc.c
+++ b/app/test/test_graph_feature_arc.c
@@ -787,7 +787,7 @@ static int
create_graph(void)
{
struct rte_graph_param gconf = {
- .socket_id = SOCKET_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
.nb_node_patterns = RTE_DIM(node_names_feature_arc),
.node_patterns = node_names_feature_arc,
};
diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index 9789065150..a7ec046d96 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -359,7 +359,7 @@ rte_graph_model_mcore_dispatch_core_bind(rte_graph_t id, int lcore)
graph->lcore_id = lcore;
graph->graph->dispatch.lcore_id = graph->lcore_id;
- graph->socket = rte_lcore_to_socket_id(lcore);
+ graph->numa_id = rte_lcore_to_numa_id(lcore);
/* Rebuild source bitmap with only source nodes bound to this lcore */
graph_src_bitmap_rebuild(graph);
@@ -477,7 +477,7 @@ rte_graph_create(const char *name, struct rte_graph_param *prm)
graph_pcap_enable(prm->pcap_enable);
/* Initialize graph object */
- graph->socket = prm->socket_id;
+ graph->numa_id = prm->numa_id;
graph->src_node_count = src_node_count;
graph->node_count = graph_nodes_count(graph);
graph->id = graph_next_free_id();
@@ -596,7 +596,7 @@ graph_clone(struct graph *parent_graph, const char *name, struct rte_graph_param
graph->node_count = parent_graph->node_count;
graph->parent_id = parent_graph->id;
graph->lcore_id = parent_graph->lcore_id;
- graph->socket = parent_graph->socket;
+ graph->numa_id = parent_graph->numa_id;
graph->id = graph_next_free_id();
/* Allocate the Graph fast path memory and populate the data */
@@ -737,8 +737,8 @@ __rte_node_stream_alloc(struct rte_graph *graph, struct rte_node *node)
RTE_VERIFY(size != UINT16_MAX);
/* Allocate double amount of size to avoid immediate realloc */
size = RTE_MIN(UINT16_MAX, RTE_MAX(RTE_GRAPH_BURST_SIZE, size * 2));
- node->objs = rte_realloc_socket(node->objs, size * sizeof(void *),
- RTE_CACHE_LINE_SIZE, graph->socket);
+ node->objs = rte_realloc_numa(node->objs, size * sizeof(void *),
+ RTE_CACHE_LINE_SIZE, graph->numa_id);
RTE_VERIFY(node->objs);
node->size = size;
node->realloc_count++;
@@ -754,8 +754,8 @@ __rte_node_stream_alloc_size(struct rte_graph *graph, struct rte_node *node,
RTE_VERIFY(size != UINT16_MAX);
/* Allocate double amount of size to avoid immediate realloc */
size = RTE_MIN(UINT16_MAX, RTE_MAX(RTE_GRAPH_BURST_SIZE, req_size * 2));
- node->objs = rte_realloc_socket(node->objs, size * sizeof(void *),
- RTE_CACHE_LINE_SIZE, graph->socket);
+ node->objs = rte_realloc_numa(node->objs, size * sizeof(void *),
+ RTE_CACHE_LINE_SIZE, graph->numa_id);
RTE_VERIFY(node->objs);
node->size = size;
node->realloc_count++;
diff --git a/lib/graph/graph_debug.c b/lib/graph/graph_debug.c
index aa5cc241a7..89faf70e31 100644
--- a/lib/graph/graph_debug.c
+++ b/lib/graph/graph_debug.c
@@ -66,7 +66,7 @@ rte_graph_obj_dump(FILE *f, struct rte_graph *g, bool all)
fprintf(f, " id=%" PRIu32 "\n", g->id);
fprintf(f, " nb_nodes=%" PRId32 "\n", g->nb_nodes);
fprintf(f, " nb_sched_words=%" PRIu16 "\n", g->nb_sched_words);
- fprintf(f, " socket=%d\n", g->socket);
+ fprintf(f, " numa_id=%d\n", g->numa_id);
fprintf(f, " fence=0x%" PRIx64 "\n", g->fence);
fprintf(f, " nodes_start=0x%" PRIx32 "\n", g->nodes_start);
fprintf(f, " sched_table=%p\n", g->sched_table);
diff --git a/lib/graph/graph_feature_arc.c b/lib/graph/graph_feature_arc.c
index 823aad3e73..9fbf31507a 100644
--- a/lib/graph/graph_feature_arc.c
+++ b/lib/graph/graph_feature_arc.c
@@ -799,7 +799,7 @@ feature_arc_main_init(rte_graph_feature_arc_main_t **pfl, uint32_t max_feature_a
sz = sizeof(rte_graph_feature_arc_main_t) +
(sizeof(pm->feature_arcs[0]) * max_feature_arcs);
- mz = rte_memzone_reserve(FEATURE_ARC_MEMZONE_NAME, sz, SOCKET_ID_ANY, 0);
+ mz = rte_memzone_reserve(FEATURE_ARC_MEMZONE_NAME, sz, RTE_NUMA_ID_ANY, 0);
if (!mz) {
graph_err("memzone reserve failed for feature arc main");
return -1;
@@ -1260,7 +1260,7 @@ rte_graph_feature_arc_create(struct rte_graph_feature_arc_register *reg,
/* Calculate size of feature arc */
feature_arc_reg_calc_size(reg, &sz, &first_feat_off, &fdata_off, &feat_sz, &num_index);
- mz = rte_memzone_reserve(reg->arc_name, sz, SOCKET_ID_ANY, 0);
+ mz = rte_memzone_reserve(reg->arc_name, sz, RTE_NUMA_ID_ANY, 0);
if (!mz) {
graph_err("memzone reserve failed for arc: %s of size: %"PRIu64,
diff --git a/lib/graph/graph_pcap.c b/lib/graph/graph_pcap.c
index 78859ec2d4..e4b3a8f78e 100644
--- a/lib/graph/graph_pcap.c
+++ b/lib/graph/graph_pcap.c
@@ -147,7 +147,7 @@ graph_pcap_mp_init(void)
pkt_mp = rte_pktmbuf_pool_create_by_ops(GRAPH_PCAP_PKT_POOL,
IOV_MAX + RTE_GRAPH_BURST_SIZE, 0, 0,
rte_pcapng_mbuf_size(RTE_MBUF_DEFAULT_BUF_SIZE),
- SOCKET_ID_ANY, "ring_mp_mc");
+ RTE_NUMA_ID_ANY, "ring_mp_mc");
if (pkt_mp == NULL) {
graph_err("Cannot create mempool for graph pcap capture.");
return -1;
diff --git a/lib/graph/graph_populate.c b/lib/graph/graph_populate.c
index 5c6829a7c7..f5f8a78b57 100644
--- a/lib/graph/graph_populate.c
+++ b/lib/graph/graph_populate.c
@@ -74,7 +74,7 @@ graph_header_populate(struct graph *_graph)
graph->pending = RTE_PTR_ADD(graph, _graph->pending_off);
graph->src_pending = RTE_PTR_ADD(graph, _graph->src_pending_off);
graph->nodes_start = _graph->nodes_start;
- graph->socket = _graph->socket;
+ graph->numa_id = _graph->numa_id;
graph->id = _graph->id;
memcpy(graph->name, _graph->name, RTE_GRAPH_NAMESIZE);
graph->fence = RTE_GRAPH_FENCE;
@@ -291,7 +291,7 @@ graph_fp_mem_create(struct graph *graph)
size_t sz;
sz = graph_fp_mem_calc_size(graph);
- mz = rte_memzone_reserve(graph->name, sz, graph->socket, 0);
+ mz = rte_memzone_reserve(graph->name, sz, graph->numa_id, 0);
if (mz == NULL)
SET_ERR_JMP(ENOMEM, fail, "Memzone %s reserve failed",
graph->name);
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index 6b986ea10b..b38c632ea5 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -124,8 +124,8 @@ struct graph {
/**< Lcore identifier where the graph prefer to run on. Used for mcore dispatch model. */
size_t mem_sz;
/**< Memory size of the graph. */
- int socket;
- /**< Socket identifier where memory is allocated. */
+ int numa_id;
+ /** NUMA node identifier where memory is allocated. */
uint64_t num_pkt_to_capture;
/**< Number of packets to be captured per core. */
char pcap_filename[RTE_GRAPH_PCAP_FILE_SZ];
diff --git a/lib/graph/graph_stats.c b/lib/graph/graph_stats.c
index b87b5707f7..dc994392ab 100644
--- a/lib/graph/graph_stats.c
+++ b/lib/graph/graph_stats.c
@@ -34,7 +34,7 @@ struct __rte_cache_aligned rte_graph_cluster_stats {
rte_graph_cluster_stats_cb_t fn;
uint32_t cluster_node_size; /* Size of struct cluster_node */
rte_node_t max_nodes;
- int socket_id;
+ int numa_id;
bool dispatch;
void *cookie;
@@ -219,7 +219,7 @@ stats_mem_init(struct cluster *cluster,
{
struct rte_graph_cluster_stats *stats;
rte_graph_cluster_stats_cb_t fn;
- int socket_id = prm->socket_id;
+ int numa_id = prm->numa_id;
uint32_t cluster_node_size;
uint32_t max_nodes;
@@ -242,13 +242,13 @@ stats_mem_init(struct cluster *cluster,
cluster_node_size += cluster->nb_graphs * sizeof(struct rte_node *);
cluster_node_size = RTE_ALIGN(cluster_node_size, RTE_CACHE_LINE_SIZE);
- stats = rte_zmalloc_socket(NULL, sizeof(struct rte_graph_cluster_stats) +
- max_nodes * cluster_node_size, 0, socket_id);
+ stats = rte_zmalloc_numa(NULL, sizeof(struct rte_graph_cluster_stats) +
+ max_nodes * cluster_node_size, 0, numa_id);
if (stats) {
stats->fn = fn;
stats->cluster_node_size = cluster_node_size;
stats->max_nodes = 0;
- stats->socket_id = socket_id;
+ stats->numa_id = numa_id;
stats->cookie = prm->cookie;
}
@@ -294,16 +294,16 @@ stats_mem_populate(struct rte_graph_cluster_stats *stats,
cluster->nodes[cluster->nb_nodes++] = node;
if (graph_node->node->xstats) {
cluster->stat.xstat_cntrs = graph_node->node->xstats->nb_xstats;
- cluster->stat.xstat_count = rte_zmalloc_socket(NULL,
+ cluster->stat.xstat_count = rte_zmalloc_numa(NULL,
sizeof(uint64_t) * graph_node->node->xstats->nb_xstats,
- RTE_CACHE_LINE_SIZE, stats->socket_id);
+ RTE_CACHE_LINE_SIZE, stats->numa_id);
if (cluster->stat.xstat_count == NULL)
SET_ERR_JMP(ENOMEM, err, "Failed to allocate memory node %s graph %s",
graph_node->node->name, graph->name);
- cluster->stat.xstat_desc = rte_zmalloc_socket(NULL,
+ cluster->stat.xstat_desc = rte_zmalloc_numa(NULL,
RTE_NODE_XSTAT_DESC_SIZE * graph_node->node->xstats->nb_xstats,
- RTE_CACHE_LINE_SIZE, stats->socket_id);
+ RTE_CACHE_LINE_SIZE, stats->numa_id);
if (cluster->stat.xstat_desc == NULL) {
rte_free(cluster->stat.xstat_count);
SET_ERR_JMP(ENOMEM, err, "Failed to allocate memory node %s graph %s",
diff --git a/lib/graph/rte_graph.h b/lib/graph/rte_graph.h
index b5eb5d820e..b80e0c775b 100644
--- a/lib/graph/rte_graph.h
+++ b/lib/graph/rte_graph.h
@@ -166,7 +166,15 @@ typedef void (*packets_enqueued_cb)(struct rte_graph *graph, uint64_t cb_priv);
* @see rte_graph_create()
*/
struct rte_graph_param {
- int socket_id; /**< Socket id where memory is allocated. */
+ union {
+ /** NUMA node ID where memory is allocated. */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
uint16_t nb_node_patterns; /**< Number of node patterns. */
const char **node_patterns;
/**< Array of node patterns based on shell pattern. */
@@ -194,8 +202,15 @@ struct rte_graph_param {
* @see rte_graph_cluster_stats_create()
*/
struct rte_graph_cluster_stats_param {
- int socket_id;
- /**< Socket id where memory is allocated */
+ union {
+ /** NUMA node ID where memory is allocated */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
rte_graph_cluster_stats_cb_t fn;
/**< Stats print callback function. NULL value allowed, in that case,
* default print stat function used.
diff --git a/lib/graph/rte_graph_model_mcore_dispatch.c b/lib/graph/rte_graph_model_mcore_dispatch.c
index 706b5469f0..ce0538f5b4 100644
--- a/lib/graph/rte_graph_model_mcore_dispatch.c
+++ b/lib/graph/rte_graph_model_mcore_dispatch.c
@@ -25,7 +25,7 @@ graph_sched_wq_create(struct graph *_graph, struct graph *_parent_graph,
if (!rte_is_power_of_2(wq_size))
flags |= RING_F_EXACT_SZ;
- graph->dispatch.wq = rte_ring_create(graph->name, wq_size, graph->socket,
+ graph->dispatch.wq = rte_ring_create(graph->name, wq_size, graph->numa_id,
flags);
if (graph->dispatch.wq == NULL)
SET_ERR_JMP(EIO, fail, "Failed to allocate graph WQ");
@@ -37,7 +37,7 @@ graph_sched_wq_create(struct graph *_graph, struct graph *_parent_graph,
graph->dispatch.mp = rte_mempool_create(graph->name, wq_size,
sizeof(struct graph_mcore_dispatch_wq_node),
0, 0, NULL, NULL, NULL, NULL,
- graph->socket, MEMPOOL_F_SP_PUT);
+ graph->numa_id, MEMPOOL_F_SP_PUT);
if (graph->dispatch.mp == NULL)
SET_ERR_JMP(EIO, fail_mp,
"Failed to allocate graph WQ schedule entry");
diff --git a/lib/graph/rte_graph_worker_common.h b/lib/graph/rte_graph_worker_common.h
index 7a7da1c34f..02990a4bab 100644
--- a/lib/graph/rte_graph_worker_common.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -74,7 +74,15 @@ struct __rte_cache_aligned rte_graph {
SLIST_ENTRY(rte_graph) next; /* The next for rte_graph list */
/* End of Fast path area.*/
rte_graph_t id; /**< Graph identifier. */
- int socket; /**< Socket ID where memory is allocated. */
+ union {
+ /** NUMA node ID where memory is allocated. */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket;
+ };
char name[RTE_GRAPH_NAMESIZE]; /**< Name of the graph. */
bool pcap_enable; /**< Pcap trace enabled. */
/** Number of packets captured per core. */
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 016/227] gro: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (14 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 015/227] graph: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 017/227] fib: " Chengwen Feng
` (211 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename the numa_id field of rte_gro_param (was socket_id),
keeping socket_id as a deprecated union alias, and update
in-tree users accordingly.
Also rename socket_id parameters, internal variables and
comments to the NUMA node terminology, and switch internal
calls to rte_zmalloc_numa() and rte_numa_id().
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-pmd/testpmd.c | 2 +-
lib/gro/gro_tcp4.c | 14 +++++++-------
lib/gro/gro_tcp4.h | 6 +++---
lib/gro/gro_tcp6.c | 14 +++++++-------
lib/gro/gro_tcp6.h | 6 +++---
lib/gro/gro_udp4.c | 14 +++++++-------
lib/gro/gro_udp4.h | 6 +++---
lib/gro/gro_vxlan_tcp4.c | 14 +++++++-------
lib/gro/gro_vxlan_tcp4.h | 6 +++---
lib/gro/gro_vxlan_udp4.c | 14 +++++++-------
lib/gro/gro_vxlan_udp4.h | 6 +++---
lib/gro/rte_gro.c | 8 ++++----
lib/gro/rte_gro.h | 17 ++++++++++++-----
13 files changed, 67 insertions(+), 60 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index c99b54a003..bbef4a8580 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1886,7 +1886,7 @@ init_config(void)
gro_param.max_flow_num = GRO_MAX_FLUSH_CYCLES;
gro_param.max_item_per_flow = MAX_PKT_BURST;
for (lc_id = 0; lc_id < nb_lcores; lc_id++) {
- gro_param.socket_id = rte_lcore_to_socket_id(
+ gro_param.numa_id = rte_lcore_to_numa_id(
fwd_lcores_cpuids[lc_id]);
fwd_lcores[lc_id]->gro_ctx = rte_gro_ctx_create(&gro_param);
if (fwd_lcores[lc_id]->gro_ctx == NULL) {
diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c
index 855cc7a71d..e4956c7618 100644
--- a/lib/gro/gro_tcp4.c
+++ b/lib/gro/gro_tcp4.c
@@ -10,7 +10,7 @@
#include "gro_tcp_internal.h"
void *
-gro_tcp4_tbl_create(uint16_t socket_id,
+gro_tcp4_tbl_create(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow)
{
@@ -24,18 +24,18 @@ gro_tcp4_tbl_create(uint16_t socket_id,
if (entries_num == 0)
return NULL;
- tbl = rte_zmalloc_socket(__func__,
+ tbl = rte_zmalloc_numa(__func__,
sizeof(struct gro_tcp4_tbl),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl == NULL)
return NULL;
size = sizeof(struct gro_tcp_item) * entries_num;
- tbl->items = rte_zmalloc_socket(__func__,
+ tbl->items = rte_zmalloc_numa(__func__,
size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl->items == NULL) {
rte_free(tbl);
return NULL;
@@ -43,10 +43,10 @@ gro_tcp4_tbl_create(uint16_t socket_id,
tbl->max_item_num = entries_num;
size = sizeof(struct gro_tcp4_flow) * entries_num;
- tbl->flows = rte_zmalloc_socket(__func__,
+ tbl->flows = rte_zmalloc_numa(__func__,
size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl->flows == NULL) {
rte_free(tbl->items);
rte_free(tbl);
diff --git a/lib/gro/gro_tcp4.h b/lib/gro/gro_tcp4.h
index 245e5da486..a55814970c 100644
--- a/lib/gro/gro_tcp4.h
+++ b/lib/gro/gro_tcp4.h
@@ -46,8 +46,8 @@ struct gro_tcp4_tbl {
/**
* This function creates a TCP/IPv4 reassembly table.
*
- * @param socket_id
- * Socket index for allocating the TCP/IPv4 reassemble table
+ * @param numa_id
+ * NUMA node index for allocating the TCP/IPv4 reassemble table
* @param max_flow_num
* The maximum number of flows in the TCP/IPv4 GRO table
* @param max_item_per_flow
@@ -57,7 +57,7 @@ struct gro_tcp4_tbl {
* - Return the table pointer on success.
* - Return NULL on failure.
*/
-void *gro_tcp4_tbl_create(uint16_t socket_id,
+void *gro_tcp4_tbl_create(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow);
diff --git a/lib/gro/gro_tcp6.c b/lib/gro/gro_tcp6.c
index ab4cd6c68b..3d8914d1c7 100644
--- a/lib/gro/gro_tcp6.c
+++ b/lib/gro/gro_tcp6.c
@@ -10,7 +10,7 @@
#include "gro_tcp_internal.h"
void *
-gro_tcp6_tbl_create(uint16_t socket_id,
+gro_tcp6_tbl_create(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow)
{
@@ -24,18 +24,18 @@ gro_tcp6_tbl_create(uint16_t socket_id,
if (entries_num == 0)
return NULL;
- tbl = rte_zmalloc_socket(__func__,
+ tbl = rte_zmalloc_numa(__func__,
sizeof(struct gro_tcp6_tbl),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl == NULL)
return NULL;
size = sizeof(struct gro_tcp_item) * entries_num;
- tbl->items = rte_zmalloc_socket(__func__,
+ tbl->items = rte_zmalloc_numa(__func__,
size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl->items == NULL) {
rte_free(tbl);
return NULL;
@@ -43,10 +43,10 @@ gro_tcp6_tbl_create(uint16_t socket_id,
tbl->max_item_num = entries_num;
size = sizeof(struct gro_tcp6_flow) * entries_num;
- tbl->flows = rte_zmalloc_socket(__func__,
+ tbl->flows = rte_zmalloc_numa(__func__,
size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl->flows == NULL) {
rte_free(tbl->items);
rte_free(tbl);
diff --git a/lib/gro/gro_tcp6.h b/lib/gro/gro_tcp6.h
index acf3971bb6..8e9f628c26 100644
--- a/lib/gro/gro_tcp6.h
+++ b/lib/gro/gro_tcp6.h
@@ -49,8 +49,8 @@ struct gro_tcp6_tbl {
/**
* This function creates a TCP/IPv6 reassembly table.
*
- * @param socket_id
- * Socket index for allocating the TCP/IPv6 reassemble table
+ * @param numa_id
+ * NUMA node index for allocating the TCP/IPv6 reassemble table
* @param max_flow_num
* The maximum number of flows in the TCP/IPv6 GRO table
* @param max_item_per_flow
@@ -60,7 +60,7 @@ struct gro_tcp6_tbl {
* - Return the table pointer on success.
* - Return NULL on failure.
*/
-void *gro_tcp6_tbl_create(uint16_t socket_id,
+void *gro_tcp6_tbl_create(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow);
diff --git a/lib/gro/gro_udp4.c b/lib/gro/gro_udp4.c
index 019e05bcde..7313a96246 100644
--- a/lib/gro/gro_udp4.c
+++ b/lib/gro/gro_udp4.c
@@ -9,7 +9,7 @@
#include "gro_udp4.h"
void *
-gro_udp4_tbl_create(uint16_t socket_id,
+gro_udp4_tbl_create(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow)
{
@@ -23,18 +23,18 @@ gro_udp4_tbl_create(uint16_t socket_id,
if (entries_num == 0)
return NULL;
- tbl = rte_zmalloc_socket(__func__,
+ tbl = rte_zmalloc_numa(__func__,
sizeof(struct gro_udp4_tbl),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl == NULL)
return NULL;
size = sizeof(struct gro_udp4_item) * entries_num;
- tbl->items = rte_zmalloc_socket(__func__,
+ tbl->items = rte_zmalloc_numa(__func__,
size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl->items == NULL) {
rte_free(tbl);
return NULL;
@@ -42,10 +42,10 @@ gro_udp4_tbl_create(uint16_t socket_id,
tbl->max_item_num = entries_num;
size = sizeof(struct gro_udp4_flow) * entries_num;
- tbl->flows = rte_zmalloc_socket(__func__,
+ tbl->flows = rte_zmalloc_numa(__func__,
size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl->flows == NULL) {
rte_free(tbl->items);
rte_free(tbl);
diff --git a/lib/gro/gro_udp4.h b/lib/gro/gro_udp4.h
index 6467d7bc3b..d6e1b0cd95 100644
--- a/lib/gro/gro_udp4.h
+++ b/lib/gro/gro_udp4.h
@@ -87,8 +87,8 @@ struct gro_udp4_tbl {
/**
* This function creates a UDP/IPv4 reassembly table.
*
- * @param socket_id
- * Socket index for allocating the UDP/IPv4 reassemble table
+ * @param numa_id
+ * NUMA node index for allocating the UDP/IPv4 reassemble table
* @param max_flow_num
* The maximum number of flows in the UDP/IPv4 GRO table
* @param max_item_per_flow
@@ -98,7 +98,7 @@ struct gro_udp4_tbl {
* - Return the table pointer on success.
* - Return NULL on failure.
*/
-void *gro_udp4_tbl_create(uint16_t socket_id,
+void *gro_udp4_tbl_create(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow);
diff --git a/lib/gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c
index 29d4a2e13d..d3b9412269 100644
--- a/lib/gro/gro_vxlan_tcp4.c
+++ b/lib/gro/gro_vxlan_tcp4.c
@@ -10,7 +10,7 @@
#include "gro_vxlan_tcp4.h"
void *
-gro_vxlan_tcp4_tbl_create(uint16_t socket_id,
+gro_vxlan_tcp4_tbl_create(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow)
{
@@ -24,18 +24,18 @@ gro_vxlan_tcp4_tbl_create(uint16_t socket_id,
if (entries_num == 0)
return NULL;
- tbl = rte_zmalloc_socket(__func__,
+ tbl = rte_zmalloc_numa(__func__,
sizeof(struct gro_vxlan_tcp4_tbl),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl == NULL)
return NULL;
size = sizeof(struct gro_vxlan_tcp4_item) * entries_num;
- tbl->items = rte_zmalloc_socket(__func__,
+ tbl->items = rte_zmalloc_numa(__func__,
size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl->items == NULL) {
rte_free(tbl);
return NULL;
@@ -43,10 +43,10 @@ gro_vxlan_tcp4_tbl_create(uint16_t socket_id,
tbl->max_item_num = entries_num;
size = sizeof(struct gro_vxlan_tcp4_flow) * entries_num;
- tbl->flows = rte_zmalloc_socket(__func__,
+ tbl->flows = rte_zmalloc_numa(__func__,
size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl->flows == NULL) {
rte_free(tbl->items);
rte_free(tbl);
diff --git a/lib/gro/gro_vxlan_tcp4.h b/lib/gro/gro_vxlan_tcp4.h
index 662db01a88..6dcae3a32d 100644
--- a/lib/gro/gro_vxlan_tcp4.h
+++ b/lib/gro/gro_vxlan_tcp4.h
@@ -66,8 +66,8 @@ struct gro_vxlan_tcp4_tbl {
* This function creates a VxLAN reassembly table for VxLAN packets
* which have an outer IPv4 header and an inner TCP/IPv4 packet.
*
- * @param socket_id
- * Socket index for allocating the table
+ * @param numa_id
+ * NUMA node index for allocating the table
* @param max_flow_num
* The maximum number of flows in the table
* @param max_item_per_flow
@@ -77,7 +77,7 @@ struct gro_vxlan_tcp4_tbl {
* - Return the table pointer on success.
* - Return NULL on failure.
*/
-void *gro_vxlan_tcp4_tbl_create(uint16_t socket_id,
+void *gro_vxlan_tcp4_tbl_create(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow);
diff --git a/lib/gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c
index ca8cee270d..7895fa8e3d 100644
--- a/lib/gro/gro_vxlan_udp4.c
+++ b/lib/gro/gro_vxlan_udp4.c
@@ -10,7 +10,7 @@
#include "gro_vxlan_udp4.h"
void *
-gro_vxlan_udp4_tbl_create(uint16_t socket_id,
+gro_vxlan_udp4_tbl_create(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow)
{
@@ -24,18 +24,18 @@ gro_vxlan_udp4_tbl_create(uint16_t socket_id,
if (entries_num == 0)
return NULL;
- tbl = rte_zmalloc_socket(__func__,
+ tbl = rte_zmalloc_numa(__func__,
sizeof(struct gro_vxlan_udp4_tbl),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl == NULL)
return NULL;
size = sizeof(struct gro_vxlan_udp4_item) * entries_num;
- tbl->items = rte_zmalloc_socket(__func__,
+ tbl->items = rte_zmalloc_numa(__func__,
size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl->items == NULL) {
rte_free(tbl);
return NULL;
@@ -43,10 +43,10 @@ gro_vxlan_udp4_tbl_create(uint16_t socket_id,
tbl->max_item_num = entries_num;
size = sizeof(struct gro_vxlan_udp4_flow) * entries_num;
- tbl->flows = rte_zmalloc_socket(__func__,
+ tbl->flows = rte_zmalloc_numa(__func__,
size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (tbl->flows == NULL) {
rte_free(tbl->items);
rte_free(tbl);
diff --git a/lib/gro/gro_vxlan_udp4.h b/lib/gro/gro_vxlan_udp4.h
index d045221243..38a3b6a6f6 100644
--- a/lib/gro/gro_vxlan_udp4.h
+++ b/lib/gro/gro_vxlan_udp4.h
@@ -67,8 +67,8 @@ struct gro_vxlan_udp4_tbl {
* This function creates a VxLAN reassembly table for VxLAN packets
* which have an outer IPv4 header and an inner UDP/IPv4 packet.
*
- * @param socket_id
- * Socket index for allocating the table
+ * @param numa_id
+ * NUMA node index for allocating the table
* @param max_flow_num
* The maximum number of flows in the table
* @param max_item_per_flow
@@ -78,7 +78,7 @@ struct gro_vxlan_udp4_tbl {
* - Return the table pointer on success.
* - Return NULL on failure.
*/
-void *gro_vxlan_udp4_tbl_create(uint16_t socket_id,
+void *gro_vxlan_udp4_tbl_create(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow);
diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index 578cc9b801..15d4830b69 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -14,7 +14,7 @@
#include "gro_vxlan_tcp4.h"
#include "gro_vxlan_udp4.h"
-typedef void *(*gro_tbl_create_fn)(uint16_t socket_id,
+typedef void *(*gro_tbl_create_fn)(uint16_t numa_id,
uint16_t max_flow_num,
uint16_t max_item_per_flow);
typedef void (*gro_tbl_destroy_fn)(void *tbl);
@@ -99,10 +99,10 @@ rte_gro_ctx_create(const struct rte_gro_param *param)
uint64_t gro_types = 0;
uint8_t i;
- gro_ctx = rte_zmalloc_socket(__func__,
+ gro_ctx = rte_zmalloc_numa(__func__,
sizeof(struct gro_ctx),
RTE_CACHE_LINE_SIZE,
- param->socket_id);
+ param->numa_id);
if (gro_ctx == NULL)
return NULL;
@@ -115,7 +115,7 @@ rte_gro_ctx_create(const struct rte_gro_param *param)
if (create_tbl_fn == NULL)
continue;
- gro_ctx->tbls[i] = create_tbl_fn(param->socket_id,
+ gro_ctx->tbls[i] = create_tbl_fn(param->numa_id,
param->max_flow_num,
param->max_item_per_flow);
if (gro_ctx->tbls[i] == NULL) {
diff --git a/lib/gro/rte_gro.h b/lib/gro/rte_gro.h
index c83dfd9ad1..b9d1a7d424 100644
--- a/lib/gro/rte_gro.h
+++ b/lib/gro/rte_gro.h
@@ -53,11 +53,18 @@ struct rte_gro_param {
/**< max flow number */
uint16_t max_item_per_flow;
/**< max packet number per flow */
- uint16_t socket_id;
- /**< socket index for allocating GRO related data structures,
- * like reassembly tables. When use rte_gro_reassemble_burst(),
- * applications don't need to set this value.
- */
+ union {
+ /** NUMA node index for allocating GRO related data structures,
+ * like reassembly tables. When use rte_gro_reassemble_burst(),
+ * applications don't need to set this value.
+ */
+ uint16_t numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ uint16_t socket_id;
+ };
};
/**
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 017/227] fib: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (15 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 016/227] gro: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 018/227] rib: " Chengwen Feng
` (210 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test/test_fib6.c | 10 +++++-----
lib/fib/dir24_8.c | 14 +++++++-------
lib/fib/dir24_8.h | 2 +-
lib/fib/rte_fib.c | 14 +++++++-------
lib/fib/rte_fib.h | 6 +++---
lib/fib/rte_fib6.c | 14 +++++++-------
lib/fib/rte_fib6.h | 6 +++---
lib/fib/trie.c | 14 +++++++-------
lib/fib/trie.h | 2 +-
9 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/app/test/test_fib6.c b/app/test/test_fib6.c
index cc120a01f7..d33226d016 100644
--- a/app/test/test_fib6.c
+++ b/app/test/test_fib6.c
@@ -955,7 +955,7 @@ test_tbl8_install_peak(void)
config.trie.nh_sz = RTE_FIB6_TRIE_2B;
config.trie.num_tbl8 = 1;
- fib = rte_fib6_create("peak", SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create("peak", RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = rte_fib6_add(fib, &aligned, 33, 1);
@@ -1029,11 +1029,11 @@ test_tbl8_install_peak_dq(void)
config.trie.nh_sz = RTE_FIB6_TRIE_2B;
config.trie.num_tbl8 = 2;
- fib = rte_fib6_create("peak_dq", SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create("peak_dq", RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
sz = rte_rcu_qsbr_get_memsize(1);
- v = rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ v = rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
RTE_TEST_ASSERT(v != NULL, "Can not allocate RCU\n");
ret = rte_rcu_qsbr_init(v, 1);
RTE_TEST_ASSERT(ret == 0, "Can not init RCU\n");
@@ -1102,11 +1102,11 @@ test_tbl8_dq_modify(void)
config.trie.nh_sz = RTE_FIB6_TRIE_2B;
config.trie.num_tbl8 = 3;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
sz = rte_rcu_qsbr_get_memsize(1);
- v = rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ v = rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
RTE_TEST_ASSERT(v != NULL, "Can not allocate RCU\n");
ret = rte_rcu_qsbr_init(v, 1);
RTE_TEST_ASSERT(ret == 0, "Can not init RCU\n");
diff --git a/lib/fib/dir24_8.c b/lib/fib/dir24_8.c
index c135285a65..dfca06b3aa 100644
--- a/lib/fib/dir24_8.c
+++ b/lib/fib/dir24_8.c
@@ -556,7 +556,7 @@ dir24_8_modify(struct rte_fib *fib, uint32_t ip, uint8_t depth,
}
void *
-dir24_8_create(const char *name, int socket_id, struct rte_fib_conf *fib_conf)
+dir24_8_create(const char *name, int numa_id, struct rte_fib_conf *fib_conf)
{
char mem_name[DIR24_8_NAMESIZE];
struct dir24_8_tbl *dp;
@@ -582,9 +582,9 @@ dir24_8_create(const char *name, int socket_id, struct rte_fib_conf *fib_conf)
BITMAP_SLAB_BIT_SIZE);
snprintf(mem_name, sizeof(mem_name), "DP_%s", name);
- dp = rte_zmalloc_socket(name, sizeof(struct dir24_8_tbl) +
+ dp = rte_zmalloc_numa(name, sizeof(struct dir24_8_tbl) +
DIR24_8_TBL24_NUM_ENT * (1 << nh_sz) + sizeof(uint32_t),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (dp == NULL) {
rte_errno = ENOMEM;
return NULL;
@@ -596,8 +596,8 @@ dir24_8_create(const char *name, int socket_id, struct rte_fib_conf *fib_conf)
snprintf(mem_name, sizeof(mem_name), "TBL8_%p", dp);
uint64_t tbl8_sz = DIR24_8_TBL8_GRP_NUM_ENT * (1ULL << nh_sz) *
(num_tbl8 + 1);
- dp->tbl8 = rte_zmalloc_socket(mem_name, tbl8_sz,
- RTE_CACHE_LINE_SIZE, socket_id);
+ dp->tbl8 = rte_zmalloc_numa(mem_name, tbl8_sz,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (dp->tbl8 == NULL) {
rte_errno = ENOMEM;
rte_free(dp);
@@ -608,9 +608,9 @@ dir24_8_create(const char *name, int socket_id, struct rte_fib_conf *fib_conf)
dp->number_tbl8s = num_tbl8;
snprintf(mem_name, sizeof(mem_name), "TBL8_idxes_%p", dp);
- dp->tbl8_idxes = rte_zmalloc_socket(mem_name,
+ dp->tbl8_idxes = rte_zmalloc_numa(mem_name,
RTE_ALIGN_CEIL(dp->number_tbl8s, 64) >> 3,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (dp->tbl8_idxes == NULL) {
rte_errno = ENOMEM;
rte_free(dp->tbl8);
diff --git a/lib/fib/dir24_8.h b/lib/fib/dir24_8.h
index b343b5d686..ac2de1694d 100644
--- a/lib/fib/dir24_8.h
+++ b/lib/fib/dir24_8.h
@@ -287,7 +287,7 @@ DECLARE_BE_LOOKUP_FN(dir24_8_lookup_bulk_3)
DECLARE_BE_LOOKUP_FN(dir24_8_lookup_bulk_uni)
void *
-dir24_8_create(const char *name, int socket_id, struct rte_fib_conf *conf);
+dir24_8_create(const char *name, int numa_id, struct rte_fib_conf *conf);
void
dir24_8_free(void *p);
diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c
index 184210f380..c6d6e28564 100644
--- a/lib/fib/rte_fib.c
+++ b/lib/fib/rte_fib.c
@@ -92,7 +92,7 @@ dummy_modify(struct rte_fib *fib, uint32_t ip, uint8_t depth,
}
static int
-init_dataplane(struct rte_fib *fib, __rte_unused int socket_id,
+init_dataplane(struct rte_fib *fib, __rte_unused int numa_id,
struct rte_fib_conf *conf)
{
char dp_name[sizeof(void *)];
@@ -105,7 +105,7 @@ init_dataplane(struct rte_fib *fib, __rte_unused int socket_id,
fib->modify = dummy_modify;
return 0;
case RTE_FIB_DIR24_8:
- fib->dp = dir24_8_create(dp_name, socket_id, conf);
+ fib->dp = dir24_8_create(dp_name, numa_id, conf);
if (fib->dp == NULL)
return -rte_errno;
fib->lookup = dir24_8_get_lookup_fn(fib->dp,
@@ -152,7 +152,7 @@ rte_fib_lookup_bulk(struct rte_fib *fib, uint32_t *ips,
RTE_EXPORT_SYMBOL(rte_fib_create)
struct rte_fib *
-rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)
+rte_fib_create(const char *name, int numa_id, struct rte_fib_conf *conf)
{
char mem_name[RTE_FIB_NAMESIZE];
int ret;
@@ -173,7 +173,7 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)
rib_conf.ext_sz = conf->rib_ext_sz;
rib_conf.max_nodes = conf->max_routes * 2;
- rib = rte_rib_create(name, socket_id, &rib_conf);
+ rib = rte_rib_create(name, numa_id, &rib_conf);
if (rib == NULL) {
FIB_LOG(ERR,
"Can not allocate RIB %s", name);
@@ -207,8 +207,8 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)
}
/* Allocate memory to store the FIB data structures. */
- fib = rte_zmalloc_socket(mem_name,
- sizeof(struct rte_fib), RTE_CACHE_LINE_SIZE, socket_id);
+ fib = rte_zmalloc_numa(mem_name,
+ sizeof(struct rte_fib), RTE_CACHE_LINE_SIZE, numa_id);
if (fib == NULL) {
FIB_LOG(ERR, "FIB %s memory allocation failed", name);
rte_errno = ENOMEM;
@@ -220,7 +220,7 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)
fib->type = conf->type;
fib->flags = conf->flags;
fib->def_nh = conf->default_nh;
- ret = init_dataplane(fib, socket_id, conf);
+ ret = init_dataplane(fib, numa_id, conf);
if (ret < 0) {
FIB_LOG(ERR,
"FIB dataplane struct %s memory allocation failed "
diff --git a/lib/fib/rte_fib.h b/lib/fib/rte_fib.h
index b16a653535..35ce1f3c09 100644
--- a/lib/fib/rte_fib.h
+++ b/lib/fib/rte_fib.h
@@ -147,8 +147,8 @@ rte_fib_free(struct rte_fib *fib);
*
* @param name
* FIB name
- * @param socket_id
- * NUMA socket ID for FIB table memory allocation
+ * @param numa_id
+ * NUMA node ID for FIB table memory allocation
* @param conf
* Structure containing the configuration
* @return
@@ -156,7 +156,7 @@ rte_fib_free(struct rte_fib *fib);
* NULL otherwise with rte_errno set to an appropriate values.
*/
struct rte_fib *
-rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)
+rte_fib_create(const char *name, int numa_id, struct rte_fib_conf *conf)
__rte_malloc __rte_dealloc(rte_fib_free, 1);
/**
diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c
index 770becdb61..5ba84d142c 100644
--- a/lib/fib/rte_fib6.c
+++ b/lib/fib/rte_fib6.c
@@ -91,7 +91,7 @@ dummy_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip,
}
static int
-init_dataplane(struct rte_fib6 *fib, __rte_unused int socket_id,
+init_dataplane(struct rte_fib6 *fib, __rte_unused int numa_id,
struct rte_fib6_conf *conf)
{
char dp_name[sizeof(void *)];
@@ -104,7 +104,7 @@ init_dataplane(struct rte_fib6 *fib, __rte_unused int socket_id,
fib->modify = dummy_modify;
return 0;
case RTE_FIB6_TRIE:
- fib->dp = trie_create(dp_name, socket_id, conf);
+ fib->dp = trie_create(dp_name, numa_id, conf);
if (fib->dp == NULL)
return -rte_errno;
fib->lookup = trie_get_lookup_fn(fib->dp, RTE_FIB6_LOOKUP_DEFAULT);
@@ -152,7 +152,7 @@ rte_fib6_lookup_bulk(struct rte_fib6 *fib,
RTE_EXPORT_SYMBOL(rte_fib6_create)
struct rte_fib6 *
-rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
+rte_fib6_create(const char *name, int numa_id, struct rte_fib6_conf *conf)
{
char mem_name[RTE_FIB6_NAMESIZE];
int ret;
@@ -172,7 +172,7 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
rib_conf.ext_sz = conf->rib_ext_sz;
rib_conf.max_nodes = conf->max_routes * 2;
- rib = rte_rib6_create(name, socket_id, &rib_conf);
+ rib = rte_rib6_create(name, numa_id, &rib_conf);
if (rib == NULL) {
FIB_LOG(ERR,
"Can not allocate RIB %s", name);
@@ -206,8 +206,8 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
}
/* Allocate memory to store the FIB data structures. */
- fib = rte_zmalloc_socket(mem_name,
- sizeof(struct rte_fib6), RTE_CACHE_LINE_SIZE, socket_id);
+ fib = rte_zmalloc_numa(mem_name,
+ sizeof(struct rte_fib6), RTE_CACHE_LINE_SIZE, numa_id);
if (fib == NULL) {
FIB_LOG(ERR, "FIB %s memory allocation failed", name);
rte_errno = ENOMEM;
@@ -218,7 +218,7 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
fib->rib = rib;
fib->type = conf->type;
fib->def_nh = conf->default_nh;
- ret = init_dataplane(fib, socket_id, conf);
+ ret = init_dataplane(fib, numa_id, conf);
if (ret < 0) {
FIB_LOG(ERR,
"FIB dataplane struct %s memory allocation failed",
diff --git a/lib/fib/rte_fib6.h b/lib/fib/rte_fib6.h
index fcbd10de15..f8fb9b6597 100644
--- a/lib/fib/rte_fib6.h
+++ b/lib/fib/rte_fib6.h
@@ -129,8 +129,8 @@ rte_fib6_free(struct rte_fib6 *fib);
*
* @param name
* FIB name
- * @param socket_id
- * NUMA socket ID for FIB table memory allocation
+ * @param numa_id
+ * NUMA node ID for FIB table memory allocation
* @param conf
* Structure containing the configuration
* @return
@@ -138,7 +138,7 @@ rte_fib6_free(struct rte_fib6 *fib);
* NULL otherwise with rte_errno set to an appropriate values.
*/
struct rte_fib6 *
-rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
+rte_fib6_create(const char *name, int numa_id, struct rte_fib6_conf *conf)
__rte_malloc __rte_dealloc(rte_fib6_free, 1);
/**
diff --git a/lib/fib/trie.c b/lib/fib/trie.c
index 9ede1a5bf7..58b0d5d472 100644
--- a/lib/fib/trie.c
+++ b/lib/fib/trie.c
@@ -683,7 +683,7 @@ trie_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip,
}
void *
-trie_create(const char *name, int socket_id,
+trie_create(const char *name, int numa_id,
struct rte_fib6_conf *conf)
{
char mem_name[TRIE_NAMESIZE];
@@ -710,9 +710,9 @@ trie_create(const char *name, int socket_id,
num_tbl8 = conf->trie.num_tbl8;
snprintf(mem_name, sizeof(mem_name), "DP_%s", name);
- dp = rte_zmalloc_socket(name, sizeof(struct rte_trie_tbl) +
+ dp = rte_zmalloc_numa(name, sizeof(struct rte_trie_tbl) +
TRIE_TBL24_NUM_ENT * (1 << nh_sz) + sizeof(uint32_t),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (dp == NULL) {
rte_errno = ENOMEM;
return dp;
@@ -721,9 +721,9 @@ trie_create(const char *name, int socket_id,
write_to_dp(&dp->tbl24, (def_nh << 1), nh_sz, 1 << 24);
snprintf(mem_name, sizeof(mem_name), "TBL8_%p", dp);
- dp->tbl8 = rte_zmalloc_socket(mem_name, TRIE_TBL8_GRP_NUM_ENT *
+ dp->tbl8 = rte_zmalloc_numa(mem_name, TRIE_TBL8_GRP_NUM_ENT *
(1ll << nh_sz) * (num_tbl8 + 1),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (dp->tbl8 == NULL) {
rte_errno = ENOMEM;
rte_free(dp);
@@ -734,9 +734,9 @@ trie_create(const char *name, int socket_id,
dp->number_tbl8s = num_tbl8;
snprintf(mem_name, sizeof(mem_name), "TBL8_idxes_%p", dp);
- dp->tbl8_pool = rte_zmalloc_socket(mem_name,
+ dp->tbl8_pool = rte_zmalloc_numa(mem_name,
sizeof(uint32_t) * dp->number_tbl8s,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (dp->tbl8_pool == NULL) {
rte_errno = ENOMEM;
rte_free(dp->tbl8);
diff --git a/lib/fib/trie.h b/lib/fib/trie.h
index c34cc2c057..e4a2677865 100644
--- a/lib/fib/trie.h
+++ b/lib/fib/trie.h
@@ -137,7 +137,7 @@ void
trie_free(void *p);
void *
-trie_create(const char *name, int socket_id, struct rte_fib6_conf *conf)
+trie_create(const char *name, int numa_id, struct rte_fib6_conf *conf)
__rte_malloc __rte_dealloc(trie_free, 1);
rte_fib6_lookup_fn_t
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 018/227] rib: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (16 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 017/227] fib: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 019/227] lpm: " Chengwen Feng
` (209 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/rib/rte_rib.c | 8 ++++----
lib/rib/rte_rib.h | 6 +++---
lib/rib/rte_rib6.c | 8 ++++----
lib/rib/rte_rib6.h | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c
index 046db131ca..e6cf27b68e 100644
--- a/lib/rib/rte_rib.c
+++ b/lib/rib/rte_rib.c
@@ -410,7 +410,7 @@ rte_rib_set_nh(struct rte_rib_node *node, uint64_t nh)
RTE_EXPORT_SYMBOL(rte_rib_create)
struct rte_rib *
-rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)
+rte_rib_create(const char *name, int numa_id, const struct rte_rib_conf *conf)
{
char mem_name[RTE_RIB_NAMESIZE];
struct rte_rib *rib = NULL;
@@ -427,7 +427,7 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)
snprintf(mem_name, sizeof(mem_name), "MP_%s", name);
node_pool = rte_mempool_create(mem_name, conf->max_nodes,
sizeof(struct rte_rib_node) + conf->ext_sz, 0, 0,
- NULL, NULL, NULL, NULL, socket_id, 0);
+ NULL, NULL, NULL, NULL, numa_id, 0);
if (node_pool == NULL) {
RIB_LOG(ERR,
@@ -462,8 +462,8 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)
}
/* Allocate memory to store the RIB data structures. */
- rib = rte_zmalloc_socket(mem_name,
- sizeof(struct rte_rib), RTE_CACHE_LINE_SIZE, socket_id);
+ rib = rte_zmalloc_numa(mem_name,
+ sizeof(struct rte_rib), RTE_CACHE_LINE_SIZE, numa_id);
if (unlikely(rib == NULL)) {
RIB_LOG(ERR, "RIB %s memory allocation failed", name);
rte_errno = ENOMEM;
diff --git a/lib/rib/rte_rib.h b/lib/rib/rte_rib.h
index c325b3e361..2d3d965d68 100644
--- a/lib/rib/rte_rib.h
+++ b/lib/rib/rte_rib.h
@@ -246,8 +246,8 @@ rte_rib_free(struct rte_rib *rib);
*
* @param name
* RIB name
- * @param socket_id
- * NUMA socket ID for RIB table memory allocation
+ * @param numa_id
+ * NUMA node ID for RIB table memory allocation
* @param conf
* Structure containing the configuration
* @return
@@ -255,7 +255,7 @@ rte_rib_free(struct rte_rib *rib);
* NULL otherwise with rte_errno indicating reason for failure.
*/
struct rte_rib *
-rte_rib_create(const char *name, int socket_id,
+rte_rib_create(const char *name, int numa_id,
const struct rte_rib_conf *conf)
__rte_malloc __rte_dealloc(rte_rib_free, 1);
diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c
index 918ddbdfd3..834ad08dad 100644
--- a/lib/rib/rte_rib6.c
+++ b/lib/rib/rte_rib6.c
@@ -472,7 +472,7 @@ rte_rib6_set_nh(struct rte_rib6_node *node, uint64_t nh)
RTE_EXPORT_SYMBOL(rte_rib6_create)
struct rte_rib6 *
-rte_rib6_create(const char *name, int socket_id,
+rte_rib6_create(const char *name, int numa_id,
const struct rte_rib6_conf *conf)
{
char mem_name[RTE_RIB6_NAMESIZE];
@@ -490,7 +490,7 @@ rte_rib6_create(const char *name, int socket_id,
snprintf(mem_name, sizeof(mem_name), "MP_%s", name);
node_pool = rte_mempool_create(mem_name, conf->max_nodes,
sizeof(struct rte_rib6_node) + conf->ext_sz, 0, 0,
- NULL, NULL, NULL, NULL, socket_id, 0);
+ NULL, NULL, NULL, NULL, numa_id, 0);
if (node_pool == NULL) {
RIB_LOG(ERR,
@@ -525,8 +525,8 @@ rte_rib6_create(const char *name, int socket_id,
}
/* Allocate memory to store the RIB6 data structures. */
- rib = rte_zmalloc_socket(mem_name,
- sizeof(struct rte_rib6), RTE_CACHE_LINE_SIZE, socket_id);
+ rib = rte_zmalloc_numa(mem_name,
+ sizeof(struct rte_rib6), RTE_CACHE_LINE_SIZE, numa_id);
if (unlikely(rib == NULL)) {
RIB_LOG(ERR, "RIB6 %s memory allocation failed", name);
rte_errno = ENOMEM;
diff --git a/lib/rib/rte_rib6.h b/lib/rib/rte_rib6.h
index e3fb464ae6..83ac8aa4a3 100644
--- a/lib/rib/rte_rib6.h
+++ b/lib/rib/rte_rib6.h
@@ -235,8 +235,8 @@ rte_rib6_free(struct rte_rib6 *rib);
*
* @param name
* RIB name
- * @param socket_id
- * NUMA socket ID for RIB table memory allocation
+ * @param numa_id
+ * NUMA node ID for RIB table memory allocation
* @param conf
* Structure containing the configuration
* @return
@@ -244,7 +244,7 @@ rte_rib6_free(struct rte_rib6 *rib);
* NULL otherwise with rte_errno indicating reason for failure.
*/
struct rte_rib6 *
-rte_rib6_create(const char *name, int socket_id,
+rte_rib6_create(const char *name, int numa_id,
const struct rte_rib6_conf *conf)
__rte_malloc __rte_dealloc(rte_rib6_free, 1);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 019/227] lpm: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (17 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 018/227] rib: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 020/227] efd: " Chengwen Feng
` (208 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/lpm/rte_lpm.c | 16 ++++++++--------
lib/lpm/rte_lpm.h | 6 +++---
lib/lpm/rte_lpm6.c | 10 +++++-----
lib/lpm/rte_lpm6.h | 6 +++---
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c
index 0d1afe0ca1..8bee4be101 100644
--- a/lib/lpm/rte_lpm.c
+++ b/lib/lpm/rte_lpm.c
@@ -149,7 +149,7 @@ rte_lpm_find_existing(const char *name)
*/
RTE_EXPORT_SYMBOL(rte_lpm_create)
struct rte_lpm *
-rte_lpm_create(const char *name, int socket_id,
+rte_lpm_create(const char *name, int numa_id,
const struct rte_lpm_config *config)
{
char mem_name[RTE_LPM_NAMESIZE + sizeof("LPM_")];
@@ -164,7 +164,7 @@ rte_lpm_create(const char *name, int socket_id,
RTE_BUILD_BUG_ON(sizeof(struct rte_lpm_tbl_entry) != 4);
/* Check user arguments. */
- if ((name == NULL) || (socket_id < -1) || (config->max_rules == 0)
+ if ((name == NULL) || (numa_id < -1) || (config->max_rules == 0)
|| config->number_tbl8s > RTE_LPM_MAX_TBL8_NUM_GROUPS) {
rte_errno = EINVAL;
return NULL;
@@ -206,8 +206,8 @@ rte_lpm_create(const char *name, int socket_id,
}
/* Allocate memory to store the LPM data structures. */
- i_lpm = rte_zmalloc_socket(mem_name, mem_size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ i_lpm = rte_zmalloc_numa(mem_name, mem_size,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (i_lpm == NULL) {
LPM_LOG(ERR, "LPM memory allocation failed");
rte_free(te);
@@ -215,8 +215,8 @@ rte_lpm_create(const char *name, int socket_id,
goto exit;
}
- i_lpm->rules_tbl = rte_zmalloc_socket(NULL,
- (size_t)rules_size, RTE_CACHE_LINE_SIZE, socket_id);
+ i_lpm->rules_tbl = rte_zmalloc_numa(NULL,
+ (size_t)rules_size, RTE_CACHE_LINE_SIZE, numa_id);
if (i_lpm->rules_tbl == NULL) {
LPM_LOG(ERR, "LPM rules_tbl memory allocation failed");
@@ -227,8 +227,8 @@ rte_lpm_create(const char *name, int socket_id,
goto exit;
}
- i_lpm->lpm.tbl8 = rte_zmalloc_socket(NULL,
- (size_t)tbl8s_size, RTE_CACHE_LINE_SIZE, socket_id);
+ i_lpm->lpm.tbl8 = rte_zmalloc_numa(NULL,
+ (size_t)tbl8s_size, RTE_CACHE_LINE_SIZE, numa_id);
if (i_lpm->lpm.tbl8 == NULL) {
LPM_LOG(ERR, "LPM tbl8 memory allocation failed");
diff --git a/lib/lpm/rte_lpm.h b/lib/lpm/rte_lpm.h
index bcd3da9706..720e944d77 100644
--- a/lib/lpm/rte_lpm.h
+++ b/lib/lpm/rte_lpm.h
@@ -167,8 +167,8 @@ rte_lpm_free(struct rte_lpm *lpm);
*
* @param name
* LPM object name
- * @param socket_id
- * NUMA socket ID for LPM table memory allocation
+ * @param numa_id
+ * NUMA node ID for LPM table memory allocation
* @param config
* Structure containing the configuration
* @return
@@ -183,7 +183,7 @@ rte_lpm_free(struct rte_lpm *lpm);
* - ENAMETOOLONG - LPM object name greater than RTE_LPM_NAMESIZE
*/
struct rte_lpm *
-rte_lpm_create(const char *name, int socket_id,
+rte_lpm_create(const char *name, int numa_id,
const struct rte_lpm_config *config)
__rte_malloc __rte_dealloc(rte_lpm_free, 1);
diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
index 5eb2f3761d..413ac4d464 100644
--- a/lib/lpm/rte_lpm6.c
+++ b/lib/lpm/rte_lpm6.c
@@ -210,7 +210,7 @@ rebuild_lpm(struct rte_lpm6 *lpm)
*/
RTE_EXPORT_SYMBOL(rte_lpm6_create)
struct rte_lpm6 *
-rte_lpm6_create(const char *name, int socket_id,
+rte_lpm6_create(const char *name, int numa_id,
const struct rte_lpm6_config *config)
{
char mem_name[RTE_LPM6_NAMESIZE];
@@ -229,7 +229,7 @@ rte_lpm6_create(const char *name, int socket_id,
sizeof(uint32_t) != 0);
/* Check user arguments. */
- if ((name == NULL) || (socket_id < -1) || (config == NULL) ||
+ if ((name == NULL) || (numa_id < -1) || (config == NULL) ||
(config->max_rules == 0) ||
config->number_tbl8s > RTE_LPM6_TBL8_MAX_NUM_GROUPS) {
rte_errno = EINVAL;
@@ -246,7 +246,7 @@ rte_lpm6_create(const char *name, int socket_id,
.hash_func_init_val = 0,
.name = mem_name,
.reserved = 0,
- .numa_id = socket_id,
+ .numa_id = numa_id,
.extra_flag = 0
};
@@ -308,8 +308,8 @@ rte_lpm6_create(const char *name, int socket_id,
}
/* Allocate memory to store the LPM data structures. */
- lpm = rte_zmalloc_socket(mem_name, (size_t)mem_size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ lpm = rte_zmalloc_numa(mem_name, (size_t)mem_size,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (lpm == NULL) {
LPM_LOG(ERR, "LPM memory allocation failed");
diff --git a/lib/lpm/rte_lpm6.h b/lib/lpm/rte_lpm6.h
index c5928b9d88..91a385b7c1 100644
--- a/lib/lpm/rte_lpm6.h
+++ b/lib/lpm/rte_lpm6.h
@@ -45,8 +45,8 @@ rte_lpm6_free(struct rte_lpm6 *lpm);
*
* @param name
* LPM object name
- * @param socket_id
- * NUMA socket ID for LPM table memory allocation
+ * @param numa_id
+ * NUMA node ID for LPM table memory allocation
* @param config
* Structure containing the configuration
* @return
@@ -60,7 +60,7 @@ rte_lpm6_free(struct rte_lpm6 *lpm);
* - ENOMEM - no appropriate memory area found in which to create memzone
*/
struct rte_lpm6 *
-rte_lpm6_create(const char *name, int socket_id,
+rte_lpm6_create(const char *name, int numa_id,
const struct rte_lpm6_config *config)
__rte_malloc __rte_dealloc(rte_lpm6_free, 1);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 020/227] efd: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (18 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 019/227] lpm: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 021/227] ip_frag: " Chengwen Feng
` (207 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/efd/rte_efd.c | 104 +++++++++++++++++++++++-----------------------
lib/efd/rte_efd.h | 38 ++++++++---------
2 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c
index 4dfc0ec9a4..a578050f59 100644
--- a/lib/efd/rte_efd.c
+++ b/lib/efd/rte_efd.c
@@ -307,8 +307,8 @@ efd_get_bin_id(const struct rte_efd_table * const table,
*
* @param table
* EFD table to reference
- * @param socket_id
- * Socket ID to use to look up existing values (ideally caller's socket id)
+ * @param numa_id
+ * NUMA node ID to use to look up existing values (ideally caller's NUMA node)
* @param chunk_id
* Chunk ID of bin to look up
* @param bin_id
@@ -319,10 +319,10 @@ efd_get_bin_id(const struct rte_efd_table * const table,
*/
static inline uint8_t
efd_get_choice(const struct rte_efd_table * const table,
- const unsigned int socket_id, const uint32_t chunk_id,
+ const unsigned int numa_id, const uint32_t chunk_id,
const uint32_t bin_id)
{
- struct efd_online_chunk *chunk = &table->chunks[socket_id][chunk_id];
+ struct efd_online_chunk *chunk = &table->chunks[numa_id][chunk_id];
/*
* Grab the chunk (byte) that contains the choices
@@ -501,12 +501,12 @@ efd_search_hash(struct rte_efd_table * const table,
RTE_EXPORT_SYMBOL(rte_efd_create)
struct rte_efd_table *
rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
- uint64_t online_cpu_socket_bitmask, uint8_t offline_cpu_socket)
+ uint64_t online_cpu_numa_bitmask, uint8_t offline_cpu_numa)
{
struct rte_efd_table *table = NULL;
uint8_t *key_array = NULL;
uint32_t num_chunks, num_chunks_shift;
- uint8_t socket_id;
+ uint8_t numa_id;
struct rte_efd_list *efd_list = NULL;
struct rte_tailq_entry *te;
uint64_t offline_table_size;
@@ -516,8 +516,8 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
- if (online_cpu_socket_bitmask == 0) {
- EFD_LOG(ERR, "At least one CPU socket must be enabled in the bitmask");
+ if (online_cpu_numa_bitmask == 0) {
+ EFD_LOG(ERR, "At least one CPU NUMA node must be enabled in the bitmask");
rte_errno = EINVAL;
return NULL;
}
@@ -574,20 +574,20 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
}
/* Create a new EFD table management structure */
- table = rte_zmalloc_socket(NULL,
+ table = rte_zmalloc_numa(NULL,
sizeof(struct rte_efd_table),
RTE_CACHE_LINE_SIZE,
- offline_cpu_socket);
+ offline_cpu_numa);
if (table == NULL) {
EFD_LOG(ERR, "Allocating EFD table management structure"
- " on socket %u failed",
- offline_cpu_socket);
+ " on NUMA node %u failed",
+ offline_cpu_numa);
goto error_unlock_exit;
}
EFD_LOG(DEBUG, "Allocated EFD table management structure "
- "on socket %u", offline_cpu_socket);
+ "on socket %u", offline_cpu_numa);
table->max_num_rules = num_chunks * EFD_TARGET_CHUNK_MAX_NUM_RULES;
table->num_rules = 0;
@@ -596,14 +596,14 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
table->key_len = key_len;
/* key_array */
- key_array = rte_zmalloc_socket(NULL,
+ key_array = rte_zmalloc_numa(NULL,
table->max_num_rules * table->key_len,
RTE_CACHE_LINE_SIZE,
- offline_cpu_socket);
+ offline_cpu_numa);
if (key_array == NULL) {
EFD_LOG(ERR, "Allocating key array"
- " on socket %u failed",
- offline_cpu_socket);
+ " on NUMA node %u failed",
+ offline_cpu_numa);
goto error_unlock_exit;
}
table->keys = key_array;
@@ -614,8 +614,8 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
num_chunks, table->max_num_rules);
/* Make sure all the allocatable table pointers are NULL initially */
- for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
- table->chunks[socket_id] = NULL;
+ for (numa_id = 0; numa_id < RTE_MAX_NUMA_NODES; numa_id++)
+ table->chunks[numa_id] = NULL;
table->offline_chunks = NULL;
/*
@@ -625,23 +625,23 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
uint64_t online_table_size = num_chunks * sizeof(struct efd_online_chunk) +
EFD_NUM_CHUNK_PADDING_BYTES;
- for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++) {
- if ((online_cpu_socket_bitmask >> socket_id) & 0x01) {
+ for (numa_id = 0; numa_id < RTE_MAX_NUMA_NODES; numa_id++) {
+ if ((online_cpu_numa_bitmask >> numa_id) & 0x01) {
/*
* Allocate all of the EFD table chunks (the online portion)
* as a continuous block
*/
- table->chunks[socket_id] =
- rte_zmalloc_socket(
+ table->chunks[numa_id] =
+ rte_zmalloc_numa(
NULL,
online_table_size,
RTE_CACHE_LINE_SIZE,
- socket_id);
- if (table->chunks[socket_id] == NULL) {
+ numa_id);
+ if (table->chunks[numa_id] == NULL) {
EFD_LOG(ERR,
"Allocating EFD online table on "
"socket %u failed",
- socket_id);
+ numa_id);
goto error_unlock_exit;
}
EFD_LOG(DEBUG,
@@ -650,7 +650,7 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
online_table_size,
(float) online_table_size /
(1024.0F * 1024.0F),
- socket_id);
+ numa_id);
}
}
@@ -685,13 +685,13 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
*/
offline_table_size = num_chunks * sizeof(struct efd_offline_chunk_rules);
table->offline_chunks =
- rte_zmalloc_socket(NULL,
+ rte_zmalloc_numa(NULL,
offline_table_size,
RTE_CACHE_LINE_SIZE,
- offline_cpu_socket);
+ offline_cpu_numa);
if (table->offline_chunks == NULL) {
EFD_LOG(ERR, "Allocating EFD offline table on socket %u "
- "failed", offline_cpu_socket);
+ "failed", offline_cpu_numa);
goto error_unlock_exit;
}
@@ -699,7 +699,7 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
"Allocated EFD offline table of size %"PRIu64" bytes "
" (%.2f MB) on socket %u", offline_table_size,
(float) offline_table_size / (1024.0F * 1024.0F),
- offline_cpu_socket);
+ offline_cpu_numa);
te->data = (void *) table;
TAILQ_INSERT_TAIL(efd_list, te, next);
@@ -711,7 +711,7 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
/* Create ring (Dummy slot index is not enqueued) */
r = rte_ring_create(ring_name, rte_align32pow2(table->max_num_rules),
- offline_cpu_socket, 0);
+ offline_cpu_numa, 0);
if (r == NULL) {
EFD_LOG(ERR, "ring creation failed: %s", rte_strerror(rte_errno));
rte_efd_free(table);
@@ -764,15 +764,15 @@ RTE_EXPORT_SYMBOL(rte_efd_free)
void
rte_efd_free(struct rte_efd_table *table)
{
- uint8_t socket_id;
+ uint8_t numa_id;
struct rte_efd_list *efd_list;
struct rte_tailq_entry *te, *temp;
if (table == NULL)
return;
- for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
- rte_free(table->chunks[socket_id]);
+ for (numa_id = 0; numa_id < RTE_MAX_NUMA_NODES; numa_id++)
+ rte_free(table->chunks[numa_id]);
efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
rte_mcfg_tailq_write_lock();
@@ -800,7 +800,7 @@ rte_efd_free(struct rte_efd_table *table)
*
* @param table
* EFD table to reference
- * @param socket_id
+ * @param numa_id
* Socket ID to use to lookup existing values (ideally caller's socket id)
* @param chunk_id
* Chunk index to update
@@ -814,13 +814,13 @@ rte_efd_free(struct rte_efd_table *table)
* Previously computed updated chunk/group entry
*/
static inline void
-efd_apply_update(struct rte_efd_table * const table, const unsigned int socket_id,
+efd_apply_update(struct rte_efd_table * const table, const unsigned int numa_id,
const uint32_t chunk_id, const uint32_t group_id,
const uint32_t bin_id, const uint8_t new_bin_choice,
const struct efd_online_group_entry * const new_group_entry)
{
int i;
- struct efd_online_chunk *chunk = &table->chunks[socket_id][chunk_id];
+ struct efd_online_chunk *chunk = &table->chunks[numa_id][chunk_id];
uint8_t bin_index = bin_id / EFD_CHUNK_NUM_BIN_TO_GROUP_SETS;
/*
@@ -939,7 +939,7 @@ revert_groups(struct efd_offline_group_rules *previous_group,
*
* @param table
* EFD table to reference
- * @param socket_id
+ * @param numa_id
* Socket ID to use to lookup existing values (ideally caller's socket id)
* @param key
* Key to insert
@@ -976,7 +976,7 @@ revert_groups(struct efd_offline_group_rules *previous_group,
*/
static inline int
efd_compute_update(struct rte_efd_table * const table,
- const unsigned int socket_id, const void *key,
+ const unsigned int numa_id, const void *key,
const efd_value_t value, uint32_t * const chunk_id,
uint32_t * const group_id, uint32_t * const bin_id,
uint8_t * const new_bin_choice,
@@ -995,7 +995,7 @@ efd_compute_update(struct rte_efd_table * const table,
&table->offline_chunks[*chunk_id];
struct efd_offline_group_rules *new_group;
- uint8_t current_choice = efd_get_choice(table, socket_id,
+ uint8_t current_choice = efd_get_choice(table, numa_id,
*chunk_id, *bin_id);
uint32_t current_group_id = efd_bin_to_group[current_choice][*bin_id];
struct efd_offline_group_rules * const current_group =
@@ -1179,14 +1179,14 @@ efd_compute_update(struct rte_efd_table * const table,
RTE_EXPORT_SYMBOL(rte_efd_update)
int
-rte_efd_update(struct rte_efd_table * const table, const unsigned int socket_id,
+rte_efd_update(struct rte_efd_table * const table, const unsigned int numa_id,
const void *key, const efd_value_t value)
{
uint32_t chunk_id = 0, group_id = 0, bin_id = 0;
uint8_t new_bin_choice = 0;
struct efd_online_group_entry entry = {{0}};
- int status = efd_compute_update(table, socket_id, key, value,
+ int status = efd_compute_update(table, numa_id, key, value,
&chunk_id, &group_id, &bin_id,
&new_bin_choice, &entry);
@@ -1196,14 +1196,14 @@ rte_efd_update(struct rte_efd_table * const table, const unsigned int socket_id,
if (status == RTE_EFD_UPDATE_FAILED)
return status;
- efd_apply_update(table, socket_id, chunk_id, group_id, bin_id,
+ efd_apply_update(table, numa_id, chunk_id, group_id, bin_id,
new_bin_choice, &entry);
return status;
}
RTE_EXPORT_SYMBOL(rte_efd_delete)
int
-rte_efd_delete(struct rte_efd_table * const table, const unsigned int socket_id,
+rte_efd_delete(struct rte_efd_table * const table, const unsigned int numa_id,
const void *key, efd_value_t * const prev_value)
{
unsigned int i;
@@ -1215,7 +1215,7 @@ rte_efd_delete(struct rte_efd_table * const table, const unsigned int socket_id,
struct efd_offline_chunk_rules * const chunk =
&table->offline_chunks[chunk_id];
- uint8_t current_choice = efd_get_choice(table, socket_id,
+ uint8_t current_choice = efd_get_choice(table, numa_id,
chunk_id, bin_id);
uint32_t current_group_id = efd_bin_to_group[current_choice][bin_id];
struct efd_offline_group_rules * const current_group =
@@ -1321,16 +1321,16 @@ efd_lookup_internal(const struct efd_online_group_entry * const group,
RTE_EXPORT_SYMBOL(rte_efd_lookup)
efd_value_t
rte_efd_lookup(const struct rte_efd_table * const table,
- const unsigned int socket_id, const void *key)
+ const unsigned int numa_id, const void *key)
{
uint32_t chunk_id, group_id, bin_id;
uint8_t bin_choice;
const struct efd_online_group_entry *group;
- const struct efd_online_chunk * const chunks = table->chunks[socket_id];
+ const struct efd_online_chunk * const chunks = table->chunks[numa_id];
/* Determine the chunk and group location for the given key */
efd_compute_ids(table, key, &chunk_id, &bin_id);
- bin_choice = efd_get_choice(table, socket_id, chunk_id, bin_id);
+ bin_choice = efd_get_choice(table, numa_id, chunk_id, bin_id);
group_id = efd_bin_to_group[bin_choice][bin_id];
group = &chunks[chunk_id].groups[group_id];
@@ -1342,7 +1342,7 @@ rte_efd_lookup(const struct rte_efd_table * const table,
RTE_EXPORT_SYMBOL(rte_efd_lookup_bulk)
void rte_efd_lookup_bulk(const struct rte_efd_table * const table,
- const unsigned int socket_id, const int num_keys,
+ const unsigned int numa_id, const int num_keys,
const void **key_list, efd_value_t * const value_list)
{
int i;
@@ -1352,7 +1352,7 @@ void rte_efd_lookup_bulk(const struct rte_efd_table * const table,
uint32_t group_id_list[RTE_EFD_BURST_MAX];
struct efd_online_group_entry *group;
- struct efd_online_chunk *chunks = table->chunks[socket_id];
+ struct efd_online_chunk *chunks = table->chunks[numa_id];
for (i = 0; i < num_keys; i++) {
efd_compute_ids(table, key_list[i], &chunk_id_list[i],
@@ -1361,7 +1361,7 @@ void rte_efd_lookup_bulk(const struct rte_efd_table * const table,
}
for (i = 0; i < num_keys; i++) {
- bin_choice_list[i] = efd_get_choice(table, socket_id,
+ bin_choice_list[i] = efd_get_choice(table, numa_id,
chunk_id_list[i], bin_id_list[i]);
group_id_list[i] =
efd_bin_to_group[bin_choice_list[i]][bin_id_list[i]];
diff --git a/lib/efd/rte_efd.h b/lib/efd/rte_efd.h
index 89cb4a2483..c92e124b4d 100644
--- a/lib/efd/rte_efd.h
+++ b/lib/efd/rte_efd.h
@@ -117,7 +117,7 @@ typedef uint16_t efd_lookuptbl_t;
typedef uint16_t efd_hashfunc_t;
/**
- * Creates an EFD table with a single offline region and multiple per-socket
+ * Creates an EFD table with a single offline region and multiple per-NUMA-node
* internally-managed copies of the online table used for lookups
*
* @param name
@@ -127,11 +127,11 @@ typedef uint16_t efd_hashfunc_t;
* Will be rounded up to the next smallest valid table size
* @param key_len
* Length of the key
- * @param online_cpu_socket_bitmask
- * Bitmask specifying which sockets should get a copy of the online table.
- * LSB = socket 0, etc.
- * @param offline_cpu_socket
- * Identifies the socket where the offline table will be allocated
+ * @param online_cpu_numa_bitmask
+ * Bitmask specifying which NUMA nodes should get a copy of the online table.
+ * LSB = NUMA node 0, etc.
+ * @param offline_cpu_numa
+ * Identifies the NUMA node where the offline table will be allocated
* (and most efficiently accessed in the case of updates/insertions)
*
* @return
@@ -139,7 +139,7 @@ typedef uint16_t efd_hashfunc_t;
*/
struct rte_efd_table *
rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
- uint64_t online_cpu_socket_bitmask, uint8_t offline_cpu_socket);
+ uint64_t online_cpu_numa_bitmask, uint8_t offline_cpu_numa);
/**
* Releases the resources from an EFD table
@@ -177,8 +177,8 @@ rte_efd_find_existing(const char *name);
*
* @param table
* EFD table to reference
- * @param socket_id
- * Socket ID to use to lookup existing value (ideally caller's socket id)
+ * @param numa_id
+ * NUMA node ID to use to lookup existing value (ideally caller's NUMA node)
* @param key
* EFD table key to modify
* @param value
@@ -198,7 +198,7 @@ rte_efd_find_existing(const char *name);
* 0 - success
*/
int
-rte_efd_update(struct rte_efd_table *table, unsigned int socket_id,
+rte_efd_update(struct rte_efd_table *table, unsigned int numa_id,
const void *key, efd_value_t value);
/**
@@ -208,8 +208,8 @@ rte_efd_update(struct rte_efd_table *table, unsigned int socket_id,
*
* @param table
* EFD table to reference
- * @param socket_id
- * Socket ID to use to lookup existing value (ideally caller's socket id)
+ * @param numa_id
+ * NUMA node ID to use to lookup existing value (ideally caller's NUMA node)
* @param key
* EFD table key to delete
* @param prev_value
@@ -220,7 +220,7 @@ rte_efd_update(struct rte_efd_table *table, unsigned int socket_id,
* nonzero otherwise
*/
int
-rte_efd_delete(struct rte_efd_table *table, unsigned int socket_id,
+rte_efd_delete(struct rte_efd_table *table, unsigned int numa_id,
const void *key, efd_value_t *prev_value);
/**
@@ -235,8 +235,8 @@ rte_efd_delete(struct rte_efd_table *table, unsigned int socket_id,
*
* @param table
* EFD table to reference
- * @param socket_id
- * Socket ID to use to lookup existing value (ideally caller's socket id)
+ * @param numa_id
+ * NUMA node ID to use to lookup existing value (ideally caller's NUMA node)
* @param key
* EFD table key to look up
*
@@ -244,7 +244,7 @@ rte_efd_delete(struct rte_efd_table *table, unsigned int socket_id,
* Value associated with the key, or random junk if they key was never inserted
*/
efd_value_t
-rte_efd_lookup(const struct rte_efd_table *table, unsigned int socket_id,
+rte_efd_lookup(const struct rte_efd_table *table, unsigned int numa_id,
const void *key);
/**
@@ -259,8 +259,8 @@ rte_efd_lookup(const struct rte_efd_table *table, unsigned int socket_id,
*
* @param table
* EFD table to reference
- * @param socket_id
- * Socket ID to use to lookup existing value (ideally caller's socket id)
+ * @param numa_id
+ * NUMA node ID to use to lookup existing value (ideally caller's NUMA node)
* @param num_keys
* Number of keys in the key_list array, must be less than RTE_EFD_BURST_MAX
* @param key_list
@@ -269,7 +269,7 @@ rte_efd_lookup(const struct rte_efd_table *table, unsigned int socket_id,
* Array of size num_keys where lookup values will be stored
*/
void
-rte_efd_lookup_bulk(const struct rte_efd_table *table, unsigned int socket_id,
+rte_efd_lookup_bulk(const struct rte_efd_table *table, unsigned int numa_id,
int num_keys, const void **key_list,
efd_value_t *value_list);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 021/227] ip_frag: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (19 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 020/227] efd: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 022/227] node: " Chengwen Feng
` (206 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/ip_frag/rte_ip_frag.h | 8 ++++----
lib/ip_frag/rte_ip_frag_common.c | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/ip_frag/rte_ip_frag.h b/lib/ip_frag/rte_ip_frag.h
index 84fd717953..483930a2d6 100644
--- a/lib/ip_frag/rte_ip_frag.h
+++ b/lib/ip_frag/rte_ip_frag.h
@@ -54,15 +54,15 @@ struct rte_ip_frag_death_row {
* The value should be less or equal then bucket_num * bucket_entries.
* @param max_cycles
* Maximum TTL in cycles for each fragmented packet.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in the case of
- * NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA constraints.
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in the case of
+ * NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraints.
* @return
* The pointer to the new allocated fragmentation table, on success. NULL on error.
*/
struct rte_ip_frag_tbl * rte_ip_frag_table_create(uint32_t bucket_num,
uint32_t bucket_entries, uint32_t max_entries,
- uint64_t max_cycles, int socket_id);
+ uint64_t max_cycles, int numa_id);
/**
* Free allocated IP fragmentation table.
diff --git a/lib/ip_frag/rte_ip_frag_common.c b/lib/ip_frag/rte_ip_frag_common.c
index 00bf9476de..d675de4338 100644
--- a/lib/ip_frag/rte_ip_frag_common.c
+++ b/lib/ip_frag/rte_ip_frag_common.c
@@ -43,7 +43,7 @@ rte_ip_frag_free_death_row(struct rte_ip_frag_death_row *dr,
RTE_EXPORT_SYMBOL(rte_ip_frag_table_create)
struct rte_ip_frag_tbl *
rte_ip_frag_table_create(uint32_t bucket_num, uint32_t bucket_entries,
- uint32_t max_entries, uint64_t max_cycles, int socket_id)
+ uint32_t max_entries, uint64_t max_cycles, int numa_id)
{
struct rte_ip_frag_tbl *tbl;
size_t sz;
@@ -62,16 +62,16 @@ rte_ip_frag_table_create(uint32_t bucket_num, uint32_t bucket_entries,
}
sz = sizeof (*tbl) + nb_entries * sizeof (tbl->pkt[0]);
- if ((tbl = rte_zmalloc_socket(__func__, sz, RTE_CACHE_LINE_SIZE,
- socket_id)) == NULL) {
+ tbl = rte_zmalloc_numa(__func__, sz, RTE_CACHE_LINE_SIZE, numa_id);
+ if (tbl == NULL) {
IP_FRAG_LOG_LINE(ERR,
- "%s: allocation of %zu bytes at socket %d failed do",
- __func__, sz, socket_id);
+ "%s: allocation of %zu bytes at NUMA node %d failed do",
+ __func__, sz, numa_id);
return NULL;
}
IP_FRAG_LOG_LINE(INFO, "%s: allocated of %zu bytes at socket %d",
- __func__, sz, socket_id);
+ __func__, sz, numa_id);
tbl->max_cycles = max_cycles;
tbl->max_entries = max_entries;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 022/227] node: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (20 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 021/227] ip_frag: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 023/227] distributor: " Chengwen Feng
` (205 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/node/ip4_lookup.c | 4 ++--
lib/node/ip4_lookup_fib.c | 10 +++++-----
lib/node/ip6_lookup.c | 4 ++--
lib/node/ip6_lookup_fib.c | 10 +++++-----
lib/node/kernel_rx.c | 4 ++--
lib/node/node_mbuf_dynfield.c | 2 +-
lib/node/udp4_input.c | 4 ++--
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lib/node/ip4_lookup.c b/lib/node/ip4_lookup.c
index 42db993142..d3a1a59f7b 100644
--- a/lib/node/ip4_lookup.c
+++ b/lib/node/ip4_lookup.c
@@ -194,7 +194,7 @@ ip4_lookup_node_init(const struct rte_graph *graph, struct rte_node *node)
/* Setup LPM tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
- socket = rte_lcore_to_socket_id(lcore_id);
+ socket = rte_lcore_to_numa_id(lcore_id);
rc = setup_lpm(&ip4_lookup_nm, socket);
if (rc) {
node_err("ip4_lookup",
@@ -207,7 +207,7 @@ ip4_lookup_node_init(const struct rte_graph *graph, struct rte_node *node)
}
/* Update socket's LPM and mbuf dyn priv1 offset in node ctx */
- IP4_LOOKUP_NODE_LPM(node->ctx) = ip4_lookup_nm.lpm_tbl[graph->socket];
+ IP4_LOOKUP_NODE_LPM(node->ctx) = ip4_lookup_nm.lpm_tbl[graph->numa_id];
IP4_LOOKUP_NODE_PRIV1_OFF(node->ctx) = dyn;
#if defined(__ARM_NEON) || defined(RTE_ARCH_X86) || \
diff --git a/lib/node/ip4_lookup_fib.c b/lib/node/ip4_lookup_fib.c
index 0857d889fc..7ff190abb7 100644
--- a/lib/node/ip4_lookup_fib.c
+++ b/lib/node/ip4_lookup_fib.c
@@ -225,7 +225,7 @@ rte_node_ip4_fib_route_add(uint32_t ip, uint8_t depth, uint16_t next_hop,
uint32_t val;
int ret;
- nb_sockets = rte_socket_count();
+ nb_sockets = rte_numa_count();
in.s_addr = htonl(ip);
inet_ntop(AF_INET, &in, abuf, sizeof(abuf));
/* Embedded next node id into 24 bit next hop */
@@ -288,15 +288,15 @@ ip4_lookup_fib_node_init(const struct rte_graph *graph, struct rte_node *node)
return -rte_errno;
}
- rc = setup_fib(graph->socket);
+ rc = setup_fib(graph->numa_id);
if (rc) {
- node_err("ip4_lookup_fib", "Failed to setup fib for sock %u, rc=%d",
- graph->socket, rc);
+ node_err("ip4_lookup_fib", "Failed to setup fib for numa %u, rc=%d",
+ graph->numa_id, rc);
return rc;
}
/* Update socket's FIB and mbuf dyn priv1 offset in node ctx */
- IP4_LOOKUP_NODE_FIB(node->ctx) = ip4_lookup_fib_nm.fib[graph->socket];
+ IP4_LOOKUP_NODE_FIB(node->ctx) = ip4_lookup_fib_nm.fib[graph->numa_id];
IP4_LOOKUP_FIB_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip4_lookup_fib", "Initialized ip4_lookup_fib node");
diff --git a/lib/node/ip6_lookup.c b/lib/node/ip6_lookup.c
index 83c0500c76..934488c5e7 100644
--- a/lib/node/ip6_lookup.c
+++ b/lib/node/ip6_lookup.c
@@ -331,7 +331,7 @@ ip6_lookup_node_init(const struct rte_graph *graph, struct rte_node *node)
/* Setup LPM tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
- socket = rte_lcore_to_socket_id(lcore_id);
+ socket = rte_lcore_to_numa_id(lcore_id);
rc = setup_lpm6(&ip6_lookup_nm, socket);
if (rc) {
node_err("ip6_lookup",
@@ -344,7 +344,7 @@ ip6_lookup_node_init(const struct rte_graph *graph, struct rte_node *node)
}
/* Update socket's LPM and mbuf dyn priv1 offset in node ctx */
- IP6_LOOKUP_NODE_LPM(node->ctx) = ip6_lookup_nm.lpm_tbl[graph->socket];
+ IP6_LOOKUP_NODE_LPM(node->ctx) = ip6_lookup_nm.lpm_tbl[graph->numa_id];
IP6_LOOKUP_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip6_lookup", "Initialized ip6_lookup node");
diff --git a/lib/node/ip6_lookup_fib.c b/lib/node/ip6_lookup_fib.c
index 40c5c753df..a471081d29 100644
--- a/lib/node/ip6_lookup_fib.c
+++ b/lib/node/ip6_lookup_fib.c
@@ -218,7 +218,7 @@ rte_node_ip6_fib_route_add(const struct rte_ipv6_addr *ip, uint8_t depth, uint16
uint32_t val;
int ret;
- nb_sockets = rte_socket_count();
+ nb_sockets = rte_numa_count();
inet_ntop(AF_INET6, ip, abuf, sizeof(abuf));
/* Embedded next node id into 24 bit next hop */
val = ((next_node << 16) | next_hop) & ((1ull << 24) - 1);
@@ -279,15 +279,15 @@ ip6_lookup_fib_node_init(const struct rte_graph *graph, struct rte_node *node)
return -rte_errno;
}
- rc = setup_fib6(graph->socket);
+ rc = setup_fib6(graph->numa_id);
if (rc) {
- node_err("ip6_lookup_fib", "Failed to setup fib6 for sock %u, rc=%d",
- graph->socket, rc);
+ node_err("ip6_lookup_fib", "Failed to setup fib6 for numa %u, rc=%d",
+ graph->numa_id, rc);
return rc;
}
/* Update socket's FIB and mbuf dyn priv1 offset in node ctx */
- IP6_LOOKUP_FIB_NODE(node->ctx) = ip6_lookup_fib_nm.fib6[graph->socket];
+ IP6_LOOKUP_FIB_NODE(node->ctx) = ip6_lookup_fib_nm.fib6[graph->numa_id];
IP6_LOOKUP_FIB_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip6_lookup_fib", "Initialized ip6_lookup_fib node");
diff --git a/lib/node/kernel_rx.c b/lib/node/kernel_rx.c
index 461330414f..5dff10139c 100644
--- a/lib/node/kernel_rx.c
+++ b/lib/node/kernel_rx.c
@@ -211,8 +211,8 @@ kernel_rx_node_init(const struct rte_graph *graph, struct rte_node *node)
return -EINVAL;
}
- recv_info = rte_zmalloc_socket("kernel_rx_info", sizeof(kernel_rx_info_t),
- RTE_CACHE_LINE_SIZE, graph->socket);
+ recv_info = rte_zmalloc_numa("kernel_rx_info", sizeof(kernel_rx_info_t),
+ RTE_CACHE_LINE_SIZE, graph->numa_id);
if (!recv_info) {
node_err("kernel_rx", "Kernel recv_info is NULL");
return -ENOMEM;
diff --git a/lib/node/node_mbuf_dynfield.c b/lib/node/node_mbuf_dynfield.c
index 9dbc80f7e5..74229c9b9c 100644
--- a/lib/node/node_mbuf_dynfield.c
+++ b/lib/node/node_mbuf_dynfield.c
@@ -36,7 +36,7 @@ int rte_node_mbuf_dynfield_register(void)
if (!mz) {
mz = rte_memzone_reserve_aligned(NODE_MBUF_DYNFIELD_MEMZONE_NAME,
sizeof(struct node_mbuf_dynfield_mz),
- SOCKET_ID_ANY, 0,
+ RTE_NUMA_ID_ANY, 0,
RTE_CACHE_LINE_SIZE);
if (!mz) {
node_err("node_mbuf_dyn", "rte_memzone_reserve_aligned failed");
diff --git a/lib/node/udp4_input.c b/lib/node/udp4_input.c
index 47aad42022..175bfa290d 100644
--- a/lib/node/udp4_input.c
+++ b/lib/node/udp4_input.c
@@ -132,7 +132,7 @@ udp4_input_node_init(const struct rte_graph *graph, struct rte_node *node)
/* Setup HASH tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
- socket = rte_lcore_to_socket_id(lcore_id);
+ socket = rte_lcore_to_numa_id(lcore_id);
rc = setup_udp4_dstprt_hash(&udp4_input_nm, socket);
if (rc) {
node_err("udp4_lookup",
@@ -144,7 +144,7 @@ udp4_input_node_init(const struct rte_graph *graph, struct rte_node *node)
init_once = 1;
}
- UDP4_INPUT_NODE_HASH(node->ctx) = udp4_input_nm.hash_tbl[graph->socket];
+ UDP4_INPUT_NODE_HASH(node->ctx) = udp4_input_nm.hash_tbl[graph->numa_id];
node_dbg("udp4_input", "Initialized udp4_input node");
return 0;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 023/227] distributor: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (21 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 022/227] node: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 024/227] reorder: " Chengwen Feng
` (204 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/distributor/rte_distributor.c | 6 +++---
lib/distributor/rte_distributor.h | 4 ++--
lib/distributor/rte_distributor_single.c | 4 ++--
lib/distributor/rte_distributor_single.h | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/distributor/rte_distributor.c b/lib/distributor/rte_distributor.c
index dde7ce2677..d34a7934fd 100644
--- a/lib/distributor/rte_distributor.c
+++ b/lib/distributor/rte_distributor.c
@@ -720,7 +720,7 @@ rte_distributor_clear_returns(struct rte_distributor *d)
RTE_EXPORT_SYMBOL(rte_distributor_create)
struct rte_distributor *
rte_distributor_create(const char *name,
- unsigned int socket_id,
+ unsigned int numa_id,
unsigned int num_workers,
unsigned int alg_type)
{
@@ -749,7 +749,7 @@ rte_distributor_create(const char *name,
return NULL;
}
d->d_single = rte_distributor_create_single(name,
- socket_id, num_workers);
+ numa_id, num_workers);
if (d->d_single == NULL) {
free(d);
/* rte_errno will have been set */
@@ -760,7 +760,7 @@ rte_distributor_create(const char *name,
}
snprintf(mz_name, sizeof(mz_name), RTE_DISTRIB_PREFIX"%s", name);
- mz = rte_memzone_reserve(mz_name, sizeof(*d), socket_id, NO_FLAGS);
+ mz = rte_memzone_reserve(mz_name, sizeof(*d), numa_id, NO_FLAGS);
if (mz == NULL) {
rte_errno = ENOMEM;
return NULL;
diff --git a/lib/distributor/rte_distributor.h b/lib/distributor/rte_distributor.h
index a073e64612..0c72300252 100644
--- a/lib/distributor/rte_distributor.h
+++ b/lib/distributor/rte_distributor.h
@@ -35,7 +35,7 @@ struct rte_mbuf;
*
* @param name
* The name to be given to the distributor instance.
- * @param socket_id
+ * @param numa_id
* The NUMA node on which the memory is to be allocated
* @param num_workers
* The maximum number of workers that will request packets from this
@@ -48,7 +48,7 @@ struct rte_mbuf;
* The newly created distributor instance
*/
struct rte_distributor *
-rte_distributor_create(const char *name, unsigned int socket_id,
+rte_distributor_create(const char *name, unsigned int numa_id,
unsigned int num_workers,
unsigned int alg_type);
diff --git a/lib/distributor/rte_distributor_single.c b/lib/distributor/rte_distributor_single.c
index d4b3e12648..a018a04cea 100644
--- a/lib/distributor/rte_distributor_single.c
+++ b/lib/distributor/rte_distributor_single.c
@@ -375,7 +375,7 @@ rte_distributor_clear_returns_single(struct rte_distributor_single *d)
/* creates a distributor instance */
struct rte_distributor_single *
rte_distributor_create_single(const char *name,
- unsigned socket_id,
+ unsigned int numa_id,
unsigned num_workers)
{
struct rte_distributor_single *d;
@@ -395,7 +395,7 @@ rte_distributor_create_single(const char *name,
}
snprintf(mz_name, sizeof(mz_name), RTE_DISTRIB_PREFIX"%s", name);
- mz = rte_memzone_reserve(mz_name, sizeof(*d), socket_id, NO_FLAGS);
+ mz = rte_memzone_reserve(mz_name, sizeof(*d), numa_id, NO_FLAGS);
if (mz == NULL) {
rte_errno = ENOMEM;
return NULL;
diff --git a/lib/distributor/rte_distributor_single.h b/lib/distributor/rte_distributor_single.h
index 2f80aa43d1..289703601d 100644
--- a/lib/distributor/rte_distributor_single.h
+++ b/lib/distributor/rte_distributor_single.h
@@ -30,7 +30,7 @@ struct rte_mbuf;
*
* @param name
* The name to be given to the distributor instance.
- * @param socket_id
+ * @param numa_id
* The NUMA node on which the memory is to be allocated
* @param num_workers
* The maximum number of workers that will request packets from this
@@ -39,7 +39,7 @@ struct rte_mbuf;
* The newly created distributor instance
*/
struct rte_distributor_single *
-rte_distributor_create_single(const char *name, unsigned int socket_id,
+rte_distributor_create_single(const char *name, unsigned int numa_id,
unsigned int num_workers);
/* *** APIS to be called on the distributor lcore *** */
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 024/227] reorder: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (22 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 023/227] distributor: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 025/227] stack: " Chengwen Feng
` (203 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/reorder/rte_reorder.c | 4 ++--
lib/reorder/rte_reorder.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/reorder/rte_reorder.c b/lib/reorder/rte_reorder.c
index af5a6d9f01..daa871a39e 100644
--- a/lib/reorder/rte_reorder.c
+++ b/lib/reorder/rte_reorder.c
@@ -160,7 +160,7 @@ rte_reorder_entry_insert(struct rte_tailq_entry *new_te)
RTE_EXPORT_SYMBOL(rte_reorder_create)
struct rte_reorder_buffer*
-rte_reorder_create(const char *name, unsigned socket_id, unsigned int size)
+rte_reorder_create(const char *name, unsigned int numa_id, unsigned int size)
{
struct rte_reorder_buffer *b = NULL;
struct rte_tailq_entry *te, *te_inserted;
@@ -190,7 +190,7 @@ rte_reorder_create(const char *name, unsigned socket_id, unsigned int size)
}
/* Allocate memory to store the reorder buffer structure. */
- b = rte_zmalloc_socket("REORDER_BUFFER", bufsize, 0, socket_id);
+ b = rte_zmalloc_numa("REORDER_BUFFER", bufsize, 0, numa_id);
if (b == NULL) {
REORDER_LOG(ERR, "Memzone allocation failed");
rte_errno = ENOMEM;
diff --git a/lib/reorder/rte_reorder.h b/lib/reorder/rte_reorder.h
index 5bcb32b164..483a260e99 100644
--- a/lib/reorder/rte_reorder.h
+++ b/lib/reorder/rte_reorder.h
@@ -59,7 +59,7 @@ rte_reorder_free(struct rte_reorder_buffer *b);
*
* @param name
* The name to be given to the reorder buffer instance.
- * @param socket_id
+ * @param numa_id
* The NUMA node on which the memory for the reorder buffer
* instance is to be reserved.
* @param size
@@ -71,7 +71,7 @@ rte_reorder_free(struct rte_reorder_buffer *b);
* - EINVAL - invalid parameters
*/
struct rte_reorder_buffer *
-rte_reorder_create(const char *name, unsigned int socket_id, unsigned int size)
+rte_reorder_create(const char *name, unsigned int numa_id, unsigned int size)
__rte_malloc __rte_dealloc(rte_reorder_free, 1);
/**
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 025/227] stack: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (23 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 024/227] reorder: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 026/227] regexdev: " Chengwen Feng
` (202 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/stack/rte_stack.c | 4 ++--
lib/stack/rte_stack.h | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/stack/rte_stack.c b/lib/stack/rte_stack.c
index a4bbf8a4d7..51f70f0960 100644
--- a/lib/stack/rte_stack.c
+++ b/lib/stack/rte_stack.c
@@ -52,7 +52,7 @@ rte_stack_get_memsize(unsigned int count, uint32_t flags)
RTE_EXPORT_SYMBOL(rte_stack_create)
struct rte_stack *
-rte_stack_create(const char *name, unsigned int count, int socket_id,
+rte_stack_create(const char *name, unsigned int count, int numa_id,
uint32_t flags)
{
char mz_name[RTE_MEMZONE_NAMESIZE];
@@ -108,7 +108,7 @@ rte_stack_create(const char *name, unsigned int count, int socket_id,
rte_mcfg_tailq_write_lock();
- mz = rte_memzone_reserve_aligned(mz_name, sz, socket_id,
+ mz = rte_memzone_reserve_aligned(mz_name, sz, numa_id,
0, alignof(typeof(*s)));
if (mz == NULL) {
STACK_LOG_ERR("Cannot reserve stack memzone!");
diff --git a/lib/stack/rte_stack.h b/lib/stack/rte_stack.h
index 14983516bf..23a739912d 100644
--- a/lib/stack/rte_stack.h
+++ b/lib/stack/rte_stack.h
@@ -254,9 +254,9 @@ rte_stack_free_count(struct rte_stack *s)
* The name of the stack.
* @param count
* The size of the stack.
- * @param socket_id
- * The *socket_id* argument is the socket identifier in case of
- * NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ * The *numa_id* argument is the NUMA node ID in case of
+ * NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
* constraint for the reserved zone.
* @param flags
* An OR of the following:
@@ -273,7 +273,7 @@ rte_stack_free_count(struct rte_stack *s)
* - ENOTSUP - platform does not support given flags combination.
*/
struct rte_stack *
-rte_stack_create(const char *name, unsigned int count, int socket_id,
+rte_stack_create(const char *name, unsigned int count, int numa_id,
uint32_t flags);
/**
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 026/227] regexdev: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (24 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 025/227] stack: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 027/227] metrics: " Chengwen Feng
` (201 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/regexdev/rte_regexdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c
index 8ba797b278..6b6052ca4e 100644
--- a/lib/regexdev/rte_regexdev.c
+++ b/lib/regexdev/rte_regexdev.c
@@ -59,7 +59,7 @@ regexdev_shared_data_prepare(void)
/* Allocate port data and ownership shared memory. */
mz = rte_memzone_reserve(MZ_RTE_REGEXDEV_DATA,
sizeof(*rte_regexdev_shared_data),
- rte_socket_id(), flags);
+ rte_numa_id(), flags);
if (mz == NULL)
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 027/227] metrics: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (25 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 026/227] regexdev: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 028/227] mbuf: " Chengwen Feng
` (200 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/metrics/rte_metrics.c | 4 ++--
lib/metrics/rte_metrics.h | 4 ++--
lib/metrics/rte_metrics_telemetry.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/metrics/rte_metrics.c b/lib/metrics/rte_metrics.c
index 4cd4623b7a..8896ea770f 100644
--- a/lib/metrics/rte_metrics.c
+++ b/lib/metrics/rte_metrics.c
@@ -58,7 +58,7 @@ struct rte_metrics_data_s {
RTE_EXPORT_SYMBOL(rte_metrics_init)
int
-rte_metrics_init(int socket_id)
+rte_metrics_init(int numa_id)
{
struct rte_metrics_data_s *stats;
const struct rte_memzone *memzone;
@@ -72,7 +72,7 @@ rte_metrics_init(int socket_id)
if (memzone != NULL)
return -EEXIST;
memzone = rte_memzone_reserve(RTE_METRICS_MEMZONE_NAME,
- sizeof(struct rte_metrics_data_s), socket_id, 0);
+ sizeof(struct rte_metrics_data_s), numa_id, 0);
if (memzone == NULL)
return -ENOMEM;
stats = memzone->addr;
diff --git a/lib/metrics/rte_metrics.h b/lib/metrics/rte_metrics.h
index 5e17873dd7..e8e10447c3 100644
--- a/lib/metrics/rte_metrics.h
+++ b/lib/metrics/rte_metrics.h
@@ -76,7 +76,7 @@ struct rte_metric_value {
* Initializes metric module. This function must be called from
* a primary process before metrics are used.
*
- * @param socket_id
+ * @param numa_id
* Socket to use for shared memory allocation.
* @return
* 0 on success
@@ -85,7 +85,7 @@ struct rte_metric_value {
* -ENOMEM - cannot allocate metrics memzone
* -E_RTE_SECONDARY - function called from secondary process
*/
-int rte_metrics_init(int socket_id);
+int rte_metrics_init(int numa_id);
/**
* Deinitialize metric module. This function must be called from
diff --git a/lib/metrics/rte_metrics_telemetry.c b/lib/metrics/rte_metrics_telemetry.c
index 2350ef5041..d7acd956db 100644
--- a/lib/metrics/rte_metrics_telemetry.c
+++ b/lib/metrics/rte_metrics_telemetry.c
@@ -98,7 +98,7 @@ rte_metrics_tel_reg_all_ethdev(int *metrics_register_done, int *reg_index_list)
int ret, nb_drv_idx = 0;
uint16_t d;
- rte_metrics_init(rte_socket_id());
+ rte_metrics_init(rte_numa_id());
RTE_ETH_FOREACH_DEV(d) {
int i;
/* Different device types have different numbers of stats, so
@@ -443,7 +443,7 @@ static int
rte_metrics_tel_initial_metrics_setup(void)
{
int ret;
- rte_metrics_init(rte_socket_id());
+ rte_metrics_init(rte_numa_id());
if (!tel_met_data.metrics_register_done) {
ret = rte_metrics_tel_reg_all_ethdev(
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 028/227] mbuf: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (26 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 027/227] metrics: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 029/227] timer: " Chengwen Feng
` (199 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/mbuf/rte_mbuf.c | 12 ++++++------
lib/mbuf/rte_mbuf.h | 18 +++++++++---------
lib/mbuf/rte_mbuf_dyn.c | 2 +-
lib/mbuf/rte_mbuf_pool_ops.c | 4 ++--
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
index ac6f3e1a3a..76c3f4b2fe 100644
--- a/lib/mbuf/rte_mbuf.c
+++ b/lib/mbuf/rte_mbuf.c
@@ -229,7 +229,7 @@ RTE_EXPORT_SYMBOL(rte_pktmbuf_pool_create_by_ops)
struct rte_mempool *
rte_pktmbuf_pool_create_by_ops(const char *name, unsigned int n,
unsigned int cache_size, uint16_t priv_size, uint16_t data_room_size,
- int socket_id, const char *ops_name)
+ int numa_id, const char *ops_name)
{
struct rte_mempool *mp;
struct rte_pktmbuf_pool_private mbp_priv;
@@ -250,7 +250,7 @@ rte_pktmbuf_pool_create_by_ops(const char *name, unsigned int n,
mbp_priv.mbuf_priv_size = priv_size;
mp = rte_mempool_create_empty(name, n, elt_size, cache_size,
- sizeof(struct rte_pktmbuf_pool_private), socket_id, 0);
+ sizeof(struct rte_pktmbuf_pool_private), numa_id, 0);
if (mp == NULL)
return NULL;
@@ -282,10 +282,10 @@ RTE_EXPORT_SYMBOL(rte_pktmbuf_pool_create)
struct rte_mempool *
rte_pktmbuf_pool_create(const char *name, unsigned int n,
unsigned int cache_size, uint16_t priv_size, uint16_t data_room_size,
- int socket_id)
+ int numa_id)
{
return rte_pktmbuf_pool_create_by_ops(name, n, cache_size, priv_size,
- data_room_size, socket_id, NULL);
+ data_room_size, numa_id, NULL);
}
/* Helper to create a mbuf pool with pinned external data buffers. */
@@ -293,7 +293,7 @@ RTE_EXPORT_SYMBOL(rte_pktmbuf_pool_create_extbuf)
struct rte_mempool *
rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,
unsigned int cache_size, uint16_t priv_size,
- uint16_t data_room_size, int socket_id,
+ uint16_t data_room_size, int numa_id,
const struct rte_pktmbuf_extmem *ext_mem,
unsigned int ext_num)
{
@@ -344,7 +344,7 @@ rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,
mbp_priv.flags = RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF;
mp = rte_mempool_create_empty(name, n, elt_size, cache_size,
- sizeof(struct rte_pktmbuf_pool_private), socket_id, 0);
+ sizeof(struct rte_pktmbuf_pool_private), numa_id, 0);
if (mp == NULL)
return NULL;
diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
index ad72328136..9b069cfab8 100644
--- a/lib/mbuf/rte_mbuf.h
+++ b/lib/mbuf/rte_mbuf.h
@@ -792,9 +792,9 @@ void rte_pktmbuf_pool_init(struct rte_mempool *mp, void *opaque_arg);
* and the data buffer. This value must be aligned to RTE_MBUF_PRIV_ALIGN.
* @param data_room_size
* Size of data buffer in each mbuf, including RTE_PKTMBUF_HEADROOM.
- * @param socket_id
+ * @param numa_id
* The socket identifier where the memory should be allocated. The
- * value can be *SOCKET_ID_ANY* if there is no NUMA constraint for the
+ * value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraint for the
* reserved zone.
* @return
* The pointer to the new allocated mempool, on success. NULL on error
@@ -808,7 +808,7 @@ void rte_pktmbuf_pool_init(struct rte_mempool *mp, void *opaque_arg);
struct rte_mempool *
rte_pktmbuf_pool_create(const char *name, unsigned n,
unsigned cache_size, uint16_t priv_size, uint16_t data_room_size,
- int socket_id);
+ int numa_id);
/**
* Create a mbuf pool with a given mempool ops name
@@ -828,9 +828,9 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
* and the data buffer. This value must be aligned to RTE_MBUF_PRIV_ALIGN.
* @param data_room_size
* Size of data buffer in each mbuf, including RTE_PKTMBUF_HEADROOM.
- * @param socket_id
+ * @param numa_id
* The socket identifier where the memory should be allocated. The
- * value can be *SOCKET_ID_ANY* if there is no NUMA constraint for the
+ * value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraint for the
* reserved zone.
* @param ops_name
* The mempool ops name to be used for this mempool instead of
@@ -847,7 +847,7 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
struct rte_mempool *
rte_pktmbuf_pool_create_by_ops(const char *name, unsigned int n,
unsigned int cache_size, uint16_t priv_size, uint16_t data_room_size,
- int socket_id, const char *ops_name);
+ int numa_id, const char *ops_name);
/** A structure that describes the pinned external buffer segment. */
struct rte_pktmbuf_extmem {
@@ -875,9 +875,9 @@ struct rte_pktmbuf_extmem {
* and the data buffer. This value must be aligned to RTE_MBUF_PRIV_ALIGN.
* @param data_room_size
* Size of data buffer in each mbuf, including RTE_PKTMBUF_HEADROOM.
- * @param socket_id
+ * @param numa_id
* The socket identifier where the memory should be allocated. The
- * value can be *SOCKET_ID_ANY* if there is no NUMA constraint for the
+ * value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraint for the
* reserved zone.
* @param ext_mem
* Pointer to the array of structures describing the external memory
@@ -898,7 +898,7 @@ struct rte_pktmbuf_extmem {
struct rte_mempool *
rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,
unsigned int cache_size, uint16_t priv_size,
- uint16_t data_room_size, int socket_id,
+ uint16_t data_room_size, int numa_id,
const struct rte_pktmbuf_extmem *ext_mem,
unsigned int ext_num);
diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c
index 5987c9dee8..798080d705 100644
--- a/lib/mbuf/rte_mbuf_dyn.c
+++ b/lib/mbuf/rte_mbuf_dyn.c
@@ -114,7 +114,7 @@ init_shared_mem(void)
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
mz = rte_memzone_reserve_aligned(RTE_MBUF_DYN_MZNAME,
sizeof(struct mbuf_dyn_shm),
- SOCKET_ID_ANY, 0,
+ RTE_NUMA_ID_ANY, 0,
RTE_CACHE_LINE_SIZE);
} else {
mz = rte_memzone_lookup(RTE_MBUF_DYN_MZNAME);
diff --git a/lib/mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c
index 219b364803..d639831ca0 100644
--- a/lib/mbuf/rte_mbuf_pool_ops.c
+++ b/lib/mbuf/rte_mbuf_pool_ops.c
@@ -26,7 +26,7 @@ rte_mbuf_set_platform_mempool_ops(const char *ops_name)
mz = rte_memzone_lookup("mbuf_platform_pool_ops");
if (mz == NULL) {
mz = rte_memzone_reserve("mbuf_platform_pool_ops",
- RTE_MEMPOOL_OPS_NAMESIZE, SOCKET_ID_ANY, 0);
+ RTE_MEMPOOL_OPS_NAMESIZE, RTE_NUMA_ID_ANY, 0);
if (mz == NULL)
return -rte_errno;
strcpy(mz->addr, ops_name);
@@ -68,7 +68,7 @@ rte_mbuf_set_user_mempool_ops(const char *ops_name)
mz = rte_memzone_lookup("mbuf_user_pool_ops");
if (mz == NULL) {
mz = rte_memzone_reserve("mbuf_user_pool_ops",
- RTE_MEMPOOL_OPS_NAMESIZE, SOCKET_ID_ANY, 0);
+ RTE_MEMPOOL_OPS_NAMESIZE, RTE_NUMA_ID_ANY, 0);
if (mz == NULL)
return -rte_errno;
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 029/227] timer: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (27 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 028/227] mbuf: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 030/227] table: " Chengwen Feng
` (198 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/timer/rte_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/timer/rte_timer.c b/lib/timer/rte_timer.c
index b349c2abbc..150fffdfec 100644
--- a/lib/timer/rte_timer.c
+++ b/lib/timer/rte_timer.c
@@ -151,7 +151,7 @@ rte_timer_subsystem_init(void)
mz = rte_memzone_lookup(mz_name);
if (mz == NULL) {
mz = rte_memzone_reserve_aligned(mz_name, mem_size,
- SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
+ RTE_NUMA_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
if (mz == NULL) {
rte_mcfg_timer_unlock();
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 030/227] table: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (28 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 029/227] timer: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 031/227] rcu: " Chengwen Feng
` (197 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/table/rte_swx_table_em.c | 2 +-
lib/table/rte_swx_table_learner.c | 2 +-
lib/table/rte_swx_table_selector.c | 2 +-
lib/table/rte_swx_table_wm.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/table/rte_swx_table_em.c b/lib/table/rte_swx_table_em.c
index c408ea6fc3..a0587c831a 100644
--- a/lib/table/rte_swx_table_em.c
+++ b/lib/table/rte_swx_table_em.c
@@ -31,7 +31,7 @@ do { \
static void *
env_malloc(size_t size, size_t alignment, int numa_node)
{
- return rte_zmalloc_socket(NULL, size, alignment, numa_node);
+ return rte_zmalloc_numa(NULL, size, alignment, numa_node);
}
static void
diff --git a/lib/table/rte_swx_table_learner.c b/lib/table/rte_swx_table_learner.c
index 3680bf26c1..120e38e012 100644
--- a/lib/table/rte_swx_table_learner.c
+++ b/lib/table/rte_swx_table_learner.c
@@ -26,7 +26,7 @@
static void *
env_calloc(size_t size, size_t alignment, int numa_node)
{
- return rte_zmalloc_socket(NULL, size, alignment, numa_node);
+ return rte_zmalloc_numa(NULL, size, alignment, numa_node);
}
static void
diff --git a/lib/table/rte_swx_table_selector.c b/lib/table/rte_swx_table_selector.c
index d42f67f157..23aa982dc3 100644
--- a/lib/table/rte_swx_table_selector.c
+++ b/lib/table/rte_swx_table_selector.c
@@ -18,7 +18,7 @@
static void *
env_calloc(size_t size, size_t alignment, int numa_node)
{
- return rte_zmalloc_socket(NULL, size, alignment, numa_node);
+ return rte_zmalloc_numa(NULL, size, alignment, numa_node);
}
static void
diff --git a/lib/table/rte_swx_table_wm.c b/lib/table/rte_swx_table_wm.c
index c57738dda3..4293e2fa6f 100644
--- a/lib/table/rte_swx_table_wm.c
+++ b/lib/table/rte_swx_table_wm.c
@@ -23,7 +23,7 @@
static void *
env_malloc(size_t size, size_t alignment, int numa_node)
{
- return rte_zmalloc_socket(NULL, size, alignment, numa_node);
+ return rte_zmalloc_numa(NULL, size, alignment, numa_node);
}
static void
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 031/227] rcu: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (29 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 030/227] table: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 032/227] pdump: " Chengwen Feng
` (196 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/rcu/rte_rcu_qsbr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
index ac6d464b7f..835c351641 100644
--- a/lib/rcu/rte_rcu_qsbr.c
+++ b/lib/rcu/rte_rcu_qsbr.c
@@ -298,7 +298,7 @@ rte_rcu_qsbr_dq_create(const struct rte_rcu_qsbr_dq_parameters *params)
/* Add token size to ring element size */
dq->r = rte_ring_create_elem(params->name,
__RTE_QSBR_TOKEN_SIZE + params->esize,
- qs_fifo_size, SOCKET_ID_ANY, flags);
+ qs_fifo_size, RTE_NUMA_ID_ANY, flags);
if (dq->r == NULL) {
RCU_LOG(ERR, "defer queue create failed");
rte_free(dq);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 032/227] pdump: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (30 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 031/227] rcu: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 033/227] pdcp: " Chengwen Feng
` (195 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/pdump/rte_pdump.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/pdump/rte_pdump.c b/lib/pdump/rte_pdump.c
index ac94efe7ff..10d195e39a 100644
--- a/lib/pdump/rte_pdump.c
+++ b/lib/pdump/rte_pdump.c
@@ -636,7 +636,7 @@ rte_pdump_init(void)
return -1;
mz = rte_memzone_reserve(MZ_RTE_PDUMP_STATS, sizeof(*pdump_stats),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mz == NULL) {
PDUMP_LOG_LINE(ERR, "cannot allocate pdump statistics");
rte_mp_action_unregister(PDUMP_MP);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 033/227] pdcp: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (31 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 032/227] pdump: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 034/227] latencystats: " Chengwen Feng
` (194 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/pdcp/rte_pdcp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/pdcp/rte_pdcp.c b/lib/pdcp/rte_pdcp.c
index d21df8ab43..21c77296d2 100644
--- a/lib/pdcp/rte_pdcp.c
+++ b/lib/pdcp/rte_pdcp.c
@@ -145,8 +145,8 @@ rte_pdcp_entity_establish(const struct rte_pdcp_entity_conf *conf)
return NULL;
}
- entity = rte_zmalloc_socket("pdcp_entity", entity_layout.total_size, RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ entity = rte_zmalloc_numa("pdcp_entity", entity_layout.total_size, RTE_CACHE_LINE_SIZE,
+ RTE_NUMA_ID_ANY);
if (entity == NULL) {
rte_errno = ENOMEM;
return NULL;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 034/227] latencystats: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (32 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 033/227] pdcp: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 035/227] gpudev: " Chengwen Feng
` (193 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/latencystats/rte_latencystats.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/latencystats/rte_latencystats.c b/lib/latencystats/rte_latencystats.c
index 64c57806d7..cd60456ac4 100644
--- a/lib/latencystats/rte_latencystats.c
+++ b/lib/latencystats/rte_latencystats.c
@@ -282,7 +282,7 @@ rte_latencystats_init(uint64_t app_samp_intvl,
/** Allocate stats in shared memory fo multi process support */
mz = rte_memzone_reserve(MZ_RTE_LATENCY_STATS, sizeof(*glob_stats),
- rte_socket_id(), flags);
+ rte_numa_id(), flags);
if (mz == NULL) {
LATENCY_STATS_LOG(ERR, "Cannot reserve memory: %s:%d",
__func__, __LINE__);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 035/227] gpudev: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (33 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 034/227] latencystats: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 036/227] dmadev: " Chengwen Feng
` (192 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/gpudev/gpudev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/gpudev/gpudev.c b/lib/gpudev/gpudev.c
index 4a2335834c..6d70a28387 100644
--- a/lib/gpudev/gpudev.c
+++ b/lib/gpudev/gpudev.c
@@ -169,7 +169,7 @@ gpu_shared_mem_init(void)
memzone = rte_memzone_reserve(GPU_MEMZONE,
sizeof(*gpu_shared_mem) +
sizeof(*gpu_shared_mem->gpus) * gpu_max,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
} else {
memzone = rte_memzone_lookup(GPU_MEMZONE);
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 036/227] dmadev: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (34 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 035/227] gpudev: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 037/227] dispatcher: " Chengwen Feng
` (191 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/dmadev/rte_dmadev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
index 2311f01906..f8f2974ef8 100644
--- a/lib/dmadev/rte_dmadev.c
+++ b/lib/dmadev/rte_dmadev.c
@@ -200,7 +200,7 @@ dma_shared_data_prepare(void)
sizeof(struct rte_dma_dev_data) * dma_devices_max;
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
- mz = rte_memzone_reserve(mz_name, size, rte_socket_id(), 0);
+ mz = rte_memzone_reserve(mz_name, size, rte_numa_id(), 0);
else
mz = rte_memzone_lookup(mz_name);
if (mz == NULL)
@@ -269,7 +269,7 @@ dma_allocate_primary(const char *name, int numa_node, size_t private_data_size)
return NULL;
}
- dev_private = rte_zmalloc_socket(name, private_data_size,
+ dev_private = rte_zmalloc_numa(name, private_data_size,
RTE_CACHE_LINE_SIZE, numa_node);
if (dev_private == NULL) {
RTE_DMA_LOG(ERR, "Cannot allocate private data");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 037/227] dispatcher: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (35 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 036/227] dmadev: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 038/227] vhost: " Chengwen Feng
` (190 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/dispatcher/rte_dispatcher.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/dispatcher/rte_dispatcher.c b/lib/dispatcher/rte_dispatcher.c
index a35967f7b7..3f33a03de1 100644
--- a/lib/dispatcher/rte_dispatcher.c
+++ b/lib/dispatcher/rte_dispatcher.c
@@ -54,7 +54,7 @@ struct __rte_cache_aligned rte_dispatcher_lcore {
struct rte_dispatcher {
uint8_t event_dev_id;
- int socket_id;
+ int numa_id;
uint32_t service_id;
struct rte_dispatcher_lcore lcores[RTE_MAX_LCORE];
uint16_t num_finalizers;
@@ -239,7 +239,7 @@ evd_service_register(struct rte_dispatcher *dispatcher)
.callback = evd_process,
.callback_userdata = dispatcher,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
- .socket_id = dispatcher->socket_id
+ .socket_id = dispatcher->numa_id
};
int rc;
@@ -271,15 +271,15 @@ RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_dispatcher_create, 23.11)
struct rte_dispatcher *
rte_dispatcher_create(uint8_t event_dev_id)
{
- int socket_id;
+ int numa_id;
struct rte_dispatcher *dispatcher;
int rc;
- socket_id = rte_event_dev_socket_id(event_dev_id);
+ numa_id = rte_event_dev_numa_id(event_dev_id);
dispatcher =
rte_malloc_socket("dispatcher", sizeof(struct rte_dispatcher),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (dispatcher == NULL) {
RTE_EDEV_LOG_ERR("Unable to allocate memory for dispatcher");
@@ -289,7 +289,7 @@ rte_dispatcher_create(uint8_t event_dev_id)
*dispatcher = (struct rte_dispatcher) {
.event_dev_id = event_dev_id,
- .socket_id = socket_id
+ .numa_id = numa_id
};
rc = evd_service_register(dispatcher);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 038/227] vhost: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (36 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 037/227] dispatcher: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 039/227] baseband/acc: " Chengwen Feng
` (189 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/vhost/iotlb.c | 2 +-
lib/vhost/rte_vhost_crypto.h | 4 ++--
lib/vhost/vhost.c | 4 ++--
lib/vhost/vhost_crypto.c | 16 ++++++++--------
lib/vhost/vhost_user.c | 22 +++++++++++-----------
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/lib/vhost/iotlb.c b/lib/vhost/iotlb.c
index 4c405388f2..32334c5df2 100644
--- a/lib/vhost/iotlb.c
+++ b/lib/vhost/iotlb.c
@@ -433,7 +433,7 @@ vhost_user_iotlb_init_one(struct virtio_net *dev, int asid)
TAILQ_INIT(&dev->iotlb[asid]->pending_list);
if (dev->flags & VIRTIO_DEV_SUPPORT_IOMMU) {
- dev->iotlb[asid]->pool = rte_calloc_socket("iotlb_pool", IOTLB_CACHE_SIZE,
+ dev->iotlb[asid]->pool = rte_calloc_numa("iotlb_pool", IOTLB_CACHE_SIZE,
sizeof(struct vhost_iotlb_entry), 0, socket);
if (!dev->iotlb[asid]->pool) {
VHOST_CONFIG_LOG(dev->ifname, ERR, "Failed to create IOTLB cache pool");
diff --git a/lib/vhost/rte_vhost_crypto.h b/lib/vhost/rte_vhost_crypto.h
index adfd5cfab0..0d96f0dae5 100644
--- a/lib/vhost/rte_vhost_crypto.h
+++ b/lib/vhost/rte_vhost_crypto.h
@@ -51,7 +51,7 @@ rte_vhost_crypto_driver_start(const char *path);
* multiple Vhost-crypto devices.
* @param sess_pool
* The pointer to the created cryptodev session pool.
- * @param socket_id
+ * @param numa_id
* NUMA Socket ID to allocate resources on. *
* @return
* 0 if the Vhost Crypto Instance is created successfully.
@@ -60,7 +60,7 @@ rte_vhost_crypto_driver_start(const char *path);
int
rte_vhost_crypto_create(int vid, uint8_t cryptodev_id,
struct rte_mempool *sess_pool,
- int socket_id);
+ int numa_id);
/**
* Free the Vhost-crypto instance
diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
index 454fc8174c..ecd5067203 100644
--- a/lib/vhost/vhost.c
+++ b/lib/vhost/vhost.c
@@ -635,7 +635,7 @@ static void
init_vring_queue(struct virtio_net *dev __rte_unused, struct vhost_virtqueue *vq,
uint32_t vring_idx)
{
- int numa_node = SOCKET_ID_ANY;
+ int numa_node = RTE_NUMA_ID_ANY;
memset(vq, 0, sizeof(struct vhost_virtqueue));
@@ -648,7 +648,7 @@ init_vring_queue(struct virtio_net *dev __rte_unused, struct vhost_virtqueue *vq
if (get_mempolicy(&numa_node, NULL, 0, vq, MPOL_F_NODE | MPOL_F_ADDR)) {
VHOST_CONFIG_LOG(dev->ifname, ERR, "failed to query numa node: %s",
rte_strerror(errno));
- numa_node = SOCKET_ID_ANY;
+ numa_node = RTE_NUMA_ID_ANY;
}
#endif
vq->numa_node = numa_node;
diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c
index 6c851c173a..69ad4e74cc 100644
--- a/lib/vhost/vhost_crypto.c
+++ b/lib/vhost/vhost_crypto.c
@@ -217,7 +217,7 @@ struct __rte_cache_aligned vhost_crypto {
uint64_t last_session_id;
/** socket id for the device */
- int socket_id;
+ int numa_id;
struct virtio_net *dev;
@@ -1806,7 +1806,7 @@ RTE_EXPORT_SYMBOL(rte_vhost_crypto_create)
int
rte_vhost_crypto_create(int vid, uint8_t cryptodev_id,
struct rte_mempool *sess_pool,
- int socket_id)
+ int numa_id)
{
struct virtio_net *dev = get_device(vid);
struct rte_hash_parameters params = {0};
@@ -1819,8 +1819,8 @@ rte_vhost_crypto_create(int vid, uint8_t cryptodev_id,
return -EINVAL;
}
- vcrypto = rte_zmalloc_socket(NULL, sizeof(*vcrypto),
- RTE_CACHE_LINE_SIZE, socket_id);
+ vcrypto = rte_zmalloc_numa(NULL, sizeof(*vcrypto),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!vcrypto) {
VC_LOG_ERR("Insufficient memory");
return -ENOMEM;
@@ -1837,7 +1837,7 @@ rte_vhost_crypto_create(int vid, uint8_t cryptodev_id,
params.entries = VHOST_CRYPTO_SESSION_MAP_ENTRIES;
params.hash_func = rte_jhash;
params.key_len = sizeof(uint64_t);
- params.numa_id = socket_id;
+ params.numa_id = numa_id;
vcrypto->session_map = rte_hash_create(¶ms);
if (!vcrypto->session_map) {
VC_LOG_ERR("Failed to creath session map");
@@ -1850,7 +1850,7 @@ rte_vhost_crypto_create(int vid, uint8_t cryptodev_id,
VHOST_CRYPTO_MBUF_POOL_SIZE, 512,
sizeof(struct vhost_crypto_data_req),
VHOST_CRYPTO_MAX_DATA_SIZE + RTE_PKTMBUF_HEADROOM,
- rte_socket_id());
+ rte_numa_id());
if (!vcrypto->mbuf_pool) {
VC_LOG_ERR("Failed to creath mbuf pool");
ret = -ENOMEM;
@@ -1862,7 +1862,7 @@ rte_vhost_crypto_create(int vid, uint8_t cryptodev_id,
VHOST_CRYPTO_MBUF_POOL_SIZE,
sizeof(struct vhost_crypto_writeback_data),
128, 0, NULL, NULL, init_wb_data, NULL,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (!vcrypto->wb_pool) {
VC_LOG_ERR("Failed to creath mempool");
ret = -ENOMEM;
@@ -1955,7 +1955,7 @@ rte_vhost_crypto_set_zero_copy(int vid, enum rte_vhost_crypto_zero_copy option)
VHOST_CRYPTO_MBUF_POOL_SIZE,
sizeof(struct vhost_crypto_writeback_data),
128, 0, NULL, NULL, init_wb_data, NULL,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (!vcrypto->wb_pool) {
VC_LOG_ERR("Failed to creath mbuf pool");
return -ENOMEM;
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index f77af4f4f7..e6ec0207d5 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -1382,7 +1382,7 @@ static int
vhost_user_initialize_memory(struct virtio_net **pdev)
{
struct virtio_net *dev = *pdev;
- int numa_node = SOCKET_ID_ANY;
+ int numa_node = RTE_NUMA_ID_ANY;
if (dev->mem != NULL) {
VHOST_CONFIG_LOG(dev->ifname, ERR,
@@ -1400,7 +1400,7 @@ vhost_user_initialize_memory(struct virtio_net **pdev)
dev->nr_guest_pages = 0;
if (dev->guest_pages == NULL) {
dev->max_guest_pages = 8;
- dev->guest_pages = rte_zmalloc_socket(NULL,
+ dev->guest_pages = rte_zmalloc_numa(NULL,
dev->max_guest_pages *
sizeof(struct guest_page),
RTE_CACHE_LINE_SIZE,
@@ -1412,7 +1412,7 @@ vhost_user_initialize_memory(struct virtio_net **pdev)
}
}
- dev->mem = rte_zmalloc_socket("vhost-mem-table", sizeof(struct rte_vhost_memory) +
+ dev->mem = rte_zmalloc_numa("vhost-mem-table", sizeof(struct rte_vhost_memory) +
sizeof(struct rte_vhost_mem_region) * VHOST_MEMORY_MAX_NREGIONS, 0, numa_node);
if (dev->mem == NULL) {
VHOST_CONFIG_LOG(dev->ifname, ERR, "failed to allocate memory for dev->mem");
@@ -1919,7 +1919,7 @@ vhost_user_get_inflight_fd(struct virtio_net **pdev,
uint16_t num_queues, queue_size;
struct virtio_net *dev = *pdev;
int fd, i, j;
- int numa_node = SOCKET_ID_ANY;
+ int numa_node = RTE_NUMA_ID_ANY;
void *addr;
if (ctx->msg.size != sizeof(ctx->msg.payload.inflight)) {
@@ -1937,7 +1937,7 @@ vhost_user_get_inflight_fd(struct virtio_net **pdev,
numa_node = dev->virtqueue[0]->numa_node;
if (dev->inflight_info == NULL) {
- dev->inflight_info = rte_zmalloc_socket("inflight_info",
+ dev->inflight_info = rte_zmalloc_numa("inflight_info",
sizeof(struct inflight_mem_info), 0, numa_node);
if (!dev->inflight_info) {
VHOST_CONFIG_LOG(dev->ifname, ERR, "failed to alloc dev inflight area");
@@ -2022,7 +2022,7 @@ vhost_user_set_inflight_fd(struct virtio_net **pdev,
struct vhost_virtqueue *vq;
void *addr;
int fd, i;
- int numa_node = SOCKET_ID_ANY;
+ int numa_node = RTE_NUMA_ID_ANY;
if (validate_msg_fds(dev, ctx, 1) != 0)
return RTE_VHOST_MSG_RESULT_ERR;
@@ -2070,7 +2070,7 @@ vhost_user_set_inflight_fd(struct virtio_net **pdev,
numa_node = dev->virtqueue[0]->numa_node;
if (!dev->inflight_info) {
- dev->inflight_info = rte_zmalloc_socket("inflight_info",
+ dev->inflight_info = rte_zmalloc_numa("inflight_info",
sizeof(struct inflight_mem_info), 0, numa_node);
if (dev->inflight_info == NULL) {
VHOST_CONFIG_LOG(dev->ifname, ERR, "failed to alloc dev inflight area");
@@ -2235,7 +2235,7 @@ vhost_check_queue_inflights_split(struct virtio_net *dev,
vhost_virtqueue_reconnect_log_split(vq);
if (resubmit_num) {
- resubmit = rte_zmalloc_socket("resubmit", sizeof(struct rte_vhost_resubmit_info),
+ resubmit = rte_zmalloc_numa("resubmit", sizeof(struct rte_vhost_resubmit_info),
0, vq->numa_node);
if (!resubmit) {
VHOST_CONFIG_LOG(dev->ifname, ERR,
@@ -2243,7 +2243,7 @@ vhost_check_queue_inflights_split(struct virtio_net *dev,
return RTE_VHOST_MSG_RESULT_ERR;
}
- resubmit->resubmit_list = rte_zmalloc_socket("resubmit_list",
+ resubmit->resubmit_list = rte_zmalloc_numa("resubmit_list",
resubmit_num * sizeof(struct rte_vhost_resubmit_desc),
0, vq->numa_node);
if (!resubmit->resubmit_list) {
@@ -2331,7 +2331,7 @@ vhost_check_queue_inflights_packed(struct virtio_net *dev,
}
if (resubmit_num) {
- resubmit = rte_zmalloc_socket("resubmit", sizeof(struct rte_vhost_resubmit_info),
+ resubmit = rte_zmalloc_numa("resubmit", sizeof(struct rte_vhost_resubmit_info),
0, vq->numa_node);
if (resubmit == NULL) {
VHOST_CONFIG_LOG(dev->ifname, ERR,
@@ -2339,7 +2339,7 @@ vhost_check_queue_inflights_packed(struct virtio_net *dev,
return RTE_VHOST_MSG_RESULT_ERR;
}
- resubmit->resubmit_list = rte_zmalloc_socket("resubmit_list",
+ resubmit->resubmit_list = rte_zmalloc_numa("resubmit_list",
resubmit_num * sizeof(struct rte_vhost_resubmit_desc),
0, vq->numa_node);
if (resubmit->resubmit_list == NULL) {
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 039/227] baseband/acc: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (37 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 038/227] vhost: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 040/227] baseband/fpga_5gnr_fec: " Chengwen Feng
` (188 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/baseband/acc/acc_common.h | 4 +--
drivers/baseband/acc/rte_acc100_pmd.c | 36 ++++++++++++-------------
drivers/baseband/acc/rte_vrb_pmd.c | 38 +++++++++++++--------------
3 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/drivers/baseband/acc/acc_common.h b/drivers/baseband/acc/acc_common.h
index 3d411cd25f..100730fe5d 100644
--- a/drivers/baseband/acc/acc_common.h
+++ b/drivers/baseband/acc/acc_common.h
@@ -787,7 +787,7 @@ alloc_2x64mb_sw_rings_mem(struct rte_bbdev *dev, struct acc_device *d,
int socket)
{
uint32_t sw_ring_size = ACC_SIZE_64MBYTE;
- d->sw_rings_base = rte_zmalloc_socket(dev->device->driver->name,
+ d->sw_rings_base = rte_zmalloc_numa(dev->device->driver->name,
2 * sw_ring_size, RTE_CACHE_LINE_SIZE, socket);
if (d->sw_rings_base == NULL) {
rte_acc_log(ERR, "Failed to allocate memory for %s:%u",
@@ -830,7 +830,7 @@ alloc_sw_rings_min_mem(struct rte_bbdev *dev, struct acc_device *d,
* the variable 'alignment' at the condition that the requested
* size is less than the page size
*/
- sw_rings_base = rte_zmalloc_socket(
+ sw_rings_base = rte_zmalloc_numa(
dev->device->driver->name,
dev_sw_ring_size, alignment, socket);
diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c
index 67b969fc71..f63beb9d2d 100644
--- a/drivers/baseband/acc/rte_acc100_pmd.c
+++ b/drivers/baseband/acc/rte_acc100_pmd.c
@@ -410,7 +410,7 @@ allocate_info_ring(struct rte_bbdev *dev)
else
reg_addr = &vf_reg_addr;
/* Allocate InfoRing */
- d->info_ring = rte_zmalloc_socket("Info Ring",
+ d->info_ring = rte_zmalloc_numa("Info Ring",
ACC_INFO_RING_NUM_ENTRIES *
sizeof(*d->info_ring), RTE_CACHE_LINE_SIZE,
dev->data->numa_id);
@@ -437,7 +437,7 @@ allocate_info_ring(struct rte_bbdev *dev)
/* Allocate 64MB memory used for all software rings */
static int
-acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
+acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int numa_id)
{
uint32_t phys_low, phys_high, value;
struct acc_device *d = dev->data->dev_private;
@@ -451,13 +451,13 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
return -ENODEV;
}
- alloc_sw_rings_min_mem(dev, d, num_queues, socket_id);
+ alloc_sw_rings_min_mem(dev, d, num_queues, numa_id);
/* If minimal memory space approach failed, then allocate
* the 2 * 64MB block for the sw rings
*/
if (d->sw_rings == NULL)
- alloc_2x64mb_sw_rings_mem(dev, d, socket_id);
+ alloc_2x64mb_sw_rings_mem(dev, d, numa_id);
if (d->sw_rings == NULL) {
rte_bbdev_log(NOTICE,
@@ -508,10 +508,10 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
/* Configure tail pointer for use when SDONE enabled */
if (d->tail_ptrs == NULL)
- d->tail_ptrs = rte_zmalloc_socket(
+ d->tail_ptrs = rte_zmalloc_numa(
dev->device->driver->name,
ACC100_NUM_QGRPS * ACC100_NUM_AQS * sizeof(uint32_t),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (d->tail_ptrs == NULL) {
rte_bbdev_log(ERR, "Failed to allocate tail ptr for %s:%u",
dev->device->driver->name,
@@ -541,7 +541,7 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
}
if (d->harq_layout == NULL)
- d->harq_layout = rte_zmalloc_socket("HARQ Layout",
+ d->harq_layout = rte_zmalloc_numa("HARQ Layout",
ACC_HARQ_LAYOUT * sizeof(*d->harq_layout),
RTE_CACHE_LINE_SIZE, dev->data->numa_id);
if (d->harq_layout == NULL) {
@@ -693,8 +693,8 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,
return -ENODEV;
}
/* Allocate the queue data structure. */
- q = rte_zmalloc_socket(dev->device->driver->name, sizeof(*q),
- RTE_CACHE_LINE_SIZE, conf->socket);
+ q = rte_zmalloc_numa(dev->device->driver->name, sizeof(*q),
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q == NULL) {
rte_bbdev_log(ERR, "Failed to allocate queue memory");
return -ENOMEM;
@@ -740,35 +740,35 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,
desc->req.fcw_ld.gain_h = 1;
}
- q->lb_in = rte_zmalloc_socket(dev->device->driver->name,
+ q->lb_in = rte_zmalloc_numa(dev->device->driver->name,
RTE_CACHE_LINE_SIZE,
- RTE_CACHE_LINE_SIZE, conf->socket);
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q->lb_in == NULL) {
rte_bbdev_log(ERR, "Failed to allocate lb_in memory");
ret = -ENOMEM;
goto free_q;
}
q->lb_in_addr_iova = rte_malloc_virt2iova(q->lb_in);
- q->lb_out = rte_zmalloc_socket(dev->device->driver->name,
+ q->lb_out = rte_zmalloc_numa(dev->device->driver->name,
RTE_CACHE_LINE_SIZE,
- RTE_CACHE_LINE_SIZE, conf->socket);
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q->lb_out == NULL) {
rte_bbdev_log(ERR, "Failed to allocate lb_out memory");
ret = -ENOMEM;
goto free_lb_in;
}
q->lb_out_addr_iova = rte_malloc_virt2iova(q->lb_out);
- q->companion_ring_addr = rte_zmalloc_socket(dev->device->driver->name,
+ q->companion_ring_addr = rte_zmalloc_numa(dev->device->driver->name,
d->sw_ring_max_depth * sizeof(*q->companion_ring_addr),
- RTE_CACHE_LINE_SIZE, conf->socket);
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q->companion_ring_addr == NULL) {
rte_bbdev_log(ERR, "Failed to allocate companion_ring memory");
ret = -ENOMEM;
goto free_lb_out;
}
- q->derm_buffer = rte_zmalloc_socket(dev->device->driver->name,
+ q->derm_buffer = rte_zmalloc_numa(dev->device->driver->name,
RTE_BBDEV_TURBO_MAX_CB_SIZE * 10,
- RTE_CACHE_LINE_SIZE, conf->socket);
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q->derm_buffer == NULL) {
rte_bbdev_log(ERR, "Failed to allocate derm_buffer memory");
ret = -ENOMEM;
@@ -4043,7 +4043,7 @@ static int acc100_pci_probe(struct rte_pci_driver *pci_drv,
return -ENODEV;
/* allocate device private memory */
- bbdev->data->dev_private = rte_zmalloc_socket(dev_name,
+ bbdev->data->dev_private = rte_zmalloc_numa(dev_name,
sizeof(struct acc_device), RTE_CACHE_LINE_SIZE,
pci_dev->device.numa_node);
diff --git a/drivers/baseband/acc/rte_vrb_pmd.c b/drivers/baseband/acc/rte_vrb_pmd.c
index 8d86694b80..d46ec72aea 100644
--- a/drivers/baseband/acc/rte_vrb_pmd.c
+++ b/drivers/baseband/acc/rte_vrb_pmd.c
@@ -512,7 +512,7 @@ allocate_info_ring(struct rte_bbdev *dev)
return 0; /* Already configured. */
/* Allocate InfoRing */
- d->info_ring = rte_zmalloc_socket("Info Ring", ACC_INFO_RING_NUM_ENTRIES *
+ d->info_ring = rte_zmalloc_numa("Info Ring", ACC_INFO_RING_NUM_ENTRIES *
sizeof(*d->info_ring), RTE_CACHE_LINE_SIZE, dev->data->numa_id);
if (d->info_ring == NULL) {
rte_bbdev_log(ERR,
@@ -540,7 +540,7 @@ allocate_info_ring(struct rte_bbdev *dev)
/* Allocate 64MB memory used for all software rings. */
static int
-vrb_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
+vrb_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int numa_id)
{
uint32_t phys_low, phys_high, value;
struct acc_device *d = dev->data->dev_private;
@@ -567,13 +567,13 @@ vrb_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
}
if (d->device_variant == VRB1_VARIANT) {
- alloc_sw_rings_min_mem(dev, d, num_queues, socket_id);
+ alloc_sw_rings_min_mem(dev, d, num_queues, numa_id);
/* If minimal memory space approach failed, then allocate
* the 2 * 64MB block for the sw rings.
*/
if (d->sw_rings == NULL)
- alloc_2x64mb_sw_rings_mem(dev, d, socket_id);
+ alloc_2x64mb_sw_rings_mem(dev, d, numa_id);
if (d->sw_rings == NULL) {
rte_bbdev_log(NOTICE, "Failure allocating sw_rings memory");
@@ -582,7 +582,7 @@ vrb_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
} else if (d->device_variant == VRB2_VARIANT) {
queues_per_op = RTE_MIN(VRB2_MAX_Q_PER_OP, num_queues);
for (i = 0; i <= RTE_BBDEV_OP_MLDTS; i++) {
- alloc_sw_rings_min_mem(dev, d, queues_per_op, socket_id);
+ alloc_sw_rings_min_mem(dev, d, queues_per_op, numa_id);
if (d->sw_rings == NULL) {
rte_bbdev_log(NOTICE, "Failure allocating sw_rings memory %d", i);
return -ENOMEM;
@@ -679,9 +679,9 @@ vrb_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
/* Configure tail pointer for use when SDONE enabled. */
if (d->tail_ptrs == NULL)
- d->tail_ptrs = rte_zmalloc_socket(dev->device->driver->name,
+ d->tail_ptrs = rte_zmalloc_numa(dev->device->driver->name,
max_queues * sizeof(uint32_t),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (d->tail_ptrs == NULL) {
rte_bbdev_log(ERR, "Failed to allocate tail ptr for %s:%u",
dev->device->driver->name,
@@ -719,7 +719,7 @@ vrb_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
}
if (d->harq_layout == NULL)
- d->harq_layout = rte_zmalloc_socket("HARQ Layout",
+ d->harq_layout = rte_zmalloc_numa("HARQ Layout",
ACC_HARQ_LAYOUT * sizeof(*d->harq_layout),
RTE_CACHE_LINE_SIZE, dev->data->numa_id);
if (d->harq_layout == NULL) {
@@ -970,8 +970,8 @@ vrb_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,
return -ENODEV;
}
/* Allocate the queue data structure. */
- q = rte_zmalloc_socket(dev->device->driver->name, sizeof(*q),
- RTE_CACHE_LINE_SIZE, conf->socket);
+ q = rte_zmalloc_numa(dev->device->driver->name, sizeof(*q),
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q == NULL) {
rte_bbdev_log(ERR, "Failed to allocate queue memory");
return -ENOMEM;
@@ -1046,27 +1046,27 @@ vrb_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,
desc->req.fcw_ld.gain_h = 1;
}
- q->lb_in = rte_zmalloc_socket(dev->device->driver->name,
+ q->lb_in = rte_zmalloc_numa(dev->device->driver->name,
RTE_CACHE_LINE_SIZE,
- RTE_CACHE_LINE_SIZE, conf->socket);
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q->lb_in == NULL) {
rte_bbdev_log(ERR, "Failed to allocate lb_in memory");
ret = -ENOMEM;
goto free_q;
}
q->lb_in_addr_iova = rte_malloc_virt2iova(q->lb_in);
- q->lb_out = rte_zmalloc_socket(dev->device->driver->name,
+ q->lb_out = rte_zmalloc_numa(dev->device->driver->name,
RTE_CACHE_LINE_SIZE,
- RTE_CACHE_LINE_SIZE, conf->socket);
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q->lb_out == NULL) {
rte_bbdev_log(ERR, "Failed to allocate lb_out memory");
ret = -ENOMEM;
goto free_lb_in;
}
q->lb_out_addr_iova = rte_malloc_virt2iova(q->lb_out);
- q->companion_ring_addr = rte_zmalloc_socket(dev->device->driver->name,
+ q->companion_ring_addr = rte_zmalloc_numa(dev->device->driver->name,
d->sw_ring_max_depth * sizeof(*q->companion_ring_addr),
- RTE_CACHE_LINE_SIZE, conf->socket);
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q->companion_ring_addr == NULL) {
rte_bbdev_log(ERR, "Failed to allocate companion_ring memory");
ret = -ENOMEM;
@@ -1095,9 +1095,9 @@ vrb_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,
goto free_companion_ring_addr;
}
- q->fcw_ring = rte_zmalloc_socket(dev->device->driver->name,
+ q->fcw_ring = rte_zmalloc_numa(dev->device->driver->name,
ACC_MAX_FCW_SIZE * d->sw_ring_max_depth,
- RTE_CACHE_LINE_SIZE, conf->socket);
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q->fcw_ring == NULL) {
rte_bbdev_log(ERR, "Failed to allocate fcw_ring memory");
ret = -ENOMEM;
@@ -4421,7 +4421,7 @@ static int vrb_pci_probe(struct rte_pci_driver *pci_drv,
return -ENODEV;
/* allocate device private memory. */
- bbdev->data->dev_private = rte_zmalloc_socket(dev_name,
+ bbdev->data->dev_private = rte_zmalloc_numa(dev_name,
sizeof(struct acc_device), RTE_CACHE_LINE_SIZE,
pci_dev->device.numa_node);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 040/227] baseband/fpga_5gnr_fec: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (38 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 039/227] baseband/acc: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:49 ` [PATCH 041/227] baseband/fpga_lte_fec: " Chengwen Feng
` (187 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
.../fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
index e14581cd48..cabf0a0ce9 100644
--- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
+++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
@@ -377,7 +377,7 @@ fpga_5gnr_get_queue_map(struct fpga_5gnr_fec_device *d, uint32_t q_id)
}
static int
-fpga_5gnr_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
+fpga_5gnr_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int numa_id)
{
/* Number of queues bound to a PF/VF */
uint32_t hw_q_num = 0;
@@ -438,9 +438,9 @@ fpga_5gnr_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id
RTE_BUILD_BUG_ON((RTE_CACHE_LINE_SIZE % 32) != 0);
/* Allocate memory for SW descriptor rings */
- d->sw_rings = rte_zmalloc_socket(dev->device->driver->name,
+ d->sw_rings = rte_zmalloc_numa(dev->device->driver->name,
num_queues * ring_size, RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (d->sw_rings == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate memory for %s:%u sw_rings",
@@ -453,8 +453,8 @@ fpga_5gnr_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id
d->sw_ring_max_depth = FPGA_5GNR_RING_MAX_SIZE;
/* Allocate memory for ring flush status */
- d->flush_queue_status = rte_zmalloc_socket(NULL,
- sizeof(uint64_t), RTE_CACHE_LINE_SIZE, socket_id);
+ d->flush_queue_status = rte_zmalloc_numa(NULL,
+ sizeof(uint64_t), RTE_CACHE_LINE_SIZE, numa_id);
if (d->flush_queue_status == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate memory for %s:%u flush_queue_status",
@@ -678,8 +678,8 @@ fpga_5gnr_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,
return -1;
/* Allocate the queue data structure. */
- q = rte_zmalloc_socket(dev->device->driver->name, sizeof(*q),
- RTE_CACHE_LINE_SIZE, conf->socket);
+ q = rte_zmalloc_numa(dev->device->driver->name, sizeof(*q),
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q == NULL) {
/* Mark queue as un-assigned */
d->q_assigned_bit_map &= (0xFFFFFFFF - (1ULL << q_idx));
@@ -699,8 +699,8 @@ fpga_5gnr_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,
q->ring_ctrl_reg.ring_base_addr = d->sw_rings_phys + (d->sw_ring_size * queue_id);
/* Allocate memory for Completion Head variable*/
- q->ring_head_addr = rte_zmalloc_socket(dev->device->driver->name,
- sizeof(uint64_t), RTE_CACHE_LINE_SIZE, conf->socket);
+ q->ring_head_addr = rte_zmalloc_numa(dev->device->driver->name,
+ sizeof(uint64_t), RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q->ring_head_addr == NULL) {
/* Mark queue as un-assigned */
d->q_assigned_bit_map &= (0xFFFFFFFF - (1ULL << q_idx));
@@ -2933,7 +2933,7 @@ fpga_5gnr_fec_probe(struct rte_pci_driver *pci_drv,
return -ENODEV;
/* allocate device private memory */
- bbdev->data->dev_private = rte_zmalloc_socket(dev_name,
+ bbdev->data->dev_private = rte_zmalloc_numa(dev_name,
sizeof(struct fpga_5gnr_fec_device),
RTE_CACHE_LINE_SIZE,
pci_dev->device.numa_node);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 041/227] baseband/fpga_lte_fec: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (39 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 040/227] baseband/fpga_5gnr_fec: " Chengwen Feng
@ 2026-11-03 14:49 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 042/227] baseband/null: " Chengwen Feng
` (186 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:49 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
index dc1394930f..27697c9b59 100644
--- a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
+++ b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
@@ -475,7 +475,7 @@ print_dma_dec_desc_debug_info(union fpga_dma_desc *desc)
#endif
static int
-fpga_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
+fpga_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int numa_id)
{
/* Number of queues bound to a PF/VF */
uint32_t hw_q_num = 0;
@@ -536,9 +536,9 @@ fpga_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
RTE_BUILD_BUG_ON((RTE_CACHE_LINE_SIZE % 32) != 0);
/* Allocate memory for SW descriptor rings */
- fpga_dev->sw_rings = rte_zmalloc_socket(dev->device->driver->name,
+ fpga_dev->sw_rings = rte_zmalloc_numa(dev->device->driver->name,
num_queues * ring_size, RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (fpga_dev->sw_rings == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate memory for %s:%u sw_rings",
@@ -551,8 +551,8 @@ fpga_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)
fpga_dev->sw_ring_max_depth = FPGA_RING_MAX_SIZE;
/* Allocate memory for ring flush status */
- fpga_dev->flush_queue_status = rte_zmalloc_socket(NULL,
- sizeof(uint64_t), RTE_CACHE_LINE_SIZE, socket_id);
+ fpga_dev->flush_queue_status = rte_zmalloc_numa(NULL,
+ sizeof(uint64_t), RTE_CACHE_LINE_SIZE, numa_id);
if (fpga_dev->flush_queue_status == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate memory for %s:%u flush_queue_status",
@@ -714,8 +714,8 @@ fpga_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,
return -1;
/* Allocate the queue data structure. */
- q = rte_zmalloc_socket(dev->device->driver->name, sizeof(*q),
- RTE_CACHE_LINE_SIZE, conf->socket);
+ q = rte_zmalloc_numa(dev->device->driver->name, sizeof(*q),
+ RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q == NULL) {
/* Mark queue as un-assigned */
d->q_assigned_bit_map &= (0xFFFFFFFF - (1ULL << q_idx));
@@ -732,8 +732,8 @@ fpga_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,
(d->sw_ring_size * queue_id);
/* Allocate memory for Completion Head variable*/
- q->ring_head_addr = rte_zmalloc_socket(dev->device->driver->name,
- sizeof(uint64_t), RTE_CACHE_LINE_SIZE, conf->socket);
+ q->ring_head_addr = rte_zmalloc_numa(dev->device->driver->name,
+ sizeof(uint64_t), RTE_CACHE_LINE_SIZE, conf->numa_id);
if (q->ring_head_addr == NULL) {
/* Mark queue as un-assigned */
d->q_assigned_bit_map &= (0xFFFFFFFF - (1ULL << q_idx));
@@ -2357,7 +2357,7 @@ fpga_lte_fec_probe(struct rte_pci_driver *pci_drv,
return -ENODEV;
/* allocate device private memory */
- bbdev->data->dev_private = rte_zmalloc_socket(dev_name,
+ bbdev->data->dev_private = rte_zmalloc_numa(dev_name,
sizeof(struct fpga_lte_fec_device), RTE_CACHE_LINE_SIZE,
pci_dev->device.numa_node);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 042/227] baseband/null: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (40 preceding siblings ...)
2026-11-03 14:49 ` [PATCH 041/227] baseband/fpga_lte_fec: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 043/227] baseband/turbo_sw: " Chengwen Feng
` (185 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/baseband/null/bbdev_null.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/baseband/null/bbdev_null.c b/drivers/baseband/null/bbdev_null.c
index 10d02da856..9f0e2adf1b 100644
--- a/drivers/baseband/null/bbdev_null.c
+++ b/drivers/baseband/null/bbdev_null.c
@@ -29,13 +29,13 @@ RTE_LOG_REGISTER_DEFAULT(bbdev_null_logtype, NOTICE);
/* Initialisation params structure that can be used by null BBDEV driver */
struct bbdev_null_params {
- int socket_id;
+ int numa_id;
uint16_t queues_num;
};
/* Acceptable params for null BBDEV devices */
#define BBDEV_NULL_MAX_NB_QUEUES_ARG "max_nb_queues"
-#define BBDEV_NULL_SOCKET_ID_ARG "socket_id"
+#define BBDEV_NULL_SOCKET_ID_ARG "numa_id"
static const char * const bbdev_null_valid_params[] = {
BBDEV_NULL_MAX_NB_QUEUES_ARG,
@@ -117,15 +117,15 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
dev->data->dev_id, q_id);
/* Allocate the queue data structure. */
- q = rte_zmalloc_socket(RTE_STR(DRIVER_NAME), sizeof(*q),
- RTE_CACHE_LINE_SIZE, queue_conf->socket);
+ q = rte_zmalloc_numa(RTE_STR(DRIVER_NAME), sizeof(*q),
+ RTE_CACHE_LINE_SIZE, queue_conf->numa_id);
if (q == NULL) {
rte_bbdev_log(ERR, "Failed to allocate queue memory");
return -ENOMEM;
}
q->processed_pkts = rte_ring_create(ring_name, queue_conf->queue_size,
- queue_conf->socket, RING_F_SP_ENQ | RING_F_SC_DEQ);
+ queue_conf->numa_id, RING_F_SP_ENQ | RING_F_SC_DEQ);
if (q->processed_pkts == NULL) {
rte_bbdev_log(ERR, "Failed to create ring");
goto free_q;
@@ -242,11 +242,11 @@ parse_bbdev_null_params(struct bbdev_null_params *params,
goto exit;
ret = rte_kvargs_process(kvlist, bbdev_null_valid_params[1],
- &parse_u16_arg, ¶ms->socket_id);
+ &parse_u16_arg, ¶ms->numa_id);
if (ret < 0)
goto exit;
- if (params->socket_id >= RTE_MAX_NUMA_NODES) {
+ if (params->numa_id >= RTE_MAX_NUMA_NODES) {
rte_bbdev_log(ERR, "Invalid socket, must be < %u",
RTE_MAX_NUMA_NODES);
goto exit;
@@ -270,9 +270,9 @@ null_bbdev_create(struct rte_vdev_device *vdev,
if (bbdev == NULL)
return -ENODEV;
- bbdev->data->dev_private = rte_zmalloc_socket(name,
+ bbdev->data->dev_private = rte_zmalloc_numa(name,
sizeof(struct bbdev_private), RTE_CACHE_LINE_SIZE,
- init_params->socket_id);
+ init_params->numa_id);
if (bbdev->data->dev_private == NULL) {
rte_bbdev_release(bbdev);
return -ENOMEM;
@@ -280,7 +280,7 @@ null_bbdev_create(struct rte_vdev_device *vdev,
bbdev->dev_ops = &pmd_ops;
bbdev->device = &vdev->device;
- bbdev->data->numa_id = init_params->socket_id;
+ bbdev->data->numa_id = init_params->numa_id;
bbdev->intr_handle = NULL;
/* register rx/tx burst functions for data path */
@@ -299,7 +299,7 @@ static int
null_bbdev_probe(struct rte_vdev_device *vdev)
{
struct bbdev_null_params init_params = {
- rte_socket_id(),
+ rte_numa_id(),
RTE_BBDEV_DEFAULT_MAX_NB_QUEUES
};
const char *name;
@@ -316,7 +316,7 @@ null_bbdev_probe(struct rte_vdev_device *vdev)
parse_bbdev_null_params(&init_params, input_args);
rte_bbdev_log_debug("Init %s on NUMA node %d with max queues: %d",
- name, init_params.socket_id, init_params.queues_num);
+ name, init_params.numa_id, init_params.queues_num);
return null_bbdev_create(vdev, &init_params);
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 043/227] baseband/turbo_sw: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (41 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 042/227] baseband/null: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 044/227] bus/auxiliary: " Chengwen Feng
` (184 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
.../baseband/turbo_sw/bbdev_turbo_software.c | 52 +++++++++----------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
index 12d168666c..315f12fb5f 100644
--- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c
+++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
@@ -58,13 +58,13 @@ struct bbdev_private {
/* Initialisation params structure that can be used by Turbo SW driver */
struct turbo_sw_params {
- int socket_id;
+ int numa_id;
uint16_t queues_num;
};
/* Acceptable params for Turbo SW devices */
#define TURBO_SW_MAX_NB_QUEUES_ARG "max_nb_queues"
-#define TURBO_SW_SOCKET_ID_ARG "socket_id"
+#define TURBO_SW_SOCKET_ID_ARG "numa_id"
static const char * const turbo_sw_valid_params[] = {
TURBO_SW_MAX_NB_QUEUES_ARG,
@@ -306,8 +306,8 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
char name[RTE_RING_NAMESIZE];
/* Allocate the queue data structure. */
- q = rte_zmalloc_socket(RTE_STR(DRIVER_NAME), sizeof(*q),
- RTE_CACHE_LINE_SIZE, queue_conf->socket);
+ q = rte_zmalloc_numa(RTE_STR(DRIVER_NAME), sizeof(*q),
+ RTE_CACHE_LINE_SIZE, queue_conf->numa_id);
if (q == NULL) {
rte_bbdev_log(ERR, "Failed to allocate queue memory");
return -ENOMEM;
@@ -323,10 +323,10 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
ret = -ENAMETOOLONG;
goto free_q;
}
- q->enc_out = rte_zmalloc_socket(name,
+ q->enc_out = rte_zmalloc_numa(name,
((RTE_BBDEV_TURBO_MAX_TB_SIZE >> 3) + 3) *
sizeof(*q->enc_out) * 3,
- RTE_CACHE_LINE_SIZE, queue_conf->socket);
+ RTE_CACHE_LINE_SIZE, queue_conf->numa_id);
if (q->enc_out == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
@@ -345,9 +345,9 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
ret = -ENAMETOOLONG;
goto free_q;
}
- q->enc_in = rte_zmalloc_socket(name,
+ q->enc_in = rte_zmalloc_numa(name,
(RTE_BBDEV_LDPC_MAX_CB_SIZE >> 3) * sizeof(*q->enc_in),
- RTE_CACHE_LINE_SIZE, queue_conf->socket);
+ RTE_CACHE_LINE_SIZE, queue_conf->numa_id);
if (q->enc_in == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
@@ -365,9 +365,9 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
ret = -ENAMETOOLONG;
goto free_q;
}
- q->ag = rte_zmalloc_socket(name,
+ q->ag = rte_zmalloc_numa(name,
RTE_BBDEV_TURBO_MAX_CB_SIZE * 10 * sizeof(*q->ag),
- RTE_CACHE_LINE_SIZE, queue_conf->socket);
+ RTE_CACHE_LINE_SIZE, queue_conf->numa_id);
if (q->ag == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
@@ -385,9 +385,9 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
ret = -ENAMETOOLONG;
goto free_q;
}
- q->code_block = rte_zmalloc_socket(name,
+ q->code_block = rte_zmalloc_numa(name,
RTE_BBDEV_TURBO_MAX_CB_SIZE * sizeof(*q->code_block),
- RTE_CACHE_LINE_SIZE, queue_conf->socket);
+ RTE_CACHE_LINE_SIZE, queue_conf->numa_id);
if (q->code_block == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
@@ -406,9 +406,9 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
ret = -ENAMETOOLONG;
goto free_q;
}
- q->deint_input = rte_zmalloc_socket(name,
+ q->deint_input = rte_zmalloc_numa(name,
DEINT_INPUT_BUF_SIZE * sizeof(*q->deint_input),
- RTE_CACHE_LINE_SIZE, queue_conf->socket);
+ RTE_CACHE_LINE_SIZE, queue_conf->numa_id);
if (q->deint_input == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
@@ -427,9 +427,9 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
ret = -ENAMETOOLONG;
goto free_q;
}
- q->deint_output = rte_zmalloc_socket(NULL,
+ q->deint_output = rte_zmalloc_numa(NULL,
DEINT_OUTPUT_BUF_SIZE * sizeof(*q->deint_output),
- RTE_CACHE_LINE_SIZE, queue_conf->socket);
+ RTE_CACHE_LINE_SIZE, queue_conf->numa_id);
if (q->deint_output == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
@@ -448,9 +448,9 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
ret = -ENAMETOOLONG;
goto free_q;
}
- q->adapter_output = rte_zmalloc_socket(NULL,
+ q->adapter_output = rte_zmalloc_numa(NULL,
ADAPTER_OUTPUT_BUF_SIZE * sizeof(*q->adapter_output),
- RTE_CACHE_LINE_SIZE, queue_conf->socket);
+ RTE_CACHE_LINE_SIZE, queue_conf->numa_id);
if (q->adapter_output == NULL) {
rte_bbdev_log(ERR,
"Failed to allocate queue memory for %s", name);
@@ -469,7 +469,7 @@ q_setup(struct rte_bbdev *dev, uint16_t q_id,
goto free_q;
}
q->processed_pkts = rte_ring_create(name, queue_conf->queue_size,
- queue_conf->socket, RING_F_SP_ENQ | RING_F_SC_DEQ);
+ queue_conf->numa_id, RING_F_SP_ENQ | RING_F_SC_DEQ);
if (q->processed_pkts == NULL) {
rte_bbdev_log(ERR, "Failed to create ring for %s", name);
ret = -rte_errno;
@@ -1874,11 +1874,11 @@ parse_turbo_sw_params(struct turbo_sw_params *params, const char *input_args)
goto exit;
ret = rte_kvargs_process(kvlist, turbo_sw_valid_params[1],
- &parse_u16_arg, ¶ms->socket_id);
+ &parse_u16_arg, ¶ms->numa_id);
if (ret < 0)
goto exit;
- if (params->socket_id >= RTE_MAX_NUMA_NODES) {
+ if (params->numa_id >= RTE_MAX_NUMA_NODES) {
rte_bbdev_log(ERR, "Invalid socket, must be < %u",
RTE_MAX_NUMA_NODES);
goto exit;
@@ -1902,9 +1902,9 @@ turbo_sw_bbdev_create(struct rte_vdev_device *vdev,
if (bbdev == NULL)
return -ENODEV;
- bbdev->data->dev_private = rte_zmalloc_socket(name,
+ bbdev->data->dev_private = rte_zmalloc_numa(name,
sizeof(struct bbdev_private), RTE_CACHE_LINE_SIZE,
- init_params->socket_id);
+ init_params->numa_id);
if (bbdev->data->dev_private == NULL) {
rte_bbdev_release(bbdev);
return -ENOMEM;
@@ -1912,7 +1912,7 @@ turbo_sw_bbdev_create(struct rte_vdev_device *vdev,
bbdev->dev_ops = &pmd_ops;
bbdev->device = &vdev->device;
- bbdev->data->numa_id = init_params->socket_id;
+ bbdev->data->numa_id = init_params->numa_id;
bbdev->intr_handle = NULL;
/* register rx/tx burst functions for data path */
@@ -1935,7 +1935,7 @@ static int
turbo_sw_bbdev_probe(struct rte_vdev_device *vdev)
{
struct turbo_sw_params init_params = {
- rte_socket_id(),
+ rte_numa_id(),
RTE_BBDEV_DEFAULT_MAX_NB_QUEUES
};
const char *name;
@@ -1952,7 +1952,7 @@ turbo_sw_bbdev_probe(struct rte_vdev_device *vdev)
rte_bbdev_log_debug(
"Initialising %s on NUMA node %d with max queues: %d",
- name, init_params.socket_id, init_params.queues_num);
+ name, init_params.numa_id, init_params.queues_num);
return turbo_sw_bbdev_create(vdev, &init_params);
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 044/227] bus/auxiliary: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (42 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 043/227] baseband/turbo_sw: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 045/227] bus/dpaa: " Chengwen Feng
` (183 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/bus/auxiliary/auxiliary_common.c | 2 +-
drivers/bus/auxiliary/linux/auxiliary.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/bus/auxiliary/auxiliary_common.c b/drivers/bus/auxiliary/auxiliary_common.c
index 016d124f0b..622e03345e 100644
--- a/drivers/bus/auxiliary/auxiliary_common.c
+++ b/drivers/bus/auxiliary/auxiliary_common.c
@@ -84,7 +84,7 @@ auxiliary_probe_device(struct rte_driver *drv, struct rte_device *dev)
if (!auxiliary_dev_exists(dev->name))
return -ENOENT;
- if (aux_dev->device.numa_node < 0 && rte_socket_count() > 1)
+ if (aux_dev->device.numa_node < 0 && rte_numa_count() > 1)
AUXILIARY_LOG(INFO, "Device %s is not NUMA-aware", aux_dev->name);
iova_mode = rte_eal_iova_mode();
diff --git a/drivers/bus/auxiliary/linux/auxiliary.c b/drivers/bus/auxiliary/linux/auxiliary.c
index 3a2dca2865..475db6caf8 100644
--- a/drivers/bus/auxiliary/linux/auxiliary.c
+++ b/drivers/bus/auxiliary/linux/auxiliary.c
@@ -43,7 +43,7 @@ auxiliary_scan_one(const char *dirname, const char *name)
eal_parse_sysfs_value(filename, &tmp) == 0)
dev->device.numa_node = tmp;
else
- dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.numa_node = RTE_NUMA_ID_ANY;
auxiliary_on_scan(dev);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 045/227] bus/dpaa: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (43 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 044/227] bus/auxiliary: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 046/227] bus/fslmc: " Chengwen Feng
` (182 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/bus/dpaa/dpaa_bus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index cbbeb927fe..c29086b783 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -216,7 +216,7 @@ dpaa_create_device_list(void)
goto cleanup;
}
- dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.numa_node = RTE_NUMA_ID_ANY;
cfg = &dpaa_netcfg->port_cfg[i];
fman_intf = cfg->fman_if;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 046/227] bus/fslmc: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (44 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 045/227] bus/dpaa: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 047/227] bus/ifpga: " Chengwen Feng
` (181 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/bus/fslmc/fslmc_bus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index e40fe59c7c..ac41993796 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -251,7 +251,7 @@ scan_one_fslmc_device(char *dev_name)
return -ENOMEM;
}
- dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.numa_node = RTE_NUMA_ID_ANY;
dev->dev_type = dev_type;
if (sscanf(dev_id, "%hu", &dev->object_id) != 1) {
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 047/227] bus/ifpga: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (45 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 046/227] bus/fslmc: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 048/227] bus/pci: " Chengwen Feng
` (180 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/bus/ifpga/ifpga_bus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index 79d1c3778f..f61d52f6aa 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -137,7 +137,7 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
goto end;
afu_dev->device.devargs = devargs;
- afu_dev->device.numa_node = SOCKET_ID_ANY;
+ afu_dev->device.numa_node = RTE_NUMA_ID_ANY;
afu_dev->device.name = devargs->name;
afu_dev->rawdev = rawdev;
afu_dev->id.uuid.uuid_low = 0;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 048/227] bus/pci: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (46 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 047/227] bus/ifpga: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 049/227] bus/platform: " Chengwen Feng
` (179 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/bus/pci/bsd/pci.c | 2 +-
drivers/bus/pci/linux/pci.c | 2 +-
drivers/bus/pci/pci_common.c | 2 +-
drivers/bus/pci/windows/pci.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/bus/pci/bsd/pci.c b/drivers/bus/pci/bsd/pci.c
index 2d29f8d2e2..57cc01cb70 100644
--- a/drivers/bus/pci/bsd/pci.c
+++ b/drivers/bus/pci/bsd/pci.c
@@ -257,7 +257,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
dev->max_vfs = 0;
/* FreeBSD has no NUMA support (yet) */
- dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.numa_node = RTE_NUMA_ID_ANY;
pci_common_set(dev);
diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index 28949e3720..063fbbce0a 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -291,7 +291,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
eal_parse_sysfs_value(filename, &tmp) == 0)
dev->device.numa_node = tmp;
else
- dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.numa_node = RTE_NUMA_ID_ANY;
pci_common_set(dev);
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 3770b4ad75..02edeb7e40 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -192,7 +192,7 @@ pci_probe_device(struct rte_driver *drv, struct rte_device *dev)
loc->domain, loc->bus, loc->devid, loc->function,
pci_dev->device.numa_node);
- if (pci_dev->device.numa_node < 0 && rte_socket_count() > 1)
+ if (pci_dev->device.numa_node < 0 && rte_numa_count() > 1)
PCI_LOG(INFO, "Device %s is not NUMA-aware", pci_dev->name);
already_probed = (pci_dev->intr_handle != NULL);
diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
index 383c6bdc2f..aa328eb75f 100644
--- a/drivers/bus/pci/windows/pci.c
+++ b/drivers/bus/pci/windows/pci.c
@@ -286,7 +286,7 @@ get_device_resource_info(HDEVINFO dev_info,
}
/* Get NUMA node using DEVPKEY_Device_Numa_Node */
- dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.numa_node = RTE_NUMA_ID_ANY;
res = SetupDiGetDevicePropertyW(dev_info, dev_info_data,
&DEVPKEY_Device_Numa_Node, &property_type,
(BYTE *)&numa_node, sizeof(numa_node), NULL, 0);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 049/227] bus/platform: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (47 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 048/227] bus/pci: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 050/227] bus/vdev: " Chengwen Feng
` (178 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/bus/platform/platform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bus/platform/platform.c b/drivers/bus/platform/platform.c
index b122d9545f..c968f5306d 100644
--- a/drivers/bus/platform/platform.c
+++ b/drivers/bus/platform/platform.c
@@ -61,7 +61,7 @@ dev_add(const char *dev_name)
pdev->device.name = pdev->name;
pdev->device.devargs = rte_bus_find_devargs(&platform_bus, dev_name);
snprintf(path, sizeof(path), PLATFORM_BUS_DEVICES_PATH "/%s/numa_node", dev_name);
- pdev->device.numa_node = eal_parse_sysfs_value(path, &val) ? rte_socket_id() : val;
+ pdev->device.numa_node = eal_parse_sysfs_value(path, &val) ? rte_numa_id() : val;
RTE_BUS_FOREACH_DEV(tmp, &platform_bus) {
if (!strcmp(tmp->name, pdev->name)) {
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 050/227] bus/vdev: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (48 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 049/227] bus/platform: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 051/227] bus/vmbus: " Chengwen Feng
` (177 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/bus/vdev/vdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index 02d719a44d..e3ff2e55d7 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -275,7 +275,7 @@ insert_vdev(const char *name, const char *args,
goto fail;
}
- dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.numa_node = RTE_NUMA_ID_ANY;
if (find_vdev(name)) {
/*
@@ -537,7 +537,7 @@ vdev_scan(void)
}
dev->device.devargs = devargs;
- dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.numa_node = RTE_NUMA_ID_ANY;
dev->device.name = devargs->name;
rte_bus_add_device(&rte_vdev_bus, &dev->device);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 051/227] bus/vmbus: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (49 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 050/227] bus/vdev: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 052/227] common/cnxk: " Chengwen Feng
` (176 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/bus/vmbus/linux/vmbus_bus.c | 2 +-
drivers/bus/vmbus/vmbus_channel.c | 2 +-
drivers/bus/vmbus/vmbus_common.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/bus/vmbus/linux/vmbus_bus.c b/drivers/bus/vmbus/linux/vmbus_bus.c
index 779ea50b92..86276eb564 100644
--- a/drivers/bus/vmbus/linux/vmbus_bus.c
+++ b/drivers/bus/vmbus/linux/vmbus_bus.c
@@ -330,7 +330,7 @@ vmbus_scan_one(const char *name)
dev->device.devargs = rte_bus_find_devargs(&rte_vmbus_bus, dev->name);
- dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.numa_node = RTE_NUMA_ID_ANY;
if (vmbus_use_numa(dev)) {
/* get numa node (if present) */
snprintf(filename, sizeof(filename), "%s/numa_node",
diff --git a/drivers/bus/vmbus/vmbus_channel.c b/drivers/bus/vmbus/vmbus_channel.c
index 90ba3d1ef6..d25db272b3 100644
--- a/drivers/bus/vmbus/vmbus_channel.c
+++ b/drivers/bus/vmbus/vmbus_channel.c
@@ -345,7 +345,7 @@ int vmbus_chan_create(const struct rte_vmbus_device *device,
struct vmbus_channel *chan;
int err;
- chan = rte_zmalloc_socket("VMBUS", sizeof(*chan), RTE_CACHE_LINE_SIZE,
+ chan = rte_zmalloc_numa("VMBUS", sizeof(*chan), RTE_CACHE_LINE_SIZE,
device->device.numa_node);
if (!chan)
return -ENOMEM;
diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c
index 4c64856abb..755e47fc91 100644
--- a/drivers/bus/vmbus/vmbus_common.c
+++ b/drivers/bus/vmbus/vmbus_common.c
@@ -104,7 +104,7 @@ vmbus_probe_device(struct rte_driver *drv, struct rte_device *dev)
if (ret != 0)
goto free_intr;
- if (vmbus_dev->device.numa_node < 0 && rte_socket_count() > 1)
+ if (vmbus_dev->device.numa_node < 0 && rte_numa_count() > 1)
VMBUS_LOG(INFO, "Device %s is not NUMA-aware", guid);
/* call the driver probe() function */
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 052/227] common/cnxk: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (50 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 051/227] bus/vmbus: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 053/227] common/nitrox: " Chengwen Feng
` (175 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/common/cnxk/roc_platform.c | 2 +-
drivers/common/cnxk/roc_platform.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/common/cnxk/roc_platform.c b/drivers/common/cnxk/roc_platform.c
index 59d662fab4..7d3b9518d7 100644
--- a/drivers/common/cnxk/roc_platform.c
+++ b/drivers/common/cnxk/roc_platform.c
@@ -305,7 +305,7 @@ roc_plt_init(void)
if (mz == NULL) {
mz = rte_memzone_reserve(PLT_MODEL_MZ_NAME,
sizeof(struct roc_model),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mz == NULL) {
plt_err("Failed to reserve mem for roc_model");
return -ENOMEM;
diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h
index 70937e8b3a..4003794b8f 100644
--- a/drivers/common/cnxk/roc_platform.h
+++ b/drivers/common/cnxk/roc_platform.h
@@ -406,7 +406,7 @@ plt_lmt_region_reserve_aligned(const char *name, size_t len, uint32_t align)
/* To ensure returned memory is physically contiguous, bounding
* the start and end address in 2M range.
*/
- return rte_memzone_reserve_bounded(name, len, SOCKET_ID_ANY,
+ return rte_memzone_reserve_bounded(name, len, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG,
align, RTE_PGSIZE_2M);
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 053/227] common/nitrox: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (51 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 052/227] common/cnxk: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 054/227] common/zsda: " Chengwen Feng
` (174 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/common/nitrox/nitrox_device.c | 2 +-
drivers/common/nitrox/nitrox_qp.c | 16 ++++++++--------
drivers/common/nitrox/nitrox_qp.h | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/common/nitrox/nitrox_device.c b/drivers/common/nitrox/nitrox_device.c
index 74c7a859a4..27a4d69ac0 100644
--- a/drivers/common/nitrox/nitrox_device.c
+++ b/drivers/common/nitrox/nitrox_device.c
@@ -19,7 +19,7 @@ ndev_allocate(struct rte_pci_device *pdev)
{
struct nitrox_device *ndev;
- ndev = rte_zmalloc_socket("nitrox device", sizeof(*ndev),
+ ndev = rte_zmalloc_numa("nitrox device", sizeof(*ndev),
RTE_CACHE_LINE_SIZE,
pdev->device.numa_node);
if (!ndev)
diff --git a/drivers/common/nitrox/nitrox_qp.c b/drivers/common/nitrox/nitrox_qp.c
index 8f481e6876..1c0279e63f 100644
--- a/drivers/common/nitrox/nitrox_qp.c
+++ b/drivers/common/nitrox/nitrox_qp.c
@@ -15,7 +15,7 @@
static int
nitrox_setup_cmdq(struct nitrox_qp *qp, uint8_t *bar_addr,
- const char *dev_name, uint8_t instr_size, int socket_id)
+ const char *dev_name, uint8_t instr_size, int numa_id)
{
char mz_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz;
@@ -24,7 +24,7 @@ nitrox_setup_cmdq(struct nitrox_qp *qp, uint8_t *bar_addr,
int err = 0;
snprintf(mz_name, sizeof(mz_name), "%s_cmdq_%d", dev_name, qp->qno);
- mz = rte_memzone_reserve_aligned(mz_name, cmdq_size, socket_id,
+ mz = rte_memzone_reserve_aligned(mz_name, cmdq_size, numa_id,
RTE_MEMZONE_SIZE_HINT_ONLY |
RTE_MEMZONE_256MB,
CMDQ_PKT_IN_ALIGN);
@@ -66,13 +66,13 @@ nitrox_setup_cmdq(struct nitrox_qp *qp, uint8_t *bar_addr,
}
static int
-nitrox_setup_ridq(struct nitrox_qp *qp, int socket_id)
+nitrox_setup_ridq(struct nitrox_qp *qp, int numa_id)
{
size_t ridq_size = qp->count * sizeof(*qp->ridq);
- qp->ridq = rte_zmalloc_socket("nitrox ridq", ridq_size,
+ qp->ridq = rte_zmalloc_numa("nitrox ridq", ridq_size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!qp->ridq) {
NITROX_LOG_LINE(ERR, "Failed to create rid queue");
return -ENOMEM;
@@ -107,7 +107,7 @@ nitrox_release_cmdq(struct nitrox_qp *qp, uint8_t *bar_addr)
RTE_EXPORT_INTERNAL_SYMBOL(nitrox_qp_setup)
int
nitrox_qp_setup(struct nitrox_qp *qp, uint8_t *bar_addr, const char *dev_name,
- uint32_t nb_descriptors, uint8_t instr_size, int socket_id)
+ uint32_t nb_descriptors, uint8_t instr_size, int numa_id)
{
int err;
uint32_t count;
@@ -126,11 +126,11 @@ nitrox_qp_setup(struct nitrox_qp *qp, uint8_t *bar_addr, const char *dev_name,
qp->head = qp->tail = 0;
rte_atomic_store_explicit(&qp->pending_count, 0,
rte_memory_order_relaxed);
- err = nitrox_setup_cmdq(qp, bar_addr, dev_name, instr_size, socket_id);
+ err = nitrox_setup_cmdq(qp, bar_addr, dev_name, instr_size, numa_id);
if (err)
return err;
- err = nitrox_setup_ridq(qp, socket_id);
+ err = nitrox_setup_ridq(qp, numa_id);
if (err)
goto ridq_err;
diff --git a/drivers/common/nitrox/nitrox_qp.h b/drivers/common/nitrox/nitrox_qp.h
index c328b88926..6aa3480cac 100644
--- a/drivers/common/nitrox/nitrox_qp.h
+++ b/drivers/common/nitrox/nitrox_qp.h
@@ -139,7 +139,7 @@ nitrox_qp_dequeue(struct nitrox_qp *qp)
__rte_internal
int nitrox_qp_setup(struct nitrox_qp *qp, uint8_t *bar_addr,
const char *dev_name, uint32_t nb_descriptors,
- uint8_t inst_size, int socket_id);
+ uint8_t inst_size, int numa_id);
__rte_internal
int nitrox_qp_release(struct nitrox_qp *qp, uint8_t *bar_addr);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 054/227] common/zsda: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (52 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 053/227] common/nitrox: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 055/227] compress/isal: " Chengwen Feng
` (173 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/common/zsda/zsda_device.c | 4 ++--
drivers/common/zsda/zsda_qp.c | 18 +++++++++---------
drivers/common/zsda/zsda_qp.h | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/common/zsda/zsda_device.c b/drivers/common/zsda/zsda_device.c
index 280a51f9b3..1041a29f02 100644
--- a/drivers/common/zsda/zsda_device.c
+++ b/drivers/common/zsda/zsda_device.c
@@ -69,7 +69,7 @@ zsda_pci_device_allocate(struct rte_pci_device *pci_dev)
struct zsda_pci_device *zsda_pci_dev;
uint8_t zsda_dev_id;
char name[ZSDA_DEV_NAME_MAX_LEN];
- unsigned int socket_id = rte_socket_id();
+ unsigned int numa_id = rte_numa_id();
rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
snprintf(name + strlen(name), (ZSDA_DEV_NAME_MAX_LEN - strlen(name)),
@@ -99,7 +99,7 @@ zsda_pci_device_allocate(struct rte_pci_device *pci_dev)
zsda_devs[zsda_dev_id].mz =
rte_memzone_reserve(name, sizeof(struct zsda_pci_device),
- (int)(socket_id & 0xfff), 0);
+ (int)(numa_id & 0xfff), 0);
if (zsda_devs[zsda_dev_id].mz == NULL) {
ZSDA_LOG(ERR, "Failed! malloc");
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
index 79172234af..257898bed5 100644
--- a/drivers/common/zsda/zsda_qp.c
+++ b/drivers/common/zsda/zsda_qp.c
@@ -543,15 +543,15 @@ zsda_qps_hw_per_service(struct zsda_pci_device *zsda_pci_dev,
static const struct rte_memzone *
zsda_queue_dma_zone_reserve(const char *queue_name,
const unsigned int queue_size,
- const unsigned int socket_id)
+ const unsigned int numa_id)
{
const struct rte_memzone *mz;
mz = rte_memzone_lookup(queue_name);
if (mz != 0) {
if (((size_t)queue_size <= mz->len) &&
- ((socket_id == (SOCKET_ID_ANY & 0xffff)) ||
- (socket_id == (mz->socket_id & 0xffff)))) {
+ ((numa_id == (RTE_NUMA_ID_ANY & 0xffff)) ||
+ (numa_id == (mz->socket_id & 0xffff)))) {
ZSDA_LOG(DEBUG,
"re-use memzone already allocated for %s",
queue_name);
@@ -562,7 +562,7 @@ zsda_queue_dma_zone_reserve(const char *queue_name,
}
mz = rte_memzone_reserve_aligned(queue_name, queue_size,
- (int)(socket_id & 0xfff),
+ (int)(numa_id & 0xfff),
RTE_MEMZONE_IOVA_CONTIG, queue_size);
return mz;
@@ -602,7 +602,7 @@ zsda_queue_create(const uint8_t dev_id, struct zsda_queue *queue,
queue->hw_queue_number);
qp_mz = zsda_queue_dma_zone_reserve(queue->memz_name, queue_size_bytes,
- rte_socket_id());
+ rte_numa_id());
if (qp_mz == NULL) {
ZSDA_LOG(ERR, "Failed! qp_mz is NULL");
return -ENOMEM;
@@ -652,11 +652,11 @@ zsda_cookie_init(const uint8_t dev_id, struct zsda_qp *qp,
qp->srv[type].nb_descriptors = zsda_qp_conf->nb_descriptors;
- qp->srv[type].op_cookies = rte_zmalloc_socket(
+ qp->srv[type].op_cookies = rte_zmalloc_numa(
"zsda PMD op cookie pointer",
zsda_qp_conf->nb_descriptors *
sizeof(*qp->srv[type].op_cookies),
- RTE_CACHE_LINE_SIZE, zsda_qp_conf->socket_id);
+ RTE_CACHE_LINE_SIZE, zsda_qp_conf->numa_id);
if (qp->srv[type].op_cookies == NULL) {
ZSDA_LOG(ERR, "Failed! op_cookies is NULL");
@@ -671,7 +671,7 @@ zsda_cookie_init(const uint8_t dev_id, struct zsda_qp *qp,
qp->srv[type].op_cookie_pool = rte_mempool_create(
op_cookie_pool_name, qp->srv[type].nb_descriptors,
zsda_qp_conf->cookie_size, 64, 0, NULL, NULL, NULL,
- NULL, (int)(rte_socket_id() & 0xfff), 0);
+ NULL, (int)(rte_numa_id() & 0xfff), 0);
if (!qp->srv[type].op_cookie_pool) {
ZSDA_LOG(ERR, "Failed! op_cookie_pool is NULL");
goto exit;
@@ -782,7 +782,7 @@ zsda_task_queue_setup(struct zsda_pci_device *zsda_pci_dev,
conf.service_type = type;
conf.cookie_size = sizeof(struct zsda_op_cookie);
conf.nb_descriptors = task_q_info->nb_des;
- conf.socket_id = task_q_info->socket_id;
+ conf.numa_id = task_q_info->numa_id;
conf.service_str = task_q_info->service_str;
ret = zsda_common_qp_setup(zsda_pci_dev->zsda_dev_id, qp, qp_id, &conf);
diff --git a/drivers/common/zsda/zsda_qp.h b/drivers/common/zsda/zsda_qp.h
index 4dbefe7bbd..5ba20673c9 100644
--- a/drivers/common/zsda/zsda_qp.h
+++ b/drivers/common/zsda/zsda_qp.h
@@ -137,7 +137,7 @@ struct zsda_qp_config {
const struct zsda_qp_hw_data *hw;
uint16_t nb_descriptors;
uint32_t cookie_size;
- int socket_id;
+ int numa_id;
const char *service_str;
};
@@ -157,7 +157,7 @@ struct zsda_op_cookie {
struct task_queue_info {
uint16_t qp_id;
uint16_t nb_des;
- int socket_id;
+ int numa_id;
enum zsda_service_type type;
const char *service_str;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 055/227] compress/isal: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (53 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 054/227] common/zsda: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 056/227] compress/mlx5: " Chengwen Feng
` (172 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/compress/isal/isal_compress_pmd.c | 4 ++--
drivers/compress/isal/isal_compress_pmd_ops.c | 24 +++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/compress/isal/isal_compress_pmd.c b/drivers/compress/isal/isal_compress_pmd.c
index 0e783243a8..f021720a38 100644
--- a/drivers/compress/isal/isal_compress_pmd.c
+++ b/drivers/compress/isal/isal_compress_pmd.c
@@ -725,7 +725,7 @@ compdev_isal_probe(struct rte_vdev_device *dev)
{
struct rte_compressdev_pmd_init_params init_params = {
"",
- rte_socket_id(),
+ rte_numa_id(),
};
const char *name, *args;
int retval;
@@ -753,5 +753,5 @@ static struct rte_vdev_driver compdev_isal_pmd_drv = {
RTE_PMD_REGISTER_VDEV(COMPDEV_NAME_ISAL_PMD, compdev_isal_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(COMPDEV_NAME_ISAL_PMD,
- "socket_id=<int>");
+ "numa_id=<int>");
RTE_LOG_REGISTER_DEFAULT(isal_logtype_driver, INFO);
diff --git a/drivers/compress/isal/isal_compress_pmd_ops.c b/drivers/compress/isal/isal_compress_pmd_ops.c
index be32a4c998..67cf060801 100644
--- a/drivers/compress/isal/isal_compress_pmd_ops.c
+++ b/drivers/compress/isal/isal_compress_pmd_ops.c
@@ -192,7 +192,7 @@ isal_comp_pmd_qp_release(struct rte_compressdev *dev, uint16_t qp_id)
/** Create a ring to place process packets on */
static struct rte_ring *
isal_comp_pmd_qp_create_processed_pkts_ring(struct isal_comp_qp *qp,
- unsigned int ring_size, int socket_id)
+ unsigned int ring_size, int numa_id)
{
struct rte_ring *r;
@@ -212,7 +212,7 @@ isal_comp_pmd_qp_create_processed_pkts_ring(struct isal_comp_qp *qp,
return NULL;
}
- return rte_ring_create(qp->name, ring_size, socket_id,
+ return rte_ring_create(qp->name, ring_size, numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
}
@@ -234,7 +234,7 @@ struct isal_comp_qp *qp)
/* Setup a queue pair */
static int
isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
- uint32_t max_inflight_ops, int socket_id)
+ uint32_t max_inflight_ops, int numa_id)
{
struct isal_comp_qp *qp = NULL;
int retval;
@@ -244,34 +244,34 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
isal_comp_pmd_qp_release(dev, qp_id);
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("Isa-l compression PMD Queue Pair", sizeof(*qp),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa("Isa-l compression PMD Queue Pair", sizeof(*qp),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL) {
ISAL_PMD_LOG(ERR, "Failed to allocate queue pair memory");
return (-ENOMEM);
}
/* Initialize memory for compression stream structure */
- qp->stream = rte_zmalloc_socket("Isa-l compression stream ",
+ qp->stream = rte_zmalloc_numa("Isa-l compression stream ",
sizeof(struct isal_zstream), RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (qp->stream == NULL) {
ISAL_PMD_LOG(ERR, "Failed to allocate compression stream memory");
goto qp_setup_cleanup;
}
/* Initialize memory for compression level buffer */
- qp->stream->level_buf = rte_zmalloc_socket("Isa-l compression lev_buf",
+ qp->stream->level_buf = rte_zmalloc_numa("Isa-l compression lev_buf",
ISAL_DEF_LVL3_DEFAULT, RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (qp->stream->level_buf == NULL) {
ISAL_PMD_LOG(ERR, "Failed to allocate compression level_buf memory");
goto qp_setup_cleanup;
}
/* Initialize memory for decompression state structure */
- qp->state = rte_zmalloc_socket("Isa-l decompression state",
+ qp->state = rte_zmalloc_numa("Isa-l decompression state",
sizeof(struct inflate_state), RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (qp->state == NULL) {
ISAL_PMD_LOG(ERR, "Failed to allocate decompression state memory");
goto qp_setup_cleanup;
@@ -288,7 +288,7 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
}
qp->processed_pkts = isal_comp_pmd_qp_create_processed_pkts_ring(qp,
- max_inflight_ops, socket_id);
+ max_inflight_ops, numa_id);
if (qp->processed_pkts == NULL) {
ISAL_PMD_LOG(ERR, "Failed to create unique name for isal "
"compression device");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 056/227] compress/mlx5: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (54 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 055/227] compress/isal: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 057/227] compress/nitrox: " Chengwen Feng
` (171 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/compress/mlx5/mlx5_compress.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/compress/mlx5/mlx5_compress.c b/drivers/compress/mlx5/mlx5_compress.c
index d122715672..0c64c2f97a 100644
--- a/drivers/compress/mlx5/mlx5_compress.c
+++ b/drivers/compress/mlx5/mlx5_compress.c
@@ -57,7 +57,7 @@ struct mlx5_compress_qp {
uint16_t pi;
uint16_t ci;
struct mlx5_mr_ctrl mr_ctrl;
- int socket_id;
+ int numa_id;
struct mlx5_devx_cq cq;
struct mlx5_devx_qp qp;
struct mlx5_pmd_mr opaque_mr;
@@ -150,7 +150,7 @@ mlx5_compress_init_qp(struct mlx5_compress_qp *qp)
static int
mlx5_compress_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
- uint32_t max_inflight_ops, int socket_id)
+ uint32_t max_inflight_ops, int numa_id)
{
struct mlx5_compress_priv *priv = dev->data->dev_private;
struct mlx5_hca_attr *attr = &priv->cdev->config.hca_attr;
@@ -170,8 +170,8 @@ mlx5_compress_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
alloc_size = RTE_ALIGN(alloc_size, RTE_CACHE_LINE_SIZE);
alloc_size += sizeof(struct rte_comp_op *) * (1u << log_ops_n);
- qp = rte_zmalloc_socket(__func__, alloc_size, RTE_CACHE_LINE_SIZE,
- socket_id);
+ qp = rte_zmalloc_numa(__func__, alloc_size, RTE_CACHE_LINE_SIZE,
+ numa_id);
if (qp == NULL) {
DRV_LOG(ERR, "Failed to allocate qp memory.");
rte_errno = ENOMEM;
@@ -194,7 +194,7 @@ mlx5_compress_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
goto err;
}
qp->entries_n = 1 << log_ops_n;
- qp->socket_id = socket_id;
+ qp->numa_id = numa_id;
qp->qp_id = qp_id;
qp->priv = priv;
qp->ops = (struct rte_comp_op **)RTE_ALIGN((uintptr_t)(qp + 1),
@@ -208,7 +208,7 @@ mlx5_compress_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
goto err;
}
ret = mlx5_devx_cq_create(priv->cdev->ctx, &qp->cq, log_ops_n, &cq_attr,
- socket_id);
+ numa_id);
if (ret != 0) {
DRV_LOG(ERR, "Failed to create CQ.");
goto err;
@@ -223,7 +223,7 @@ mlx5_compress_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
attr->decomp_deflate_v1_en || attr->decomp_deflate_v2_en;
ret = mlx5_devx_qp_create(priv->cdev->ctx, &qp->qp,
qp_attr.num_of_send_wqbbs *
- MLX5_WQE_SIZE, &qp_attr, socket_id);
+ MLX5_WQE_SIZE, &qp_attr, numa_id);
if (ret != 0) {
DRV_LOG(ERR, "Failed to create QP.");
goto err;
@@ -368,7 +368,7 @@ mlx5_compress_xform_create(struct rte_compressdev *dev,
ret = mlx5_compress_xform_validate(xform, &priv->cdev->config.hca_attr);
if (ret < 0)
return ret;
- xfrm = rte_zmalloc_socket(__func__, sizeof(*xfrm), 0,
+ xfrm = rte_zmalloc_numa(__func__, sizeof(*xfrm), 0,
priv->dev_config.numa_id);
if (xfrm == NULL)
return -ENOMEM;
@@ -828,7 +828,7 @@ mlx5_compress_dev_probe(struct mlx5_common_device *cdev,
struct mlx5_compress_devarg_params devarg_prms = {0};
struct rte_compressdev_pmd_init_params init_params = {
.name = "",
- .socket_id = cdev->dev->numa_node,
+ .numa_id = cdev->dev->numa_node,
};
const char *ibdev_name = mlx5_os_get_ctx_device_name(cdev->ctx);
uint32_t crc32_opaq_offset;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 057/227] compress/nitrox: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (55 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 056/227] compress/mlx5: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 058/227] compress/octeontx: " Chengwen Feng
` (170 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/compress/nitrox/nitrox_comp.c | 14 +++++++-------
drivers/compress/nitrox/nitrox_comp_reqmgr.c | 14 +++++++-------
drivers/compress/nitrox/nitrox_comp_reqmgr.h | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/compress/nitrox/nitrox_comp.c b/drivers/compress/nitrox/nitrox_comp.c
index 56a90a35c5..d6a7ae1629 100644
--- a/drivers/compress/nitrox/nitrox_comp.c
+++ b/drivers/compress/nitrox/nitrox_comp.c
@@ -153,7 +153,7 @@ static void nitrox_comp_dev_info_get(struct rte_compressdev *dev,
static int nitrox_comp_queue_pair_setup(struct rte_compressdev *dev,
uint16_t qp_id,
- uint32_t max_inflight_ops, int socket_id)
+ uint32_t max_inflight_ops, int numa_id)
{
struct nitrox_comp_device *comp_dev = dev->data->dev_private;
struct nitrox_device *ndev = comp_dev->ndev;
@@ -173,9 +173,9 @@ static int nitrox_comp_queue_pair_setup(struct rte_compressdev *dev,
return err;
}
- qp = rte_zmalloc_socket("nitrox PMD qp", sizeof(*qp),
+ qp = rte_zmalloc_numa("nitrox PMD qp", sizeof(*qp),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!qp) {
NITROX_LOG_LINE(ERR, "Failed to allocate nitrox qp");
return -ENOMEM;
@@ -185,12 +185,12 @@ static int nitrox_comp_queue_pair_setup(struct rte_compressdev *dev,
qp->qno = qp_id;
err = nitrox_qp_setup(qp, ndev->bar_addr, dev->data->name,
max_inflight_ops, ZIP_INSTR_SIZE,
- socket_id);
+ numa_id);
if (unlikely(err))
goto qp_setup_err;
qp->sr_mp = nitrox_comp_req_pool_create(dev, qp->count, qp_id,
- socket_id);
+ numa_id);
if (unlikely(!qp->sr_mp))
goto req_pool_err;
@@ -410,7 +410,7 @@ static int nitrox_comp_stream_create(struct rte_compressdev *dev,
nxform->window_size = NITROX_DEFAULT_DEFLATE_SEARCH_DEPTH;
}
- nxform->history_window = rte_zmalloc_socket(NULL, nxform->window_size,
+ nxform->history_window = rte_zmalloc_numa(NULL, nxform->window_size,
8, comp_dev->xform_pool->numa_id);
if (unlikely(nxform->history_window == NULL)) {
err = -ENOMEM;
@@ -420,7 +420,7 @@ static int nitrox_comp_stream_create(struct rte_compressdev *dev,
if (xform->type == RTE_COMP_COMPRESS)
return 0;
- nxform->context = rte_zmalloc_socket(NULL,
+ nxform->context = rte_zmalloc_numa(NULL,
NITROX_DECOMP_CTX_SIZE, 8,
comp_dev->xform_pool->numa_id);
if (unlikely(nxform->context == NULL)) {
diff --git a/drivers/compress/nitrox/nitrox_comp_reqmgr.c b/drivers/compress/nitrox/nitrox_comp_reqmgr.c
index 42358cd14f..e8689d608b 100644
--- a/drivers/compress/nitrox/nitrox_comp_reqmgr.c
+++ b/drivers/compress/nitrox/nitrox_comp_reqmgr.c
@@ -523,7 +523,7 @@ static int handle_zero_length_compression(struct nitrox_softreq *sr,
static int create_sglist_from_mbuf(struct nitrox_sgtable *sgtbl,
struct rte_mbuf *mbuf, uint32_t off,
uint32_t datalen, uint8_t extra_segs,
- int socket_id)
+ int numa_id)
{
struct rte_mbuf *m;
union nitrox_zip_zptr *sgl;
@@ -555,9 +555,9 @@ static int create_sglist_from_mbuf(struct nitrox_sgtable *sgtbl,
NITROX_LOG_LINE(INFO, "Mbuf has more segs %d than allocated %d",
nb_segs, sgtbl->nb_sgls);
- sgl = rte_realloc_socket(sgtbl->sgl,
+ sgl = rte_realloc_numa(sgtbl->sgl,
sizeof(*sgtbl->sgl) * nb_segs,
- 8, socket_id);
+ 8, numa_id);
if (unlikely(!sgl)) {
NITROX_LOG_LINE(ERR, "Failed to expand sglist memory");
return -ENOMEM;
@@ -1159,10 +1159,10 @@ static void req_pool_obj_init(struct rte_mempool *mp, void *arg, void *obj,
RTE_SET_USED(mp);
RTE_SET_USED(obj_idx);
sr = obj;
- sr->src.sgl = rte_zmalloc_socket(NULL,
+ sr->src.sgl = rte_zmalloc_numa(NULL,
sizeof(*sr->src.sgl) * NITROX_ZIP_SGL_COUNT,
8, mp->numa_id);
- sr->dst.sgl = rte_zmalloc_socket(NULL,
+ sr->dst.sgl = rte_zmalloc_numa(NULL,
sizeof(*sr->dst.sgl) * NITROX_ZIP_SGL_COUNT,
8, mp->numa_id);
if (sr->src.sgl == NULL || sr->dst.sgl == NULL) {
@@ -1178,7 +1178,7 @@ static void req_pool_obj_init(struct rte_mempool *mp, void *arg, void *obj,
struct rte_mempool *
nitrox_comp_req_pool_create(struct rte_compressdev *dev, uint32_t nobjs,
- uint16_t qp_id, int socket_id)
+ uint16_t qp_id, int numa_id)
{
char softreq_pool_name[RTE_RING_NAMESIZE];
struct rte_mempool *mp;
@@ -1190,7 +1190,7 @@ nitrox_comp_req_pool_create(struct rte_compressdev *dev, uint32_t nobjs,
RTE_ALIGN_MUL_CEIL(nobjs, 64),
sizeof(struct nitrox_softreq),
64, 0, NULL, NULL, req_pool_obj_init, &err,
- socket_id, 0);
+ numa_id, 0);
if (unlikely(!mp))
NITROX_LOG_LINE(ERR, "Failed to create req pool, qid %d, err %d",
qp_id, rte_errno);
diff --git a/drivers/compress/nitrox/nitrox_comp_reqmgr.h b/drivers/compress/nitrox/nitrox_comp_reqmgr.h
index f0cd1eb8fd..d544acb25f 100644
--- a/drivers/compress/nitrox/nitrox_comp_reqmgr.h
+++ b/drivers/compress/nitrox/nitrox_comp_reqmgr.h
@@ -52,7 +52,7 @@ int nitrox_check_comp_req(struct nitrox_softreq *sr, struct rte_comp_op **op);
void *nitrox_comp_instr_addr(struct nitrox_softreq *sr);
struct rte_mempool *nitrox_comp_req_pool_create(struct rte_compressdev *cdev,
uint32_t nobjs, uint16_t qp_id,
- int socket_id);
+ int numa_id);
void nitrox_comp_req_pool_free(struct rte_mempool *mp);
#endif /* _NITROX_COMP_REQMGR_H_ */
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 058/227] compress/octeontx: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (56 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 057/227] compress/nitrox: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 059/227] compress/uadk: " Chengwen Feng
` (169 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/compress/octeontx/otx_zip_pmd.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/compress/octeontx/otx_zip_pmd.c b/drivers/compress/octeontx/otx_zip_pmd.c
index 74e3e942ad..a70e9ddfa5 100644
--- a/drivers/compress/octeontx/otx_zip_pmd.c
+++ b/drivers/compress/octeontx/otx_zip_pmd.c
@@ -225,7 +225,7 @@ zip_pmd_config(struct rte_compressdev *dev,
NULL,
NULL,
NULL,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
0);
if (zip_buf_mp == NULL) {
@@ -246,7 +246,7 @@ zip_pmd_config(struct rte_compressdev *dev,
NULL,
NULL,
NULL,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
MEMPOOL_F_NO_SPREAD);
if (zip_sg_mp == NULL) {
@@ -356,7 +356,7 @@ zip_pmd_qp_release(struct rte_compressdev *dev, uint16_t qp_id)
/** Create a ring to place process packets on */
static struct rte_ring *
zip_pmd_qp_create_processed_pkts_ring(struct zipvf_qp *qp,
- unsigned int ring_size, int socket_id)
+ unsigned int ring_size, int numa_id)
{
struct rte_ring *r;
@@ -373,14 +373,14 @@ zip_pmd_qp_create_processed_pkts_ring(struct zipvf_qp *qp,
return NULL;
}
- return rte_ring_create(qp->name, ring_size, socket_id,
+ return rte_ring_create(qp->name, ring_size, numa_id,
RING_F_EXACT_SZ);
}
/** Setup a queue pair */
static int
zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
- uint32_t max_inflight_ops, int socket_id)
+ uint32_t max_inflight_ops, int numa_id)
{
struct zipvf_qp *qp = NULL;
struct zip_vf *vf;
@@ -406,8 +406,8 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
dev->data->dev_id, qp_id);
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket(name, sizeof(*qp),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa(name, sizeof(*qp),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL) {
rte_free(name);
return (-ENOMEM);
@@ -417,7 +417,7 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
/* Create completion queue up to max_inflight_ops */
qp->processed_pkts = zip_pmd_qp_create_processed_pkts_ring(qp,
- max_inflight_ops, socket_id);
+ max_inflight_ops, numa_id);
if (qp->processed_pkts == NULL)
goto qp_setup_cleanup;
@@ -629,7 +629,7 @@ zip_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct rte_compressdev *compressdev;
struct rte_compressdev_pmd_init_params init_params = {
"",
- rte_socket_id(),
+ rte_numa_id(),
};
ZIP_PMD_INFO("vendor_id=0x%x device_id=0x%x",
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 059/227] compress/uadk: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (57 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 058/227] compress/octeontx: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 060/227] compress/zlib: " Chengwen Feng
` (168 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/compress/uadk/uadk_compress_pmd.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/compress/uadk/uadk_compress_pmd.c b/drivers/compress/uadk/uadk_compress_pmd.c
index 0d5cd21bec..2810b22b0c 100644
--- a/drivers/compress/uadk/uadk_compress_pmd.c
+++ b/drivers/compress/uadk/uadk_compress_pmd.c
@@ -157,7 +157,7 @@ uadk_pmd_qp_set_unique_name(struct rte_compressdev *dev,
static struct rte_ring *
uadk_pmd_qp_create_processed_pkts_ring(struct uadk_compress_qp *qp,
- unsigned int ring_size, int socket_id)
+ unsigned int ring_size, int numa_id)
{
struct rte_ring *r = qp->processed_pkts;
@@ -173,13 +173,13 @@ uadk_pmd_qp_create_processed_pkts_ring(struct uadk_compress_qp *qp,
return NULL;
}
- return rte_ring_create(qp->name, ring_size, socket_id,
+ return rte_ring_create(qp->name, ring_size, numa_id,
RING_F_EXACT_SZ);
}
static int
uadk_compress_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
- uint32_t max_inflight_ops, int socket_id)
+ uint32_t max_inflight_ops, int numa_id)
{
struct uadk_compress_qp *qp = NULL;
@@ -188,8 +188,8 @@ uadk_compress_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
uadk_compress_pmd_qp_release(dev, qp_id);
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("uadk PMD Queue Pair", sizeof(*qp),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa("uadk PMD Queue Pair", sizeof(*qp),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL)
return (-ENOMEM);
@@ -200,7 +200,7 @@ uadk_compress_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
goto qp_setup_cleanup;
qp->processed_pkts = uadk_pmd_qp_create_processed_pkts_ring(qp,
- max_inflight_ops, socket_id);
+ max_inflight_ops, numa_id);
if (qp->processed_pkts == NULL)
goto qp_setup_cleanup;
@@ -422,7 +422,7 @@ uadk_compress_probe(struct rte_vdev_device *vdev)
{
struct rte_compressdev_pmd_init_params init_params = {
"",
- rte_socket_id(),
+ rte_numa_id(),
};
struct rte_compressdev *compressdev;
struct uacce_dev *udev;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 060/227] compress/zlib: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (58 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 059/227] compress/uadk: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 061/227] compress/zsda: " Chengwen Feng
` (167 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/compress/zlib/zlib_pmd.c | 2 +-
drivers/compress/zlib/zlib_pmd_ops.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/compress/zlib/zlib_pmd.c b/drivers/compress/zlib/zlib_pmd.c
index ed3905484c..6943367b6f 100644
--- a/drivers/compress/zlib/zlib_pmd.c
+++ b/drivers/compress/zlib/zlib_pmd.c
@@ -535,7 +535,7 @@ zlib_probe(struct rte_vdev_device *vdev)
{
struct rte_compressdev_pmd_init_params init_params = {
"",
- rte_socket_id()
+ rte_numa_id()
};
const char *name;
const char *input_args;
diff --git a/drivers/compress/zlib/zlib_pmd_ops.c b/drivers/compress/zlib/zlib_pmd_ops.c
index fb9cec8488..e240db25f4 100644
--- a/drivers/compress/zlib/zlib_pmd_ops.c
+++ b/drivers/compress/zlib/zlib_pmd_ops.c
@@ -155,7 +155,7 @@ zlib_pmd_qp_set_unique_name(struct rte_compressdev *dev,
/** Create a ring to place process packets on */
static struct rte_ring *
zlib_pmd_qp_create_processed_pkts_ring(struct zlib_qp *qp,
- unsigned int ring_size, int socket_id)
+ unsigned int ring_size, int numa_id)
{
struct rte_ring *r = qp->processed_pkts;
@@ -171,14 +171,14 @@ zlib_pmd_qp_create_processed_pkts_ring(struct zlib_qp *qp,
return NULL;
}
- return rte_ring_create(qp->name, ring_size, socket_id,
+ return rte_ring_create(qp->name, ring_size, numa_id,
RING_F_EXACT_SZ);
}
/** Setup a queue pair */
static int
zlib_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
- uint32_t max_inflight_ops, int socket_id)
+ uint32_t max_inflight_ops, int numa_id)
{
struct zlib_qp *qp = NULL;
@@ -187,8 +187,8 @@ zlib_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
zlib_pmd_qp_release(dev, qp_id);
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("ZLIB PMD Queue Pair", sizeof(*qp),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa("ZLIB PMD Queue Pair", sizeof(*qp),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL)
return (-ENOMEM);
@@ -199,7 +199,7 @@ zlib_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
goto qp_setup_cleanup;
qp->processed_pkts = zlib_pmd_qp_create_processed_pkts_ring(qp,
- max_inflight_ops, socket_id);
+ max_inflight_ops, numa_id);
if (qp->processed_pkts == NULL)
goto qp_setup_cleanup;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 061/227] compress/zsda: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (59 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 060/227] compress/zlib: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 062/227] crypto/armv8: " Chengwen Feng
` (166 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/compress/zsda/zsda_comp_pmd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/compress/zsda/zsda_comp_pmd.c b/drivers/compress/zsda/zsda_comp_pmd.c
index 6d857be2f0..057e7178e2 100644
--- a/drivers/compress/zsda/zsda_comp_pmd.c
+++ b/drivers/compress/zsda/zsda_comp_pmd.c
@@ -227,7 +227,7 @@ zsda_private_xform_free(struct rte_compressdev *dev __rte_unused,
static int
zsda_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
- uint32_t max_inflight_ops, int socket_id)
+ uint32_t max_inflight_ops, int numa_id)
{
int ret = ZSDA_SUCCESS;
struct zsda_qp *qp_new;
@@ -247,15 +247,15 @@ zsda_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
return ret;
}
- qp_new = rte_zmalloc_socket("zsda PMD qp metadata", sizeof(*qp_new),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp_new = rte_zmalloc_numa("zsda PMD qp metadata", sizeof(*qp_new),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp_new == NULL) {
ZSDA_LOG(ERR, "Failed! qp_new is NULL");
return -ENOMEM;
}
task_q_info.nb_des = nb_des;
- task_q_info.socket_id = socket_id;
+ task_q_info.numa_id = numa_id;
task_q_info.qp_id = qp_id;
task_q_info.rx_cb = zsda_comp_callback;
@@ -377,7 +377,7 @@ zsda_comp_dev_create(struct zsda_pci_device *zsda_pci_dev)
comp_dev->capa_mz = rte_memzone_lookup(capa_memz_name);
if (comp_dev->capa_mz == NULL)
comp_dev->capa_mz = rte_memzone_reserve(
- capa_memz_name, capa_size, rte_socket_id(), 0);
+ capa_memz_name, capa_size, rte_numa_id(), 0);
if (comp_dev->capa_mz == NULL) {
ZSDA_LOG(DEBUG, "Failed! comp_dev->capa_mz is NULL");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 062/227] crypto/armv8: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (60 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 061/227] compress/zsda: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 063/227] crypto/bcmfs: " Chengwen Feng
` (165 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/armv8/rte_armv8_pmd.c | 6 +++---
drivers/crypto/armv8/rte_armv8_pmd_ops.c | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
index 582dbadbdd..86378ddf4d 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
@@ -807,7 +807,7 @@ cryptodev_armv8_crypto_init(struct rte_vdev_device *vdev)
struct rte_cryptodev_pmd_init_params init_params = {
"",
sizeof(struct armv8_crypto_private),
- rte_socket_id(),
+ rte_numa_id(),
RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS
};
const char *name;
@@ -835,7 +835,7 @@ cryptodev_armv8_crypto_uninit(struct rte_vdev_device *vdev)
ARMV8_CRYPTO_LOG_INFO(
"Closing ARMv8 crypto device %s on numa socket %u",
- name, rte_socket_id());
+ name, rte_numa_id());
cryptodev = rte_cryptodev_pmd_get_named_dev(name);
if (cryptodev == NULL)
@@ -857,6 +857,6 @@ RTE_LOG_REGISTER_DEFAULT(crypto_armv8_log_type, ERR);
RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ARMV8_PMD, armv8_crypto_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_ARMV8_PMD,
"max_nb_queue_pairs=<int> "
- "socket_id=<int>");
+ "numa_id=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(armv8_crypto_drv, armv8_crypto_pmd_drv.driver,
cryptodev_driver_id);
diff --git a/drivers/crypto/armv8/rte_armv8_pmd_ops.c b/drivers/crypto/armv8/rte_armv8_pmd_ops.c
index c4964bc112..7d78ac94b9 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd_ops.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd_ops.c
@@ -190,7 +190,7 @@ armv8_crypto_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
/** Create a ring to place processed operations on */
static struct rte_ring *
armv8_crypto_pmd_qp_create_processed_ops_ring(struct armv8_crypto_qp *qp,
- unsigned int ring_size, int socket_id)
+ unsigned int ring_size, int numa_id)
{
struct rte_ring *r;
@@ -209,7 +209,7 @@ armv8_crypto_pmd_qp_create_processed_ops_ring(struct armv8_crypto_qp *qp,
return NULL;
}
- return rte_ring_create(qp->name, ring_size, socket_id,
+ return rte_ring_create(qp->name, ring_size, numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
}
@@ -218,7 +218,7 @@ armv8_crypto_pmd_qp_create_processed_ops_ring(struct armv8_crypto_qp *qp,
static int
armv8_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct armv8_crypto_qp *qp = NULL;
@@ -227,8 +227,8 @@ armv8_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
armv8_crypto_pmd_qp_release(dev, qp_id);
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("ARMv8 PMD Queue Pair", sizeof(*qp),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa("ARMv8 PMD Queue Pair", sizeof(*qp),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL)
return -ENOMEM;
@@ -239,7 +239,7 @@ armv8_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
goto qp_setup_cleanup;
qp->processed_ops = armv8_crypto_pmd_qp_create_processed_ops_ring(qp,
- qp_conf->nb_descriptors, socket_id);
+ qp_conf->nb_descriptors, numa_id);
if (qp->processed_ops == NULL)
goto qp_setup_cleanup;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 063/227] crypto/bcmfs: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (61 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 062/227] crypto/armv8: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 064/227] crypto/caam_jr: " Chengwen Feng
` (164 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/bcmfs/bcmfs_qp.c | 16 ++++++++--------
drivers/crypto/bcmfs/bcmfs_qp.h | 2 +-
drivers/crypto/bcmfs/bcmfs_sym_pmd.c | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/crypto/bcmfs/bcmfs_qp.c b/drivers/crypto/bcmfs/bcmfs_qp.c
index 59e39a6c14..feaaa81015 100644
--- a/drivers/crypto/bcmfs/bcmfs_qp.c
+++ b/drivers/crypto/bcmfs/bcmfs_qp.c
@@ -63,15 +63,15 @@ bcmfs_queue_delete(struct bcmfs_queue *queue,
static const struct rte_memzone *
queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size,
- int socket_id, unsigned int align)
+ int numa_id, unsigned int align)
{
const struct rte_memzone *mz;
mz = rte_memzone_lookup(queue_name);
if (mz != NULL) {
if (((size_t)queue_size <= mz->len) &&
- (socket_id == SOCKET_ID_ANY ||
- socket_id == mz->socket_id)) {
+ (numa_id == RTE_NUMA_ID_ANY ||
+ numa_id == mz->socket_id)) {
BCMFS_LOG(DEBUG, "re-use memzone already "
"allocated for %s", queue_name);
return mz;
@@ -81,14 +81,14 @@ queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size,
"allocated %s, size %u, socket %d. "
"Requested size %u, socket %u",
queue_name, (uint32_t)mz->len,
- mz->socket_id, queue_size, socket_id);
+ mz->socket_id, queue_size, numa_id);
return NULL;
}
BCMFS_LOG(DEBUG, "Allocate memzone for %s, size %u on socket %u",
- queue_name, queue_size, socket_id);
+ queue_name, queue_size, numa_id);
return rte_memzone_reserve_aligned(queue_name, queue_size,
- socket_id, RTE_MEMZONE_IOVA_CONTIG, align);
+ numa_id, RTE_MEMZONE_IOVA_CONTIG, align);
}
static int
@@ -216,9 +216,9 @@ bcmfs_qp_setup(struct bcmfs_qp **qp_addr,
return -EINVAL;
}
- qp = rte_zmalloc_socket("BCM FS PMD qp metadata",
+ qp = rte_zmalloc_numa("BCM FS PMD qp metadata",
sizeof(*qp), RTE_CACHE_LINE_SIZE,
- qp_conf->socket_id);
+ qp_conf->numa_id);
if (qp == NULL) {
BCMFS_LOG(ERR, "Failed to alloc mem for qp struct");
return -ENOMEM;
diff --git a/drivers/crypto/bcmfs/bcmfs_qp.h b/drivers/crypto/bcmfs/bcmfs_qp.h
index 42adff9033..dbcb19e628 100644
--- a/drivers/crypto/bcmfs/bcmfs_qp.h
+++ b/drivers/crypto/bcmfs/bcmfs_qp.h
@@ -44,7 +44,7 @@ struct bcmfs_qp_stats {
struct bcmfs_qp_config {
/* Socket to allocate memory on */
- int socket_id;
+ int numa_id;
/* Mapped iobase for qp */
void *iobase;
/* nb_descriptors or requests a h/w queue can accommodate */
diff --git a/drivers/crypto/bcmfs/bcmfs_sym_pmd.c b/drivers/crypto/bcmfs/bcmfs_sym_pmd.c
index 3f2ff40cd8..bd1758fa0c 100644
--- a/drivers/crypto/bcmfs/bcmfs_sym_pmd.c
+++ b/drivers/crypto/bcmfs/bcmfs_sym_pmd.c
@@ -149,7 +149,7 @@ req_pool_obj_init(__rte_unused struct rte_mempool *mp,
static struct rte_mempool *
bcmfs_sym_req_pool_create(struct rte_cryptodev *cdev __rte_unused,
uint32_t nobjs, uint16_t qp_id,
- int socket_id)
+ int numa_id)
{
char softreq_pool_name[RTE_RING_NAMESIZE];
struct rte_mempool *mp;
@@ -161,7 +161,7 @@ bcmfs_sym_req_pool_create(struct rte_cryptodev *cdev __rte_unused,
RTE_ALIGN_MUL_CEIL(nobjs, 64),
sizeof(struct bcmfs_sym_request),
64, 0, NULL, NULL, req_pool_obj_init, NULL,
- socket_id, 0);
+ numa_id, 0);
if (mp == NULL)
BCMFS_LOG(ERR, "Failed to create req pool, qid %d, err %d",
qp_id, rte_errno);
@@ -172,7 +172,7 @@ bcmfs_sym_req_pool_create(struct rte_cryptodev *cdev __rte_unused,
static int
bcmfs_sym_qp_setup(struct rte_cryptodev *cdev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
int ret = 0;
struct bcmfs_qp *qp = NULL;
@@ -197,7 +197,7 @@ bcmfs_sym_qp_setup(struct rte_cryptodev *cdev, uint16_t qp_id,
}
bcmfs_qp_conf.nb_descriptors = qp_conf->nb_descriptors;
- bcmfs_qp_conf.socket_id = socket_id;
+ bcmfs_qp_conf.numa_id = numa_id;
bcmfs_qp_conf.max_descs_req = BCMFS_CRYPTO_MAX_HW_DESCS_PER_REQ;
bcmfs_qp_conf.iobase = BCMFS_QP_IOBASE_XLATE(fsdev->mmap_addr, qp_id);
bcmfs_qp_conf.ops = fsdev->sym_hw_qp_ops;
@@ -209,7 +209,7 @@ bcmfs_sym_qp_setup(struct rte_cryptodev *cdev, uint16_t qp_id,
qp = (struct bcmfs_qp *)*qp_addr;
qp->sr_mp = bcmfs_sym_req_pool_create(cdev, qp_conf->nb_descriptors,
- qp_id, socket_id);
+ qp_id, numa_id);
if (qp->sr_mp == NULL)
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 064/227] crypto/caam_jr: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (62 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 063/227] crypto/bcmfs: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 065/227] crypto/ccp: " Chengwen Feng
` (163 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/caam_jr/caam_jr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index 01a9bed1ff..7d3355975b 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -1514,7 +1514,7 @@ static int
caam_jr_queue_pair_setup(
struct rte_cryptodev *dev, uint16_t qp_id,
__rte_unused const struct rte_cryptodev_qp_conf *qp_conf,
- __rte_unused int socket_id)
+ __rte_unused int numa_id)
{
struct sec_job_ring_t *internals;
struct caam_jr_qp *qp = NULL;
@@ -1962,7 +1962,7 @@ caam_jr_dev_configure(struct rte_cryptodev *dev,
sizeof(struct caam_jr_op_ctx),
CTX_POOL_CACHE_SIZE, 0,
NULL, NULL, NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (!internals->ctx_pool) {
CAAM_JR_ERR("%s create failed", str);
return -ENOMEM;
@@ -2373,7 +2373,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
struct rte_cryptodev_pmd_init_params init_params = {
"",
sizeof(struct sec_job_ring_t),
- rte_socket_id(),
+ rte_numa_id(),
RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS
};
const char *name;
@@ -2455,7 +2455,7 @@ static struct cryptodev_driver caam_jr_crypto_drv;
RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_CAAM_JR_PMD, cryptodev_caam_jr_drv);
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_CAAM_JR_PMD,
"max_nb_queue_pairs=<int>"
- "socket_id=<int>");
+ "numa_id=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(caam_jr_crypto_drv, cryptodev_caam_jr_drv.driver,
cryptodev_driver_id);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 065/227] crypto/ccp: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (63 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 064/227] crypto/caam_jr: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 066/227] crypto/cnxk: " Chengwen Feng
` (162 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/ccp/ccp_dev.c | 14 +++++++-------
drivers/crypto/ccp/ccp_pmd_ops.c | 14 +++++++-------
drivers/crypto/ccp/rte_ccp_pmd.c | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/crypto/ccp/ccp_dev.c b/drivers/crypto/ccp/ccp_dev.c
index a75816cdfc..defbb1e5a8 100644
--- a/drivers/crypto/ccp/ccp_dev.c
+++ b/drivers/crypto/ccp/ccp_dev.c
@@ -85,15 +85,15 @@ ccp_read_hwrng(uint32_t *value)
static const struct rte_memzone *
ccp_queue_dma_zone_reserve(const char *queue_name,
uint32_t queue_size,
- int socket_id)
+ int numa_id)
{
const struct rte_memzone *mz;
mz = rte_memzone_lookup(queue_name);
if (mz != 0) {
if (((size_t)queue_size <= mz->len) &&
- ((socket_id == SOCKET_ID_ANY) ||
- (socket_id == mz->socket_id))) {
+ ((numa_id == RTE_NUMA_ID_ANY) ||
+ (numa_id == mz->socket_id))) {
CCP_LOG_INFO("re-use memzone already "
"allocated for %s", queue_name);
return mz;
@@ -102,15 +102,15 @@ ccp_queue_dma_zone_reserve(const char *queue_name,
"allocated %s, size %u, socket %d. "
"Requested size %u, socket %u",
queue_name, (uint32_t)mz->len,
- mz->socket_id, queue_size, socket_id);
+ mz->socket_id, queue_size, numa_id);
return NULL;
}
CCP_LOG_INFO("Allocate memzone for %s, size %u on socket %u",
- queue_name, queue_size, socket_id);
+ queue_name, queue_size, numa_id);
return rte_memzone_reserve_aligned(queue_name, queue_size,
- socket_id, RTE_MEMZONE_IOVA_CONTIG, queue_size);
+ numa_id, RTE_MEMZONE_IOVA_CONTIG, queue_size);
}
/* bitmap support apis */
@@ -545,7 +545,7 @@ ccp_add_device(struct ccp_device *dev)
(int)dev->id, "queue",
(int)cmd_q->id, "mem");
q_mz = ccp_queue_dma_zone_reserve(cmd_q->memz_name,
- cmd_q->qsize, SOCKET_ID_ANY);
+ cmd_q->qsize, RTE_NUMA_ID_ANY);
cmd_q->qbase_addr = (void *)q_mz->addr;
cmd_q->qbase_desc = (void *)q_mz->addr;
cmd_q->qbase_phys_addr = q_mz->iova;
diff --git a/drivers/crypto/ccp/ccp_pmd_ops.c b/drivers/crypto/ccp/ccp_pmd_ops.c
index 52f320b02b..3e22653df1 100644
--- a/drivers/crypto/ccp/ccp_pmd_ops.c
+++ b/drivers/crypto/ccp/ccp_pmd_ops.c
@@ -660,7 +660,7 @@ ccp_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
static struct rte_ring *
ccp_pmd_qp_create_batch_info_ring(struct ccp_qp *qp,
- unsigned int ring_size, int socket_id)
+ unsigned int ring_size, int numa_id)
{
struct rte_ring *r;
@@ -678,14 +678,14 @@ ccp_pmd_qp_create_batch_info_ring(struct ccp_qp *qp,
return NULL;
}
- return rte_ring_create(qp->name, ring_size, socket_id,
+ return rte_ring_create(qp->name, ring_size, numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
}
static int
ccp_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct ccp_private *internals = dev->data->dev_private;
struct ccp_qp *qp;
@@ -702,8 +702,8 @@ ccp_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
ccp_pmd_qp_release(dev, qp_id);
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("CCP Crypto PMD Queue Pair", sizeof(*qp),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa("CCP Crypto PMD Queue Pair", sizeof(*qp),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL) {
CCP_LOG_ERR("Failed to allocate queue pair memory");
return (-ENOMEM);
@@ -720,7 +720,7 @@ ccp_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
}
qp->processed_pkts = ccp_pmd_qp_create_batch_info_ring(qp,
- qp_conf->nb_descriptors, socket_id);
+ qp_conf->nb_descriptors, numa_id);
if (qp->processed_pkts == NULL) {
CCP_LOG_ERR("Failed to create batch info ring");
goto qp_setup_cleanup;
@@ -735,7 +735,7 @@ ccp_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
sizeof(struct ccp_batch_info),
RTE_CACHE_LINE_SIZE,
0, NULL, NULL, NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (qp->batch_mp == NULL)
goto qp_setup_cleanup;
memset(&qp->qp_stats, 0, sizeof(qp->qp_stats));
diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c
index ab19f8fd9c..50e2adb6d0 100644
--- a/drivers/crypto/ccp/rte_ccp_pmd.c
+++ b/drivers/crypto/ccp/rte_ccp_pmd.c
@@ -29,7 +29,7 @@ struct ccp_pmd_init_params {
};
#define CCP_CRYPTODEV_PARAM_NAME ("name")
-#define CCP_CRYPTODEV_PARAM_SOCKET_ID ("socket_id")
+#define CCP_CRYPTODEV_PARAM_SOCKET_ID ("numa_id")
#define CCP_CRYPTODEV_PARAM_MAX_NB_QP ("max_nb_queue_pairs")
#define CCP_CRYPTODEV_PARAM_AUTH_OPT ("ccp_auth_opt")
@@ -194,7 +194,7 @@ cryptodev_ccp_remove(struct rte_pci_device *pci_dev)
ccp_pmd_init_done = 0;
- CCP_LOG_INFO("Closing ccp device %s on numa socket %u", name, rte_socket_id());
+ CCP_LOG_INFO("Closing ccp device %s on numa socket %u", name, rte_numa_id());
return rte_cryptodev_pmd_destroy(dev);
}
@@ -271,7 +271,7 @@ cryptodev_ccp_probe(struct rte_pci_driver *pci_drv __rte_unused,
.def_p = {
"",
sizeof(struct ccp_private),
- rte_socket_id(),
+ rte_numa_id(),
CCP_PMD_MAX_QUEUE_PAIRS
},
.auth_opt = CCP_PMD_AUTH_OPT_CCP,
@@ -316,7 +316,7 @@ RTE_PMD_REGISTER_PCI(CRYPTODEV_NAME_CCP_PMD, cryptodev_ccp_pmd_drv);
RTE_PMD_REGISTER_KMOD_DEP(CRYPTODEV_NAME_CCP_PMD, "* igb_uio | uio_pci_generic | vfio-pci");
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_CCP_PMD,
"max_nb_queue_pairs=<int> "
- "socket_id=<int> "
+ "numa_id=<int> "
"ccp_auth_opt=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(ccp_crypto_drv, cryptodev_ccp_pmd_drv.driver,
ccp_cryptodev_driver_id);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 066/227] crypto/cnxk: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (64 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 065/227] crypto/ccp: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 067/227] crypto/dpaa2_sec: " Chengwen Feng
` (161 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 12 ++++++------
drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c
index a5b8aff146..f0bb698390 100644
--- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c
+++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c
@@ -356,7 +356,7 @@ cnxk_cpt_metabuf_mempool_create(const struct rte_cryptodev *dev,
dev->data->dev_id, qp_id);
pool = rte_mempool_create(mempool_name, mb_pool_sz, mlen, cache_sz, 0,
- NULL, NULL, NULL, NULL, rte_socket_id(), 0);
+ NULL, NULL, NULL, NULL, rte_numa_id(), 0);
if (pool == NULL) {
plt_err("Could not create mempool for metabuf");
@@ -394,7 +394,7 @@ cnxk_cpt_qp_create(const struct rte_cryptodev *dev, uint16_t qp_id,
int ret;
/* Allocate queue pair */
- qp = rte_zmalloc_socket("CNXK Crypto PMD Queue Pair", sizeof(*qp),
+ qp = rte_zmalloc_numa("CNXK Crypto PMD Queue Pair", sizeof(*qp),
ROC_ALIGN, 0);
if (qp == NULL) {
plt_err("Could not allocate queue pair");
@@ -407,7 +407,7 @@ cnxk_cpt_qp_create(const struct rte_cryptodev *dev, uint16_t qp_id,
qp_memzone_name_get(name, RTE_MEMZONE_NAMESIZE, dev->data->dev_id, qp_id);
- pq_mem = rte_memzone_reserve_aligned(name, len, rte_socket_id(),
+ pq_mem = rte_memzone_reserve_aligned(name, len, rte_numa_id(),
RTE_MEMZONE_SIZE_HINT_ONLY | RTE_MEMZONE_256MB,
RTE_CACHE_LINE_SIZE);
if (pq_mem == NULL) {
@@ -499,7 +499,7 @@ cnxk_cpt_queue_pair_release(struct rte_cryptodev *dev, uint16_t qp_id)
int
cnxk_cpt_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *conf,
- int socket_id __rte_unused)
+ int numa_id __rte_unused)
{
struct cnxk_cpt_vf *vf = dev->data->dev_private;
struct roc_cpt *roc_cpt = &vf->cpt;
@@ -593,7 +593,7 @@ cnxk_cpt_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
int
cnxk_cpt_queue_pair_reset(struct rte_cryptodev *dev, uint16_t qp_id,
- const struct rte_cryptodev_qp_conf *conf, int socket_id)
+ const struct rte_cryptodev_qp_conf *conf, int numa_id)
{
if (conf == NULL) {
struct cnxk_cpt_vf *vf = dev->data->dev_private;
@@ -618,7 +618,7 @@ cnxk_cpt_queue_pair_reset(struct rte_cryptodev *dev, uint16_t qp_id,
return 0;
}
- return cnxk_cpt_queue_pair_setup(dev, qp_id, conf, socket_id);
+ return cnxk_cpt_queue_pair_setup(dev, qp_id, conf, numa_id);
}
uint32_t
diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h
index 6c4265f339..a605ceb613 100644
--- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h
+++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h
@@ -139,10 +139,10 @@ void cnxk_cpt_dev_info_get(struct rte_cryptodev *dev,
int cnxk_cpt_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *conf,
- int socket_id __rte_unused);
+ int numa_id __rte_unused);
int cnxk_cpt_queue_pair_reset(struct rte_cryptodev *dev, uint16_t qp_id,
- const struct rte_cryptodev_qp_conf *conf, int socket_id);
+ const struct rte_cryptodev_qp_conf *conf, int numa_id);
int cnxk_cpt_queue_pair_release(struct rte_cryptodev *dev, uint16_t qp_id);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 067/227] crypto/dpaa2_sec: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (65 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 066/227] crypto/cnxk: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 068/227] crypto/dpaa_sec: " Chengwen Feng
` (160 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 7bcb472838..64fbf20d5a 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -2084,7 +2084,7 @@ dpaa2_sec_queue_pair_release(struct rte_cryptodev *dev, uint16_t queue_pair_id)
static int
dpaa2_sec_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- __rte_unused int socket_id)
+ __rte_unused int numa_id)
{
struct dpaa2_sec_dev_private *priv = dev->data->dev_private;
struct dpaa2_sec_qp *qp;
@@ -2137,7 +2137,7 @@ dpaa2_sec_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
FLE_POOL_BUF_SIZE,
FLE_POOL_CACHE_SIZE, 0,
NULL, NULL, NULL, NULL,
- SOCKET_ID_ANY, MEMPOOL_F_SP_PUT | MEMPOOL_F_SC_GET);
+ RTE_NUMA_ID_ANY, MEMPOOL_F_SP_PUT | MEMPOOL_F_SC_GET);
if (!qp->fle_pool) {
DPAA2_SEC_ERR("Mempool (%s) creation failed", str);
return -ENOMEM;
@@ -4376,7 +4376,7 @@ dpaa2_sec_uninit(const struct rte_cryptodev *dev)
rte_free(dev->security_ctx);
DPAA2_SEC_INFO("Closing DPAA2_SEC device %s on numa socket %u",
- dev->data->name, rte_socket_id());
+ dev->data->name, rte_numa_id());
return 0;
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 068/227] crypto/dpaa_sec: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (66 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 067/227] crypto/dpaa2_sec: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 069/227] crypto/ionic: " Chengwen Feng
` (159 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/dpaa_sec/dpaa_sec.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 65b3573a1a..9eb7772b05 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -2135,7 +2135,7 @@ dpaa_sec_queue_pair_release(struct rte_cryptodev *dev,
static int
dpaa_sec_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
__rte_unused const struct rte_cryptodev_qp_conf *qp_conf,
- __rte_unused int socket_id)
+ __rte_unused int numa_id)
{
struct dpaa_sec_dev_private *internals;
struct dpaa_sec_qp *qp = NULL;
@@ -2160,7 +2160,7 @@ dpaa_sec_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
CTX_POOL_BUF_SIZE,
CTX_POOL_CACHE_SIZE, 0,
NULL, NULL, NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (!qp->ctx_pool) {
DPAA_SEC_ERR("%s create failed", str);
return -ENOMEM;
@@ -3619,7 +3619,7 @@ dpaa_sec_uninit(struct rte_cryptodev *dev)
rte_free(dev->security_ctx);
DPAA_SEC_INFO("Closing DPAA_SEC device %s on numa socket %u",
- dev->data->name, rte_socket_id());
+ dev->data->name, rte_numa_id());
return 0;
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 069/227] crypto/ionic: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (67 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 068/227] crypto/dpaa_sec: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 070/227] crypto/ipsec_mb: " Chengwen Feng
` (158 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/ionic/ionic_crypto.h | 6 ++--
drivers/crypto/ionic/ionic_crypto_main.c | 42 ++++++++++++------------
drivers/crypto/ionic/ionic_crypto_ops.c | 8 ++---
drivers/crypto/ionic/ionic_crypto_vdev.c | 2 +-
4 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/drivers/crypto/ionic/ionic_crypto.h b/drivers/crypto/ionic/ionic_crypto.h
index 5a03260486..4054f0beb1 100644
--- a/drivers/crypto/ionic/ionic_crypto.h
+++ b/drivers/crypto/ionic/ionic_crypto.h
@@ -234,7 +234,7 @@ struct iocpt_dev {
uint32_t max_sessions;
uint16_t state;
uint8_t driver_id;
- uint8_t socket_id;
+ uint8_t numa_id;
rte_spinlock_t adminq_lock;
rte_spinlock_t adminq_service_lock;
@@ -285,7 +285,7 @@ struct iocpt_admin_ctx {
int iocpt_probe(void *bus_dev, struct rte_device *rte_dev,
struct iocpt_dev_bars *bars, const struct iocpt_dev_intf *intf,
- uint8_t driver_id, uint8_t socket_id);
+ uint8_t driver_id, uint8_t numa_id);
int iocpt_remove(struct rte_device *rte_dev);
void iocpt_configure(struct iocpt_dev *dev);
@@ -301,7 +301,7 @@ void iocpt_dev_reset(struct iocpt_dev *dev);
int iocpt_adminq_post_wait(struct iocpt_dev *dev, struct iocpt_admin_ctx *ctx);
-int iocpt_cryptoq_alloc(struct iocpt_dev *dev, uint32_t socket_id,
+int iocpt_cryptoq_alloc(struct iocpt_dev *dev, uint32_t numa_id,
uint32_t index, uint16_t ndescs);
void iocpt_cryptoq_free(struct iocpt_crypto_q *cptq);
diff --git a/drivers/crypto/ionic/ionic_crypto_main.c b/drivers/crypto/ionic/ionic_crypto_main.c
index f670d6e658..01adbb6769 100644
--- a/drivers/crypto/ionic/ionic_crypto_main.c
+++ b/drivers/crypto/ionic/ionic_crypto_main.c
@@ -68,7 +68,7 @@ iocpt_cq_service(struct iocpt_cq *cq, uint32_t work_to_do,
static int
iocpt_q_init(struct iocpt_queue *q, uint8_t type, uint32_t index,
- uint16_t num_descs, uint16_t num_segs, uint32_t socket_id)
+ uint16_t num_descs, uint16_t num_segs, uint32_t numa_id)
{
uint32_t ring_size;
@@ -87,9 +87,9 @@ iocpt_q_init(struct iocpt_queue *q, uint8_t type, uint32_t index,
q->head_idx = 0;
q->tail_idx = 0;
- q->info = rte_calloc_socket("iocpt",
+ q->info = rte_calloc_numa("iocpt",
(uint64_t)num_descs * num_segs, sizeof(void *),
- rte_mem_page_size(), socket_id);
+ rte_mem_page_size(), numa_id);
if (q->info == NULL) {
IOCPT_PRINT(ERR, "Cannot allocate queue info");
return -ENOMEM;
@@ -303,7 +303,7 @@ iocpt_session_deinit(struct iocpt_session_priv *priv)
static const struct rte_memzone *
iocpt_dma_zone_reserve(const char *type_name, uint16_t qid, size_t size,
- unsigned int align, int socket_id)
+ unsigned int align, int numa_id)
{
char zone_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz;
@@ -320,7 +320,7 @@ iocpt_dma_zone_reserve(const char *type_name, uint16_t qid, size_t size,
if (mz != NULL)
return mz;
- return rte_memzone_reserve_aligned(zone_name, size, socket_id,
+ return rte_memzone_reserve_aligned(zone_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, align);
}
@@ -328,7 +328,7 @@ static int
iocpt_commonq_alloc(struct iocpt_dev *dev,
uint8_t type,
size_t struct_size,
- uint32_t socket_id,
+ uint32_t numa_id,
uint32_t index,
const char *type_name,
uint16_t flags,
@@ -364,8 +364,8 @@ iocpt_commonq_alloc(struct iocpt_dev *dev,
if (flags & IOCPT_Q_F_SG)
total_size += RTE_ALIGN(sg_size, page_size) + page_size;
- new = rte_zmalloc_socket("iocpt", struct_size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ new = rte_zmalloc_numa("iocpt", struct_size,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (new == NULL) {
IOCPT_PRINT(ERR, "Cannot allocate queue structure");
return -ENOMEM;
@@ -374,7 +374,7 @@ iocpt_commonq_alloc(struct iocpt_dev *dev,
new->dev = dev;
err = iocpt_q_init(&new->q, type, index, num_descs, num_segs,
- socket_id);
+ numa_id);
if (err != 0) {
IOCPT_PRINT(ERR, "Queue initialization failed");
goto err_free_q;
@@ -387,7 +387,7 @@ iocpt_commonq_alloc(struct iocpt_dev *dev,
}
new->base_z = iocpt_dma_zone_reserve(type_name, index, total_size,
- IONIC_ALIGN, socket_id);
+ IONIC_ALIGN, numa_id);
if (new->base_z == NULL) {
IOCPT_PRINT(ERR, "Cannot reserve queue DMA memory");
err = -ENOMEM;
@@ -428,7 +428,7 @@ iocpt_commonq_alloc(struct iocpt_dev *dev,
}
int
-iocpt_cryptoq_alloc(struct iocpt_dev *dev, uint32_t socket_id, uint32_t index,
+iocpt_cryptoq_alloc(struct iocpt_dev *dev, uint32_t numa_id, uint32_t index,
uint16_t num_descs)
{
struct iocpt_crypto_q *cptq;
@@ -444,7 +444,7 @@ iocpt_cryptoq_alloc(struct iocpt_dev *dev, uint32_t socket_id, uint32_t index,
err = iocpt_commonq_alloc(dev,
IOCPT_QTYPE_CRYPTOQ,
sizeof(struct iocpt_crypto_q),
- socket_id,
+ numa_id,
index,
"crypto",
flags,
@@ -589,7 +589,7 @@ iocpt_adminq_alloc(struct iocpt_dev *dev)
err = iocpt_commonq_alloc(dev,
IOCPT_QTYPE_ADMINQ,
sizeof(struct iocpt_admin_q),
- rte_socket_id(),
+ rte_numa_id(),
0,
"admin",
flags,
@@ -645,9 +645,9 @@ iocpt_alloc_objs(struct iocpt_dev *dev)
IOCPT_PRINT(DEBUG, "Crypto: %s", dev->name);
- dev->cryptoqs = rte_calloc_socket("iocpt",
+ dev->cryptoqs = rte_calloc_numa("iocpt",
dev->max_qps, sizeof(*dev->cryptoqs),
- RTE_CACHE_LINE_SIZE, dev->socket_id);
+ RTE_CACHE_LINE_SIZE, dev->numa_id);
if (dev->cryptoqs == NULL) {
IOCPT_PRINT(ERR, "Cannot allocate tx queues array");
return -ENOMEM;
@@ -665,7 +665,7 @@ iocpt_alloc_objs(struct iocpt_dev *dev)
dev->info_sz = RTE_ALIGN(sizeof(*dev->info), rte_mem_page_size());
dev->info_z = iocpt_dma_zone_reserve("info", 0, dev->info_sz,
- IONIC_ALIGN, dev->socket_id);
+ IONIC_ALIGN, dev->numa_id);
if (dev->info_z == NULL) {
IOCPT_PRINT(ERR, "Cannot allocate dev info memory");
err = -ENOMEM;
@@ -676,8 +676,8 @@ iocpt_alloc_objs(struct iocpt_dev *dev)
dev->info_pa = dev->info_z->iova;
bmsize = rte_bitmap_get_memory_footprint(dev->max_sessions);
- bm = rte_malloc_socket("iocpt", bmsize,
- RTE_CACHE_LINE_SIZE, dev->socket_id);
+ bm = rte_malloc_numa("iocpt", bmsize,
+ RTE_CACHE_LINE_SIZE, dev->numa_id);
if (bm == NULL) {
IOCPT_PRINT(ERR, "Cannot allocate %uB bitmap memory", bmsize);
err = -ENOMEM;
@@ -849,12 +849,12 @@ iocpt_devargs(struct rte_devargs *devargs, struct iocpt_dev *dev)
int
iocpt_probe(void *bus_dev, struct rte_device *rte_dev,
struct iocpt_dev_bars *bars, const struct iocpt_dev_intf *intf,
- uint8_t driver_id, uint8_t socket_id)
+ uint8_t driver_id, uint8_t numa_id)
{
struct rte_cryptodev_pmd_init_params init_params = {
"iocpt",
sizeof(struct iocpt_dev),
- socket_id,
+ numa_id,
RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS
};
struct rte_cryptodev *cdev;
@@ -883,7 +883,7 @@ iocpt_probe(void *bus_dev, struct rte_device *rte_dev,
dev->bus_dev = bus_dev;
dev->intf = intf;
dev->driver_id = driver_id;
- dev->socket_id = socket_id;
+ dev->numa_id = numa_id;
for (i = 0; i < bars->num_bars; i++) {
struct ionic_dev_bar *bar = &bars->bar[i];
diff --git a/drivers/crypto/ionic/ionic_crypto_ops.c b/drivers/crypto/ionic/ionic_crypto_ops.c
index 839bbf69d1..405c282fd7 100644
--- a/drivers/crypto/ionic/ionic_crypto_ops.c
+++ b/drivers/crypto/ionic/ionic_crypto_ops.c
@@ -101,7 +101,7 @@ iocpt_op_queue_release(struct rte_cryptodev *cdev, uint16_t queue_id)
static int
iocpt_op_queue_setup(struct rte_cryptodev *cdev, uint16_t queue_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct iocpt_dev *dev = cdev->data->dev_private;
int err;
@@ -119,7 +119,7 @@ iocpt_op_queue_setup(struct rte_cryptodev *cdev, uint16_t queue_id,
IOCPT_PRINT(DEBUG, "queue_id %u", queue_id);
- err = iocpt_cryptoq_alloc(dev, socket_id, queue_id,
+ err = iocpt_cryptoq_alloc(dev, numa_id, queue_id,
qp_conf->nb_descriptors);
if (err != 0)
return err;
@@ -428,8 +428,8 @@ iocpt_enqueue_wdog(struct iocpt_crypto_q *cptq)
if (avail < 1)
goto out_flush;
- wdog_op = rte_zmalloc_socket("iocpt", sizeof(*wdog_op),
- RTE_CACHE_LINE_SIZE, rte_socket_id());
+ wdog_op = rte_zmalloc_numa("iocpt", sizeof(*wdog_op),
+ RTE_CACHE_LINE_SIZE, rte_numa_id());
if (wdog_op == NULL)
goto out_flush;
diff --git a/drivers/crypto/ionic/ionic_crypto_vdev.c b/drivers/crypto/ionic/ionic_crypto_vdev.c
index d15acf660a..e4a7d56e5d 100644
--- a/drivers/crypto/ionic/ionic_crypto_vdev.c
+++ b/drivers/crypto/ionic/ionic_crypto_vdev.c
@@ -107,7 +107,7 @@ iocpt_vdev_probe(struct rte_vdev_device *vdev)
return iocpt_probe((void *)vdev, &vdev->device,
&bars, &iocpt_vdev_intf,
- iocpt_vdev_driver_id, rte_socket_id());
+ iocpt_vdev_driver_id, rte_numa_id());
}
static int
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 070/227] crypto/ipsec_mb: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (68 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 069/227] crypto/ionic: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 071/227] crypto/mlx5: " Chengwen Feng
` (157 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 22 +++++++++++-----------
drivers/crypto/ipsec_mb/ipsec_mb_private.c | 2 +-
drivers/crypto/ipsec_mb/ipsec_mb_private.h | 4 ++--
drivers/crypto/ipsec_mb/pmd_aesni_gcm.c | 6 +++---
drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 2 +-
drivers/crypto/ipsec_mb/pmd_snow3g.c | 2 +-
drivers/crypto/ipsec_mb/pmd_zuc.c | 2 +-
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
index 50ee140ccd..7a9a518c74 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
@@ -96,7 +96,7 @@ ipsec_mb_info_get(struct rte_cryptodev *dev,
static int
ipsec_mb_secondary_qp_op(int dev_id, int qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id, enum ipsec_mb_mp_req_type op_type)
+ int numa_id, enum ipsec_mb_mp_req_type op_type)
{
int ret;
struct rte_mp_msg qp_req_msg;
@@ -114,7 +114,7 @@ ipsec_mb_secondary_qp_op(int dev_id, int qp_id,
req_param->type = op_type;
req_param->dev_id = dev_id;
req_param->qp_id = qp_id;
- req_param->socket_id = socket_id;
+ req_param->numa_id = numa_id;
req_param->process_id = getpid();
if (qp_conf) {
req_param->nb_descriptors = qp_conf->nb_descriptors;
@@ -179,7 +179,7 @@ ipsec_mb_qp_set_unique_name(struct rte_cryptodev *dev,
/** Create a ring to place processed operations on */
static struct rte_ring
*ipsec_mb_qp_create_processed_ops_ring(
- struct ipsec_mb_qp *qp, unsigned int ring_size, int socket_id)
+ struct ipsec_mb_qp *qp, unsigned int ring_size, int numa_id)
{
struct rte_ring *r;
char ring_name[RTE_CRYPTODEV_NAME_MAX_LEN];
@@ -203,7 +203,7 @@ static struct rte_ring
return NULL;
}
- return rte_ring_create(ring_name, ring_size, socket_id,
+ return rte_ring_create(ring_name, ring_size, numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
}
@@ -218,7 +218,7 @@ ipsec_mb_alloc_mgr_from_memzone(const struct rte_memzone **mb_mgr_mz,
if (*mb_mgr_mz == NULL) {
*mb_mgr_mz = rte_memzone_reserve(mb_mgr_mz_name,
imb_get_mb_mgr_size(),
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
}
if (*mb_mgr_mz == NULL) {
IPSEC_MB_LOG(DEBUG, "Error allocating memzone for %s",
@@ -244,7 +244,7 @@ ipsec_mb_alloc_mgr_from_memzone(const struct rte_memzone **mb_mgr_mz,
int
ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct ipsec_mb_qp *qp = NULL;
struct ipsec_mb_dev_private *internals = dev->data->dev_private;
@@ -258,7 +258,7 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
if (qp == NULL) {
IPSEC_MB_LOG(DEBUG, "Secondary process setting up device qp.");
return ipsec_mb_secondary_qp_op(dev->data->dev_id, qp_id,
- qp_conf, socket_id, RTE_IPSEC_MB_MP_REQ_QP_SET);
+ qp_conf, numa_id, RTE_IPSEC_MB_MP_REQ_QP_SET);
}
} else {
/* Free memory prior to re-allocation if needed. */
@@ -267,8 +267,8 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
qp_size = sizeof(*qp) + pmd_data->qp_priv_size;
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("IPSEC PMD Queue Pair", qp_size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa("IPSEC PMD Queue Pair", qp_size,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL)
return -ENOMEM;
}
@@ -297,7 +297,7 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
qp->sess_mp = qp_conf->mp_session;
qp->ingress_queue = ipsec_mb_qp_create_processed_ops_ring(qp,
- qp_conf->nb_descriptors, socket_id);
+ qp_conf->nb_descriptors, numa_id);
if (qp->ingress_queue == NULL) {
ret = -EINVAL;
goto qp_setup_cleanup;
@@ -356,7 +356,7 @@ ipsec_mb_ipc_request(const struct rte_mp_msg *mp_msg, const void *peer)
goto out;
}
- ret = ipsec_mb_qp_setup(dev, qp_id, &queue_conf, req_param->socket_id);
+ ret = ipsec_mb_qp_setup(dev, qp_id, &queue_conf, req_param->numa_id);
if (!ret) {
qp = dev->data->queue_pairs[qp_id];
if (!qp) {
diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_private.c b/drivers/crypto/ipsec_mb/ipsec_mb_private.c
index 23ec99004b..92c60daacd 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_private.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_private.c
@@ -101,7 +101,7 @@ ipsec_mb_create(struct rte_vdev_device *vdev,
pmd_data->internals_priv_size;
init_params.max_nb_queue_pairs =
RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS;
- init_params.numa_id = rte_socket_id();
+ init_params.numa_id = rte_numa_id();
name = rte_vdev_device_name(vdev);
if (name == NULL)
diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_private.h b/drivers/crypto/ipsec_mb/ipsec_mb_private.h
index fc7d6f5f06..636b9d393e 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_private.h
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_private.h
@@ -163,7 +163,7 @@ struct ipsec_mb_mp_param {
/**< The identifier of the device */
int qp_id;
/**< The index of the queue pair to be configured */
- int socket_id;
+ int numa_id;
/**< Socket to allocate resources on */
uint16_t process_id;
/**< The pid who send out the requested */
@@ -411,7 +411,7 @@ ipsec_mb_qp_set_unique_name(struct rte_cryptodev *dev, struct ipsec_mb_qp *qp);
int
ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id);
+ int numa_id);
/** Returns the size of the aesni multi-buffer session structure */
unsigned
diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c b/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c
index 2a4bede7dd..57967653da 100644
--- a/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c
+++ b/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c
@@ -740,9 +740,9 @@ aesni_gcm_process_bulk(struct rte_cryptodev *dev __rte_unused,
static int
aesni_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
- int ret = ipsec_mb_qp_setup(dev, qp_id, qp_conf, socket_id);
+ int ret = ipsec_mb_qp_setup(dev, qp_id, qp_conf, numa_id);
if (ret < 0)
return ret;
@@ -790,7 +790,7 @@ static struct cryptodev_driver aesni_gcm_crypto_drv;
RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_GCM_PMD,
cryptodev_aesni_gcm_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_GCM_PMD,
- "max_nb_queue_pairs=<int> socket_id=<int>");
+ "max_nb_queue_pairs=<int> numa_id=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(aesni_gcm_crypto_drv,
cryptodev_aesni_gcm_pmd_drv.driver,
pmd_driver_id_aesni_gcm);
diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
index d39539d7aa..d1a044f205 100644
--- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
@@ -2552,7 +2552,7 @@ static struct cryptodev_driver aesni_mb_crypto_drv;
RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_AESNI_MB_PMD,
cryptodev_aesni_mb_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_MB_PMD,
- "max_nb_queue_pairs=<int> socket_id=<int>");
+ "max_nb_queue_pairs=<int> numa_id=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(
aesni_mb_crypto_drv,
cryptodev_aesni_mb_pmd_drv.driver,
diff --git a/drivers/crypto/ipsec_mb/pmd_snow3g.c b/drivers/crypto/ipsec_mb/pmd_snow3g.c
index 28b078ea0c..54e8ba6588 100644
--- a/drivers/crypto/ipsec_mb/pmd_snow3g.c
+++ b/drivers/crypto/ipsec_mb/pmd_snow3g.c
@@ -575,7 +575,7 @@ static struct cryptodev_driver snow3g_crypto_drv;
RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_SNOW3G_PMD, cryptodev_snow3g_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SNOW3G_PMD,
- "max_nb_queue_pairs=<int> socket_id=<int>");
+ "max_nb_queue_pairs=<int> numa_id=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(snow3g_crypto_drv,
cryptodev_snow3g_pmd_drv.driver,
pmd_driver_id_snow3g);
diff --git a/drivers/crypto/ipsec_mb/pmd_zuc.c b/drivers/crypto/ipsec_mb/pmd_zuc.c
index 102ac520bb..784c2aa2bf 100644
--- a/drivers/crypto/ipsec_mb/pmd_zuc.c
+++ b/drivers/crypto/ipsec_mb/pmd_zuc.c
@@ -378,7 +378,7 @@ static struct cryptodev_driver zuc_crypto_drv;
RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ZUC_PMD, cryptodev_zuc_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_ZUC_PMD,
- "max_nb_queue_pairs=<int> socket_id=<int>");
+ "max_nb_queue_pairs=<int> numa_id=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(zuc_crypto_drv, cryptodev_zuc_pmd_drv.driver,
pmd_driver_id_zuc);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 071/227] crypto/mlx5: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (69 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 070/227] crypto/ipsec_mb: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 072/227] crypto/mvsam: " Chengwen Feng
` (156 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/mlx5/mlx5_crypto.c | 2 +-
drivers/crypto/mlx5/mlx5_crypto_gcm.c | 16 ++++++++--------
drivers/crypto/mlx5/mlx5_crypto_xts.c | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c
index 821dd54b31..c668b2d04a 100644
--- a/drivers/crypto/mlx5/mlx5_crypto.c
+++ b/drivers/crypto/mlx5/mlx5_crypto.c
@@ -353,7 +353,7 @@ mlx5_crypto_dev_probe(struct mlx5_common_device *cdev,
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
.private_data_size = sizeof(struct mlx5_crypto_priv),
- .socket_id = cdev->dev->numa_node,
+ .numa_id = cdev->dev->numa_node,
.max_nb_queue_pairs =
RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS,
};
diff --git a/drivers/crypto/mlx5/mlx5_crypto_gcm.c b/drivers/crypto/mlx5/mlx5_crypto_gcm.c
index d0f01dab4a..078162e7b4 100644
--- a/drivers/crypto/mlx5/mlx5_crypto_gcm.c
+++ b/drivers/crypto/mlx5/mlx5_crypto_gcm.c
@@ -264,7 +264,7 @@ mlx5_crypto_gcm_init_qp(struct mlx5_crypto_qp *qp)
static inline int
mlx5_crypto_gcm_umr_qp_setup(struct rte_cryptodev *dev, struct mlx5_crypto_qp *qp,
- int socket_id)
+ int numa_id)
{
struct mlx5_crypto_priv *priv = dev->data->dev_private;
struct mlx5_devx_qp_attr attr = {0};
@@ -284,7 +284,7 @@ mlx5_crypto_gcm_umr_qp_setup(struct rte_cryptodev *dev, struct mlx5_crypto_qp *q
attr.cd_master = 1;
ret = mlx5_devx_qp_create(priv->cdev->ctx, &qp->umr_qp_obj,
attr.num_of_send_wqbbs * MLX5_SEND_WQE_BB,
- &attr, socket_id);
+ &attr, numa_id);
if (ret) {
DRV_LOG(ERR, "Failed to create UMR QP.");
return -1;
@@ -301,7 +301,7 @@ mlx5_crypto_gcm_umr_qp_setup(struct rte_cryptodev *dev, struct mlx5_crypto_qp *q
static int
mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct mlx5_crypto_priv *priv = dev->data->dev_private;
struct mlx5_hca_attr *attr = &priv->cdev->config.hca_attr;
@@ -332,8 +332,8 @@ mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
alloc_size = RTE_ALIGN(alloc_size, RTE_CACHE_LINE_SIZE);
alloc_size += (sizeof(struct rte_crypto_op *) +
extra_obj_size) * entries;
- qp = rte_zmalloc_socket(__func__, alloc_size, RTE_CACHE_LINE_SIZE,
- socket_id);
+ qp = rte_zmalloc_numa(__func__, alloc_size, RTE_CACHE_LINE_SIZE,
+ numa_id);
if (qp == NULL) {
DRV_LOG(ERR, "Failed to allocate qp memory.");
rte_errno = ENOMEM;
@@ -377,7 +377,7 @@ mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
qp->cq_entries_n = rte_align32pow2(entries * (mlx5_crypto_is_ipsec_opt(priv) ? 1 : 3));
ret = mlx5_devx_cq_create(priv->cdev->ctx, &qp->cq_obj,
rte_log2_u32(qp->cq_entries_n),
- &cq_attr, socket_id);
+ &cq_attr, numa_id);
if (ret != 0) {
DRV_LOG(ERR, "Failed to create CQ.");
goto err;
@@ -391,7 +391,7 @@ mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
qp_attr.cd_slave_send = !mlx5_crypto_is_ipsec_opt(priv);
ret = mlx5_devx_qp_create(priv->cdev->ctx, &qp->qp_obj,
qp_attr.num_of_send_wqbbs * MLX5_WQE_SIZE,
- &qp_attr, socket_id);
+ &qp_attr, numa_id);
if (ret != 0) {
DRV_LOG(ERR, "Failed to create QP.");
goto err;
@@ -403,7 +403,7 @@ mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
qp->ops = (struct rte_crypto_op **)(qp + 1);
if (!mlx5_crypto_is_ipsec_opt(priv)) {
qp->mkey = (struct mlx5_devx_obj **)(qp->ops + entries);
- if (mlx5_crypto_gcm_umr_qp_setup(dev, qp, socket_id)) {
+ if (mlx5_crypto_gcm_umr_qp_setup(dev, qp, numa_id)) {
DRV_LOG(ERR, "Failed to setup UMR QP.");
goto err;
}
diff --git a/drivers/crypto/mlx5/mlx5_crypto_xts.c b/drivers/crypto/mlx5/mlx5_crypto_xts.c
index badde267a7..26b2bcbe1c 100644
--- a/drivers/crypto/mlx5/mlx5_crypto_xts.c
+++ b/drivers/crypto/mlx5/mlx5_crypto_xts.c
@@ -460,7 +460,7 @@ mlx5_crypto_gcm_mkey_klm_update(struct mlx5_crypto_priv *priv,
static int
mlx5_crypto_xts_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct mlx5_crypto_priv *priv = dev->data->dev_private;
struct mlx5_devx_qp_attr attr = {0};
@@ -486,15 +486,15 @@ mlx5_crypto_xts_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
alloc_size += (sizeof(struct rte_crypto_op *) +
sizeof(struct mlx5_devx_obj *)) *
(size_t)RTE_BIT32(log_nb_desc);
- qp = rte_zmalloc_socket(__func__, alloc_size, RTE_CACHE_LINE_SIZE,
- socket_id);
+ qp = rte_zmalloc_numa(__func__, alloc_size, RTE_CACHE_LINE_SIZE,
+ numa_id);
if (qp == NULL) {
DRV_LOG(ERR, "Failed to allocate QP memory.");
rte_errno = ENOMEM;
return -rte_errno;
}
if (mlx5_devx_cq_create(priv->cdev->ctx, &qp->cq_obj, log_nb_desc,
- &cq_attr, socket_id) != 0) {
+ &cq_attr, numa_id) != 0) {
DRV_LOG(ERR, "Failed to create CQ.");
goto error;
}
@@ -509,7 +509,7 @@ mlx5_crypto_xts_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
mlx5_ts_format_conv(priv->cdev->config.hca_attr.qp_ts_format);
ret = mlx5_devx_qp_create(priv->cdev->ctx, &qp->qp_obj,
attr.num_of_send_wqbbs * MLX5_WQE_SIZE,
- &attr, socket_id);
+ &attr, numa_id);
if (ret) {
DRV_LOG(ERR, "Failed to create QP.");
goto error;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 072/227] crypto/mvsam: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (70 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 071/227] crypto/mlx5: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 073/227] crypto/nitrox: " Chengwen Feng
` (155 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/mvsam/rte_mrvl_pmd.c | 4 ++--
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd.c b/drivers/crypto/mvsam/rte_mrvl_pmd.c
index c69f526c52..26069d9db3 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd.c
@@ -1258,7 +1258,7 @@ cryptodev_mrvl_crypto_uninit(struct rte_vdev_device *vdev)
return -EINVAL;
MRVL_LOG(INFO, "Closing Marvell crypto device %s on numa socket %u.",
- name, rte_socket_id());
+ name, rte_numa_id());
sam_deinit();
rte_mvep_deinit(MVEP_MOD_T_SAM);
@@ -1285,7 +1285,7 @@ RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_MRVL_PMD, cryptodev_mrvl_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_MRVL_PMD,
"max_nb_queue_pairs=<int> "
"max_nb_sessions=<int> "
- "socket_id=<int>");
+ "numa_id=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(mrvl_crypto_drv, cryptodev_mrvl_pmd_drv.driver,
cryptodev_driver_id);
RTE_LOG_REGISTER_DEFAULT(mrvl_logtype_driver, NOTICE);
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
index 5a0658cf83..d485c3dd52 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
@@ -628,21 +628,21 @@ mrvl_crypto_pmd_close(struct rte_cryptodev *dev)
* @param dev Pointer to the device structure.
* @param qp_id ID of the Queue Pair.
* @param qp_conf Queue pair configuration (nb of descriptors).
- * @param socket_id NUMA socket to allocate memory on.
+ * @param numa_id NUMA socket to allocate memory on.
* @returns 0 upon success, negative value otherwise.
*/
static int
mrvl_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct mrvl_crypto_qp *qp = NULL;
char match[RTE_CRYPTODEV_NAME_MAX_LEN];
unsigned int n;
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("MRVL Crypto PMD Queue Pair", sizeof(*qp),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa("MRVL Crypto PMD Queue Pair", sizeof(*qp),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL)
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 073/227] crypto/nitrox: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (71 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 072/227] crypto/mvsam: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 074/227] crypto/null: " Chengwen Feng
` (154 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/nitrox/nitrox_sym.c | 10 +++++-----
drivers/crypto/nitrox/nitrox_sym_reqmgr.c | 4 ++--
drivers/crypto/nitrox/nitrox_sym_reqmgr.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/nitrox/nitrox_sym.c b/drivers/crypto/nitrox/nitrox_sym.c
index 510d6059b1..5f7a37573c 100644
--- a/drivers/crypto/nitrox/nitrox_sym.c
+++ b/drivers/crypto/nitrox/nitrox_sym.c
@@ -170,7 +170,7 @@ nitrox_sym_dev_stats_reset(struct rte_cryptodev *cdev)
static int
nitrox_sym_dev_qp_setup(struct rte_cryptodev *cdev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct nitrox_sym_device *sym_dev = cdev->data->dev_private;
struct nitrox_device *ndev = sym_dev->ndev;
@@ -190,9 +190,9 @@ nitrox_sym_dev_qp_setup(struct rte_cryptodev *cdev, uint16_t qp_id,
return err;
}
- qp = rte_zmalloc_socket("nitrox PMD qp", sizeof(*qp),
+ qp = rte_zmalloc_numa("nitrox PMD qp", sizeof(*qp),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!qp) {
NITROX_LOG_LINE(ERR, "Failed to allocate nitrox qp");
return -ENOMEM;
@@ -202,12 +202,12 @@ nitrox_sym_dev_qp_setup(struct rte_cryptodev *cdev, uint16_t qp_id,
qp->qno = qp_id;
err = nitrox_qp_setup(qp, ndev->bar_addr, cdev->data->name,
qp_conf->nb_descriptors, NPS_PKT_IN_INSTR_SIZE,
- socket_id);
+ numa_id);
if (unlikely(err))
goto qp_setup_err;
qp->sr_mp = nitrox_sym_req_pool_create(cdev, qp->count, qp_id,
- socket_id);
+ numa_id);
if (unlikely(!qp->sr_mp))
goto req_pool_err;
diff --git a/drivers/crypto/nitrox/nitrox_sym_reqmgr.c b/drivers/crypto/nitrox/nitrox_sym_reqmgr.c
index 7751c1a9fc..dd2809935c 100644
--- a/drivers/crypto/nitrox/nitrox_sym_reqmgr.c
+++ b/drivers/crypto/nitrox/nitrox_sym_reqmgr.c
@@ -888,7 +888,7 @@ req_pool_obj_init(__rte_unused struct rte_mempool *mp,
struct rte_mempool *
nitrox_sym_req_pool_create(struct rte_cryptodev *cdev, uint32_t nobjs,
- uint16_t qp_id, int socket_id)
+ uint16_t qp_id, int numa_id)
{
char softreq_pool_name[RTE_RING_NAMESIZE];
struct rte_mempool *mp;
@@ -899,7 +899,7 @@ nitrox_sym_req_pool_create(struct rte_cryptodev *cdev, uint32_t nobjs,
RTE_ALIGN_MUL_CEIL(nobjs, 64),
sizeof(struct nitrox_softreq),
64, 0, NULL, NULL, req_pool_obj_init, NULL,
- socket_id, 0);
+ numa_id, 0);
if (unlikely(!mp))
NITROX_LOG_LINE(ERR, "Failed to create req pool, qid %d, err %d",
qp_id, rte_errno);
diff --git a/drivers/crypto/nitrox/nitrox_sym_reqmgr.h b/drivers/crypto/nitrox/nitrox_sym_reqmgr.h
index fa2637bdb8..37e557360f 100644
--- a/drivers/crypto/nitrox/nitrox_sym_reqmgr.h
+++ b/drivers/crypto/nitrox/nitrox_sym_reqmgr.h
@@ -17,7 +17,7 @@ int nitrox_check_se_req(struct nitrox_softreq *sr, struct rte_crypto_op **op);
void *nitrox_sym_instr_addr(struct nitrox_softreq *sr);
struct rte_mempool *nitrox_sym_req_pool_create(struct rte_cryptodev *cdev,
uint32_t nobjs, uint16_t qp_id,
- int socket_id);
+ int numa_id);
void nitrox_sym_req_pool_free(struct rte_mempool *mp);
#endif /* _NITROX_SYM_REQMGR_H_ */
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 074/227] crypto/null: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (72 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 073/227] crypto/nitrox: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 075/227] crypto/octeontx: " Chengwen Feng
` (153 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/null/null_crypto_pmd.c | 4 ++--
drivers/crypto/null/null_crypto_pmd_ops.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c
index 6db9deaee8..a32eca5514 100644
--- a/drivers/crypto/null/null_crypto_pmd.c
+++ b/drivers/crypto/null/null_crypto_pmd.c
@@ -186,7 +186,7 @@ cryptodev_null_probe(struct rte_vdev_device *dev)
struct rte_cryptodev_pmd_init_params init_params = {
"",
sizeof(struct null_crypto_private),
- rte_socket_id(),
+ rte_numa_id(),
RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS
};
const char *name, *args;
@@ -237,7 +237,7 @@ static struct cryptodev_driver null_crypto_drv;
RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_NULL_PMD, cryptodev_null_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_NULL_PMD,
"max_nb_queue_pairs=<int> "
- "socket_id=<int>");
+ "numa_id=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(null_crypto_drv, cryptodev_null_pmd_drv.driver,
cryptodev_driver_id);
RTE_LOG_REGISTER_DEFAULT(null_logtype_driver, INFO);
diff --git a/drivers/crypto/null/null_crypto_pmd_ops.c b/drivers/crypto/null/null_crypto_pmd_ops.c
index f07e9c2ea0..27bc9231b3 100644
--- a/drivers/crypto/null/null_crypto_pmd_ops.c
+++ b/drivers/crypto/null/null_crypto_pmd_ops.c
@@ -161,7 +161,7 @@ null_crypto_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
/** Create a ring to place process packets on */
static struct rte_ring *
null_crypto_pmd_qp_create_processed_pkts_ring(struct null_crypto_qp *qp,
- unsigned ring_size, int socket_id)
+ unsigned int ring_size, int numa_id)
{
struct rte_ring *r;
@@ -180,7 +180,7 @@ null_crypto_pmd_qp_create_processed_pkts_ring(struct null_crypto_qp *qp,
return NULL;
}
- return rte_ring_create(qp->name, ring_size, socket_id,
+ return rte_ring_create(qp->name, ring_size, numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
}
@@ -188,7 +188,7 @@ null_crypto_pmd_qp_create_processed_pkts_ring(struct null_crypto_qp *qp,
static int
null_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct null_crypto_private *internals = dev->data->dev_private;
struct null_crypto_qp *qp;
@@ -206,8 +206,8 @@ null_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
null_crypto_pmd_qp_release(dev, qp_id);
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("Null Crypto PMD Queue Pair", sizeof(*qp),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa("Null Crypto PMD Queue Pair", sizeof(*qp),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL) {
NULL_LOG(ERR, "Failed to allocate queue pair memory");
return (-ENOMEM);
@@ -225,7 +225,7 @@ null_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
}
qp->processed_pkts = null_crypto_pmd_qp_create_processed_pkts_ring(qp,
- qp_conf->nb_descriptors, socket_id);
+ qp_conf->nb_descriptors, numa_id);
if (qp->processed_pkts == NULL) {
NULL_LOG(ERR, "Failed to create unique name for null "
"crypto device");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 075/227] crypto/octeontx: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (73 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 074/227] crypto/null: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 076/227] crypto/openssl: " Chengwen Feng
` (152 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/octeontx/otx_cryptodev.c | 2 +-
drivers/crypto/octeontx/otx_cryptodev_hw_access.c | 2 +-
drivers/crypto/octeontx/otx_cryptodev_ops.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/octeontx/otx_cryptodev.c b/drivers/crypto/octeontx/otx_cryptodev.c
index b2f6f53ee3..8ddfa28865 100644
--- a/drivers/crypto/octeontx/otx_cryptodev.c
+++ b/drivers/crypto/octeontx/otx_cryptodev.c
@@ -42,7 +42,7 @@ otx_cpt_pci_probe(struct rte_pci_driver *pci_drv,
rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
- cryptodev = rte_cryptodev_pmd_allocate(name, rte_socket_id());
+ cryptodev = rte_cryptodev_pmd_allocate(name, rte_numa_id());
if (cryptodev == NULL)
return -ENOMEM;
diff --git a/drivers/crypto/octeontx/otx_cryptodev_hw_access.c b/drivers/crypto/octeontx/otx_cryptodev_hw_access.c
index 27604459e4..6c91a82564 100644
--- a/drivers/crypto/octeontx/otx_cryptodev_hw_access.c
+++ b/drivers/crypto/octeontx/otx_cryptodev_hw_access.c
@@ -458,7 +458,7 @@ otx_cpt_metabuf_mempool_create(const struct rte_cryptodev *dev,
pool = rte_mempool_create_empty(mempool_name, mb_pool_sz, max_mlen,
METABUF_POOL_CACHE_SIZE, 0,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (pool == NULL) {
CPT_LOG_ERR("Could not create mempool for metabuf");
diff --git a/drivers/crypto/octeontx/otx_cryptodev_ops.c b/drivers/crypto/octeontx/otx_cryptodev_ops.c
index 40f565cd78..abb94bf8d1 100644
--- a/drivers/crypto/octeontx/otx_cryptodev_ops.c
+++ b/drivers/crypto/octeontx/otx_cryptodev_ops.c
@@ -137,7 +137,7 @@ static int
otx_cpt_que_pair_setup(struct rte_cryptodev *dev,
uint16_t que_pair_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id __rte_unused)
+ int numa_id __rte_unused)
{
struct cpt_instance *instance = NULL;
struct rte_pci_device *pci_dev;
@@ -1017,9 +1017,9 @@ otx_cpt_dev_create(struct rte_cryptodev *c_dev)
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
- cptvf = rte_zmalloc_socket("otx_cryptodev_private_mem",
+ cptvf = rte_zmalloc_numa("otx_cryptodev_private_mem",
sizeof(struct cpt_vf), RTE_CACHE_LINE_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (cptvf == NULL) {
CPT_LOG_ERR("Cannot allocate memory for device private data");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 076/227] crypto/openssl: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (74 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 075/227] crypto/octeontx: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 077/227] crypto/scheduler: " Chengwen Feng
` (151 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/openssl/rte_openssl_pmd.c | 4 ++--
drivers/crypto/openssl/rte_openssl_pmd_ops.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c
index 1b33470c8f..c105d6a263 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd.c
@@ -4218,7 +4218,7 @@ cryptodev_openssl_probe(struct rte_vdev_device *vdev)
struct rte_cryptodev_pmd_init_params init_params = {
"",
sizeof(struct openssl_private),
- rte_socket_id(),
+ rte_numa_id(),
RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS
};
const char *name;
@@ -4265,7 +4265,7 @@ RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_OPENSSL_PMD,
cryptodev_openssl_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_OPENSSL_PMD,
"max_nb_queue_pairs=<int> "
- "socket_id=<int>");
+ "numa_id=<int>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(openssl_crypto_drv,
cryptodev_openssl_pmd_drv.driver, cryptodev_driver_id);
RTE_LOG_REGISTER_DEFAULT(openssl_logtype_driver, INFO);
diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
index d3718c28e4..d6a2dfb549 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
@@ -1080,7 +1080,7 @@ openssl_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
/** Create a ring to place processed operations on */
static struct rte_ring *
openssl_pmd_qp_create_processed_ops_ring(struct openssl_qp *qp,
- unsigned int ring_size, int socket_id)
+ unsigned int ring_size, int numa_id)
{
struct rte_ring *r;
@@ -1099,7 +1099,7 @@ openssl_pmd_qp_create_processed_ops_ring(struct openssl_qp *qp,
return NULL;
}
- return rte_ring_create(qp->name, ring_size, socket_id,
+ return rte_ring_create(qp->name, ring_size, numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
}
@@ -1108,7 +1108,7 @@ openssl_pmd_qp_create_processed_ops_ring(struct openssl_qp *qp,
static int
openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct openssl_qp *qp = NULL;
@@ -1117,8 +1117,8 @@ openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
openssl_pmd_qp_release(dev, qp_id);
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("OPENSSL PMD Queue Pair", sizeof(*qp),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa("OPENSSL PMD Queue Pair", sizeof(*qp),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL)
return -ENOMEM;
@@ -1129,7 +1129,7 @@ openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
goto qp_setup_cleanup;
qp->processed_ops = openssl_pmd_qp_create_processed_ops_ring(qp,
- qp_conf->nb_descriptors, socket_id);
+ qp_conf->nb_descriptors, numa_id);
if (qp->processed_ops == NULL)
goto qp_setup_cleanup;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 077/227] crypto/scheduler: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (75 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 076/227] crypto/openssl: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 078/227] crypto/uadk: " Chengwen Feng
` (150 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
.../scheduler/rte_cryptodev_scheduler.c | 16 +++++++-------
drivers/crypto/scheduler/scheduler_failover.c | 4 ++--
.../crypto/scheduler/scheduler_multicore.c | 12 +++++-----
.../scheduler/scheduler_pkt_size_distr.c | 8 +++----
drivers/crypto/scheduler/scheduler_pmd.c | 22 +++++++++----------
drivers/crypto/scheduler/scheduler_pmd_ops.c | 10 ++++-----
.../crypto/scheduler/scheduler_roundrobin.c | 4 ++--
7 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
index 1ca8443431..d69b8b237d 100644
--- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
+++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
@@ -258,9 +258,9 @@ update_scheduler_capability(struct scheduler_ctx *sched_ctx)
return -1;
}
- sched_ctx->capabilities = rte_zmalloc_socket(NULL,
+ sched_ctx->capabilities = rte_zmalloc_numa(NULL,
sizeof(struct rte_cryptodev_capabilities) *
- (nb_caps + 1), 0, SOCKET_ID_ANY);
+ (nb_caps + 1), 0, RTE_NUMA_ID_ANY);
if (!sched_ctx->capabilities)
return -ENOMEM;
@@ -277,16 +277,16 @@ update_scheduler_capability(struct scheduler_ctx *sched_ctx)
nb_sec_caps, rte_security_capabilities_get(sec_ctx));
}
- sched_ctx->sec_capabilities = rte_zmalloc_socket(NULL,
+ sched_ctx->sec_capabilities = rte_zmalloc_numa(NULL,
sizeof(struct rte_security_capability) *
- (nb_sec_caps + 1), 0, SOCKET_ID_ANY);
+ (nb_sec_caps + 1), 0, RTE_NUMA_ID_ANY);
if (!sched_ctx->sec_capabilities)
return -ENOMEM;
- sched_ctx->sec_crypto_capabilities = rte_zmalloc_socket(NULL,
+ sched_ctx->sec_crypto_capabilities = rte_zmalloc_numa(NULL,
sizeof(struct rte_cryptodev_capabilities *) *
(nb_sec_caps + 1),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!sched_ctx->sec_crypto_capabilities)
return -ENOMEM;
@@ -300,9 +300,9 @@ update_scheduler_capability(struct scheduler_ctx *sched_ctx)
nb_sec_crypto_caps++;
sched_ctx->sec_crypto_capabilities[i] =
- rte_zmalloc_socket(NULL,
+ rte_zmalloc_numa(NULL,
sizeof(struct rte_cryptodev_capabilities) *
- (nb_sec_crypto_caps + 1), 0, SOCKET_ID_ANY);
+ (nb_sec_crypto_caps + 1), 0, RTE_NUMA_ID_ANY);
if (!sched_ctx->sec_crypto_capabilities[i])
return -ENOMEM;
diff --git a/drivers/crypto/scheduler/scheduler_failover.c b/drivers/crypto/scheduler/scheduler_failover.c
index 52ff2ffbb7..1a60a531ec 100644
--- a/drivers/crypto/scheduler/scheduler_failover.c
+++ b/drivers/crypto/scheduler/scheduler_failover.c
@@ -194,8 +194,8 @@ scheduler_config_qp(struct rte_cryptodev *dev, uint16_t qp_id)
struct scheduler_qp_ctx *qp_ctx = dev->data->queue_pairs[qp_id];
struct fo_scheduler_qp_ctx *fo_qp_ctx;
- fo_qp_ctx = rte_zmalloc_socket(NULL, sizeof(*fo_qp_ctx), 0,
- rte_socket_id());
+ fo_qp_ctx = rte_zmalloc_numa(NULL, sizeof(*fo_qp_ctx), 0,
+ rte_numa_id());
if (!fo_qp_ctx) {
CR_SCHED_LOG(ERR, "failed allocate memory for private queue pair");
return -ENOMEM;
diff --git a/drivers/crypto/scheduler/scheduler_multicore.c b/drivers/crypto/scheduler/scheduler_multicore.c
index 70f8a25b70..4146e97335 100644
--- a/drivers/crypto/scheduler/scheduler_multicore.c
+++ b/drivers/crypto/scheduler/scheduler_multicore.c
@@ -324,8 +324,8 @@ scheduler_config_qp(struct rte_cryptodev *dev, uint16_t qp_id)
struct scheduler_ctx *sched_ctx = dev->data->dev_private;
struct mc_scheduler_ctx *mc_ctx = sched_ctx->private_ctx;
- mc_qp_ctx = rte_zmalloc_socket(NULL, sizeof(*mc_qp_ctx), 0,
- rte_socket_id());
+ mc_qp_ctx = rte_zmalloc_numa(NULL, sizeof(*mc_qp_ctx), 0,
+ rte_numa_id());
if (!mc_qp_ctx) {
CR_SCHED_LOG(ERR, "failed allocate memory for private queue pair");
return -ENOMEM;
@@ -350,8 +350,8 @@ scheduler_create_private_ctx(struct rte_cryptodev *dev)
sched_ctx->private_ctx = NULL;
}
- mc_ctx = rte_zmalloc_socket(NULL, sizeof(struct mc_scheduler_ctx), 0,
- rte_socket_id());
+ mc_ctx = rte_zmalloc_numa(NULL, sizeof(struct mc_scheduler_ctx), 0,
+ rte_numa_id());
if (!mc_ctx) {
CR_SCHED_LOG(ERR, "failed allocate memory");
return -ENOMEM;
@@ -367,7 +367,7 @@ scheduler_create_private_ctx(struct rte_cryptodev *dev)
if (!mc_ctx->sched_enq_ring[i]) {
mc_ctx->sched_enq_ring[i] = rte_ring_create(r_name,
PER_WORKER_BUFF_SIZE,
- rte_socket_id(),
+ rte_numa_id(),
RING_F_SC_DEQ | RING_F_SP_ENQ);
if (!mc_ctx->sched_enq_ring[i]) {
CR_SCHED_LOG(ERR, "Cannot create ring for worker %u",
@@ -381,7 +381,7 @@ scheduler_create_private_ctx(struct rte_cryptodev *dev)
if (!mc_ctx->sched_deq_ring[i]) {
mc_ctx->sched_deq_ring[i] = rte_ring_create(r_name,
PER_WORKER_BUFF_SIZE,
- rte_socket_id(),
+ rte_numa_id(),
RING_F_SC_DEQ | RING_F_SP_ENQ);
if (!mc_ctx->sched_deq_ring[i]) {
CR_SCHED_LOG(ERR, "Cannot create ring for worker %u",
diff --git a/drivers/crypto/scheduler/scheduler_pkt_size_distr.c b/drivers/crypto/scheduler/scheduler_pkt_size_distr.c
index 1334a79b7b..2c455406c0 100644
--- a/drivers/crypto/scheduler/scheduler_pkt_size_distr.c
+++ b/drivers/crypto/scheduler/scheduler_pkt_size_distr.c
@@ -325,8 +325,8 @@ scheduler_config_qp(struct rte_cryptodev *dev, uint16_t qp_id)
struct scheduler_qp_ctx *qp_ctx = dev->data->queue_pairs[qp_id];
struct psd_scheduler_qp_ctx *ps_qp_ctx;
- ps_qp_ctx = rte_zmalloc_socket(NULL, sizeof(*ps_qp_ctx), 0,
- rte_socket_id());
+ ps_qp_ctx = rte_zmalloc_numa(NULL, sizeof(*ps_qp_ctx), 0,
+ rte_numa_id());
if (!ps_qp_ctx) {
CR_SCHED_LOG(ERR, "failed allocate memory for private queue pair");
return -ENOMEM;
@@ -348,8 +348,8 @@ scheduler_create_private_ctx(struct rte_cryptodev *dev)
sched_ctx->private_ctx = NULL;
}
- psd_ctx = rte_zmalloc_socket(NULL, sizeof(struct psd_scheduler_ctx), 0,
- rte_socket_id());
+ psd_ctx = rte_zmalloc_numa(NULL, sizeof(struct psd_scheduler_ctx), 0,
+ rte_numa_id());
if (!psd_ctx) {
CR_SCHED_LOG(ERR, "failed allocate memory");
return -ENOMEM;
diff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c
index 8ca09ba3d0..d76cf96f8b 100644
--- a/drivers/crypto/scheduler/scheduler_pmd.c
+++ b/drivers/crypto/scheduler/scheduler_pmd.c
@@ -38,7 +38,7 @@ struct scheduler_init_params {
#define RTE_CRYPTODEV_VDEV_MODE_PARAM ("mode_param")
#define RTE_CRYPTODEV_VDEV_ORDERING ("ordering")
#define RTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG ("max_nb_queue_pairs")
-#define RTE_CRYPTODEV_VDEV_SOCKET_ID ("socket_id")
+#define RTE_CRYPTODEV_VDEV_SOCKET_ID ("numa_id")
#define RTE_CRYPTODEV_VDEV_COREMASK ("coremask")
#define RTE_CRYPTODEV_VDEV_CORELIST ("corelist")
@@ -217,10 +217,10 @@ cryptodev_scheduler_create(const char *name,
for (i = 0; i < init_params->nb_workers; i++) {
sched_ctx->init_worker_names[sched_ctx->nb_init_workers] =
- rte_zmalloc_socket(
+ rte_zmalloc_numa(
NULL,
RTE_CRYPTODEV_SCHEDULER_NAME_MAX_LEN, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!sched_ctx->init_worker_names[
sched_ctx->nb_init_workers]) {
@@ -241,9 +241,9 @@ cryptodev_scheduler_create(const char *name,
* Initialize capabilities structure as an empty structure,
* in case device information is requested when no workers are attached
*/
- sched_ctx->capabilities = rte_zmalloc_socket(NULL,
+ sched_ctx->capabilities = rte_zmalloc_numa(NULL,
sizeof(struct rte_cryptodev_capabilities),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!sched_ctx->capabilities) {
CR_SCHED_LOG(ERR, "Not enough memory for capability information");
@@ -253,9 +253,9 @@ cryptodev_scheduler_create(const char *name,
/* Initialize security context */
struct rte_security_ctx *security_instance;
- security_instance = rte_zmalloc_socket(NULL,
+ security_instance = rte_zmalloc_numa(NULL,
sizeof(struct rte_security_ctx),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!security_instance) {
CR_SCHED_LOG(ERR, "Not enough memory for security context");
free_mem(dev);
@@ -271,9 +271,9 @@ cryptodev_scheduler_create(const char *name,
* Initialize security capabilities structure as an empty structure,
* in case device information is requested when no workers are attached
*/
- sched_ctx->sec_capabilities = rte_zmalloc_socket(NULL,
+ sched_ctx->sec_capabilities = rte_zmalloc_numa(NULL,
sizeof(struct rte_security_capability),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!sched_ctx->sec_capabilities) {
CR_SCHED_LOG(ERR, "Not enough memory for security capability information");
@@ -588,7 +588,7 @@ cryptodev_scheduler_probe(struct rte_vdev_device *vdev)
.def_p = {
"",
sizeof(struct scheduler_ctx),
- rte_socket_id(),
+ rte_numa_id(),
RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS
},
.nb_workers = 0,
@@ -622,7 +622,7 @@ RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_SCHEDULER_PMD,
cryptodev_scheduler_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SCHEDULER_PMD,
"max_nb_queue_pairs=<int> "
- "socket_id=<int> "
+ "numa_id=<int> "
"worker=<name>");
RTE_PMD_REGISTER_CRYPTO_DRIVER(scheduler_crypto_drv,
cryptodev_scheduler_pmd_drv.driver,
diff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c b/drivers/crypto/scheduler/scheduler_pmd_ops.c
index 105d9cf02a..06a0e23fc0 100644
--- a/drivers/crypto/scheduler/scheduler_pmd_ops.c
+++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c
@@ -302,7 +302,7 @@ update_order_ring(struct rte_cryptodev *dev, uint16_t qp_id)
}
qp_ctx->order_ring = rte_ring_create(order_ring_name,
- buff_size, rte_socket_id(),
+ buff_size, rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (!qp_ctx->order_ring) {
CR_SCHED_LOG(ERR, "failed to create order ring");
@@ -576,7 +576,7 @@ scheduler_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
/** Setup a queue pair */
static int
scheduler_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
- const struct rte_cryptodev_qp_conf *qp_conf, int socket_id)
+ const struct rte_cryptodev_qp_conf *qp_conf, int numa_id)
{
struct scheduler_ctx *sched_ctx = dev->data->dev_private;
struct scheduler_qp_ctx *qp_ctx;
@@ -604,14 +604,14 @@ scheduler_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
* must be big enough for all the drivers used.
*/
ret = rte_cryptodev_queue_pair_setup(worker_id, qp_id,
- qp_conf, socket_id);
+ qp_conf, numa_id);
if (ret < 0)
return ret;
}
/* Allocate the queue pair data structure. */
- qp_ctx = rte_zmalloc_socket(name, sizeof(*qp_ctx), RTE_CACHE_LINE_SIZE,
- socket_id);
+ qp_ctx = rte_zmalloc_numa(name, sizeof(*qp_ctx), RTE_CACHE_LINE_SIZE,
+ numa_id);
if (qp_ctx == NULL)
return -ENOMEM;
diff --git a/drivers/crypto/scheduler/scheduler_roundrobin.c b/drivers/crypto/scheduler/scheduler_roundrobin.c
index 08041887a8..cce4c4030f 100644
--- a/drivers/crypto/scheduler/scheduler_roundrobin.c
+++ b/drivers/crypto/scheduler/scheduler_roundrobin.c
@@ -174,8 +174,8 @@ scheduler_config_qp(struct rte_cryptodev *dev, uint16_t qp_id)
struct scheduler_qp_ctx *qp_ctx = dev->data->queue_pairs[qp_id];
struct rr_scheduler_qp_ctx *rr_qp_ctx;
- rr_qp_ctx = rte_zmalloc_socket(NULL, sizeof(*rr_qp_ctx), 0,
- rte_socket_id());
+ rr_qp_ctx = rte_zmalloc_numa(NULL, sizeof(*rr_qp_ctx), 0,
+ rte_numa_id());
if (!rr_qp_ctx) {
CR_SCHED_LOG(ERR, "failed allocate memory for private queue pair");
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 078/227] crypto/uadk: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (76 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 077/227] crypto/scheduler: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 079/227] crypto/virtio: " Chengwen Feng
` (149 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/uadk/uadk_crypto_pmd.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/uadk/uadk_crypto_pmd.c b/drivers/crypto/uadk/uadk_crypto_pmd.c
index 221ad546da..0758fb6e1b 100644
--- a/drivers/crypto/uadk/uadk_crypto_pmd.c
+++ b/drivers/crypto/uadk/uadk_crypto_pmd.c
@@ -485,7 +485,7 @@ uadk_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
/* Create a ring to place process packets on */
static struct rte_ring *
uadk_pmd_qp_create_processed_pkts_ring(struct uadk_qp *qp,
- unsigned int ring_size, int socket_id)
+ unsigned int ring_size, int numa_id)
{
struct rte_ring *r = qp->processed_pkts;
@@ -501,14 +501,14 @@ uadk_pmd_qp_create_processed_pkts_ring(struct uadk_qp *qp,
return NULL;
}
- return rte_ring_create(qp->name, ring_size, socket_id,
+ return rte_ring_create(qp->name, ring_size, numa_id,
RING_F_EXACT_SZ);
}
static int
uadk_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
struct uadk_qp *qp;
@@ -517,8 +517,8 @@ uadk_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
uadk_crypto_pmd_qp_release(dev, qp_id);
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("uadk PMD Queue Pair", sizeof(*qp),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp = rte_zmalloc_numa("uadk PMD Queue Pair", sizeof(*qp),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp == NULL)
return (-ENOMEM);
@@ -529,7 +529,7 @@ uadk_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
goto qp_setup_cleanup;
qp->processed_pkts = uadk_pmd_qp_create_processed_pkts_ring(qp,
- qp_conf->nb_descriptors, socket_id);
+ qp_conf->nb_descriptors, numa_id);
if (qp->processed_pkts == NULL)
goto qp_setup_cleanup;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 079/227] crypto/virtio: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (77 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 078/227] crypto/uadk: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 080/227] crypto/zsda: " Chengwen Feng
` (148 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/virtio/virtio_cryptodev.c | 12 ++++++------
drivers/crypto/virtio/virtio_cryptodev.h | 2 +-
drivers/crypto/virtio/virtqueue.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/virtio/virtio_cryptodev.c b/drivers/crypto/virtio/virtio_cryptodev.c
index d0fe21947c..9f1df7be50 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -30,7 +30,7 @@ static void virtio_crypto_dev_stats_reset(struct rte_cryptodev *dev);
static int virtio_crypto_qp_setup(struct rte_cryptodev *dev,
uint16_t queue_pair_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id);
+ int numa_id);
static int virtio_crypto_qp_release(struct rte_cryptodev *dev,
uint16_t queue_pair_id);
static void virtio_crypto_dev_free_mbufs(struct rte_cryptodev *dev);
@@ -90,7 +90,7 @@ virtio_crypto_queue_setup(struct rte_cryptodev *dev,
int queue_type,
uint16_t vtpci_queue_idx,
uint16_t nb_desc,
- int socket_id,
+ int numa_id,
struct virtqueue **pvq)
{
char vq_name[VIRTQUEUE_MAX_NAME_SZ];
@@ -144,7 +144,7 @@ virtio_crypto_queue_setup(struct rte_cryptodev *dev,
vq = hw->vqs[vtpci_queue_idx];
else
vq = virtcrypto_queue_alloc(hw, vtpci_queue_idx, nb_desc,
- socket_id, vq_name);
+ numa_id, vq_name);
if (vq == NULL) {
VIRTIO_CRYPTO_INIT_LOG_ERR("Can not allocate virtqueue");
return -ENOMEM;
@@ -162,7 +162,7 @@ virtio_crypto_queue_setup(struct rte_cryptodev *dev,
nb_desc,
sizeof(struct virtio_crypto_op_cookie),
RTE_CACHE_LINE_SIZE, 0,
- NULL, NULL, NULL, NULL, socket_id,
+ NULL, NULL, NULL, NULL, numa_id,
0);
if (!vq->mpool) {
VIRTIO_CRYPTO_DRV_LOG_ERR("Virtio Crypto PMD "
@@ -298,7 +298,7 @@ virtio_crypto_dev_stats_reset(struct rte_cryptodev *dev)
static int
virtio_crypto_qp_setup(struct rte_cryptodev *dev, uint16_t queue_pair_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
int ret;
struct virtqueue *vq;
@@ -310,7 +310,7 @@ virtio_crypto_qp_setup(struct rte_cryptodev *dev, uint16_t queue_pair_id,
return 0;
ret = virtio_crypto_queue_setup(dev, VTCRYPTO_DATAQ, queue_pair_id,
- qp_conf->nb_descriptors, socket_id, &vq);
+ qp_conf->nb_descriptors, numa_id, &vq);
if (ret < 0) {
VIRTIO_CRYPTO_INIT_LOG_ERR(
"virtio crypto data queue initialization failed");
diff --git a/drivers/crypto/virtio/virtio_cryptodev.h b/drivers/crypto/virtio/virtio_cryptodev.h
index 075b5ff444..2ca1e77492 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.h
+++ b/drivers/crypto/virtio/virtio_cryptodev.h
@@ -63,7 +63,7 @@ int virtio_crypto_queue_setup(struct rte_cryptodev *dev,
int queue_type,
uint16_t vtpci_queue_idx,
uint16_t nb_desc,
- int socket_id,
+ int numa_id,
struct virtqueue **pvq);
void virtio_crypto_queue_release(struct virtqueue *vq);
diff --git a/drivers/crypto/virtio/virtqueue.c b/drivers/crypto/virtio/virtqueue.c
index 061aa09dbe..d76e0a0cf5 100644
--- a/drivers/crypto/virtio/virtqueue.c
+++ b/drivers/crypto/virtio/virtqueue.c
@@ -190,7 +190,7 @@ virtcrypto_queue_alloc(struct virtio_crypto_hw *hw, uint16_t index, uint16_t num
size = sizeof(*vq) + num * sizeof(struct vq_desc_extra);
size = RTE_ALIGN_CEIL(size, RTE_CACHE_LINE_SIZE);
- vq = rte_zmalloc_socket(name, size, RTE_CACHE_LINE_SIZE, node);
+ vq = rte_zmalloc_numa(name, size, RTE_CACHE_LINE_SIZE, node);
if (vq == NULL) {
PMD_INIT_LOG(ERR, "can not allocate vq");
return NULL;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 080/227] crypto/zsda: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (78 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 079/227] crypto/virtio: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 081/227] dma/ae4dma: " Chengwen Feng
` (147 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/crypto/zsda/zsda_crypto_pmd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/zsda/zsda_crypto_pmd.c b/drivers/crypto/zsda/zsda_crypto_pmd.c
index d1cdfcce0b..d080a26891 100644
--- a/drivers/crypto/zsda/zsda_crypto_pmd.c
+++ b/drivers/crypto/zsda/zsda_crypto_pmd.c
@@ -115,7 +115,7 @@ zsda_crypto_stats_reset(struct rte_cryptodev *dev)
static int
zsda_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id)
+ int numa_id)
{
int ret = ZSDA_SUCCESS;
struct zsda_qp *qp_new;
@@ -134,15 +134,15 @@ zsda_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
return ret;
}
- qp_new = rte_zmalloc_socket("zsda PMD qp metadata", sizeof(*qp_new),
- RTE_CACHE_LINE_SIZE, socket_id);
+ qp_new = rte_zmalloc_numa("zsda PMD qp metadata", sizeof(*qp_new),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (qp_new == NULL) {
ZSDA_LOG(ERR, "Failed to alloc mem for qp struct");
return -ENOMEM;
}
task_q_info.nb_des = nb_des;
- task_q_info.socket_id = socket_id;
+ task_q_info.numa_id = numa_id;
task_q_info.qp_id = qp_id;
task_q_info.rx_cb = zsda_crypto_callback;
@@ -315,7 +315,7 @@ zsda_crypto_dev_create(struct zsda_pci_device *zsda_pci_dev)
crypto_dev_priv->capa_mz = rte_memzone_lookup(capa_memz_name);
if (crypto_dev_priv->capa_mz == NULL)
crypto_dev_priv->capa_mz = rte_memzone_reserve(
- capa_memz_name, capa_size, rte_socket_id(), 0);
+ capa_memz_name, capa_size, rte_numa_id(), 0);
if (crypto_dev_priv->capa_mz == NULL) {
ZSDA_LOG(ERR, "Failed! crypto_dev_priv->capa_mz");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 081/227] dma/ae4dma: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (79 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 080/227] crypto/zsda: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 082/227] dma/cnxk: " Chengwen Feng
` (146 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/dma/ae4dma/ae4dma_dmadev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/ae4dma/ae4dma_dmadev.c b/drivers/dma/ae4dma/ae4dma_dmadev.c
index 64c19955eb..fdce20df2d 100644
--- a/drivers/dma/ae4dma/ae4dma_dmadev.c
+++ b/drivers/dma/ae4dma/ae4dma_dmadev.c
@@ -26,9 +26,9 @@ RTE_LOG_REGISTER_DEFAULT(ae4dma_pmd_logtype, INFO);
#define AE4DMA_PMD_NAME dmadev_ae4dma
static const struct rte_memzone *
-ae4dma_queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size, int socket_id)
+ae4dma_queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size, int numa_id)
{
- return rte_memzone_reserve_aligned(queue_name, queue_size, socket_id,
+ return rte_memzone_reserve_aligned(queue_name, queue_size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, queue_size);
}
@@ -507,7 +507,7 @@ ae4dma_add_queue(struct ae4dma_dmadev *dev, struct rte_pci_device *pci, uint8_t
snprintf(cmd_q->memz_name, sizeof(cmd_q->memz_name), "ae4dma_%s_q%u", pci_name,
(unsigned int)qn);
- q_mz = ae4dma_queue_dma_zone_reserve(cmd_q->memz_name, cmd_q->qsize, rte_socket_id());
+ q_mz = ae4dma_queue_dma_zone_reserve(cmd_q->memz_name, cmd_q->qsize, rte_numa_id());
if (q_mz == NULL) {
AE4DMA_PMD_ERR("memzone reserve failed for %s", cmd_q->memz_name);
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 082/227] dma/cnxk: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (80 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 081/227] dma/ae4dma: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 083/227] dma/dpaa: " Chengwen Feng
` (145 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/dma/cnxk/cnxk_dmadev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index db177afd6f..2f0100ab2b 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -151,7 +151,7 @@ cnxk_dmadev_chunk_pool_create(struct rte_dma_dev *dev, uint32_t nb_chunks, uint3
nb_chunks += (CNXK_DPI_POOL_MAX_CACHE_SZ * rte_lcore_count());
dpivf->chunk_pool = rte_mempool_create_empty(
- pool_name, nb_chunks, chunk_sz, CNXK_DPI_POOL_MAX_CACHE_SZ, 0, rte_socket_id(), 0);
+ pool_name, nb_chunks, chunk_sz, CNXK_DPI_POOL_MAX_CACHE_SZ, 0, rte_numa_id(), 0);
if (dpivf->chunk_pool == NULL) {
plt_err("Unable to create chunkpool.");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 083/227] dma/dpaa: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (81 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 082/227] dma/cnxk: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 084/227] dma/dpaa2: " Chengwen Feng
` (144 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/dma/dpaa/dpaa_qdma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/dpaa/dpaa_qdma.c b/drivers/dma/dpaa/dpaa_qdma.c
index d8bece700a..eb4cddae3e 100644
--- a/drivers/dma/dpaa/dpaa_qdma.c
+++ b/drivers/dma/dpaa/dpaa_qdma.c
@@ -1500,7 +1500,7 @@ dpaa_qdma_probe(__rte_unused struct rte_dpaa_driver *dpaa_drv,
}
dmadev = rte_dma_pmd_allocate(dpaa_dev->device.name,
- rte_socket_id(),
+ rte_numa_id(),
sizeof(struct fsl_qdma_engine));
if (!dmadev) {
DPAA_QDMA_ERR("Unable to allocate dmadevice");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 084/227] dma/dpaa2: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (82 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 083/227] dma/dpaa: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 085/227] dma/hisi_acc: " Chengwen Feng
` (143 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/dma/dpaa2/dpaa2_qdma.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/dpaa2/dpaa2_qdma.c b/drivers/dma/dpaa2/dpaa2_qdma.c
index 8d10edfd04..2650d07695 100644
--- a/drivers/dma/dpaa2/dpaa2_qdma.c
+++ b/drivers/dma/dpaa2/dpaa2_qdma.c
@@ -1400,7 +1400,7 @@ dpaa2_qdma_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan,
qdma_dev->vqs[vchan].fle_pool = rte_mempool_create(pool_name,
DPAA2_QDMA_MAX_DESC * 2, pool_size,
512, 0, NULL, NULL, NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (!qdma_dev->vqs[vchan].fle_pool) {
DPAA2_QDMA_ERR("%s create failed", pool_name);
return -ENOMEM;
@@ -1749,7 +1749,7 @@ dpaa2_qdma_probe(struct rte_dpaa2_driver *dpaa2_drv,
RTE_SET_USED(dpaa2_drv);
dmadev = rte_dma_pmd_allocate(dpaa2_dev->device.name,
- rte_socket_id(),
+ rte_numa_id(),
sizeof(struct dpaa2_dpdmai_dev));
if (!dmadev) {
DPAA2_QDMA_ERR("Unable to allocate dmadevice");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 085/227] dma/hisi_acc: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (83 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 084/227] dma/dpaa2: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 086/227] dma/idxd: " Chengwen Feng
` (142 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/dma/hisi_acc/hisi_acc_dmadev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/hisi_acc/hisi_acc_dmadev.c b/drivers/dma/hisi_acc/hisi_acc_dmadev.c
index 196aaadc05..7754d27b40 100644
--- a/drivers/dma/hisi_acc/hisi_acc_dmadev.c
+++ b/drivers/dma/hisi_acc/hisi_acc_dmadev.c
@@ -631,7 +631,7 @@ hacc_dma_create(struct rte_uacce_device *uacce_dev, uint16_t queue_id)
uacce_dev->qfrt_sz[RTE_UACCE_QFRT_DUS] - sizeof(uint32_t));
hw->cq_status = hw->sq_status - 1;
- hw->status = rte_zmalloc_socket(NULL, sizeof(uint16_t) * hw->sq_depth,
+ hw->status = rte_zmalloc_numa(NULL, sizeof(uint16_t) * hw->sq_depth,
RTE_CACHE_LINE_SIZE, uacce_dev->numa_node);
if (hw->status == NULL) {
HACC_DMA_ERR(hw, "malloc status region fail!");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 086/227] dma/idxd: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (84 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 085/227] dma/hisi_acc: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 087/227] dma/imx_edma5: " Chengwen Feng
` (141 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/dma/idxd/idxd_bus.c | 2 +-
drivers/dma/idxd/idxd_common.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c
index 2ec526ec09..197d14f9fe 100644
--- a/drivers/dma/idxd/idxd_bus.c
+++ b/drivers/dma/idxd/idxd_bus.c
@@ -286,7 +286,7 @@ dsa_scan(void)
while ((wq = readdir(dev_dir)) != NULL) {
struct rte_dsa_device *dev;
- int numa_node = SOCKET_ID_ANY;
+ int numa_node = RTE_NUMA_ID_ANY;
if (strncmp(wq->d_name, "wq", 2) != 0)
continue;
diff --git a/drivers/dma/idxd/idxd_common.c b/drivers/dma/idxd/idxd_common.c
index dc2e8cd432..e70238794b 100644
--- a/drivers/dma/idxd/idxd_common.c
+++ b/drivers/dma/idxd/idxd_common.c
@@ -612,7 +612,7 @@ idxd_dmadev_create(const char *name, struct rte_device *dev,
* The +1 is because we can never fully use
* the ring, otherwise read == write means both full and empty.
*/
- idxd->batch_comp_ring = rte_zmalloc_socket(NULL, (sizeof(idxd->batch_idx_ring[0]) +
+ idxd->batch_comp_ring = rte_zmalloc_numa(NULL, (sizeof(idxd->batch_idx_ring[0]) +
sizeof(idxd->batch_comp_ring[0])) * (idxd->max_batches + 1),
sizeof(idxd->batch_comp_ring[0]), dev->numa_node);
if (idxd->batch_comp_ring == NULL) {
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 087/227] dma/imx_edma5: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (85 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 086/227] dma/idxd: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 088/227] dma/odm: " Chengwen Feng
` (140 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/dma/imx_edma5/imx_edma5_dmadev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/imx_edma5/imx_edma5_dmadev.c b/drivers/dma/imx_edma5/imx_edma5_dmadev.c
index 778644fa82..33f751465f 100644
--- a/drivers/dma/imx_edma5/imx_edma5_dmadev.c
+++ b/drivers/dma/imx_edma5/imx_edma5_dmadev.c
@@ -100,7 +100,7 @@ imx_edma5_configure(struct rte_dma_dev *dev, const struct rte_dma_conf *conf, ui
RTE_SET_USED(conf_sz);
if (ed->vchans == NULL) {
- ed->vchans = rte_zmalloc_socket("imx_edma5_vchans",
+ ed->vchans = rte_zmalloc_numa("imx_edma5_vchans",
ed->max_vchans * sizeof(struct imx_edma5_vchan), RTE_CACHE_LINE_SIZE,
dev->data->numa_node);
if (ed->vchans == NULL) {
@@ -202,7 +202,7 @@ imx_edma5_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan,
vc->desc_mask = conf->nb_desc - 1;
vc->iova_is_va = (rte_eal_iova_mode() == RTE_IOVA_VA);
- vc->jobs = rte_zmalloc_socket("imx_edma5_jobs", vc->nb_desc * sizeof(struct imx_edma5_job),
+ vc->jobs = rte_zmalloc_numa("imx_edma5_jobs", vc->nb_desc * sizeof(struct imx_edma5_job),
RTE_CACHE_LINE_SIZE, dev->data->numa_node);
if (vc->jobs == NULL) {
IMX_EDMA5_LOG(ERR, "Failed to alloc job ring for vchan %u", vchan);
@@ -210,7 +210,7 @@ imx_edma5_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan,
}
/* One IMX_EDMA5_SG_TCD_PER_JOB descriptor slice per job ring slot. */
- vc->sg_tcd_pool = rte_zmalloc_socket("imx_edma5_sgtcd",
+ vc->sg_tcd_pool = rte_zmalloc_numa("imx_edma5_sgtcd",
(size_t)vc->nb_desc * IMX_EDMA5_SG_TCD_PER_JOB * sizeof(struct imx_edma5_hw_tcd64),
RTE_CACHE_LINE_SIZE, dev->data->numa_node);
if (vc->sg_tcd_pool == NULL) {
@@ -1037,7 +1037,7 @@ imx_edma5_probe(struct rte_platform_device *pdev)
return -EINVAL;
}
- dev = rte_dma_pmd_allocate(name, rte_socket_id(), sizeof(struct imx_edma5_dev));
+ dev = rte_dma_pmd_allocate(name, rte_numa_id(), sizeof(struct imx_edma5_dev));
if (dev == NULL) {
IMX_EDMA5_LOG(ERR, "Failed to allocate dmadev for %s", name);
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 088/227] dma/odm: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (86 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 087/227] dma/imx_edma5: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 089/227] dma/skeleton: " Chengwen Feng
` (139 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/dma/odm/odm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/odm/odm.c b/drivers/dma/odm/odm.c
index 0633ce0b4b..cf56f89394 100644
--- a/drivers/dma/odm/odm.c
+++ b/drivers/dma/odm/odm.c
@@ -201,7 +201,7 @@ odm_vchan_setup(struct odm_dev *odm, int vchan, const struct rte_dma_vchan_conf
isize = RTE_ALIGN_CEIL(conf->nb_desc * ODM_IRING_ENTRY_SIZE_MAX * 8, 1024);
isize = RTE_MIN(isize, ODM_IRING_MAX_SIZE);
snprintf(name, sizeof(name), "vq%d_iring%d", odm->vfid, vchan);
- mz = rte_memzone_reserve_aligned(name, isize, SOCKET_ID_ANY, 0, 1024);
+ mz = rte_memzone_reserve_aligned(name, isize, RTE_NUMA_ID_ANY, 0, 1024);
if (mz == NULL)
return -ENOMEM;
vq->iring_mz = mz;
@@ -211,7 +211,7 @@ odm_vchan_setup(struct odm_dev *odm, int vchan, const struct rte_dma_vchan_conf
max_nb_desc = (isize / (ODM_IRING_ENTRY_SIZE_MIN * 8));
csize = RTE_ALIGN_CEIL(max_nb_desc * sizeof(union odm_cmpl_ent_s), 1024);
snprintf(name, sizeof(name), "vq%d_cring%d", odm->vfid, vchan);
- mz = rte_memzone_reserve_aligned(name, csize, SOCKET_ID_ANY, 0, 1024);
+ mz = rte_memzone_reserve_aligned(name, csize, RTE_NUMA_ID_ANY, 0, 1024);
if (mz == NULL) {
rc = -ENOMEM;
goto iring_free;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 089/227] dma/skeleton: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (87 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 088/227] dma/odm: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 090/227] event/cnxk: " Chengwen Feng
` (138 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/dma/skeleton/skeleton_dmadev.c | 26 +++++++++++++-------------
drivers/dma/skeleton/skeleton_dmadev.h | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/dma/skeleton/skeleton_dmadev.c b/drivers/dma/skeleton/skeleton_dmadev.c
index e287802eb9..05f07fe80a 100644
--- a/drivers/dma/skeleton/skeleton_dmadev.c
+++ b/drivers/dma/skeleton/skeleton_dmadev.c
@@ -235,24 +235,24 @@ vchan_setup(struct skeldma_hw *hw, int16_t dev_id, uint16_t nb_desc)
struct rte_ring *completed;
uint16_t i;
- desc = rte_zmalloc_socket(NULL, nb_desc * sizeof(struct skeldma_desc),
- RTE_CACHE_LINE_SIZE, hw->socket_id);
+ desc = rte_zmalloc_numa(NULL, nb_desc * sizeof(struct skeldma_desc),
+ RTE_CACHE_LINE_SIZE, hw->numa_id);
if (desc == NULL) {
SKELDMA_LOG(ERR, "Malloc dma skeleton desc fail!");
return -ENOMEM;
}
snprintf(name, RTE_RING_NAMESIZE, "dma_skel_desc_empty_%d", dev_id);
- empty = rte_ring_create(name, nb_desc, hw->socket_id,
+ empty = rte_ring_create(name, nb_desc, hw->numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
snprintf(name, RTE_RING_NAMESIZE, "dma_skel_desc_pend_%d", dev_id);
- pending = rte_ring_create(name, nb_desc, hw->socket_id,
+ pending = rte_ring_create(name, nb_desc, hw->numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
snprintf(name, RTE_RING_NAMESIZE, "dma_skel_desc_run_%d", dev_id);
- running = rte_ring_create(name, nb_desc, hw->socket_id,
+ running = rte_ring_create(name, nb_desc, hw->numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
snprintf(name, RTE_RING_NAMESIZE, "dma_skel_desc_comp_%d", dev_id);
- completed = rte_ring_create(name, nb_desc, hw->socket_id,
+ completed = rte_ring_create(name, nb_desc, hw->numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (empty == NULL || pending == NULL || running == NULL ||
completed == NULL) {
@@ -380,12 +380,12 @@ skeldma_dump(const struct rte_dma_dev *dev, FILE *f)
(void)fprintf(f,
" lcore_id: %d\n"
- " socket_id: %d\n"
+ " numa_id: %d\n"
" desc_empty_ring_count: %u\n"
" desc_pending_ring_count: %u\n"
" desc_running_ring_count: %u\n"
" desc_completed_ring_count: %u\n",
- hw->lcore_id, hw->socket_id,
+ hw->lcore_id, hw->numa_id,
GET_RING_COUNT(hw->desc_empty),
GET_RING_COUNT(hw->desc_pending),
GET_RING_COUNT(hw->desc_running),
@@ -601,11 +601,11 @@ skeldma_create(const char *name, struct rte_vdev_device *vdev, int lcore_id)
{
struct rte_dma_dev *dev;
struct skeldma_hw *hw;
- int socket_id;
+ int numa_id;
- socket_id = (lcore_id < 0) ? rte_socket_id() :
- rte_lcore_to_socket_id(lcore_id);
- dev = rte_dma_pmd_allocate(name, socket_id, sizeof(struct skeldma_hw));
+ numa_id = (lcore_id < 0) ? rte_numa_id() :
+ rte_lcore_to_numa_id(lcore_id);
+ dev = rte_dma_pmd_allocate(name, numa_id, sizeof(struct skeldma_hw));
if (dev == NULL) {
SKELDMA_LOG(ERR, "Unable to allocate dmadev: %s", name);
return -EINVAL;
@@ -624,7 +624,7 @@ skeldma_create(const char *name, struct rte_vdev_device *vdev, int lcore_id)
hw = dev->data->dev_private;
hw->lcore_id = lcore_id;
- hw->socket_id = socket_id;
+ hw->numa_id = numa_id;
dev->state = RTE_DMA_DEV_READY;
diff --git a/drivers/dma/skeleton/skeleton_dmadev.h b/drivers/dma/skeleton/skeleton_dmadev.h
index 0365f64589..2fe0547acb 100644
--- a/drivers/dma/skeleton/skeleton_dmadev.h
+++ b/drivers/dma/skeleton/skeleton_dmadev.h
@@ -45,7 +45,7 @@ struct skeldma_desc {
struct skeldma_hw {
int lcore_id; /* cpuwork task affinity core */
- int socket_id;
+ int numa_id;
rte_thread_t thread; /* cpuwork task thread */
volatile int exit_flag; /* cpuwork task exit flag */
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 090/227] event/cnxk: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (88 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 089/227] dma/skeleton: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 091/227] event/dlb2: " Chengwen Feng
` (137 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/event/cnxk/cn10k_eventdev.c | 4 ++--
drivers/event/cnxk/cn20k_eventdev.c | 4 ++--
drivers/event/cnxk/cn9k_eventdev.c | 8 ++++----
drivers/event/cnxk/cnxk_eventdev.c | 2 +-
drivers/event/cnxk/cnxk_eventdev_adptr.c | 2 +-
drivers/event/cnxk/cnxk_eventdev_selftest.c | 2 +-
drivers/event/cnxk/cnxk_tim_evdev.c | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c
index 47d1ec6823..4543a76ee2 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -190,12 +190,12 @@ cn10k_sso_updt_tx_adptr_data(const struct rte_eventdev *event_dev)
void *ws_cookie;
ws_cookie = cnxk_sso_hws_get_cookie(ws);
- ws_cookie = rte_realloc_socket(
+ ws_cookie = rte_realloc_numa(
ws_cookie,
sizeof(struct cnxk_sso_hws_cookie) +
sizeof(struct cn10k_sso_hws) +
dev->tx_adptr_data_sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (ws_cookie == NULL)
return -ENOMEM;
ws = RTE_PTR_ADD(ws_cookie, sizeof(struct cnxk_sso_hws_cookie));
diff --git a/drivers/event/cnxk/cn20k_eventdev.c b/drivers/event/cnxk/cn20k_eventdev.c
index 29495eb4f9..dc368051f6 100644
--- a/drivers/event/cnxk/cn20k_eventdev.c
+++ b/drivers/event/cnxk/cn20k_eventdev.c
@@ -255,11 +255,11 @@ cn20k_sso_updt_tx_adptr_data(const struct rte_eventdev *event_dev)
void *ws_cookie;
ws_cookie = cnxk_sso_hws_get_cookie(ws);
- ws_cookie = rte_realloc_socket(ws_cookie,
+ ws_cookie = rte_realloc_numa(ws_cookie,
sizeof(struct cnxk_sso_hws_cookie) +
sizeof(struct cn20k_sso_hws) +
dev->tx_adptr_data_sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (ws_cookie == NULL)
return -ENOMEM;
ws = RTE_PTR_ADD(ws_cookie, sizeof(struct cnxk_sso_hws_cookie));
diff --git a/drivers/event/cnxk/cn9k_eventdev.c b/drivers/event/cnxk/cn9k_eventdev.c
index 313dcbb384..dc509b5c95 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -269,12 +269,12 @@ cn9k_sso_updt_tx_adptr_data(const struct rte_eventdev *event_dev)
void *ws_cookie;
ws_cookie = cnxk_sso_hws_get_cookie(dws);
- ws_cookie = rte_realloc_socket(
+ ws_cookie = rte_realloc_numa(
ws_cookie,
sizeof(struct cnxk_sso_hws_cookie) +
sizeof(struct cn9k_sso_hws_dual) +
dev->tx_adptr_data_sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (ws_cookie == NULL)
return -ENOMEM;
dws = RTE_PTR_ADD(ws_cookie,
@@ -287,12 +287,12 @@ cn9k_sso_updt_tx_adptr_data(const struct rte_eventdev *event_dev)
void *ws_cookie;
ws_cookie = cnxk_sso_hws_get_cookie(ws);
- ws_cookie = rte_realloc_socket(
+ ws_cookie = rte_realloc_numa(
ws_cookie,
sizeof(struct cnxk_sso_hws_cookie) +
sizeof(struct cn9k_sso_hws_dual) +
dev->tx_adptr_data_sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (ws_cookie == NULL)
return -ENOMEM;
ws = RTE_PTR_ADD(ws_cookie,
diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c
index e3a3134264..9d842e1788 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -639,7 +639,7 @@ cnxk_sso_init(struct rte_eventdev *event_dev)
int rc;
mz = rte_memzone_reserve(CNXK_SSO_MZ_NAME, sizeof(uint64_t),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mz == NULL) {
plt_err("Failed to create eventdev memzone");
return -ENOMEM;
diff --git a/drivers/event/cnxk/cnxk_eventdev_adptr.c b/drivers/event/cnxk/cnxk_eventdev_adptr.c
index 5678e5d264..85b5a3fc33 100644
--- a/drivers/event/cnxk/cnxk_eventdev_adptr.c
+++ b/drivers/event/cnxk/cnxk_eventdev_adptr.c
@@ -671,7 +671,7 @@ crypto_adapter_qp_setup(struct cnxk_sso_evdev *evdev, const struct rte_cryptodev
cache_size = RTE_MIN(RTE_MEMPOOL_CACHE_MAX_SIZE, qp->lf.nb_desc / 1.5);
nb_req = qp->lf.nb_desc + (cache_size * rte_lcore_count());
qp->ca.req_mp = rte_mempool_create(name, nb_req, req_size, cache_size, 0, NULL, NULL, NULL,
- NULL, rte_socket_id(), 0);
+ NULL, rte_numa_id(), 0);
if (qp->ca.req_mp == NULL)
return -ENOMEM;
diff --git a/drivers/event/cnxk/cnxk_eventdev_selftest.c b/drivers/event/cnxk/cnxk_eventdev_selftest.c
index 8f3d0982e9..828a0f9ec1 100644
--- a/drivers/event/cnxk/cnxk_eventdev_selftest.c
+++ b/drivers/event/cnxk/cnxk_eventdev_selftest.c
@@ -145,7 +145,7 @@ _eventdev_setup(int mode)
/* Create and destroy pool for each test case to make it standalone */
eventdev_test_mempool = rte_pktmbuf_pool_create(
- pool_name, MAX_EVENTS, 0, 0, 512, rte_socket_id());
+ pool_name, MAX_EVENTS, 0, 0, 512, rte_numa_id());
if (!eventdev_test_mempool) {
plt_err("ERROR creating mempool");
return -1;
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c b/drivers/event/cnxk/cnxk_tim_evdev.c
index 11945e0e6e..8cfb5c122f 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -37,7 +37,7 @@ cnxk_tim_chnk_pool_populate_aligned(struct rte_mempool *mp, size_t align)
stride = (size_t)mp->header_size + mp->elt_size + mp->trailer_size;
len = stride * mp->size;
- mem = rte_zmalloc_socket("cnxk_tim_chunks", len, align, mp->numa_id);
+ mem = rte_zmalloc_numa("cnxk_tim_chunks", len, align, mp->numa_id);
if (mem == NULL)
return -ENOMEM;
@@ -83,7 +83,7 @@ cnxk_tim_chnk_pool_create(struct cnxk_tim_ring *tim_ring,
tim_ring->chunk_pool = rte_mempool_create_empty(pool_name, tim_ring->nb_chunks,
tim_ring->chunk_sz, cache_sz, 0,
- rte_socket_id(), mp_flags);
+ rte_numa_id(), mp_flags);
if (tim_ring->chunk_pool == NULL) {
plt_err("Unable to create chunkpool.");
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 091/227] event/dlb2: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (89 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 090/227] event/cnxk: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 092/227] event/dpaa: " Chengwen Feng
` (136 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/event/dlb2/dlb2.c | 8 ++++----
drivers/event/dlb2/dlb2_priv.h | 4 ++--
drivers/event/dlb2/dlb2_selftest.c | 2 +-
drivers/event/dlb2/dlb2_xstats.c | 8 ++++----
drivers/event/dlb2/pf/dlb2_pf.c | 12 ++++++------
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c
index 084875f1c8..b1e4963b95 100644
--- a/drivers/event/dlb2/dlb2.c
+++ b/drivers/event/dlb2/dlb2.c
@@ -332,14 +332,14 @@ set_producer_coremask(const char *key __rte_unused,
static int
set_numa_node(const char *key __rte_unused, const char *value, void *opaque)
{
- int *socket_id = opaque;
+ int *numa_id = opaque;
int ret;
- ret = dlb2_string_to_int(socket_id, value);
+ ret = dlb2_string_to_int(numa_id, value);
if (ret < 0)
return ret;
- if (*socket_id > RTE_MAX_NUMA_NODES)
+ if (*numa_id > RTE_MAX_NUMA_NODES)
return -EINVAL;
return 0;
}
@@ -5224,7 +5224,7 @@ dlb2_parse_params(const char *params,
} else {
int ret = rte_kvargs_process(kvlist, NUMA_NODE_ARG,
set_numa_node,
- &dlb2_args->socket_id);
+ &dlb2_args->numa_id);
if (ret != 0) {
DLB2_LOG_ERR("%s: Error parsing numa node parameter",
name);
diff --git a/drivers/event/dlb2/dlb2_priv.h b/drivers/event/dlb2/dlb2_priv.h
index 607b4d24d0..196c629e7d 100644
--- a/drivers/event/dlb2/dlb2_priv.h
+++ b/drivers/event/dlb2/dlb2_priv.h
@@ -196,7 +196,7 @@ struct dlb2_hw_resource_info {
/**> Max resources that can be provided */
struct dlb2_hw_rsrcs hw_rsrc_max;
int num_sched_domains;
- uint32_t socket_id;
+ uint32_t numa_id;
};
enum dlb2_enqueue_type {
@@ -674,7 +674,7 @@ struct dlb2_cos_bw {
};
struct dlb2_devargs {
- int socket_id;
+ int numa_id;
int max_num_events;
int num_dir_credits_override;
int dev_id;
diff --git a/drivers/event/dlb2/dlb2_selftest.c b/drivers/event/dlb2/dlb2_selftest.c
index 87d98700c9..bd608f08d1 100644
--- a/drivers/event/dlb2/dlb2_selftest.c
+++ b/drivers/event/dlb2/dlb2_selftest.c
@@ -1396,7 +1396,7 @@ do_selftest(void)
32 /*MBUF_CACHE_SIZE*/,
0,
512, /* use very small mbufs */
- rte_socket_id());
+ rte_numa_id());
if (!eventdev_func_mempool) {
printf("ERROR creating mempool\n");
goto test_fail;
diff --git a/drivers/event/dlb2/dlb2_xstats.c b/drivers/event/dlb2/dlb2_xstats.c
index c037cfe786..3398c06bd0 100644
--- a/drivers/event/dlb2/dlb2_xstats.c
+++ b/drivers/event/dlb2/dlb2_xstats.c
@@ -586,9 +586,9 @@ dlb2_xstats_init(struct dlb2_eventdev *dlb2)
DLB2_MAX_NUM_QUEUES(dlb2->version) * RTE_DIM(qid_stats);
unsigned int i, port, qid, stat_id = 0;
- dlb2->xstats = rte_zmalloc_socket(NULL,
+ dlb2->xstats = rte_zmalloc_numa(NULL,
sizeof(dlb2->xstats[0]) * count, 0,
- dlb2->qm_instance.info.socket_id);
+ dlb2->qm_instance.info.numa_id);
if (dlb2->xstats == NULL)
return -ENOMEM;
@@ -1027,8 +1027,8 @@ dlb2_eventdev_dump(struct rte_eventdev *dev, FILE *f)
else
fprintf(f, "UNEXPECTED\n");
- fprintf(f, "domain ID=%u, socket_id=%u, evdev=%p\n",
- handle->domain_id, handle->info.socket_id, dlb2->event_dev);
+ fprintf(f, "domain ID=%u, numa_id=%u, evdev=%p\n",
+ handle->domain_id, handle->info.numa_id, dlb2->event_dev);
fprintf(f, "num dir ports=%u, num dir queues=%u\n",
dlb2->num_dir_ports, dlb2->num_dir_queues);
diff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c
index aaa55bbe00..998df9ca0c 100644
--- a/drivers/event/dlb2/pf/dlb2_pf.c
+++ b/drivers/event/dlb2/pf/dlb2_pf.c
@@ -298,14 +298,14 @@ dlb2_alloc_coherent_aligned(const struct rte_memzone **mz, uintptr_t *phys,
{
char mz_name[RTE_MEMZONE_NAMESIZE];
uint32_t core_id = rte_lcore_id();
- unsigned int socket_id;
+ unsigned int numa_id;
snprintf(mz_name, sizeof(mz_name) - 1, "event_dlb2_pf_%lx",
(unsigned long)rte_get_timer_cycles());
if (core_id == (unsigned int)LCORE_ID_ANY)
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,
+ numa_id = rte_lcore_to_numa_id(core_id);
+ *mz = rte_memzone_reserve_aligned(mz_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, align);
if (*mz == NULL) {
DLB2_LOG_LINE_DBG("Unable to allocate DMA memory of size %zu bytes - %s",
@@ -758,7 +758,7 @@ dlb2_eventdev_pci_init(struct rte_eventdev *eventdev)
int ret = 0;
struct rte_pci_device *pci_dev;
struct dlb2_devargs dlb2_args = {
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.max_num_events = DLB2_MAX_NUM_LDB_CREDITS,
.producer_coremask = NULL,
.num_dir_credits_override = -1,
@@ -776,7 +776,7 @@ dlb2_eventdev_pci_init(struct rte_eventdev *eventdev)
int q;
const void *probe_args = NULL;
- DLB2_LOG_LINE_DBG("Enter with dev_id=%d socket_id=%d",
+ DLB2_LOG_LINE_DBG("Enter with dev_id=%d numa_id=%d",
eventdev->data->dev_id, eventdev->data->numa_id);
for (q = 0; q < DLB2_MAX_NUM_PORTS_ALL; q++)
@@ -787,7 +787,7 @@ dlb2_eventdev_pci_init(struct rte_eventdev *eventdev)
pci_dev = RTE_CLASS_TO_BUS_DEVICE(eventdev, *pci_dev);
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- dlb2 = dlb2_pmd_priv(eventdev); /* rte_zmalloc_socket mem */
+ dlb2 = dlb2_pmd_priv(eventdev); /* rte_zmalloc_numa mem */
dlb2->version = DLB2_HW_DEVICE_FROM_PCI_ID(pci_dev);
if (dlb2->version == DLB2_HW_V2_5)
dlb2_args.max_num_events = DLB2_MAX_NUM_CREDITS(DLB2_HW_V2_5);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 092/227] event/dpaa: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (90 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 091/227] event/dlb2: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 093/227] event/dpaa2: " Chengwen Feng
` (135 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/event/dpaa/dpaa_eventdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c
index e5d93afca2..085a2cd69c 100644
--- a/drivers/event/dpaa/dpaa_eventdev.c
+++ b/drivers/event/dpaa/dpaa_eventdev.c
@@ -984,7 +984,7 @@ dpaa_event_dev_create(const char *name, const char *params, struct rte_vdev_devi
eventdev = rte_event_pmd_vdev_init(name,
sizeof(struct dpaa_eventdev),
- rte_socket_id(), vdev);
+ rte_numa_id(), vdev);
if (eventdev == NULL) {
DPAA_EVENTDEV_ERR("Failed to create eventdev vdev %s", name);
goto fail;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 093/227] event/dpaa2: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (91 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 092/227] event/dpaa: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 094/227] event/dsw: " Chengwen Feng
` (134 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/event/dpaa2/dpaa2_eventdev.c | 2 +-
drivers/event/dpaa2/dpaa2_eventdev_selftest.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c
index 95d9154b11..2530d9a271 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -1084,7 +1084,7 @@ dpaa2_eventdev_create(const char *name, struct rte_vdev_device *vdev)
eventdev = rte_event_pmd_vdev_init(name,
sizeof(struct dpaa2_eventdev),
- rte_socket_id(), vdev);
+ rte_numa_id(), vdev);
if (eventdev == NULL) {
DPAA2_EVENTDEV_ERR("Failed to create Event device %s", name);
goto fail;
diff --git a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c
index b1e4bf6855..079825ed58 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c
@@ -124,7 +124,7 @@ _eventdev_setup(int mode)
0 /*MBUF_CACHE_SIZE*/,
0,
512, /* Use very small mbufs */
- rte_socket_id());
+ rte_numa_id());
if (!eventdev_test_mempool) {
dpaa2_evdev_err("ERROR creating mempool");
return -1;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 094/227] event/dsw: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (92 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 093/227] event/dpaa2: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 095/227] event/octeontx: " Chengwen Feng
` (133 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/event/dsw/dsw_evdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 55e3a2045c..84ba4a06c2 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -448,7 +448,7 @@ dsw_probe(struct rte_vdev_device *vdev)
name = rte_vdev_device_name(vdev);
dev = rte_event_pmd_vdev_init(name, sizeof(struct dsw_evdev),
- rte_socket_id(), vdev);
+ rte_numa_id(), vdev);
if (dev == NULL)
return -EFAULT;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 095/227] event/octeontx: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (93 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 094/227] event/dsw: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 096/227] event/opdl: " Chengwen Feng
` (132 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/event/octeontx/ssovf_evdev.c | 4 ++--
drivers/event/octeontx/ssovf_evdev_selftest.c | 2 +-
drivers/event/octeontx/ssovf_worker.c | 2 +-
drivers/event/octeontx/timvf_evdev.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c
index 1e5818569b..ba9e92fd99 100644
--- a/drivers/event/octeontx/ssovf_evdev.c
+++ b/drivers/event/octeontx/ssovf_evdev.c
@@ -254,7 +254,7 @@ ssovf_port_setup(struct rte_eventdev *dev, uint8_t port_id,
}
/* Allocate event port memory */
- ws = rte_zmalloc_socket("eventdev ssows",
+ ws = rte_zmalloc_numa("eventdev ssows",
sizeof(struct ssows), RTE_CACHE_LINE_SIZE,
dev->data->numa_id);
if (ws == NULL) {
@@ -893,7 +893,7 @@ ssovf_vdev_probe(struct rte_vdev_device *vdev)
}
eventdev = rte_event_pmd_vdev_init(name, sizeof(struct ssovf_evdev),
- rte_socket_id(), vdev);
+ rte_numa_id(), vdev);
if (eventdev == NULL) {
ssovf_log_err("Failed to create eventdev vdev %s", name);
return -ENOMEM;
diff --git a/drivers/event/octeontx/ssovf_evdev_selftest.c b/drivers/event/octeontx/ssovf_evdev_selftest.c
index df8e710b57..45ff890780 100644
--- a/drivers/event/octeontx/ssovf_evdev_selftest.c
+++ b/drivers/event/octeontx/ssovf_evdev_selftest.c
@@ -159,7 +159,7 @@ _eventdev_setup(int mode)
0 /*MBUF_CACHE_SIZE*/,
0,
512, /* Use very small mbufs */
- rte_socket_id());
+ rte_numa_id());
if (!eventdev_test_mempool) {
ssovf_log_dbg("ERROR creating mempool");
return -1;
diff --git a/drivers/event/octeontx/ssovf_worker.c b/drivers/event/octeontx/ssovf_worker.c
index f3c6a0da5c..fe7031b6c5 100644
--- a/drivers/event/octeontx/ssovf_worker.c
+++ b/drivers/event/octeontx/ssovf_worker.c
@@ -463,7 +463,7 @@ octeontx_fastpath_lookup_mem_get(void)
/* Request for the first time */
mz = rte_memzone_reserve_aligned(name, LOOKUP_ARRAY_SZ,
- SOCKET_ID_ANY, 0, OCCTX_ALIGN);
+ RTE_NUMA_ID_ANY, 0, OCCTX_ALIGN);
if (mz != NULL) {
mem = mz->addr;
/* Form the rx ol_flags based on errcode */
diff --git a/drivers/event/octeontx/timvf_evdev.c b/drivers/event/octeontx/timvf_evdev.c
index b404b1db61..5eaf580c7f 100644
--- a/drivers/event/octeontx/timvf_evdev.c
+++ b/drivers/event/octeontx/timvf_evdev.c
@@ -323,7 +323,7 @@ timvf_ring_create(struct rte_event_timer_adapter *adptr)
snprintf(pool_name, sizeof(pool_name), "timvf_chunk_pool%d",
timr->tim_ring_id);
timr->chunk_pool = (void *)rte_mempool_create_empty(pool_name,
- timr->nb_chunks, TIM_CHUNK_SIZE, 0, 0, rte_socket_id(),
+ timr->nb_chunks, TIM_CHUNK_SIZE, 0, 0, rte_numa_id(),
mp_flags);
if (!timr->chunk_pool) {
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 096/227] event/opdl: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (94 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 095/227] event/octeontx: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 097/227] event/skeleton: " Chengwen Feng
` (131 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/event/opdl/opdl_evdev.c | 16 ++++++++--------
drivers/event/opdl/opdl_ring.c | 6 +++---
drivers/event/opdl/opdl_ring.h | 2 +-
drivers/event/opdl/opdl_test.c | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/event/opdl/opdl_evdev.c b/drivers/event/opdl/opdl_evdev.c
index 44a648a11a..d5396fda4f 100644
--- a/drivers/event/opdl/opdl_evdev.c
+++ b/drivers/event/opdl/opdl_evdev.c
@@ -581,9 +581,9 @@ opdl_close(struct rte_eventdev *dev)
static int
assign_numa_node(const char *key __rte_unused, const char *value, void *opaque)
{
- int *socket_id = opaque;
- *socket_id = atoi(value);
- if (*socket_id >= RTE_MAX_NUMA_NODES)
+ int *numa_id = opaque;
+ *numa_id = atoi(value);
+ if (*numa_id >= RTE_MAX_NUMA_NODES)
return -1;
return 0;
}
@@ -647,7 +647,7 @@ opdl_probe(struct rte_vdev_device *vdev)
const char *params;
struct rte_eventdev *dev;
struct opdl_evdev *opdl;
- int socket_id = rte_socket_id();
+ int numa_id = rte_numa_id();
int do_validation = 0;
int do_test = 0;
int str_len;
@@ -664,7 +664,7 @@ opdl_probe(struct rte_vdev_device *vdev)
name);
} else {
int ret = rte_kvargs_process(kvlist, NUMA_NODE_ARG,
- assign_numa_node, &socket_id);
+ assign_numa_node, &numa_id);
if (ret != 0) {
PMD_DRV_LOG(ERR,
"%s: Error parsing numa node parameter",
@@ -698,7 +698,7 @@ opdl_probe(struct rte_vdev_device *vdev)
}
}
dev = rte_event_pmd_vdev_init(name,
- sizeof(struct opdl_evdev), socket_id, vdev);
+ sizeof(struct opdl_evdev), numa_id, vdev);
if (dev == NULL) {
PMD_DRV_LOG(ERR, "eventdev vdev init() failed");
@@ -710,7 +710,7 @@ opdl_probe(struct rte_vdev_device *vdev)
" , self_test:[%s]",
dev->data->dev_id,
name,
- socket_id,
+ numa_id,
(do_validation ? "true" : "false"),
(do_test ? "true" : "false"));
@@ -726,7 +726,7 @@ opdl_probe(struct rte_vdev_device *vdev)
opdl = dev->data->dev_private;
opdl->data = dev->data;
- opdl->socket = socket_id;
+ opdl->socket = numa_id;
opdl->do_validation = do_validation;
opdl->do_test = do_test;
str_len = strlen(name);
diff --git a/drivers/event/opdl/opdl_ring.c b/drivers/event/opdl/opdl_ring.c
index 60991c4b03..d1e8cdb048 100644
--- a/drivers/event/opdl/opdl_ring.c
+++ b/drivers/event/opdl/opdl_ring.c
@@ -805,13 +805,13 @@ init_stage(struct opdl_ring *t, struct opdl_stage *s, bool threadsafe,
s->shared.stage = s;
/* Alloc memory for deps */
- s->dep_tracking = rte_zmalloc_socket(LIB_NAME,
+ s->dep_tracking = rte_zmalloc_numa(LIB_NAME,
t->max_num_stages * sizeof(enum dep_type),
0, t->socket);
if (s->dep_tracking == NULL)
return -ENOMEM;
- s->deps = rte_zmalloc_socket(LIB_NAME,
+ s->deps = rte_zmalloc_numa(LIB_NAME,
t->max_num_stages * sizeof(struct shared_state *),
0, t->socket);
if (s->deps == NULL) {
@@ -923,7 +923,7 @@ opdl_ring_create(const char *name, uint32_t num_slots, uint32_t slot_size,
}
/* Alloc memory for stages */
- st = rte_zmalloc_socket(LIB_NAME,
+ st = rte_zmalloc_numa(LIB_NAME,
max_num_stages * sizeof(struct opdl_stage),
RTE_CACHE_LINE_SIZE, socket);
if (st == NULL)
diff --git a/drivers/event/opdl/opdl_ring.h b/drivers/event/opdl/opdl_ring.h
index 14ababe0bb..c055dd4f7d 100644
--- a/drivers/event/opdl/opdl_ring.h
+++ b/drivers/event/opdl/opdl_ring.h
@@ -69,7 +69,7 @@ struct opdl_stage;
* @param max_num_stages
* Maximum number of stages.
* @param socket
- * The NUMA socket (or SOCKET_ID_ANY) to allocate the memory used for this
+ * The NUMA socket (or RTE_NUMA_ID_ANY) to allocate the memory used for this
* opdl_ring instance.
* @param threadsafe
* Whether to support multiple threads inputting to the opdl_ring or not.
diff --git a/drivers/event/opdl/opdl_test.c b/drivers/event/opdl/opdl_test.c
index 9b0c4db5ce..daa07f52e2 100644
--- a/drivers/event/opdl/opdl_test.c
+++ b/drivers/event/opdl/opdl_test.c
@@ -1017,7 +1017,7 @@ opdl_selftest(void)
32 /*MBUF_CACHE_SIZE*/,
0,
512, /* use very small mbufs */
- rte_socket_id());
+ rte_numa_id());
if (!eventdev_func_mempool) {
PMD_DRV_LOG(ERR, "ERROR creating mempool");
free(t);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 097/227] event/skeleton: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (95 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 096/227] event/opdl: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 098/227] event/sw: " Chengwen Feng
` (130 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/event/skeleton/skeleton_eventdev.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/event/skeleton/skeleton_eventdev.c b/drivers/event/skeleton/skeleton_eventdev.c
index 9eccf61cad..0893fac541 100644
--- a/drivers/event/skeleton/skeleton_eventdev.c
+++ b/drivers/event/skeleton/skeleton_eventdev.c
@@ -220,7 +220,7 @@ skeleton_eventdev_port_setup(struct rte_eventdev *dev, uint8_t port_id,
}
/* Allocate event port memory */
- sp = rte_zmalloc_socket("eventdev port",
+ sp = rte_zmalloc_numa("eventdev port",
sizeof(struct skeleton_port), RTE_CACHE_LINE_SIZE,
dev->data->numa_id);
if (sp == NULL) {
@@ -351,7 +351,7 @@ skeleton_eventdev_init(struct rte_eventdev *eventdev)
pci_dev->addr.domain, pci_dev->addr.bus,
pci_dev->addr.devid, pci_dev->addr.function);
- PMD_DRV_LOG(INFO, "dev_id=%d socket_id=%d (%x:%x)",
+ PMD_DRV_LOG(INFO, "dev_id=%d numa_id=%d (%x:%x)",
eventdev->data->dev_id, eventdev->data->numa_id,
skel->vendor_id, skel->device_id);
@@ -401,12 +401,12 @@ RTE_PMD_REGISTER_PCI_TABLE(event_skeleton_pci, pci_id_skeleton_map);
/* VDEV based event device */
static int
-skeleton_eventdev_create(const char *name, int socket_id, struct rte_vdev_device *vdev)
+skeleton_eventdev_create(const char *name, int numa_id, struct rte_vdev_device *vdev)
{
struct rte_eventdev *eventdev;
eventdev = rte_event_pmd_vdev_init(name,
- sizeof(struct skeleton_eventdev), socket_id, vdev);
+ sizeof(struct skeleton_eventdev), numa_id, vdev);
if (eventdev == NULL) {
PMD_DRV_ERR("Failed to create eventdev vdev %s", name);
goto fail;
@@ -428,8 +428,8 @@ skeleton_eventdev_probe(struct rte_vdev_device *vdev)
const char *name;
name = rte_vdev_device_name(vdev);
- PMD_DRV_LOG(INFO, "Initializing %s on NUMA node %d", name, rte_socket_id());
- return skeleton_eventdev_create(name, rte_socket_id(), vdev);
+ PMD_DRV_LOG(INFO, "Initializing %s on NUMA node %d", name, rte_numa_id());
+ return skeleton_eventdev_create(name, rte_numa_id(), vdev);
}
static int
@@ -438,7 +438,7 @@ skeleton_eventdev_remove(struct rte_vdev_device *vdev)
const char *name;
name = rte_vdev_device_name(vdev);
- PMD_DRV_LOG(INFO, "Closing %s on NUMA node %d", name, rte_socket_id());
+ PMD_DRV_LOG(INFO, "Closing %s on NUMA node %d", name, rte_numa_id());
return rte_event_pmd_vdev_uninit(name);
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 098/227] event/sw: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (96 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 097/227] event/skeleton: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 099/227] mempool/bucket: " Chengwen Feng
` (129 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/event/sw/event_ring.h | 4 ++--
drivers/event/sw/sw_evdev.c | 26 +++++++++++++-------------
drivers/event/sw/sw_evdev_selftest.c | 2 +-
drivers/event/sw/sw_evdev_xstats.c | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/event/sw/event_ring.h b/drivers/event/sw/event_ring.h
index 35931888dd..bb12697720 100644
--- a/drivers/event/sw/event_ring.h
+++ b/drivers/event/sw/event_ring.h
@@ -31,14 +31,14 @@ struct rob_ring {
};
static inline struct rob_ring *
-rob_ring_create(unsigned int size, unsigned int socket_id)
+rob_ring_create(unsigned int size, unsigned int numa_id)
{
struct rob_ring *retval;
const uint32_t ring_size = rte_align32pow2(size + 1);
size_t memsize = sizeof(*retval) +
(ring_size * sizeof(retval->ring[0]));
- retval = rte_zmalloc_socket(NULL, memsize, 0, socket_id);
+ retval = rte_zmalloc_numa(NULL, memsize, 0, numa_id);
if (retval == NULL)
goto end;
retval->ring_size = ring_size;
diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index d6bc23a220..b2dc61142a 100644
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -237,7 +237,7 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type,
const struct rte_event_queue_conf *queue_conf)
{
unsigned int i;
- int socket_id = sw->data->numa_id;
+ int numa_id = sw->data->numa_id;
struct sw_qid *qid = &sw->qids[idx];
/* Initialize the FID structures to no pinning (-1), and zero packets */
@@ -267,9 +267,9 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type,
goto cleanup;
}
- qid->reorder_buffer = rte_zmalloc_socket(NULL,
+ qid->reorder_buffer = rte_zmalloc_numa(NULL,
window_size * sizeof(qid->reorder_buffer[0]),
- 0, socket_id);
+ 0, numa_id);
if (!qid->reorder_buffer) {
SW_LOG_DBG("reorder_buffer malloc failed");
goto cleanup;
@@ -280,7 +280,7 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type,
window_size * sizeof(qid->reorder_buffer[0]));
qid->reorder_buffer_freelist = rob_ring_create(window_size,
- socket_id);
+ numa_id);
if (!qid->reorder_buffer_freelist) {
SW_LOG_DBG("freelist ring create failed");
goto cleanup;
@@ -533,7 +533,7 @@ sw_dev_configure(const struct rte_eventdev *dev)
*/
rte_free(sw->chunks);
- sw->chunks = rte_malloc_socket(NULL,
+ sw->chunks = rte_malloc_numa(NULL,
sizeof(struct sw_queue_chunk) *
num_chunks,
0,
@@ -886,9 +886,9 @@ sw_close(struct rte_eventdev *dev)
static int
assign_numa_node(const char *key __rte_unused, const char *value, void *opaque)
{
- int *socket_id = opaque;
- *socket_id = atoi(value);
- if (*socket_id >= RTE_MAX_NUMA_NODES)
+ int *numa_id = opaque;
+ *numa_id = atoi(value);
+ if (*numa_id >= RTE_MAX_NUMA_NODES)
return -1;
return 0;
}
@@ -997,7 +997,7 @@ sw_probe(struct rte_vdev_device *vdev)
const char *params;
struct rte_eventdev *dev;
struct sw_evdev *sw;
- int socket_id = rte_socket_id();
+ int numa_id = rte_numa_id();
int sched_quanta = SW_DEFAULT_SCHED_QUANTA;
int credit_quanta = SW_DEFAULT_CREDIT_QUANTA;
int min_burst_size = 1;
@@ -1015,7 +1015,7 @@ sw_probe(struct rte_vdev_device *vdev)
name);
} else {
int ret = rte_kvargs_process(kvlist, NUMA_NODE_ARG,
- assign_numa_node, &socket_id);
+ assign_numa_node, &numa_id);
if (ret != 0) {
SW_LOG_ERR(
"%s: Error parsing numa node parameter",
@@ -1082,11 +1082,11 @@ sw_probe(struct rte_vdev_device *vdev)
"Creating eventdev sw device %s, numa_node=%d, "
"sched_quanta=%d, credit_quanta=%d "
"min_burst=%d, deq_burst=%d, refill_once=%d",
- name, socket_id, sched_quanta, credit_quanta,
+ name, numa_id, sched_quanta, credit_quanta,
min_burst_size, deq_burst_size, refill_once);
dev = rte_event_pmd_vdev_init(name,
- sizeof(struct sw_evdev), socket_id, vdev);
+ sizeof(struct sw_evdev), numa_id, vdev);
if (dev == NULL) {
SW_LOG_ERR("eventdev vdev init() failed");
return -EFAULT;
@@ -1116,7 +1116,7 @@ sw_probe(struct rte_vdev_device *vdev)
snprintf(service.name, sizeof(service.name), "%s_service", name);
snprintf(sw->service_name, sizeof(sw->service_name), "%s_service",
name);
- service.socket_id = socket_id;
+ service.socket_id = numa_id;
service.callback = sw_sched_service_func;
service.callback_userdata = (void *)dev;
diff --git a/drivers/event/sw/sw_evdev_selftest.c b/drivers/event/sw/sw_evdev_selftest.c
index a2ce14051c..979ec28a72 100644
--- a/drivers/event/sw/sw_evdev_selftest.c
+++ b/drivers/event/sw/sw_evdev_selftest.c
@@ -3351,7 +3351,7 @@ test_sw_eventdev(void)
32 /*MBUF_CACHE_SIZE*/,
0,
512, /* use very small mbufs */
- rte_socket_id());
+ rte_numa_id());
if (!eventdev_func_mempool) {
printf("ERROR creating mempool\n");
goto test_fail;
diff --git a/drivers/event/sw/sw_evdev_xstats.c b/drivers/event/sw/sw_evdev_xstats.c
index 611a7ce94a..bd558d5cdf 100644
--- a/drivers/event/sw/sw_evdev_xstats.c
+++ b/drivers/event/sw/sw_evdev_xstats.c
@@ -261,7 +261,7 @@ sw_xstats_init(struct sw_evdev *sw)
RTE_DIM(qid_port_stats);
unsigned int i, port, qid, iq, bkt, stat = 0;
- sw->xstats = rte_zmalloc_socket(NULL, sizeof(sw->xstats[0]) * count, 0,
+ sw->xstats = rte_zmalloc_numa(NULL, sizeof(sw->xstats[0]) * count, 0,
sw->data->numa_id);
if (sw->xstats == NULL)
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 099/227] mempool/bucket: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (97 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 098/227] event/sw: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 100/227] mempool/cnxk: " Chengwen Feng
` (128 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/mempool/bucket/rte_mempool_bucket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mempool/bucket/rte_mempool_bucket.c b/drivers/mempool/bucket/rte_mempool_bucket.c
index d3f626e064..a94e76bc13 100644
--- a/drivers/mempool/bucket/rte_mempool_bucket.c
+++ b/drivers/mempool/bucket/rte_mempool_bucket.c
@@ -63,7 +63,7 @@ bucket_stack_create(const struct rte_mempool *mp, unsigned int n_elts)
{
struct bucket_stack *stack;
- stack = rte_zmalloc_socket("bucket_stack",
+ stack = rte_zmalloc_numa("bucket_stack",
sizeof(struct bucket_stack) +
n_elts * sizeof(void *),
RTE_CACHE_LINE_SIZE,
@@ -465,7 +465,7 @@ bucket_alloc(struct rte_mempool *mp)
if (rc < 0)
return rc;
- bd = rte_zmalloc_socket("bucket_pool", sizeof(*bd),
+ bd = rte_zmalloc_numa("bucket_pool", sizeof(*bd),
RTE_CACHE_LINE_SIZE, mp->numa_id);
if (bd == NULL) {
rc = -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 100/227] mempool/cnxk: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (98 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 099/227] mempool/bucket: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:50 ` [PATCH 101/227] ml/cnxk: " Chengwen Feng
` (127 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/mempool/cnxk/cn10k_mempool_ops.c | 2 +-
drivers/mempool/cnxk/cnxk_mempool.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mempool/cnxk/cn10k_mempool_ops.c b/drivers/mempool/cnxk/cn10k_mempool_ops.c
index 09f900a850..472144da8b 100644
--- a/drivers/mempool/cnxk/cn10k_mempool_ops.c
+++ b/drivers/mempool/cnxk/cn10k_mempool_ops.c
@@ -47,7 +47,7 @@ batch_op_data_table_create(void)
sz = maxpools * sizeof(struct batch_op_data *);
mz = rte_memzone_reserve_aligned(
- BATCH_OP_DATA_TABLE_MZ_NAME, sz, SOCKET_ID_ANY,
+ BATCH_OP_DATA_TABLE_MZ_NAME, sz, RTE_NUMA_ID_ANY,
0, ROC_ALIGN);
}
if (mz == NULL) {
diff --git a/drivers/mempool/cnxk/cnxk_mempool.c b/drivers/mempool/cnxk/cnxk_mempool.c
index 6939fccff4..8a6a1b8c4c 100644
--- a/drivers/mempool/cnxk/cnxk_mempool.c
+++ b/drivers/mempool/cnxk/cnxk_mempool.c
@@ -108,7 +108,7 @@ npa_init(struct rte_pci_device *pci_dev)
int rc = -ENOMEM;
mz = rte_memzone_reserve_aligned(npa_dev_to_name(pci_dev, name),
- sizeof(*dev), SOCKET_ID_ANY, 0,
+ sizeof(*dev), RTE_NUMA_ID_ANY, 0,
RTE_CACHE_LINE_SIZE);
if (mz == NULL)
goto error;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 101/227] ml/cnxk: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (99 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 100/227] mempool/cnxk: " Chengwen Feng
@ 2026-11-03 14:50 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 102/227] net/af_packet: " Chengwen Feng
` (126 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:50 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/ml/cnxk/cnxk_ml_ops.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/ml/cnxk/cnxk_ml_ops.c b/drivers/ml/cnxk/cnxk_ml_ops.c
index dc05764306..c47c58e4d0 100644
--- a/drivers/ml/cnxk/cnxk_ml_ops.c
+++ b/drivers/ml/cnxk/cnxk_ml_ops.c
@@ -73,7 +73,7 @@ cnxk_ml_dev_queue_pair_release(struct rte_ml_dev *dev, uint16_t queue_pair_id)
}
static struct cnxk_ml_qp *
-cnxk_ml_qp_create(const struct rte_ml_dev *dev, uint16_t qp_id, uint32_t nb_desc, int socket_id)
+cnxk_ml_qp_create(const struct rte_ml_dev *dev, uint16_t qp_id, uint32_t nb_desc, int numa_id)
{
const struct rte_memzone *qp_mem;
char name[RTE_MEMZONE_NAMESIZE];
@@ -85,8 +85,8 @@ cnxk_ml_qp_create(const struct rte_ml_dev *dev, uint16_t qp_id, uint32_t nb_desc
cnxk_mldev = dev->data->dev_private;
/* Allocate queue pair */
- qp = rte_zmalloc_socket("cnxk_ml_pmd_queue_pair", sizeof(struct cnxk_ml_qp), ROC_ALIGN,
- socket_id);
+ qp = rte_zmalloc_numa("cnxk_ml_pmd_queue_pair", sizeof(struct cnxk_ml_qp), ROC_ALIGN,
+ numa_id);
if (qp == NULL) {
plt_err("Could not allocate queue pair");
return NULL;
@@ -96,7 +96,7 @@ cnxk_ml_qp_create(const struct rte_ml_dev *dev, uint16_t qp_id, uint32_t nb_desc
len = nb_desc * sizeof(struct cnxk_ml_req);
qp_memzone_name_get(name, RTE_MEMZONE_NAMESIZE, dev->data->dev_id, qp_id);
qp_mem = rte_memzone_reserve_aligned(
- name, len, socket_id, RTE_MEMZONE_SIZE_HINT_ONLY | RTE_MEMZONE_256MB, ROC_ALIGN);
+ name, len, numa_id, RTE_MEMZONE_SIZE_HINT_ONLY | RTE_MEMZONE_256MB, ROC_ALIGN);
if (qp_mem == NULL) {
plt_err("Could not reserve memzone: %s", name);
goto qp_free;
@@ -837,7 +837,7 @@ cnxk_ml_dev_selftest(struct rte_ml_dev *dev)
static int
cnxk_ml_dev_queue_pair_setup(struct rte_ml_dev *dev, uint16_t queue_pair_id,
- const struct rte_ml_dev_qp_conf *qp_conf, int socket_id)
+ const struct rte_ml_dev_qp_conf *qp_conf, int numa_id)
{
struct rte_ml_dev_info dev_info;
struct cnxk_ml_qp *qp;
@@ -870,7 +870,7 @@ cnxk_ml_dev_queue_pair_setup(struct rte_ml_dev *dev, uint16_t queue_pair_id,
*/
nb_desc =
(qp_conf->nb_desc == dev_info.max_desc) ? dev_info.max_desc : qp_conf->nb_desc + 1;
- qp = cnxk_ml_qp_create(dev, queue_pair_id, nb_desc, socket_id);
+ qp = cnxk_ml_qp_create(dev, queue_pair_id, nb_desc, numa_id);
if (qp == NULL) {
plt_err("Could not create queue pair %u", queue_pair_id);
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 102/227] net/af_packet: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (100 preceding siblings ...)
2026-11-03 14:50 ` [PATCH 101/227] ml/cnxk: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 103/227] net/af_xdp: " Chengwen Feng
` (125 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/af_packet/rte_eth_af_packet.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 44f82c0309..ad59d3dd7d 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -599,7 +599,7 @@ eth_dev_close(struct rte_eth_dev *dev)
return 0;
PMD_LOG(INFO, "Closing AF_PACKET ethdev on NUMA socket %u",
- rte_socket_id());
+ rte_numa_id());
internals = dev->data->dev_private;
req = &internals->req;
@@ -656,7 +656,7 @@ static int
eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool)
{
@@ -694,7 +694,7 @@ static int
eth_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
@@ -933,17 +933,17 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
"%s: creating AF_PACKET-backed ethdev on numa socket %u",
name, numa_node);
- *internals = rte_zmalloc_socket(name, sizeof(**internals),
+ *internals = rte_zmalloc_numa(name, sizeof(**internals),
0, numa_node);
if (*internals == NULL)
return -1;
- (*internals)->rx_queue = rte_calloc_socket("af_packet_rx",
+ (*internals)->rx_queue = rte_calloc_numa("af_packet_rx",
nb_queues,
sizeof(struct pkt_rx_queue),
0, numa_node);
- (*internals)->tx_queue = rte_calloc_socket("af_packet_tx",
+ (*internals)->tx_queue = rte_calloc_numa("af_packet_tx",
nb_queues,
sizeof(struct pkt_tx_queue),
0, numa_node);
@@ -979,7 +979,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
PMD_LOG_ERRNO(ERR, "%s: ioctl failed (SIOCGIFINDEX)", name);
goto free_internals;
}
- (*internals)->if_name = rte_malloc_socket(name, ifnamelen + 1, 0, numa_node);
+ (*internals)->if_name = rte_malloc_numa(name, ifnamelen + 1, 0, numa_node);
if ((*internals)->if_name == NULL)
goto free_internals;
strlcpy((*internals)->if_name, pair->value, ifnamelen + 1);
@@ -1098,7 +1098,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
/* rdsize is same for both Tx and Rx */
rdsize = req->tp_frame_nr * sizeof(*(rx_queue->rd));
- rx_queue->rd = rte_zmalloc_socket(name, rdsize, 0, numa_node);
+ rx_queue->rd = rte_zmalloc_numa(name, rdsize, 0, numa_node);
if (rx_queue->rd == NULL)
goto error;
for (i = 0; i < req->tp_frame_nr; ++i) {
@@ -1115,7 +1115,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
tx_queue->map = rx_queue->map + req->tp_block_size * req->tp_block_nr;
- tx_queue->rd = rte_zmalloc_socket(name, rdsize, 0, numa_node);
+ tx_queue->rd = rte_zmalloc_numa(name, rdsize, 0, numa_node);
if (tx_queue->rd == NULL)
goto error;
for (i = 0; i < req->tp_frame_nr; ++i) {
@@ -1406,8 +1406,8 @@ rte_pmd_af_packet_probe(struct rte_vdev_device *dev)
goto exit;
}
- if (dev->device.numa_node == SOCKET_ID_ANY)
- dev->device.numa_node = rte_socket_id();
+ if (dev->device.numa_node == RTE_NUMA_ID_ANY)
+ dev->device.numa_node = rte_numa_id();
ret = rte_eth_from_packet(dev, &sockfd, kvlist);
close(sockfd); /* no longer needed */
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 103/227] net/af_xdp: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (101 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 102/227] net/af_packet: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 104/227] net/ark: " Chengwen Feng
` (124 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 34 ++++++++++++++---------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 9c99dcec20..02ede3f648 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -996,7 +996,7 @@ eth_dev_configure(struct rte_eth_dev *dev)
if (list)
return 0;
- list = rte_zmalloc_socket(name, sizeof(*list), 0,
+ list = rte_zmalloc_numa(name, sizeof(*list), 0,
dev->device->numa_node);
if (list == NULL)
return -1;
@@ -1246,7 +1246,7 @@ eth_dev_close(struct rte_eth_dev *dev)
goto out;
AF_XDP_LOG_LINE(INFO, "Closing AF_XDP ethdev on numa socket %u",
- rte_socket_id());
+ rte_numa_id());
for (i = 0; i < internals->queue_cnt; i++) {
rxq = &internals->rx_queues[i];
@@ -1423,8 +1423,8 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
rte_pktmbuf_priv_size(mb_pool) +
RTE_PKTMBUF_HEADROOM;
- umem = rte_zmalloc_socket("umem", sizeof(*umem), 0,
- rte_socket_id());
+ umem = rte_zmalloc_numa("umem", sizeof(*umem), 0,
+ rte_numa_id());
if (umem == NULL) {
AF_XDP_LOG_LINE(ERR, "Failed to allocate umem info");
return NULL;
@@ -1490,7 +1490,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
int ret;
uint64_t i;
- umem = rte_zmalloc_socket("umem", sizeof(*umem), 0, rte_socket_id());
+ umem = rte_zmalloc_numa("umem", sizeof(*umem), 0, rte_numa_id());
if (umem == NULL) {
AF_XDP_LOG_LINE(ERR, "Failed to allocate umem info");
return NULL;
@@ -1500,7 +1500,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
internals->if_name, rxq->xsk_queue_idx);
umem->buf_ring = rte_ring_create(ring_name,
ETH_AF_XDP_NUM_BUFFERS,
- rte_socket_id(),
+ rte_numa_id(),
0x0);
if (umem->buf_ring == NULL) {
AF_XDP_LOG_LINE(ERR, "Failed to create rte_ring");
@@ -1515,7 +1515,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
internals->if_name, rxq->xsk_queue_idx);
mz = rte_memzone_reserve_aligned(mz_name,
ETH_AF_XDP_NUM_BUFFERS * ETH_AF_XDP_FRAME_SIZE,
- rte_socket_id(), RTE_MEMZONE_IOVA_CONTIG,
+ rte_numa_id(), RTE_MEMZONE_IOVA_CONTIG,
getpagesize());
if (mz == NULL) {
AF_XDP_LOG_LINE(ERR, "Failed to reserve memzone for af_xdp umem.");
@@ -2062,7 +2062,7 @@ static int
eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -2127,7 +2127,7 @@ static int
eth_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct pmd_internals *internals = dev->data->dev_private;
@@ -2579,7 +2579,7 @@ init_internals(struct rte_vdev_device *dev, const char *if_name,
int ret;
int i;
- internals = rte_zmalloc_socket(name, sizeof(*internals), 0, numa_node);
+ internals = rte_zmalloc_numa(name, sizeof(*internals), 0, numa_node);
if (internals == NULL)
return NULL;
@@ -2619,7 +2619,7 @@ init_internals(struct rte_vdev_device *dev, const char *if_name,
goto err_free_internals;
}
- internals->rx_queues = rte_zmalloc_socket(NULL,
+ internals->rx_queues = rte_zmalloc_numa(NULL,
sizeof(struct pkt_rx_queue) * queue_cnt,
0, numa_node);
if (internals->rx_queues == NULL) {
@@ -2627,7 +2627,7 @@ init_internals(struct rte_vdev_device *dev, const char *if_name,
goto err_free_internals;
}
- internals->tx_queues = rte_zmalloc_socket(NULL,
+ internals->tx_queues = rte_zmalloc_numa(NULL,
sizeof(struct pkt_tx_queue) * queue_cnt,
0, numa_node);
if (internals->tx_queues == NULL) {
@@ -2648,7 +2648,7 @@ init_internals(struct rte_vdev_device *dev, const char *if_name,
goto err_free_tx;
process_private = (struct pmd_process_private *)
- rte_zmalloc_socket(name, sizeof(struct pmd_process_private),
+ rte_zmalloc_numa(name, sizeof(struct pmd_process_private),
RTE_CACHE_LINE_SIZE, numa_node);
if (process_private == NULL) {
AF_XDP_LOG_LINE(ERR, "Failed to alloc memory for process private");
@@ -2859,7 +2859,7 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev)
eth_dev->rx_pkt_burst = rte_eth_pkt_burst_dummy;
eth_dev->tx_pkt_burst = rte_eth_pkt_burst_dummy;
eth_dev->process_private = (struct pmd_process_private *)
- rte_zmalloc_socket(name,
+ rte_zmalloc_numa(name,
sizeof(struct pmd_process_private),
RTE_CACHE_LINE_SIZE,
eth_dev->device->numa_node);
@@ -2994,14 +2994,14 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev)
}
/* get numa node id from net sysfs */
- if (dev->device.numa_node == SOCKET_ID_ANY) {
+ if (dev->device.numa_node == RTE_NUMA_ID_ANY) {
unsigned long numa = 0;
char numa_path[PATH_MAX];
snprintf(numa_path, sizeof(numa_path), "/sys/class/net/%s/device/numa_node",
if_name);
if (access(numa_path, R_OK) != 0 || eal_parse_sysfs_value(numa_path, &numa) != 0)
- dev->device.numa_node = rte_socket_id();
+ dev->device.numa_node = rte_numa_id();
else
dev->device.numa_node = numa;
}
@@ -3041,7 +3041,7 @@ rte_pmd_af_xdp_remove(struct rte_vdev_device *dev)
struct rte_eth_dev *eth_dev = NULL;
AF_XDP_LOG_LINE(INFO, "Removing AF_XDP ethdev on numa socket %u",
- rte_socket_id());
+ rte_numa_id());
if (dev == NULL)
return -1;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 104/227] net/ark: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (102 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 103/227] net/af_xdp: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 105/227] net/atlantic: " Chengwen Feng
` (123 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/ark/ark_ethdev.c | 4 ++--
drivers/net/ark/ark_ethdev_rx.c | 14 +++++++-------
drivers/net/ark/ark_ethdev_rx.h | 2 +-
drivers/net/ark/ark_ethdev_tx.c | 14 +++++++-------
drivers/net/ark/ark_ethdev_tx.h | 2 +-
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index d6b1abf383..1df54b27b4 100644
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -441,10 +441,10 @@ ark_dev_init(struct rte_eth_dev *dev)
eth_dev->device = &pci_dev->device;
/* Device requires new dev_private data */
eth_dev->data->dev_private =
- rte_zmalloc_socket(name,
+ rte_zmalloc_numa(name,
sizeof(struct ark_adapter),
RTE_CACHE_LINE_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (eth_dev->data->dev_private == NULL) {
ARK_PMD_LOG(ERR, "Memory allocation for dev_private failed\n");
goto error;
diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c
index adba943fa2..4af6f5e40a 100644
--- a/drivers/net/ark/ark_ethdev_rx.c
+++ b/drivers/net/ark/ark_ethdev_rx.c
@@ -114,7 +114,7 @@ int
ark_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -154,10 +154,10 @@ ark_dev_rx_queue_setup(struct rte_eth_dev *dev,
}
/* Allocate queue struct */
- queue = rte_zmalloc_socket("Ark_rxqueue",
+ queue = rte_zmalloc_numa("Ark_rxqueue",
sizeof(struct ark_rx_queue),
64,
- socket_id);
+ numa_id);
if (queue == 0) {
ARK_PMD_LOG(ERR, "Failed to allocate memory in %s\n", __func__);
return -ENOMEM;
@@ -183,16 +183,16 @@ ark_dev_rx_queue_setup(struct rte_eth_dev *dev,
queue->ext_user_data = ark->user_data[dev->data->port_id];
queue->reserve_q =
- rte_zmalloc_socket("Ark_rx_queue mbuf",
+ rte_zmalloc_numa("Ark_rx_queue mbuf",
nb_desc * sizeof(struct rte_mbuf *),
512,
- socket_id);
+ numa_id);
/* Align buffer to PCIe's boundary size to reduce upstream read request TLPs from FPGA */
queue->paddress_q =
- rte_zmalloc_socket("Ark_rx_queue paddr",
+ rte_zmalloc_numa("Ark_rx_queue paddr",
nb_desc * sizeof(rte_iova_t),
ARK_PCIE_BOUNDARY,
- socket_id);
+ numa_id);
if (queue->reserve_q == 0 || queue->paddress_q == 0) {
ARK_PMD_LOG(ERR,
diff --git a/drivers/net/ark/ark_ethdev_rx.h b/drivers/net/ark/ark_ethdev_rx.h
index 184733640b..0e5d0d5158 100644
--- a/drivers/net/ark/ark_ethdev_rx.h
+++ b/drivers/net/ark/ark_ethdev_rx.h
@@ -14,7 +14,7 @@
int ark_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
int ark_dev_rx_queue_count(void *rx_queue);
diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c
index 0d6a94b919..5b0375ee56 100644
--- a/drivers/net/ark/ark_ethdev_tx.c
+++ b/drivers/net/ark/ark_ethdev_tx.c
@@ -227,7 +227,7 @@ int
ark_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct ark_adapter *ark = dev->data->dev_private;
@@ -248,10 +248,10 @@ ark_tx_queue_setup(struct rte_eth_dev *dev,
nb_desc = 2 * nb_desc;
/* Allocate queue struct */
- queue = rte_zmalloc_socket("Ark_txqueue",
+ queue = rte_zmalloc_numa("Ark_txqueue",
sizeof(struct ark_tx_queue),
64,
- socket_id);
+ numa_id);
if (queue == 0) {
ARK_PMD_LOG(ERR, "Failed to allocate tx "
"queue memory in %s\n",
@@ -269,15 +269,15 @@ ark_tx_queue_setup(struct rte_eth_dev *dev,
queue->ext_user_data = ark->user_data[dev->data->port_id];
queue->meta_q =
- rte_zmalloc_socket("Ark_txqueue meta",
+ rte_zmalloc_numa("Ark_txqueue meta",
nb_desc * sizeof(union ark_tx_meta),
64,
- socket_id);
+ numa_id);
queue->bufs =
- rte_zmalloc_socket("Ark_txqueue bufs",
+ rte_zmalloc_numa("Ark_txqueue bufs",
nb_desc * sizeof(struct rte_mbuf *),
64,
- socket_id);
+ numa_id);
if (queue->meta_q == 0 || queue->bufs == 0) {
ARK_PMD_LOG(ERR, "Failed to allocate "
diff --git a/drivers/net/ark/ark_ethdev_tx.h b/drivers/net/ark/ark_ethdev_tx.h
index 2653408de6..099257012b 100644
--- a/drivers/net/ark/ark_ethdev_tx.h
+++ b/drivers/net/ark/ark_ethdev_tx.h
@@ -16,7 +16,7 @@ uint16_t ark_xmit_pkts(void *vtxq,
int ark_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
void ark_tx_queue_release(void *vtx_queue);
int ark_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 105/227] net/atlantic: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (103 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 104/227] net/ark: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 106/227] net/avp: " Chengwen Feng
` (122 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/atlantic/atl_ethdev.h | 4 ++--
drivers/net/atlantic/atl_rxtx.c | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/atlantic/atl_ethdev.h b/drivers/net/atlantic/atl_ethdev.h
index d2f951c146..41bd29652f 100644
--- a/drivers/net/atlantic/atl_ethdev.h
+++ b/drivers/net/atlantic/atl_ethdev.h
@@ -58,12 +58,12 @@ void atl_rx_queue_release(struct rte_eth_dev *dev, uint16_t rx_queue_id);
void atl_tx_queue_release(struct rte_eth_dev *dev, uint16_t tx_queue_id);
int atl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
int atl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int atl_rx_queue_count(void *rx_queue);
diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c
index 8d02b92304..016351e69d 100644
--- a/drivers/net/atlantic/atl_rxtx.c
+++ b/drivers/net/atlantic/atl_rxtx.c
@@ -100,7 +100,7 @@ atl_reset_rx_queue(struct atl_rx_queue *rxq)
int
atl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -130,8 +130,8 @@ atl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
}
/* allocate memory for the queue structure */
- rxq = rte_zmalloc_socket("atlantic Rx queue", sizeof(*rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("atlantic Rx queue", sizeof(*rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL) {
PMD_INIT_LOG(ERR, "Cannot allocate queue structure");
return -ENOMEM;
@@ -152,9 +152,9 @@ atl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
PMD_DRV_LOG(ERR, "PMD does not support KEEP_CRC offload");
/* allocate memory for the software ring */
- rxq->sw_ring = rte_zmalloc_socket("atlantic sw rx ring",
+ rxq->sw_ring = rte_zmalloc_numa("atlantic sw rx ring",
nb_rx_desc * sizeof(struct atl_rx_entry),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq->sw_ring == NULL) {
PMD_INIT_LOG(ERR,
"Port %d: Cannot allocate software ring for queue %d",
@@ -171,7 +171,7 @@ atl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
mz = rte_eth_dma_zone_reserve(dev, "rx hw_ring", rx_queue_id,
HW_ATL_B0_MAX_RXD *
sizeof(struct hw_atl_rxd_s),
- 128, socket_id);
+ 128, numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR,
"Port %d: Cannot allocate hardware ring for queue %d",
@@ -223,7 +223,7 @@ atl_reset_tx_queue(struct atl_tx_queue *txq)
int
atl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct atl_tx_queue *txq;
@@ -252,8 +252,8 @@ atl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
}
/* allocate memory for the queue structure */
- txq = rte_zmalloc_socket("atlantic Tx queue", sizeof(*txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("atlantic Tx queue", sizeof(*txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL) {
PMD_INIT_LOG(ERR, "Cannot allocate queue structure");
return -ENOMEM;
@@ -267,9 +267,9 @@ atl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
/* allocate memory for the software ring */
- txq->sw_ring = rte_zmalloc_socket("atlantic sw tx ring",
+ txq->sw_ring = rte_zmalloc_numa("atlantic sw tx ring",
nb_tx_desc * sizeof(struct atl_tx_entry),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL) {
PMD_INIT_LOG(ERR,
"Port %d: Cannot allocate software ring for queue %d",
@@ -285,7 +285,7 @@ atl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
*/
mz = rte_eth_dma_zone_reserve(dev, "tx hw_ring", tx_queue_id,
HW_ATL_B0_MAX_TXD * sizeof(struct hw_atl_txd_s),
- 128, socket_id);
+ 128, numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR,
"Port %d: Cannot allocate hardware ring for queue %d",
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 106/227] net/avp: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (104 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 105/227] net/atlantic: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 107/227] net/axgbe: " Chengwen Feng
` (121 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/avp/avp_ethdev.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c
index d536f764cf..ed6eb1cce8 100644
--- a/drivers/net/avp/avp_ethdev.c
+++ b/drivers/net/avp/avp_ethdev.c
@@ -49,14 +49,14 @@ static int avp_dev_promiscuous_disable(struct rte_eth_dev *dev);
static int avp_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *pool);
static int avp_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
static uint16_t avp_recv_scattered_pkts(void *rx_queue,
@@ -1093,7 +1093,7 @@ static int
avp_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *pool)
{
@@ -1131,8 +1131,8 @@ avp_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
avp->guest_mbuf_size);
/* allocate a queue object */
- rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct avp_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("ethdev RX queue", sizeof(struct avp_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL) {
PMD_DRV_LOG_LINE(ERR, "Failed to allocate new Rx queue object");
return -ENOMEM;
@@ -1157,7 +1157,7 @@ static int
avp_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
@@ -1170,8 +1170,8 @@ avp_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
}
/* allocate a queue object */
- txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct avp_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("ethdev TX queue", sizeof(struct avp_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL) {
PMD_DRV_LOG_LINE(ERR, "Failed to allocate new Tx queue object");
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 107/227] net/axgbe: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (105 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 106/227] net/avp: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 108/227] net/bnx2x: " Chengwen Feng
` (120 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/axgbe/axgbe_rxtx.c | 16 ++++++++--------
drivers/net/axgbe/axgbe_rxtx.h | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 51a1aeb0b9..47c09399c1 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -36,7 +36,7 @@ void axgbe_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx)
}
int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -55,9 +55,9 @@ int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
rx_desc > pdata->rx_desc_count)
return -EINVAL;
/* First allocate the rx queue data structure */
- rxq = rte_zmalloc_socket("ethdev RX queue",
+ rxq = rte_zmalloc_numa("ethdev RX queue",
sizeof(struct axgbe_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq) {
PMD_INIT_LOG(ERR, "rte_zmalloc for rxq failed!");
return -ENOMEM;
@@ -90,7 +90,7 @@ int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
/* Allocate RX ring hardware descriptors */
size = rxq->nb_desc * sizeof(union axgbe_rx_desc);
dma = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx, size, 128,
- socket_id);
+ numa_id);
if (!dma) {
PMD_DRV_LOG_LINE(ERR, "ring_dma_zone_reserve for rx_ring failed");
axgbe_rx_queue_release(rxq);
@@ -101,9 +101,9 @@ int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
memset((void *)rxq->desc, 0, size);
/* Allocate software ring */
size = rxq->nb_desc * sizeof(struct rte_mbuf *);
- rxq->sw_ring = rte_zmalloc_socket("sw_ring", size,
+ rxq->sw_ring = rte_zmalloc_numa("sw_ring", size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq->sw_ring) {
PMD_DRV_LOG_LINE(ERR, "rte_zmalloc for sw_ring failed");
axgbe_rx_queue_release(rxq);
@@ -544,7 +544,7 @@ void axgbe_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx)
}
int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
PMD_INIT_FUNC_TRACE();
@@ -593,7 +593,7 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
/* Allocate TX ring hardware descriptors */
tsize = txq->nb_desc * sizeof(struct axgbe_tx_desc);
tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx,
- tsize, AXGBE_DESC_ALIGN, socket_id);
+ tsize, AXGBE_DESC_ALIGN, numa_id);
if (!tz) {
axgbe_tx_queue_release(txq);
return -ENOMEM;
diff --git a/drivers/net/axgbe/axgbe_rxtx.h b/drivers/net/axgbe/axgbe_rxtx.h
index f5f74a0a39..ca6b4935d4 100644
--- a/drivers/net/axgbe/axgbe_rxtx.h
+++ b/drivers/net/axgbe/axgbe_rxtx.h
@@ -157,7 +157,7 @@ void axgbe_set_rx_function(struct rte_eth_dev *dev);
void axgbe_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx);
int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
void axgbe_dev_enable_tx(struct rte_eth_dev *dev);
void axgbe_dev_disable_tx(struct rte_eth_dev *dev);
@@ -179,7 +179,7 @@ uint16_t axgbe_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
void axgbe_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx);
int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
void axgbe_dev_enable_rx(struct rte_eth_dev *dev);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 108/227] net/bnx2x: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (106 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 107/227] net/axgbe: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 109/227] net/bnxt: " Chengwen Feng
` (119 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/bnx2x/bnx2x.c | 2 +-
drivers/net/bnx2x/bnx2x_rxtx.c | 22 +++++++++++-----------
drivers/net/bnx2x/bnx2x_rxtx.h | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 2924fed66b..fdb3290413 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -156,7 +156,7 @@ bnx2x_dma_alloc(struct bnx2x_softc *sc, size_t size, struct bnx2x_dma *dma,
/* Caller must take care that strlen(mz_name) < RTE_MEMZONE_NAMESIZE */
z = rte_memzone_reserve_aligned(mz_name, (uint64_t)size,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG, align);
if (z == NULL) {
PMD_DRV_LOG(ERR, sc, "DMA alloc failed for %s", msg);
diff --git a/drivers/net/bnx2x/bnx2x_rxtx.c b/drivers/net/bnx2x/bnx2x_rxtx.c
index fbc0bb7698..0b8451d4ab 100644
--- a/drivers/net/bnx2x/bnx2x_rxtx.c
+++ b/drivers/net/bnx2x/bnx2x_rxtx.c
@@ -10,10 +10,10 @@
static const struct rte_memzone *
ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,
- uint16_t queue_id, uint32_t ring_size, int socket_id)
+ uint16_t queue_id, uint32_t ring_size, int numa_id)
{
return rte_eth_dma_zone_reserve(dev, ring_name, queue_id,
- ring_size, BNX2X_PAGE_SIZE, socket_id);
+ ring_size, BNX2X_PAGE_SIZE, numa_id);
}
static void
@@ -45,7 +45,7 @@ int
bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -61,8 +61,8 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
rte_iova_t busaddr;
/* First allocate the rx queue data structure */
- rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct bnx2x_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("ethdev RX queue", sizeof(struct bnx2x_rx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (NULL == rxq) {
PMD_DRV_LOG(ERR, sc, "rte_zmalloc for rxq failed!");
return -ENOMEM;
@@ -88,7 +88,7 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
/* Allocate RX ring hardware descriptors */
dma_size = rxq->nb_rx_desc * sizeof(struct eth_rx_bd);
- dma = ring_dma_zone_reserve(dev, "hw_ring", queue_idx, dma_size, socket_id);
+ dma = ring_dma_zone_reserve(dev, "hw_ring", queue_idx, dma_size, numa_id);
if (NULL == dma) {
PMD_RX_LOG(ERR, "ring_dma_zone_reserve for rx_ring failed!");
bnx2x_rx_queue_release(rxq);
@@ -107,9 +107,9 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
/* Allocate software ring */
dma_size = rxq->nb_rx_desc * sizeof(struct bnx2x_rx_entry);
- rxq->sw_ring = rte_zmalloc_socket("sw_ring", dma_size,
+ rxq->sw_ring = rte_zmalloc_numa("sw_ring", dma_size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (NULL == rxq->sw_ring) {
PMD_RX_LOG(ERR, "rte_zmalloc for sw_ring failed!");
bnx2x_rx_queue_release(rxq);
@@ -136,7 +136,7 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
/* Allocate CQ chain. */
dma_size = BNX2X_RX_CHAIN_PAGE_SZ * rxq->nb_cq_pages;
- dma = ring_dma_zone_reserve(dev, "bnx2x_rcq", queue_idx, dma_size, socket_id);
+ dma = ring_dma_zone_reserve(dev, "bnx2x_rcq", queue_idx, dma_size, numa_id);
if (NULL == dma) {
PMD_RX_LOG(ERR, "RCQ alloc failed");
return -ENOMEM;
@@ -231,7 +231,7 @@ int
bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
uint16_t i;
@@ -270,7 +270,7 @@ bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev,
/* Allocate TX ring hardware descriptors */
tsize = txq->nb_tx_desc * sizeof(union eth_tx_bd_types);
- tz = ring_dma_zone_reserve(dev, "tx_hw_ring", queue_idx, tsize, socket_id);
+ tz = ring_dma_zone_reserve(dev, "tx_hw_ring", queue_idx, tsize, numa_id);
if (tz == NULL) {
bnx2x_tx_queue_release(txq);
return -ENOMEM;
diff --git a/drivers/net/bnx2x/bnx2x_rxtx.h b/drivers/net/bnx2x/bnx2x_rxtx.h
index 247a72230b..c8dc12156d 100644
--- a/drivers/net/bnx2x/bnx2x_rxtx.h
+++ b/drivers/net/bnx2x/bnx2x_rxtx.h
@@ -64,12 +64,12 @@ struct bnx2x_tx_queue {
};
int bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
int bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
void bnx2x_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 109/227] net/bnxt: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (107 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 108/227] net/bnx2x: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 110/227] net/bonding: " Chengwen Feng
` (118 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/bnxt/bnxt_ethdev.c | 6 ++--
drivers/net/bnxt/bnxt_mpc.c | 38 ++++++++++-----------
drivers/net/bnxt/bnxt_reps.c | 32 ++++++++---------
drivers/net/bnxt/bnxt_reps.h | 4 +--
drivers/net/bnxt/bnxt_ring.c | 12 +++----
drivers/net/bnxt/bnxt_ring.h | 2 +-
drivers/net/bnxt/bnxt_rxq.c | 10 +++---
drivers/net/bnxt/bnxt_rxq.h | 2 +-
drivers/net/bnxt/bnxt_rxr.c | 22 ++++++------
drivers/net/bnxt/bnxt_rxr.h | 2 +-
drivers/net/bnxt/bnxt_txq.c | 14 ++++----
drivers/net/bnxt/bnxt_txq.h | 2 +-
drivers/net/bnxt/bnxt_txr.c | 18 +++++-----
drivers/net/bnxt/bnxt_txr.h | 2 +-
drivers/net/bnxt/tf_core/v3/tfc_tbl_scope.c | 2 +-
15 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 4ecd2effdf..2bb5cad1d9 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -632,7 +632,7 @@ static int bnxt_alloc_ctx_mem_buf(struct bnxt *bp, char *type, size_t size,
if (!ctx)
return -EINVAL;
- ctx->va = rte_zmalloc_socket(type, size, 0,
+ ctx->va = rte_zmalloc_numa(type, size, 0,
bp->eth_dev->device->numa_node);
if (ctx->va == NULL)
return -ENOMEM;
@@ -5418,7 +5418,7 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
sizeof(struct rx_port_stats_ext) + 512);
if (!mz) {
mz = rte_memzone_reserve(mz_name, total_alloc_len,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RTE_MEMZONE_2MB |
RTE_MEMZONE_SIZE_HINT_ONLY |
RTE_MEMZONE_IOVA_CONTIG);
@@ -5444,7 +5444,7 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
if (!mz) {
mz = rte_memzone_reserve(mz_name,
total_alloc_len,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RTE_MEMZONE_2MB |
RTE_MEMZONE_SIZE_HINT_ONLY |
RTE_MEMZONE_IOVA_CONTIG);
diff --git a/drivers/net/bnxt/bnxt_mpc.c b/drivers/net/bnxt/bnxt_mpc.c
index 5560d3da00..1644e2c96e 100644
--- a/drivers/net/bnxt/bnxt_mpc.c
+++ b/drivers/net/bnxt/bnxt_mpc.c
@@ -179,23 +179,23 @@ int bnxt_mpc_close(struct bnxt *bp)
}
static int bnxt_init_mpc_ring_struct(struct bnxt_mpc_txq *mpc_queue,
- unsigned int socket_id)
+ unsigned int numa_id)
{
struct bnxt_cp_ring_info *cpr;
struct bnxt_mpc_ring_info *mpr;
struct bnxt_ring *ring;
int rc = 0;
- mpr = rte_zmalloc_socket("bnxt_mpc_ring",
+ mpr = rte_zmalloc_numa("bnxt_mpc_ring",
sizeof(struct bnxt_mpc_ring_info),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (mpr == NULL)
return -ENOMEM;
mpc_queue->mpc_ring = mpr;
- ring = rte_zmalloc_socket("bnxt_mpc_ring_struct",
+ ring = rte_zmalloc_numa("bnxt_mpc_ring_struct",
sizeof(struct bnxt_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (ring == NULL) {
PMD_DRV_LOG_LINE(ERR, "MPC ring struct alloc failed rc:%d", rc);
rc = -ENOMEM;
@@ -211,9 +211,9 @@ static int bnxt_init_mpc_ring_struct(struct bnxt_mpc_txq *mpc_queue,
ring->vmem = (void **)&mpr->mpc_buf_ring;
ring->fw_ring_id = INVALID_HW_RING_ID;
- cpr = rte_zmalloc_socket("bnxt_mpc_ring",
+ cpr = rte_zmalloc_numa("bnxt_mpc_ring",
sizeof(struct bnxt_cp_ring_info),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (cpr == NULL) {
PMD_DRV_LOG_LINE(ERR, "MPC cp ring alloc failed rc:%d", rc);
rc = -ENOMEM;
@@ -221,9 +221,9 @@ static int bnxt_init_mpc_ring_struct(struct bnxt_mpc_txq *mpc_queue,
}
mpc_queue->cp_ring = cpr;
- ring = rte_zmalloc_socket("bnxt_mpc_ring_struct",
+ ring = rte_zmalloc_numa("bnxt_mpc_ring_struct",
sizeof(struct bnxt_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (ring == NULL) {
PMD_DRV_LOG_LINE(ERR, "MPC cp ring struct alloc failed rc:%d", rc);
rc = -ENOMEM;
@@ -323,7 +323,7 @@ static int bnxt_alloc_mpc_rings(struct bnxt_mpc_txq *mpc_queue,
mz = rte_memzone_lookup(mz_name);
if (!mz) {
mz = rte_memzone_reserve_aligned(mz_name, total_alloc_len,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RTE_MEMZONE_2MB |
RTE_MEMZONE_SIZE_HINT_ONLY |
RTE_MEMZONE_IOVA_CONTIG,
@@ -398,7 +398,7 @@ static uint16_t get_mpc_ring_logical_id(uint8_t mpc_cap,
}
static int bnxt_mpc_queue_setup_one(struct bnxt *bp, enum bnxt_mpc_chnl chnl_id,
- uint16_t nb_desc, unsigned int socket_id)
+ uint16_t nb_desc, unsigned int numa_id)
{
int rc = 0;
struct bnxt_mpc *mpc;
@@ -408,18 +408,18 @@ static int bnxt_mpc_queue_setup_one(struct bnxt *bp, enum bnxt_mpc_chnl chnl_id,
return 0;
mpc = bp->mpc;
- mpc_queue = rte_zmalloc_socket("bnxt_mpc_queue",
+ mpc_queue = rte_zmalloc_numa("bnxt_mpc_queue",
sizeof(struct bnxt_mpc_txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!mpc_queue) {
PMD_DRV_LOG_LINE(ERR, "bnxt_mpc_queue allocation failed!");
return -ENOMEM;
}
mpc_queue->free =
- rte_zmalloc_socket(NULL,
+ rte_zmalloc_numa(NULL,
sizeof(struct bnxt_mpc_mbuf *) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!mpc_queue->free) {
PMD_DRV_LOG_LINE(ERR, "allocation of mpc mbuf free array failed!");
rc = -ENOMEM;
@@ -430,7 +430,7 @@ static int bnxt_mpc_queue_setup_one(struct bnxt *bp, enum bnxt_mpc_chnl chnl_id,
/* TBD: hardcoded to 1 for now and should be tuned later for perf */
mpc_queue->free_thresh = BNXT_MPC_DESC_THRESH;
- rc = bnxt_init_mpc_ring_struct(mpc_queue, socket_id);
+ rc = bnxt_init_mpc_ring_struct(mpc_queue, numa_id);
if (rc)
goto bnxt_mpc_queue_setup_one_err1;
@@ -530,7 +530,7 @@ int bnxt_mpc_open(struct bnxt *bp)
int rc = 0;
enum bnxt_mpc_chnl i;
struct bnxt_mpc *mpc;
- unsigned int socket_id;
+ unsigned int numa_id;
rc = is_bnxt_in_error(bp);
if (rc)
@@ -545,7 +545,7 @@ int bnxt_mpc_open(struct bnxt *bp)
PMD_DRV_LOG_LINE(ERR, "MPC channels enable failed rc:%d", rc);
return rc;
}
- socket_id = rte_lcore_to_socket_id(rte_get_main_lcore());
+ numa_id = rte_lcore_to_numa_id(rte_get_main_lcore());
mpc = bp->mpc;
/* Limit to MPC TE_CFA and RE_CFA */
@@ -556,7 +556,7 @@ int bnxt_mpc_open(struct bnxt *bp)
for (i = 0; i < BNXT_MPC_CHNL_MAX; i++) {
if (!(mpc->mpc_chnls_cap & (1 << i)))
continue;
- rc = bnxt_mpc_queue_setup_one(bp, i, BNXT_MPC_NB_DESC, socket_id);
+ rc = bnxt_mpc_queue_setup_one(bp, i, BNXT_MPC_NB_DESC, numa_id);
if (rc) {
PMD_DRV_LOG_LINE(ERR, "MPC queue %d setup failed rc:%d",
i, rc);
diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c
index dd0f14d5c6..d3d1afd7d8 100644
--- a/drivers/net/bnxt/bnxt_reps.c
+++ b/drivers/net/bnxt/bnxt_reps.c
@@ -684,21 +684,21 @@ int bnxt_rep_dev_configure_op(struct rte_eth_dev *eth_dev)
}
static int bnxt_init_rep_rx_ring(struct bnxt_rx_queue *rxq,
- unsigned int socket_id)
+ unsigned int numa_id)
{
struct bnxt_rx_ring_info *rxr;
struct bnxt_ring *ring;
- rxr = rte_zmalloc_socket("bnxt_rep_rx_ring",
+ rxr = rte_zmalloc_numa("bnxt_rep_rx_ring",
sizeof(struct bnxt_rx_ring_info),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxr == NULL)
return -ENOMEM;
rxq->rx_ring = rxr;
- ring = rte_zmalloc_socket("bnxt_rep_rx_ring_struct",
+ ring = rte_zmalloc_numa("bnxt_rep_rx_ring_struct",
sizeof(struct bnxt_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (ring == NULL)
return -ENOMEM;
rxr->rx_ring_struct = ring;
@@ -711,7 +711,7 @@ static int bnxt_init_rep_rx_ring(struct bnxt_rx_queue *rxq,
int bnxt_rep_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
__rte_unused struct rte_mempool *mp)
{
@@ -756,9 +756,9 @@ int bnxt_rep_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
bnxt_rx_queue_release_op(eth_dev, queue_idx);
}
- rxq = rte_zmalloc_socket("bnxt_vfr_rx_queue",
+ rxq = rte_zmalloc_numa("bnxt_vfr_rx_queue",
sizeof(struct bnxt_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq) {
PMD_DRV_LOG_LINE(ERR, "bnxt_vfr_rx_queue allocation failed!");
return -ENOMEM;
@@ -768,14 +768,14 @@ int bnxt_rep_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
rxq->nb_rx_desc = nb_desc;
- rc = bnxt_init_rep_rx_ring(rxq, socket_id);
+ rc = bnxt_init_rep_rx_ring(rxq, numa_id);
if (rc)
goto out;
- buf_ring = rte_zmalloc_socket("bnxt_rx_vfr_buf_ring",
+ buf_ring = rte_zmalloc_numa("bnxt_rx_vfr_buf_ring",
sizeof(struct rte_mbuf *) *
rxq->rx_ring->rx_ring_struct->ring_size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!buf_ring) {
PMD_DRV_LOG_LINE(ERR, "bnxt_rx_vfr_buf_ring allocation failed!");
rc = -ENOMEM;
@@ -814,7 +814,7 @@ void bnxt_rep_rx_queue_release_op(struct rte_eth_dev *dev, uint16_t queue_idx)
int bnxt_rep_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
__rte_unused const struct rte_eth_txconf *tx_conf)
{
struct bnxt_representor *rep_bp = eth_dev->data->dev_private;
@@ -856,16 +856,16 @@ int bnxt_rep_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
bnxt_rep_tx_queue_release_op(eth_dev, queue_idx);
}
- vfr_txq = rte_zmalloc_socket("bnxt_vfr_tx_queue",
+ vfr_txq = rte_zmalloc_numa("bnxt_vfr_tx_queue",
sizeof(struct bnxt_vf_rep_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!vfr_txq) {
PMD_DRV_LOG_LINE(ERR, "bnxt_vfr_tx_queue allocation failed!");
return -ENOMEM;
}
- txq = rte_zmalloc_socket("bnxt_tx_queue",
+ txq = rte_zmalloc_numa("bnxt_tx_queue",
sizeof(struct bnxt_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq) {
PMD_DRV_LOG_LINE(ERR, "bnxt_tx_queue allocation failed!");
rte_free(vfr_txq);
diff --git a/drivers/net/bnxt/bnxt_reps.h b/drivers/net/bnxt/bnxt_reps.h
index 1615ecf11c..0f02770ae6 100644
--- a/drivers/net/bnxt/bnxt_reps.h
+++ b/drivers/net/bnxt/bnxt_reps.h
@@ -32,14 +32,14 @@ int bnxt_rep_dev_start_op(struct rte_eth_dev *eth_dev);
int bnxt_rep_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
__rte_unused uint16_t queue_idx,
__rte_unused uint16_t nb_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *
rx_conf,
__rte_unused struct rte_mempool *mp);
int bnxt_rep_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
__rte_unused uint16_t queue_idx,
__rte_unused uint16_t nb_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_txconf *
tx_conf);
void bnxt_rep_rx_queue_release_op(struct rte_eth_dev *dev, uint16_t queue_idx);
diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index d478c60a1e..a01a8462fc 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -95,7 +95,7 @@ int bnxt_alloc_ring_grps(struct bnxt *bp)
* tx bd ring - Only non-zero length if tx_ring_info is not NULL
* rx bd ring - Only non-zero length if rx_ring_info is not NULL
*/
-int bnxt_alloc_rings(struct bnxt *bp, unsigned int socket_id, uint16_t qidx,
+int bnxt_alloc_rings(struct bnxt *bp, unsigned int numa_id, uint16_t qidx,
struct bnxt_tx_queue *txq,
struct bnxt_rx_queue *rxq,
struct bnxt_cp_ring_info *cp_ring_info,
@@ -207,7 +207,7 @@ int bnxt_alloc_rings(struct bnxt *bp, unsigned int socket_id, uint16_t qidx,
mz = rte_memzone_lookup(mz_name);
if (!mz) {
mz = rte_memzone_reserve_aligned(mz_name, total_alloc_len,
- socket_id,
+ numa_id,
RTE_MEMZONE_2MB |
RTE_MEMZONE_SIZE_HINT_ONLY |
RTE_MEMZONE_IOVA_CONTIG,
@@ -459,14 +459,14 @@ int bnxt_alloc_rxtx_nq_ring(struct bnxt *bp)
if (!BNXT_HAS_NQ(bp) || bp->rxtx_nq_ring)
return 0;
- nqr = rte_zmalloc_socket("nqr",
+ nqr = rte_zmalloc_numa("nqr",
sizeof(struct bnxt_cp_ring_info),
RTE_CACHE_LINE_SIZE,
bp->eth_dev->device->numa_node);
if (nqr == NULL)
return -ENOMEM;
- ring = rte_zmalloc_socket("bnxt_cp_ring_struct",
+ ring = rte_zmalloc_numa("bnxt_cp_ring_struct",
sizeof(struct bnxt_ring),
RTE_CACHE_LINE_SIZE,
bp->eth_dev->device->numa_node);
@@ -879,14 +879,14 @@ int bnxt_alloc_async_ring_struct(struct bnxt *bp)
if (BNXT_NUM_ASYNC_CPR(bp) == 0)
return 0;
- cpr = rte_zmalloc_socket("cpr",
+ cpr = rte_zmalloc_numa("cpr",
sizeof(struct bnxt_cp_ring_info),
RTE_CACHE_LINE_SIZE,
bp->eth_dev->device->numa_node);
if (cpr == NULL)
return -ENOMEM;
- ring = rte_zmalloc_socket("bnxt_cp_ring_struct",
+ ring = rte_zmalloc_numa("bnxt_cp_ring_struct",
sizeof(struct bnxt_ring),
RTE_CACHE_LINE_SIZE,
bp->eth_dev->device->numa_node);
diff --git a/drivers/net/bnxt/bnxt_ring.h b/drivers/net/bnxt/bnxt_ring.h
index d63ae8d8f8..7e339a270d 100644
--- a/drivers/net/bnxt/bnxt_ring.h
+++ b/drivers/net/bnxt/bnxt_ring.h
@@ -67,7 +67,7 @@ struct bnxt_rx_ring_info;
struct bnxt_cp_ring_info;
void bnxt_free_ring(struct bnxt_ring *ring);
int bnxt_alloc_ring_grps(struct bnxt *bp);
-int bnxt_alloc_rings(struct bnxt *bp, unsigned int socket_id, uint16_t qidx,
+int bnxt_alloc_rings(struct bnxt *bp, unsigned int numa_id, uint16_t qidx,
struct bnxt_tx_queue *txq,
struct bnxt_rx_queue *rxq,
struct bnxt_cp_ring_info *cp_ring_info,
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 11115db1fd..09033309b2 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -281,7 +281,7 @@ void bnxt_rx_queue_release_op(struct rte_eth_dev *dev, uint16_t queue_idx)
int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -324,8 +324,8 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
rxq = eth_dev->data->rx_queues[queue_idx];
if (rxq)
bnxt_rx_queue_release_op(eth_dev, queue_idx);
- rxq = rte_zmalloc_socket("bnxt_rx_queue", sizeof(struct bnxt_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("bnxt_rx_queue", sizeof(struct bnxt_rx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq) {
PMD_DRV_LOG_LINE(ERR, "bnxt_rx_queue allocation failed!");
return -ENOMEM;
@@ -351,7 +351,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
eth_dev->data->rx_queues[queue_idx] = rxq;
- rc = bnxt_init_rx_ring_struct(rxq, socket_id);
+ rc = bnxt_init_rx_ring_struct(rxq, numa_id);
if (rc) {
PMD_DRV_LOG_LINE(ERR,
"init_rx_ring_struct failed!");
@@ -367,7 +367,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
rxq->crc_len = 0;
/* Allocate RX ring hardware descriptors */
- rc = bnxt_alloc_rings(bp, socket_id, queue_idx, NULL, rxq, rxq->cp_ring,
+ rc = bnxt_alloc_rings(bp, numa_id, queue_idx, NULL, rxq, rxq->cp_ring,
NULL, "rxr");
if (rc) {
PMD_DRV_LOG_LINE(ERR,
diff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h
index 3385496e70..4ef5c4b4d0 100644
--- a/drivers/net/bnxt/bnxt_rxq.h
+++ b/drivers/net/bnxt/bnxt_rxq.h
@@ -57,7 +57,7 @@ void bnxt_rx_queue_release_op(struct rte_eth_dev *dev, uint16_t queue_idx);
int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
void bnxt_free_rx_mbufs(struct bnxt *bp);
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 43b13790f8..2f0c619c67 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -1528,7 +1528,7 @@ void bnxt_free_rx_rings(struct bnxt *bp)
}
}
-int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)
+int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int numa_id)
{
struct bnxt_cp_ring_info *cpr;
struct bnxt_rx_ring_info *rxr;
@@ -1540,18 +1540,18 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)
rxr = rxq->rx_ring;
} else {
- rxr = rte_zmalloc_socket("bnxt_rx_ring",
+ rxr = rte_zmalloc_numa("bnxt_rx_ring",
sizeof(struct bnxt_rx_ring_info),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxr == NULL)
return -ENOMEM;
rxq->rx_ring = rxr;
}
if (rxr->rx_ring_struct == NULL) {
- ring = rte_zmalloc_socket("bnxt_rx_ring_struct",
+ ring = rte_zmalloc_numa("bnxt_rx_ring_struct",
sizeof(struct bnxt_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (ring == NULL)
return -ENOMEM;
rxr->rx_ring_struct = ring;
@@ -1571,18 +1571,18 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)
if (rxq->cp_ring != NULL) {
cpr = rxq->cp_ring;
} else {
- cpr = rte_zmalloc_socket("bnxt_rx_ring",
+ cpr = rte_zmalloc_numa("bnxt_rx_ring",
sizeof(struct bnxt_cp_ring_info),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (cpr == NULL)
return -ENOMEM;
rxq->cp_ring = cpr;
}
if (cpr->cp_ring_struct == NULL) {
- ring = rte_zmalloc_socket("bnxt_rx_ring_struct",
+ ring = rte_zmalloc_numa("bnxt_rx_ring_struct",
sizeof(struct bnxt_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (ring == NULL)
return -ENOMEM;
cpr->cp_ring_struct = ring;
@@ -1606,9 +1606,9 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)
rxr = rxq->rx_ring;
/* Allocate Aggregator rings */
- ring = rte_zmalloc_socket("bnxt_rx_ring_struct",
+ ring = rte_zmalloc_numa("bnxt_rx_ring_struct",
sizeof(struct bnxt_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (ring == NULL)
return -ENOMEM;
rxr->ag_ring_struct = ring;
diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h
index 4e745bd7b7..a42564c165 100644
--- a/drivers/net/bnxt/bnxt_rxr.h
+++ b/drivers/net/bnxt/bnxt_rxr.h
@@ -148,7 +148,7 @@ struct bnxt_rx_ring_info {
uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
void bnxt_free_rx_rings(struct bnxt *bp);
-int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id);
+int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int numa_id);
int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq);
int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id);
int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id);
diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c
index 983be5130b..cbd9223e8e 100644
--- a/drivers/net/bnxt/bnxt_txq.c
+++ b/drivers/net/bnxt/bnxt_txq.c
@@ -123,7 +123,7 @@ void bnxt_tx_queue_release_op(struct rte_eth_dev *dev, uint16_t queue_idx)
int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct bnxt *bp = eth_dev->data->dev_private;
@@ -151,8 +151,8 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
if (txq)
bnxt_tx_queue_release_op(eth_dev, queue_idx);
}
- txq = rte_zmalloc_socket("bnxt_tx_queue", sizeof(struct bnxt_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("bnxt_tx_queue", sizeof(struct bnxt_tx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq) {
PMD_DRV_LOG_LINE(ERR, "bnxt_tx_queue allocation failed!");
return -ENOMEM;
@@ -161,9 +161,9 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
txq->bp = bp;
eth_dev->data->tx_queues[queue_idx] = txq;
- txq->free = rte_zmalloc_socket(NULL,
+ txq->free = rte_zmalloc_numa(NULL,
sizeof(struct rte_mbuf *) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq->free) {
PMD_DRV_LOG_LINE(ERR, "allocation of tx mbuf free array failed!");
rc = -ENOMEM;
@@ -187,7 +187,7 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
txq->tx_deferred_start = tx_conf->tx_deferred_start;
- rc = bnxt_init_tx_ring_struct(txq, socket_id);
+ rc = bnxt_init_tx_ring_struct(txq, numa_id);
if (rc)
goto err;
@@ -195,7 +195,7 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
txq->port_id = eth_dev->data->port_id;
/* Allocate TX ring hardware descriptors */
- if (bnxt_alloc_rings(bp, socket_id, queue_idx, txq, NULL, txq->cp_ring,
+ if (bnxt_alloc_rings(bp, numa_id, queue_idx, txq, NULL, txq->cp_ring,
NULL, "txr")) {
PMD_DRV_LOG_LINE(ERR, "ring_dma_zone_reserve for tx_ring failed!");
rc = -ENOMEM;
diff --git a/drivers/net/bnxt/bnxt_txq.h b/drivers/net/bnxt/bnxt_txq.h
index 01f5cf817a..52fe889c8c 100644
--- a/drivers/net/bnxt/bnxt_txq.h
+++ b/drivers/net/bnxt/bnxt_txq.h
@@ -46,7 +46,7 @@ void bnxt_tx_queue_release_op(struct rte_eth_dev *dev, uint16_t queue_idx);
int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
uint64_t bnxt_get_tx_port_offloads(struct bnxt *bp);
#endif
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 4c01e8a275..700b2ca43f 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -60,22 +60,22 @@ int bnxt_init_one_tx_ring(struct bnxt_tx_queue *txq)
return 0;
}
-int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id)
+int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int numa_id)
{
struct bnxt_cp_ring_info *cpr;
struct bnxt_tx_ring_info *txr;
struct bnxt_ring *ring;
- txr = rte_zmalloc_socket("bnxt_tx_ring",
+ txr = rte_zmalloc_numa("bnxt_tx_ring",
sizeof(struct bnxt_tx_ring_info),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txr == NULL)
return -ENOMEM;
txq->tx_ring = txr;
- ring = rte_zmalloc_socket("bnxt_tx_ring_struct",
+ ring = rte_zmalloc_numa("bnxt_tx_ring_struct",
sizeof(struct bnxt_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (ring == NULL)
return -ENOMEM;
txr->tx_ring_struct = ring;
@@ -87,16 +87,16 @@ int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id)
ring->vmem = (void **)&txr->tx_buf_ring;
ring->fw_ring_id = INVALID_HW_RING_ID;
- cpr = rte_zmalloc_socket("bnxt_tx_ring",
+ cpr = rte_zmalloc_numa("bnxt_tx_ring",
sizeof(struct bnxt_cp_ring_info),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (cpr == NULL)
return -ENOMEM;
txq->cp_ring = cpr;
- ring = rte_zmalloc_socket("bnxt_tx_ring_struct",
+ ring = rte_zmalloc_numa("bnxt_tx_ring_struct",
sizeof(struct bnxt_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (ring == NULL)
return -ENOMEM;
cpr->cp_ring_struct = ring;
diff --git a/drivers/net/bnxt/bnxt_txr.h b/drivers/net/bnxt/bnxt_txr.h
index fd92a242c3..a68d9f3822 100644
--- a/drivers/net/bnxt/bnxt_txr.h
+++ b/drivers/net/bnxt/bnxt_txr.h
@@ -46,7 +46,7 @@ static inline uint32_t bnxt_tx_avail(struct bnxt_tx_queue *txq)
void bnxt_free_tx_rings(struct bnxt *bp);
int bnxt_init_one_tx_ring(struct bnxt_tx_queue *txq);
-int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id);
+int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int numa_id);
uint16_t bnxt_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts);
uint16_t _bnxt_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
diff --git a/drivers/net/bnxt/tf_core/v3/tfc_tbl_scope.c b/drivers/net/bnxt/tf_core/v3/tfc_tbl_scope.c
index a761d9bdeb..22bdc25906 100644
--- a/drivers/net/bnxt/tf_core/v3/tfc_tbl_scope.c
+++ b/drivers/net/bnxt/tf_core/v3/tfc_tbl_scope.c
@@ -500,7 +500,7 @@ static int alloc_link_pbl(struct tfc_ts_mem_cfg *mem_cfg, uint32_t page_size,
/* Backing store does not already exist so allocate */
mem_cfg->ts_mz.mz = rte_memzone_reserve_aligned(mz_name,
total_size,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
mz_size |
RTE_MEMZONE_SIZE_HINT_ONLY |
RTE_MEMZONE_IOVA_CONTIG,
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 110/227] net/bonding: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (108 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 109/227] net/bnxt: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 111/227] net/cnxk: " Chengwen Feng
` (117 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/bonding/eth_bond_private.h | 2 +-
drivers/net/bonding/rte_eth_bond.h | 4 +--
drivers/net/bonding/rte_eth_bond_8023ad.c | 14 ++++-----
drivers/net/bonding/rte_eth_bond_alb.c | 4 +--
drivers/net/bonding/rte_eth_bond_api.c | 4 +--
drivers/net/bonding/rte_eth_bond_args.c | 14 ++++-----
drivers/net/bonding/rte_eth_bond_flow.c | 2 +-
drivers/net/bonding/rte_eth_bond_pmd.c | 36 +++++++++++------------
8 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/drivers/net/bonding/eth_bond_private.h b/drivers/net/bonding/eth_bond_private.h
index 378bbba4e6..684f8c30cb 100644
--- a/drivers/net/bonding/eth_bond_private.h
+++ b/drivers/net/bonding/eth_bond_private.h
@@ -23,7 +23,7 @@
#define PMD_BOND_MODE_KVARG ("mode")
#define PMD_BOND_AGG_MODE_KVARG ("agg_mode")
#define PMD_BOND_XMIT_POLICY_KVARG ("xmit_policy")
-#define PMD_BOND_SOCKET_ID_KVARG ("socket_id")
+#define PMD_BOND_SOCKET_ID_KVARG ("numa_id")
#define PMD_BOND_MAC_ADDR_KVARG ("mac")
#define PMD_BOND_LSC_POLL_PERIOD_KVARG ("lsc_poll_period_ms")
#define PMD_BOND_LINK_UP_PROP_DELAY_KVARG ("up_delay")
diff --git a/drivers/net/bonding/rte_eth_bond.h b/drivers/net/bonding/rte_eth_bond.h
index 4f79ff9b85..37d780dd34 100644
--- a/drivers/net/bonding/rte_eth_bond.h
+++ b/drivers/net/bonding/rte_eth_bond.h
@@ -97,13 +97,13 @@ extern "C" {
*
* @param name Name of new link bonding device.
* @param mode Mode to initialize bonding device in.
- * @param socket_id Socket Id on which to allocate eth_dev resources.
+ * @param numa_id Socket Id on which to allocate eth_dev resources.
*
* @return
* Port Id of created rte_eth_dev on success, negative value otherwise
*/
int
-rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id);
+rte_eth_bond_create(const char *name, uint8_t mode, uint8_t numa_id);
/**
* Free a bonding rte_eth_dev device
diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index c445290079..245d535a7a 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -1033,7 +1033,7 @@ bond_mode_8023ad_activate_member(struct rte_eth_dev *bond_dev,
};
char mem_name[RTE_ETH_NAME_MAX_LEN];
- int socket_id;
+ int numa_id;
unsigned element_size;
uint32_t total_tx_desc;
struct bond_tx_queue *bd_tx_q;
@@ -1073,9 +1073,9 @@ bond_mode_8023ad_activate_member(struct rte_eth_dev *bond_dev,
RTE_ASSERT(port->rx_ring == NULL);
RTE_ASSERT(port->tx_ring == NULL);
- socket_id = rte_eth_dev_socket_id(member_id);
- if (socket_id == -1)
- socket_id = rte_socket_id();
+ numa_id = rte_eth_dev_numa_id(member_id);
+ if (numa_id == -1)
+ numa_id = rte_numa_id();
element_size = sizeof(struct slow_protocol_frame) +
RTE_PKTMBUF_HEADROOM;
@@ -1094,7 +1094,7 @@ bond_mode_8023ad_activate_member(struct rte_eth_dev *bond_dev,
port->mbuf_pool = rte_pktmbuf_pool_create(mem_name, total_tx_desc,
RTE_MEMPOOL_CACHE_MAX_SIZE >= 32 ?
32 : RTE_MEMPOOL_CACHE_MAX_SIZE,
- 0, element_size, socket_id);
+ 0, element_size, numa_id);
/* Any memory allocation failure in initialization is critical because
* resources can't be free, so reinitialization is impossible. */
@@ -1105,7 +1105,7 @@ bond_mode_8023ad_activate_member(struct rte_eth_dev *bond_dev,
snprintf(mem_name, RTE_DIM(mem_name), "member_%u_rx", member_id);
port->rx_ring = rte_ring_create(mem_name,
- rte_align32pow2(BOND_MODE_8023AX_MEMBER_RX_PKTS), socket_id, 0);
+ rte_align32pow2(BOND_MODE_8023AX_MEMBER_RX_PKTS), numa_id, 0);
if (port->rx_ring == NULL) {
rte_panic("Member %u: Failed to create rx ring '%s': %s\n", member_id,
@@ -1115,7 +1115,7 @@ bond_mode_8023ad_activate_member(struct rte_eth_dev *bond_dev,
/* TX ring is at least one pkt longer to make room for marker packet. */
snprintf(mem_name, RTE_DIM(mem_name), "member_%u_tx", member_id);
port->tx_ring = rte_ring_create(mem_name,
- rte_align32pow2(BOND_MODE_8023AX_MEMBER_TX_PKTS + 1), socket_id, 0);
+ rte_align32pow2(BOND_MODE_8023AX_MEMBER_TX_PKTS + 1), numa_id, 0);
if (port->tx_ring == NULL) {
rte_panic("Member %u: Failed to create tx ring '%s': %s\n", member_id,
diff --git a/drivers/net/bonding/rte_eth_bond_alb.c b/drivers/net/bonding/rte_eth_bond_alb.c
index 253f38da4a..0720541510 100644
--- a/drivers/net/bonding/rte_eth_bond_alb.c
+++ b/drivers/net/bonding/rte_eth_bond_alb.c
@@ -36,7 +36,7 @@ bond_mode_alb_enable(struct rte_eth_dev *bond_dev)
uint16_t data_size;
char mem_name[RTE_ETH_NAME_MAX_LEN];
- int socket_id = bond_dev->data->numa_node;
+ int numa_id = bond_dev->data->numa_node;
/* Fill hash table with initial values */
memset(hash_table, 0, sizeof(struct client_data) * ALB_HASH_TABLE_SIZE);
@@ -57,7 +57,7 @@ bond_mode_alb_enable(struct rte_eth_dev *bond_dev)
512 * RTE_MAX_ETHPORTS,
RTE_MEMPOOL_CACHE_MAX_SIZE >= 32 ?
32 : RTE_MEMPOOL_CACHE_MAX_SIZE,
- 0, data_size, socket_id);
+ 0, data_size, numa_id);
if (internals->mode6.mempool == NULL) {
RTE_BOND_LOG(ERR, "%s: Failed to initialize ALB mempool.",
diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
index a4b54a71dd..6835a516d9 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -152,7 +152,7 @@ deactivate_member(struct rte_eth_dev *eth_dev, uint16_t port_id)
RTE_EXPORT_SYMBOL(rte_eth_bond_create)
int
-rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
+rte_eth_bond_create(const char *name, uint8_t mode, uint8_t numa_id)
{
struct bond_dev_private *internals;
struct rte_eth_dev *bond_dev;
@@ -165,7 +165,7 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
}
ret = snprintf(devargs, sizeof(devargs),
- "driver=net_bonding,mode=%d,socket_id=%d", mode, socket_id);
+ "driver=net_bonding,mode=%d,numa_id=%d", mode, numa_id);
if (ret < 0 || ret >= (int)sizeof(devargs))
return -ENOMEM;
diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c
index 823ed80f07..cbf6a7fb91 100644
--- a/drivers/net/bonding/rte_eth_bond_args.c
+++ b/drivers/net/bonding/rte_eth_bond_args.c
@@ -201,26 +201,26 @@ int
bond_ethdev_parse_socket_id_kvarg(const char *key __rte_unused,
const char *value, void *extra_args)
{
- long socket_id;
+ long numa_id;
char *endptr;
if (value == NULL || extra_args == NULL)
return -1;
errno = 0;
- socket_id = strtol(value, &endptr, 10);
+ numa_id = strtol(value, &endptr, 10);
if (*endptr != 0 || errno != 0)
return -1;
- /* SOCKET_ID_ANY also consider a valid socket id */
- if ((int8_t)socket_id == SOCKET_ID_ANY) {
- *(int *)extra_args = SOCKET_ID_ANY;
+ /* RTE_NUMA_ID_ANY also consider a valid socket id */
+ if ((int8_t)numa_id == RTE_NUMA_ID_ANY) {
+ *(int *)extra_args = RTE_NUMA_ID_ANY;
return 0;
}
/* validate socket id value */
- if (socket_id >= 0 && socket_id < RTE_MAX_NUMA_NODES) {
- *(int *)extra_args = (int)socket_id;
+ if (numa_id >= 0 && numa_id < RTE_MAX_NUMA_NODES) {
+ *(int *)extra_args = (int)numa_id;
return 0;
}
return -1;
diff --git a/drivers/net/bonding/rte_eth_bond_flow.c b/drivers/net/bonding/rte_eth_bond_flow.c
index 5d0be5caf5..da77281499 100644
--- a/drivers/net/bonding/rte_eth_bond_flow.c
+++ b/drivers/net/bonding/rte_eth_bond_flow.c
@@ -34,7 +34,7 @@ bond_flow_alloc(int numa_node, const struct rte_flow_attr *attr,
strerror(rte_errno));
return NULL;
}
- flow = rte_zmalloc_socket(NULL, offsetof(struct rte_flow, rule) + ret,
+ flow = rte_zmalloc_numa(NULL, offsetof(struct rte_flow, rule) + ret,
RTE_CACHE_LINE_SIZE, numa_node);
if (unlikely(flow == NULL)) {
RTE_BOND_LOG(ERR, "Could not allocate new flow");
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 526f8118b3..fa538d2493 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1741,7 +1741,7 @@ member_configure_slow_queue(struct rte_eth_dev *bonding_eth_dev,
slow_rx_conf.rx_free_thresh = nb_rx_desc / 4;
errval = rte_eth_rx_queue_setup(member_eth_dev->data->port_id,
internals->mode4.dedicated_queues.rx_qid, nb_rx_desc,
- rte_eth_dev_socket_id(member_eth_dev->data->port_id),
+ rte_eth_dev_numa_id(member_eth_dev->data->port_id),
&slow_rx_conf, port->slow_pool);
if (errval != 0) {
RTE_BOND_LOG(ERR,
@@ -1757,7 +1757,7 @@ member_configure_slow_queue(struct rte_eth_dev *bonding_eth_dev,
errval = rte_eth_tx_queue_setup(member_eth_dev->data->port_id,
internals->mode4.dedicated_queues.tx_qid, nb_tx_desc,
- rte_eth_dev_socket_id(member_eth_dev->data->port_id),
+ rte_eth_dev_numa_id(member_eth_dev->data->port_id),
NULL);
if (errval != 0) {
RTE_BOND_LOG(ERR,
@@ -1871,7 +1871,7 @@ member_start(struct rte_eth_dev *bonding_eth_dev,
errval = rte_eth_rx_queue_setup(member_port_id, q_id,
bd_rx_q->nb_rx_desc,
- rte_eth_dev_socket_id(member_port_id),
+ rte_eth_dev_numa_id(member_port_id),
&(bd_rx_q->rx_conf), bd_rx_q->mb_pool);
if (errval != 0) {
RTE_BOND_LOG(ERR,
@@ -1887,7 +1887,7 @@ member_start(struct rte_eth_dev *bonding_eth_dev,
errval = rte_eth_tx_queue_setup(member_port_id, q_id,
bd_tx_q->nb_tx_desc,
- rte_eth_dev_socket_id(member_port_id),
+ rte_eth_dev_numa_id(member_port_id),
&bd_tx_q->tx_conf);
if (errval != 0) {
RTE_BOND_LOG(ERR,
@@ -2428,11 +2428,11 @@ bond_ethdev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
static int
bond_ethdev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id __rte_unused,
+ uint16_t nb_rx_desc, unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mb_pool)
{
struct bond_rx_queue *bd_rx_q = (struct bond_rx_queue *)
- rte_zmalloc_socket(NULL, sizeof(struct bond_rx_queue),
+ rte_zmalloc_numa(NULL, sizeof(struct bond_rx_queue),
0, dev->data->numa_node);
if (bd_rx_q == NULL)
return -1;
@@ -2452,11 +2452,11 @@ bond_ethdev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
static int
bond_ethdev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id __rte_unused,
+ uint16_t nb_tx_desc, unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf)
{
struct bond_tx_queue *bd_tx_q = (struct bond_tx_queue *)
- rte_zmalloc_socket(NULL, sizeof(struct bond_tx_queue),
+ rte_zmalloc_numa(NULL, sizeof(struct bond_tx_queue),
0, dev->data->numa_node);
if (bd_tx_q == NULL)
@@ -3678,7 +3678,7 @@ static int
bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
{
const char *name = rte_vdev_device_name(dev);
- int socket_id = dev->device.numa_node;
+ int numa_id = dev->device.numa_node;
struct bond_dev_private *internals = NULL;
struct rte_eth_dev *eth_dev = NULL;
uint32_t vlan_filter_bmp_size;
@@ -3699,8 +3699,8 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
eth_dev->data->nb_tx_queues = (uint16_t)1;
/* Allocate memory for storing MAC addresses */
- eth_dev->data->mac_addrs = rte_zmalloc_socket(name, RTE_ETHER_ADDR_LEN *
- BOND_MAX_MAC_ADDRS, 0, socket_id);
+ eth_dev->data->mac_addrs = rte_zmalloc_numa(name, RTE_ETHER_ADDR_LEN *
+ BOND_MAX_MAC_ADDRS, 0, numa_id);
if (eth_dev->data->mac_addrs == NULL) {
RTE_BOND_LOG(ERR,
"Failed to allocate %u bytes needed to store MAC addresses",
@@ -3811,7 +3811,7 @@ bond_probe(struct rte_vdev_device *dev)
struct rte_kvargs *kvlist;
uint8_t bonding_mode;
int arg_count, port_id;
- int socket_id;
+ int numa_id;
uint8_t agg_mode;
struct rte_eth_dev *eth_dev;
@@ -3869,7 +3869,7 @@ bond_probe(struct rte_vdev_device *dev)
arg_count = rte_kvargs_count(kvlist, PMD_BOND_SOCKET_ID_KVARG);
if (arg_count == 1) {
if (rte_kvargs_process(kvlist, PMD_BOND_SOCKET_ID_KVARG,
- &bond_ethdev_parse_socket_id_kvarg, &socket_id)
+ &bond_ethdev_parse_socket_id_kvarg, &numa_id)
!= 0) {
RTE_BOND_LOG(ERR, "Invalid socket Id specified for "
"bonding device %s", name);
@@ -3880,16 +3880,16 @@ bond_probe(struct rte_vdev_device *dev)
"bonding device %s", name);
goto parse_error;
} else {
- socket_id = rte_socket_id();
+ numa_id = rte_numa_id();
}
- dev->device.numa_node = socket_id;
+ dev->device.numa_node = numa_id;
/* Create link bonding eth device */
port_id = bond_alloc(dev, bonding_mode);
if (port_id < 0) {
RTE_BOND_LOG(ERR, "Failed to create socket %s in mode %u on "
- "socket %d.", name, bonding_mode, socket_id);
+ "socket %d.", name, bonding_mode, numa_id);
goto parse_error;
}
internals = rte_eth_devices[port_id].data->dev_private;
@@ -3914,7 +3914,7 @@ bond_probe(struct rte_vdev_device *dev)
rte_eth_dev_probing_finish(&rte_eth_devices[port_id]);
RTE_BOND_LOG(INFO, "Create bonding device %s on port %d in mode %u on "
- "socket %u.", name, port_id, bonding_mode, socket_id);
+ "socket %u.", name, port_id, bonding_mode, numa_id);
return 0;
parse_error:
@@ -4318,7 +4318,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_bonding,
"mode=[0-6] "
"xmit_policy=[l2 | l23 | l34] "
"agg_mode=[count | stable | bandwidth] "
- "socket_id=<int> "
+ "numa_id=<int> "
"mac=<mac addr> "
"lsc_poll_period_ms=<int> "
"up_delay=<int> "
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 111/227] net/cnxk: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (109 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 110/227] net/bonding: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 112/227] net/cxgbe: " Chengwen Feng
` (116 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/cnxk/cnxk_eswitch.c | 2 +-
drivers/net/cnxk/cnxk_ethdev_sec.c | 6 +++---
drivers/net/cnxk/cnxk_lookup.c | 2 +-
drivers/net/cnxk/cnxk_rep.h | 4 ++--
drivers/net/cnxk/cnxk_rep_ops.c | 8 ++++----
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/cnxk/cnxk_eswitch.c b/drivers/net/cnxk/cnxk_eswitch.c
index 57e2c490df..741621959e 100644
--- a/drivers/net/cnxk/cnxk_eswitch.c
+++ b/drivers/net/cnxk/cnxk_eswitch.c
@@ -722,7 +722,7 @@ cnxk_eswitch_dev_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pc
return 0;
mz = rte_memzone_reserve_aligned(CNXK_REP_ESWITCH_DEV_MZ, sizeof(*eswitch_dev),
- SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
+ RTE_NUMA_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
if (mz == NULL) {
plt_err("Failed to reserve a memzone");
goto fail;
diff --git a/drivers/net/cnxk/cnxk_ethdev_sec.c b/drivers/net/cnxk/cnxk_ethdev_sec.c
index d208569168..4c41151bdc 100644
--- a/drivers/net/cnxk/cnxk_ethdev_sec.c
+++ b/drivers/net/cnxk/cnxk_ethdev_sec.c
@@ -87,7 +87,7 @@ cnxk_nix_inl_meta_pool_cb(uint64_t *aura_handle, uintptr_t *mpool, uint32_t buf_
*/
mp = rte_mempool_create_empty(mp_name, nb_bufs, buf_sz, 0,
sizeof(struct rte_pktmbuf_pool_private),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (!mp) {
plt_err("Failed to create inline meta pool");
return -EIO;
@@ -157,7 +157,7 @@ cnxk_nix_inl_custom_meta_pool_cb(uintptr_t pmpool, uintptr_t *mpool, const char
*/
hp = rte_mempool_create_empty(mempool_name, nb_bufs, buf_sz, 0,
sizeof(struct rte_pktmbuf_pool_private),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (!hp) {
plt_err("Failed to create inline meta pool");
return -EIO;
@@ -865,7 +865,7 @@ cnxk_nix_inl_dev_probe(struct rte_pci_driver *pci_drv,
return 0;
mz = rte_memzone_reserve_aligned(nix_inl_dev_to_name(pci_dev, name),
- sizeof(*inl_dev), SOCKET_ID_ANY, 0,
+ sizeof(*inl_dev), RTE_NUMA_ID_ANY, 0,
RTE_CACHE_LINE_SIZE);
if (mz == NULL)
return rc;
diff --git a/drivers/net/cnxk/cnxk_lookup.c b/drivers/net/cnxk/cnxk_lookup.c
index 7af9cb111e..9504327e58 100644
--- a/drivers/net/cnxk/cnxk_lookup.c
+++ b/drivers/net/cnxk/cnxk_lookup.c
@@ -316,7 +316,7 @@ cnxk_nix_fastpath_lookup_mem_get(void)
return mz->addr;
/* Request for the first time */
- mz = rte_memzone_reserve_aligned(name, LOOKUP_ARRAY_SZ, SOCKET_ID_ANY,
+ mz = rte_memzone_reserve_aligned(name, LOOKUP_ARRAY_SZ, RTE_NUMA_ID_ANY,
0, ROC_ALIGN);
if (mz != NULL) {
mem = mz->addr;
diff --git a/drivers/net/cnxk/cnxk_rep.h b/drivers/net/cnxk/cnxk_rep.h
index 9ede1e6dad..b891856bb7 100644
--- a/drivers/net/cnxk/cnxk_rep.h
+++ b/drivers/net/cnxk/cnxk_rep.h
@@ -122,10 +122,10 @@ int cnxk_rep_dev_configure(struct rte_eth_dev *eth_dev);
int cnxk_rep_link_update(struct rte_eth_dev *eth_dev, int wait_to_compl);
int cnxk_rep_dev_start(struct rte_eth_dev *eth_dev);
int cnxk_rep_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id, const struct rte_eth_rxconf *rx_conf,
+ unsigned int numa_id, const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
int cnxk_rep_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id, const struct rte_eth_txconf *tx_conf);
+ unsigned int numa_id, const struct rte_eth_txconf *tx_conf);
void cnxk_rep_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx);
void cnxk_rep_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx);
int cnxk_rep_dev_stop(struct rte_eth_dev *eth_dev);
diff --git a/drivers/net/cnxk/cnxk_rep_ops.c b/drivers/net/cnxk/cnxk_rep_ops.c
index d4f260af20..792de73bba 100644
--- a/drivers/net/cnxk/cnxk_rep_ops.c
+++ b/drivers/net/cnxk/cnxk_rep_ops.c
@@ -288,7 +288,7 @@ cnxk_rep_dev_stop(struct rte_eth_dev *ethdev)
int
cnxk_rep_rx_queue_setup(struct rte_eth_dev *ethdev, uint16_t rx_queue_id, uint16_t nb_rx_desc,
- unsigned int socket_id, const struct rte_eth_rxconf *rx_conf,
+ unsigned int numa_id, const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
struct cnxk_rep_dev *rep_dev = cnxk_rep_pmd_priv(ethdev);
@@ -296,7 +296,7 @@ cnxk_rep_rx_queue_setup(struct rte_eth_dev *ethdev, uint16_t rx_queue_id, uint16
uint16_t qid = 0;
int rc;
- PLT_SET_USED(socket_id);
+ PLT_SET_USED(numa_id);
/* If no representee assigned, store the respective rxq parameters */
if (!rep_dev->is_vf_active && !rep_dev->rxq) {
rxq = plt_zmalloc(sizeof(*rxq), RTE_CACHE_LINE_SIZE);
@@ -384,13 +384,13 @@ cnxk_rep_rx_queue_release(struct rte_eth_dev *ethdev, uint16_t queue_id)
int
cnxk_rep_tx_queue_setup(struct rte_eth_dev *ethdev, uint16_t tx_queue_id, uint16_t nb_tx_desc,
- unsigned int socket_id, const struct rte_eth_txconf *tx_conf)
+ unsigned int numa_id, const struct rte_eth_txconf *tx_conf)
{
struct cnxk_rep_dev *rep_dev = cnxk_rep_pmd_priv(ethdev);
struct cnxk_rep_txq *txq = NULL;
int rc = 0, qid = 0;
- PLT_SET_USED(socket_id);
+ PLT_SET_USED(numa_id);
/* If no representee assigned, store the respective rxq parameters */
if (!rep_dev->is_vf_active && !rep_dev->txq) {
txq = plt_zmalloc(sizeof(*txq), RTE_CACHE_LINE_SIZE);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 112/227] net/cxgbe: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (110 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 111/227] net/cnxk: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 113/227] net/dpaa: " Chengwen Feng
` (115 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/cxgbe/base/adapter.h | 6 +++---
drivers/net/cxgbe/cxgbe_ethdev.c | 16 ++++++++--------
drivers/net/cxgbe/cxgbe_main.c | 18 +++++++++---------
drivers/net/cxgbe/cxgbe_pfvf.h | 4 ++--
drivers/net/cxgbe/cxgbevf_main.c | 4 ++--
drivers/net/cxgbe/sge.c | 28 ++++++++++++++--------------
6 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/drivers/net/cxgbe/base/adapter.h b/drivers/net/cxgbe/base/adapter.h
index 207f3ecb88..bdeeadbddf 100644
--- a/drivers/net/cxgbe/base/adapter.h
+++ b/drivers/net/cxgbe/base/adapter.h
@@ -759,15 +759,15 @@ int t4_sge_init(struct adapter *adap);
int t4vf_sge_init(struct adapter *adap);
int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
struct rte_eth_dev *eth_dev, uint16_t queue_id,
- unsigned int iqid, int socket_id);
+ unsigned int iqid, int numa_id);
int t4_sge_alloc_ctrl_txq(struct adapter *adap, struct sge_ctrl_txq *txq,
struct rte_eth_dev *eth_dev, uint16_t queue_id,
- unsigned int iqid, int socket_id);
+ unsigned int iqid, int numa_id);
int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *rspq, bool fwevtq,
struct rte_eth_dev *eth_dev, int intr_idx,
struct sge_fl *fl, rspq_handler_t handler,
int cong, struct rte_mempool *mp, int queue_id,
- int socket_id);
+ int numa_id);
int t4_sge_eth_txq_start(struct sge_eth_txq *txq);
int t4_sge_eth_txq_stop(struct sge_eth_txq *txq);
void t4_sge_eth_txq_release(struct adapter *adap, struct sge_eth_txq *txq);
diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index 93554f354c..0d427663db 100644
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -501,7 +501,7 @@ int cxgbe_dev_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)
int cxgbe_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct port_info *pi = eth_dev->data->dev_private;
@@ -512,9 +512,9 @@ int cxgbe_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
int err = 0;
txq = &s->ethtxq[pi->first_txqset + queue_idx];
- dev_debug(adapter, "%s: eth_dev->data->nb_tx_queues = %d; queue_idx = %d; nb_desc = %d; socket_id = %d; pi->first_qset = %u\n",
+ dev_debug(adapter, "%s: eth_dev->data->nb_tx_queues = %d; queue_idx = %d; nb_desc = %d; numa_id = %d; pi->first_qset = %u\n",
__func__, eth_dev->data->nb_tx_queues, queue_idx, nb_desc,
- socket_id, pi->first_txqset);
+ numa_id, pi->first_txqset);
/* Free up the existing queue */
if (eth_dev->data->tx_queues[queue_idx]) {
@@ -544,7 +544,7 @@ int cxgbe_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
txq->q.size = temp_nb_desc;
err = t4_sge_alloc_eth_txq(adapter, txq, eth_dev, queue_idx,
- s->fw_evtq.cntxt_id, socket_id);
+ s->fw_evtq.cntxt_id, numa_id);
dev_debug(adapter, "%s: txq->q.cntxt_id= %u txq->q.abs_id= %u err = %d\n",
__func__, txq->q.cntxt_id, txq->q.abs_id, err);
@@ -605,7 +605,7 @@ int cxgbe_dev_rx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id)
int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mp)
{
@@ -620,9 +620,9 @@ int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
struct sge_eth_rxq *rxq;
rxq = &s->ethrxq[pi->first_rxqset + queue_idx];
- dev_debug(adapter, "%s: eth_dev->data->nb_rx_queues = %d; queue_idx = %d; nb_desc = %d; socket_id = %d; mp = %p\n",
+ dev_debug(adapter, "%s: eth_dev->data->nb_rx_queues = %d; queue_idx = %d; nb_desc = %d; numa_id = %d; mp = %p\n",
__func__, eth_dev->data->nb_rx_queues, queue_idx, nb_desc,
- socket_id, mp);
+ numa_id, mp);
err = cxgbe_dev_info_get(eth_dev, &dev_info);
if (err != 0) {
@@ -672,7 +672,7 @@ int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
&rxq->fl, NULL,
is_pf4(adapter) ?
t4_get_tp_ch_map(adapter, pi->tx_chan) : 0, mp,
- queue_idx, socket_id);
+ queue_idx, numa_id);
dev_debug(adapter, "%s: err = %d; port_id = %d; cntxt_id = %u; abs_id = %u\n",
__func__, err, pi->port_id, rxq->rspq.cntxt_id,
diff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c
index 2ed21f2d66..9adbc82d69 100644
--- a/drivers/net/cxgbe/cxgbe_main.c
+++ b/drivers/net/cxgbe/cxgbe_main.c
@@ -208,7 +208,7 @@ int cxgbe_setup_sge_ctrl_txq(struct adapter *adapter)
err = t4_sge_alloc_ctrl_txq(adapter, q,
adapter->eth_dev, i,
s->fw_evtq.cntxt_id,
- rte_socket_id());
+ rte_numa_id());
if (err) {
dev_err(adapter, "Failed to alloc ctrl txq. Err: %d",
err);
@@ -221,7 +221,7 @@ int cxgbe_setup_sge_ctrl_txq(struct adapter *adapter)
RTE_CACHE_LINE_SIZE,
RTE_MBUF_PRIV_ALIGN,
RTE_MBUF_DEFAULT_BUF_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!q->mb_pool) {
err = -rte_errno;
dev_err(adapter,
@@ -276,7 +276,7 @@ int cxgbe_setup_sge_fwevtq(struct adapter *adapter)
err = t4_sge_alloc_rxq(adapter, &s->fw_evtq, true, adapter->eth_dev,
msi_idx, NULL, fwevtq_handler, -1, NULL, 0,
- rte_socket_id());
+ rte_numa_id());
return err;
}
@@ -605,15 +605,15 @@ int cxgbe_cfg_queues(struct rte_eth_dev *eth_dev)
u16 i;
if (!(adap->flags & CFG_QUEUES)) {
- s->ethrxq = rte_calloc_socket(NULL, s->max_ethqsets,
+ s->ethrxq = rte_calloc_numa(NULL, s->max_ethqsets,
sizeof(struct sge_eth_rxq), 0,
- rte_socket_id());
+ rte_numa_id());
if (!s->ethrxq)
return -ENOMEM;
- s->ethtxq = rte_calloc_socket(NULL, s->max_ethqsets,
+ s->ethtxq = rte_calloc_numa(NULL, s->max_ethqsets,
sizeof(struct sge_eth_txq), 0,
- rte_socket_id());
+ rte_numa_id());
if (!s->ethtxq) {
rte_free(s->ethrxq);
s->ethrxq = NULL;
@@ -2239,7 +2239,7 @@ int cxgbe_probe(struct adapter *adapter)
}
for_each_port(adapter, i) {
- const unsigned int numa_node = rte_socket_id();
+ const unsigned int numa_node = rte_numa_id();
char name[RTE_ETH_NAME_MAX_LEN];
struct rte_eth_dev *eth_dev;
@@ -2263,7 +2263,7 @@ int cxgbe_probe(struct adapter *adapter)
goto out_free;
eth_dev->data->dev_private =
- rte_zmalloc_socket(name, sizeof(struct port_info),
+ rte_zmalloc_numa(name, sizeof(struct port_info),
RTE_CACHE_LINE_SIZE, numa_node);
if (!eth_dev->data->dev_private)
goto out_free;
diff --git a/drivers/net/cxgbe/cxgbe_pfvf.h b/drivers/net/cxgbe/cxgbe_pfvf.h
index 11e95b5836..fd90b96784 100644
--- a/drivers/net/cxgbe/cxgbe_pfvf.h
+++ b/drivers/net/cxgbe/cxgbe_pfvf.h
@@ -29,10 +29,10 @@ int cxgbe_dev_allmulticast_disable(struct rte_eth_dev *eth_dev);
int cxgbe_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *addr);
int cxgbe_dev_configure(struct rte_eth_dev *eth_dev);
int cxgbe_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
int cxgbe_dev_tx_queue_start(struct rte_eth_dev *eth_dev,
diff --git a/drivers/net/cxgbe/cxgbevf_main.c b/drivers/net/cxgbe/cxgbevf_main.c
index d0c93f8ac3..cc77730f6e 100644
--- a/drivers/net/cxgbe/cxgbevf_main.c
+++ b/drivers/net/cxgbe/cxgbevf_main.c
@@ -201,7 +201,7 @@ int cxgbevf_probe(struct adapter *adapter)
pmask = adapter->params.vfres.pmask;
for_each_port(adapter, i) {
- const unsigned int numa_node = rte_socket_id();
+ const unsigned int numa_node = rte_numa_id();
char name[RTE_ETH_NAME_MAX_LEN];
struct rte_eth_dev *eth_dev;
int port_id;
@@ -232,7 +232,7 @@ int cxgbevf_probe(struct adapter *adapter)
goto out_free;
}
eth_dev->data->dev_private =
- rte_zmalloc_socket(name, sizeof(struct port_info),
+ rte_zmalloc_numa(name, sizeof(struct port_info),
RTE_CACHE_LINE_SIZE, numa_node);
if (!eth_dev->data->dev_private)
goto out_free;
diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c
index b8dac0c46e..044fd7118f 100644
--- a/drivers/net/cxgbe/sge.c
+++ b/drivers/net/cxgbe/sge.c
@@ -1366,7 +1366,7 @@ int t4_mgmt_tx(struct sge_ctrl_txq *q, struct rte_mbuf *mbuf)
* @dev: the port associated with the queue
* @z_name: memzone's name
* @queue_id: queue index
- * @socket_id: preferred socket id for memory allocations
+ * @numa_id: preferred socket id for memory allocations
* @nelem: the number of descriptors
* @elem_size: the size of each descriptor
* @stat_size: extra space in HW ring for status information
@@ -1383,7 +1383,7 @@ int t4_mgmt_tx(struct sge_ctrl_txq *q, struct rte_mbuf *mbuf)
* of the SW ring.
*/
static void *alloc_ring(struct rte_eth_dev *dev, const char *z_name,
- uint16_t queue_id, int socket_id, size_t nelem,
+ uint16_t queue_id, int numa_id, size_t nelem,
size_t elem_size, size_t stat_size, size_t sw_size,
dma_addr_t *phys, void *metadata)
{
@@ -1396,9 +1396,9 @@ static void *alloc_ring(struct rte_eth_dev *dev, const char *z_name,
dev->data->port_id, queue_id, z_name);
dev_debug(adapter, "%s: nelem = %zu; elem_size = %zu; sw_size = %zu; "
- "stat_size = %zu; queue_id = %u; socket_id = %d; z_name = %s;"
+ "stat_size = %zu; queue_id = %u; numa_id = %d; z_name = %s;"
" z_name_sw = %s\n", __func__, nelem, elem_size, sw_size,
- stat_size, queue_id, socket_id, z_name, z_name_sw);
+ stat_size, queue_id, numa_id, z_name, z_name_sw);
/*
* Allocate TX/RX ring hardware descriptors. A memzone large enough to
@@ -1406,14 +1406,14 @@ static void *alloc_ring(struct rte_eth_dev *dev, const char *z_name,
* resizing in later calls to the queue setup function.
*/
tz = rte_eth_dma_zone_reserve(dev, z_name, queue_id, len, 4096,
- socket_id);
+ numa_id);
if (!tz)
return NULL;
memset(tz->addr, 0, len);
if (sw_size) {
- s = rte_zmalloc_socket(z_name_sw, nelem * sw_size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ s = rte_zmalloc_numa(z_name_sw, nelem * sw_size,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!s) {
dev_err(adapter, "%s: failed to get sw_ring memory\n",
@@ -1756,7 +1756,7 @@ static int cxgbe_sge_fl_buf_size_index(const struct adapter *adap,
int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
struct rte_eth_dev *eth_dev, int intr_idx,
struct sge_fl *fl, rspq_handler_t hnd, int cong,
- struct rte_mempool *mp, int queue_id, int socket_id)
+ struct rte_mempool *mp, int queue_id, int numa_id)
{
struct port_info *pi = eth_dev->data->dev_private;
u8 pciechan, fl_buf_size_idx = 0;
@@ -1777,7 +1777,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
iq->size = cxgbe_roundup(iq->size, 16);
iq->desc = alloc_ring(eth_dev, fwevtq ? "fwq_ring" : "rx_ring",
- queue_id, socket_id, iq->size, iq->iqe_len,
+ queue_id, numa_id, iq->size, iq->iqe_len,
0, 0, &iq->phys_addr, NULL);
if (!iq->desc)
return -ENOMEM;
@@ -1834,7 +1834,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
fl->size = s->fl_starve_thres - 1 + 2 * 8;
fl->size = cxgbe_roundup(fl->size, 8);
- fl->desc = alloc_ring(eth_dev, "fl_ring", queue_id, socket_id,
+ fl->desc = alloc_ring(eth_dev, "fl_ring", queue_id, numa_id,
fl->size, sizeof(__be64), s->stat_len,
sizeof(struct rx_sw_desc),
&fl->addr, &fl->sdesc);
@@ -2019,7 +2019,7 @@ int t4_sge_eth_txq_stop(struct sge_eth_txq *txq)
int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
struct rte_eth_dev *eth_dev, uint16_t queue_id,
- unsigned int iqid, int socket_id)
+ unsigned int iqid, int numa_id)
{
int ret, nentries;
struct fw_eq_eth_cmd c;
@@ -2030,7 +2030,7 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
/* Add status entries */
nentries = txq->q.size + s->stat_len / sizeof(struct tx_desc);
- txq->q.desc = alloc_ring(eth_dev, "tx_ring", queue_id, socket_id,
+ txq->q.desc = alloc_ring(eth_dev, "tx_ring", queue_id, numa_id,
txq->q.size, sizeof(struct tx_desc),
s->stat_len, sizeof(struct tx_sw_desc),
&txq->q.phys_addr, &txq->q.sdesc);
@@ -2092,7 +2092,7 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
int t4_sge_alloc_ctrl_txq(struct adapter *adap, struct sge_ctrl_txq *txq,
struct rte_eth_dev *eth_dev, uint16_t queue_id,
- unsigned int iqid, int socket_id)
+ unsigned int iqid, int numa_id)
{
int ret, nentries;
struct fw_eq_ctrl_cmd c;
@@ -2103,7 +2103,7 @@ int t4_sge_alloc_ctrl_txq(struct adapter *adap, struct sge_ctrl_txq *txq,
nentries = txq->q.size + s->stat_len / sizeof(struct tx_desc);
txq->q.desc = alloc_ring(eth_dev, "ctrl_tx_ring", queue_id,
- socket_id, txq->q.size, sizeof(struct tx_desc),
+ numa_id, txq->q.size, sizeof(struct tx_desc),
0, 0, &txq->q.phys_addr, NULL);
if (!txq->q.desc)
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 113/227] net/dpaa: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (111 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 112/227] net/cxgbe: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 114/227] net/dpaa2: " Chengwen Feng
` (114 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/dpaa/dpaa_ethdev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index fe49c7b961..0e4679fd2b 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1123,7 +1123,7 @@ static inline int dpaa_eth_rx_queue_bp_check(struct rte_eth_dev *dev,
static
int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -1450,7 +1450,7 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,
static
int dpaa_eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
uint16_t nb_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf)
{
struct dpaa_if *dpaa_intf = dev->data->dev_private;
@@ -2652,7 +2652,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv,
DPAA_POOL_SIZE,
DPAA_POOL_CACHE_SIZE, 0,
DPAA_MAX_SGS * sizeof(struct qm_sg_entry),
- rte_socket_id());
+ rte_numa_id());
if (dpaa_tx_sg_pool == NULL) {
DPAA_PMD_ERR("SG pool creation failed");
diag = -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 114/227] net/dpaa2: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (112 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 113/227] net/dpaa: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 115/227] net/ena: " Chengwen Feng
` (113 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/dpaa2/dpaa2_ethdev.c | 6 +++---
drivers/net/dpaa2/dpaa2_tm.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index b3a725c0ea..12ddfe90b1 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -933,7 +933,7 @@ static int
dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -1142,7 +1142,7 @@ static int
dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf)
{
struct dpaa2_dev_priv *priv = dev->data->dev_private;
@@ -3874,7 +3874,7 @@ static int dpaa2_tx_sg_pool_init(void)
DPAA2_POOL_SIZE,
DPAA2_POOL_CACHE_SIZE, 0,
DPAA2_MAX_SGS * sizeof(struct qbman_sge),
- rte_socket_id());
+ rte_numa_id());
if (!dpaa2_tx_sg_pool) {
DPAA2_PMD_ERR("SG pool creation failed");
return -ENOMEM;
diff --git a/drivers/net/dpaa2/dpaa2_tm.c b/drivers/net/dpaa2/dpaa2_tm.c
index 3057f4d031..d26b27f915 100644
--- a/drivers/net/dpaa2/dpaa2_tm.c
+++ b/drivers/net/dpaa2/dpaa2_tm.c
@@ -322,8 +322,8 @@ dpaa2_shaper_profile_add(struct rte_eth_dev *dev, uint32_t shaper_profile_id,
RTE_TM_ERROR_TYPE_SHAPER_PROFILE_ID,
NULL, "Profile id already exists\n");
- profile = rte_zmalloc_socket(NULL, sizeof(*profile), 0,
- rte_socket_id());
+ profile = rte_zmalloc_numa(NULL, sizeof(*profile), 0,
+ rte_numa_id());
if (!profile)
return -rte_tm_error_set(error, ENOMEM,
RTE_TM_ERROR_TYPE_UNSPECIFIED,
@@ -486,7 +486,7 @@ dpaa2_node_add(struct rte_eth_dev *dev, uint32_t node_id,
RTE_TM_ERROR_TYPE_NODE_ID,
NULL, "Node id already exists\n");
- node = rte_zmalloc_socket(NULL, sizeof(*node), 0, rte_socket_id());
+ node = rte_zmalloc_numa(NULL, sizeof(*node), 0, rte_numa_id());
if (!node)
return -rte_tm_error_set(error, ENOMEM,
RTE_TM_ERROR_TYPE_UNSPECIFIED,
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 115/227] net/ena: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (113 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 114/227] net/dpaa2: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 116/227] net/enetc: " Chengwen Feng
` (112 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/ena/base/ena_plat_dpdk.h | 6 ++--
drivers/net/ena/ena_ethdev.c | 42 ++++++++++++++--------------
drivers/net/ena/ena_ethdev.h | 2 +-
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index 4a6d53d0a2..066cd11885 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -215,7 +215,7 @@ typedef struct {
const struct rte_memzone *
ena_mem_alloc_coherent(struct rte_eth_dev_data *data, size_t size,
- int socket_id, unsigned int alignment, void **virt_addr,
+ int numa_id, unsigned int alignment, void **virt_addr,
dma_addr_t *phys_addr);
#define ENA_MEM_ALLOC_COHERENT_ALIGNED( \
@@ -224,7 +224,7 @@ ena_mem_alloc_coherent(struct rte_eth_dev_data *data, size_t size,
void *virt_addr; \
dma_addr_t phys_addr; \
(mem_handle) = ena_mem_alloc_coherent((dmadev), (size), \
- SOCKET_ID_ANY, (alignment), &virt_addr, &phys_addr); \
+ RTE_NUMA_ID_ANY, (alignment), &virt_addr, &phys_addr); \
(virt) = virt_addr; \
(phys) = phys_addr; \
} while (0)
@@ -252,7 +252,7 @@ ena_mem_alloc_coherent(struct rte_eth_dev_data *data, size_t size,
#define ENA_MEM_ALLOC_NODE(dmadev, size, virt, node) \
do { \
ENA_TOUCH(dmadev); \
- virt = rte_zmalloc_socket(NULL, size, 0, node); \
+ virt = rte_zmalloc_numa(NULL, size, 0, node); \
} while (0)
#define ENA_MEM_ALLOC(dmadev, size) rte_zmalloc(NULL, size, 1)
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index c2d0194e51..8b65b244eb 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -245,10 +245,10 @@ static uint16_t eth_ena_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
static uint16_t eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts);
static int ena_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
static int ena_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
static inline void ena_init_rx_mbuf(struct rte_mbuf *mbuf, uint16_t len);
@@ -1516,7 +1516,7 @@ static int ena_create_io_queue(struct rte_eth_dev *dev, struct ena_ring *ring)
}
ctx.queue_size = ring->ring_size;
ctx.qid = ena_qid;
- ctx.numa_node = ring->numa_socket_id;
+ ctx.numa_node = ring->numa_id;
rc = ena_com_create_io_queue(ena_dev, &ctx);
if (rc) {
@@ -1621,7 +1621,7 @@ static int ena_queue_start(struct rte_eth_dev *dev, struct ena_ring *ring)
static int ena_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct ena_ring *txq = NULL;
@@ -1657,24 +1657,24 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,
txq->next_to_use = 0;
txq->ring_size = nb_desc;
txq->size_mask = nb_desc - 1;
- txq->numa_socket_id = socket_id;
+ txq->numa_id = numa_id;
txq->pkts_without_db = false;
txq->last_cleanup_ticks = 0;
- txq->tx_buffer_info = rte_zmalloc_socket("txq->tx_buffer_info",
+ txq->tx_buffer_info = rte_zmalloc_numa("txq->tx_buffer_info",
sizeof(struct ena_tx_buffer) * txq->ring_size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!txq->tx_buffer_info) {
PMD_DRV_LOG_LINE(ERR,
"Failed to allocate memory for Tx buffer info");
return -ENOMEM;
}
- txq->empty_tx_reqs = rte_zmalloc_socket("txq->empty_tx_reqs",
+ txq->empty_tx_reqs = rte_zmalloc_numa("txq->empty_tx_reqs",
sizeof(uint16_t) * txq->ring_size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!txq->empty_tx_reqs) {
PMD_DRV_LOG_LINE(ERR,
"Failed to allocate memory for empty Tx requests");
@@ -1683,10 +1683,10 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,
}
txq->push_buf_intermediate_buf =
- rte_zmalloc_socket("txq->push_buf_intermediate_buf",
+ rte_zmalloc_numa("txq->push_buf_intermediate_buf",
txq->tx_max_header_size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!txq->push_buf_intermediate_buf) {
PMD_DRV_LOG_LINE(ERR, "Failed to alloc push buffer for LLQ");
rte_free(txq->tx_buffer_info);
@@ -1722,7 +1722,7 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,
static int ena_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -1768,23 +1768,23 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,
rxq->next_to_use = 0;
rxq->ring_size = nb_desc;
rxq->size_mask = nb_desc - 1;
- rxq->numa_socket_id = socket_id;
+ rxq->numa_id = numa_id;
rxq->mb_pool = mp;
- rxq->rx_buffer_info = rte_zmalloc_socket("rxq->buffer_info",
+ rxq->rx_buffer_info = rte_zmalloc_numa("rxq->buffer_info",
sizeof(struct ena_rx_buffer) * nb_desc,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq->rx_buffer_info) {
PMD_DRV_LOG_LINE(ERR,
"Failed to allocate memory for Rx buffer info");
return -ENOMEM;
}
- rxq->rx_refill_buffer = rte_zmalloc_socket("rxq->rx_refill_buffer",
+ rxq->rx_refill_buffer = rte_zmalloc_numa("rxq->rx_refill_buffer",
sizeof(struct rte_mbuf *) * nb_desc,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq->rx_refill_buffer) {
PMD_DRV_LOG_LINE(ERR,
"Failed to allocate memory for Rx refill buffer");
@@ -1793,10 +1793,10 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,
return -ENOMEM;
}
- rxq->empty_rx_reqs = rte_zmalloc_socket("rxq->empty_rx_reqs",
+ rxq->empty_rx_reqs = rte_zmalloc_numa("rxq->empty_rx_reqs",
sizeof(uint16_t) * nb_desc,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq->empty_rx_reqs) {
PMD_DRV_LOG_LINE(ERR,
"Failed to allocate memory for empty Rx requests");
@@ -4111,7 +4111,7 @@ int ena_mp_indirect_table_get(struct ena_adapter *adapter,
const struct rte_memzone *
ena_mem_alloc_coherent(struct rte_eth_dev_data *data, size_t size,
- int socket_id, unsigned int alignment, void **virt_addr,
+ int numa_id, unsigned int alignment, void **virt_addr,
dma_addr_t *phys_addr)
{
char z_name[RTE_MEMZONE_NAMESIZE];
@@ -4129,7 +4129,7 @@ ena_mem_alloc_coherent(struct rte_eth_dev_data *data, size_t size,
}
adapter->memzone_cnt++;
- memzone = rte_memzone_reserve_aligned(z_name, size, socket_id,
+ memzone = rte_memzone_reserve_aligned(z_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, alignment);
if (memzone == NULL) {
PMD_DRV_LOG_LINE(ERR, "Failed to allocate ena_com memzone: %s",
diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h
index b204b07767..fa0b147ff1 100644
--- a/drivers/net/ena/ena_ethdev.h
+++ b/drivers/net/ena/ena_ethdev.h
@@ -206,7 +206,7 @@ struct __rte_cache_aligned ena_ring {
struct ena_stats_tx tx_stats;
};
- unsigned int numa_socket_id;
+ unsigned int numa_id;
uint32_t missing_tx_completion_threshold;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 116/227] net/enetc: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (114 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 115/227] net/ena: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 117/227] net/enetfec: " Chengwen Feng
` (111 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/enetc/enetc.h | 4 ++--
drivers/net/enetc/enetc4_ethdev.c | 4 ++--
drivers/net/enetc/enetc_ethdev.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index 925ba22af6..cec38d3dea 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -382,14 +382,14 @@ int enetc4_dev_close(struct rte_eth_dev *dev);
int enetc4_dev_infos_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info);
int enetc4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id __rte_unused,
+ uint16_t nb_rx_desc, unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
int enetc4_rx_queue_start(struct rte_eth_dev *dev, uint16_t qidx);
int enetc4_rx_queue_stop(struct rte_eth_dev *dev, uint16_t qidx);
void enetc4_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
int enetc4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id __rte_unused,
+ uint16_t nb_desc, unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf);
int enetc4_tx_queue_start(struct rte_eth_dev *dev, uint16_t qidx);
int enetc4_tx_queue_stop(struct rte_eth_dev *dev, uint16_t qidx);
diff --git a/drivers/net/enetc/enetc4_ethdev.c b/drivers/net/enetc/enetc4_ethdev.c
index 199cd45ee5..aeda977ab4 100644
--- a/drivers/net/enetc/enetc4_ethdev.c
+++ b/drivers/net/enetc/enetc4_ethdev.c
@@ -483,7 +483,7 @@ int
enetc4_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf)
{
int err;
@@ -704,7 +704,7 @@ int
enetc4_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c
index 55b0e0b881..1f6528df8e 100644
--- a/drivers/net/enetc/enetc_ethdev.c
+++ b/drivers/net/enetc/enetc_ethdev.c
@@ -302,7 +302,7 @@ static int
enetc_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf)
{
int err = 0;
@@ -447,7 +447,7 @@ static int
enetc_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 117/227] net/enetfec: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (115 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 116/227] net/enetc: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 118/227] net/enic: " Chengwen Feng
` (110 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/enetfec/enet_ethdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/enetfec/enet_ethdev.c b/drivers/net/enetfec/enet_ethdev.c
index c7ef097875..e84c4f7580 100644
--- a/drivers/net/enetfec/enet_ethdev.c
+++ b/drivers/net/enetfec/enet_ethdev.c
@@ -343,7 +343,7 @@ static int
enetfec_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct enetfec_private *fep = dev->data->dev_private;
@@ -424,7 +424,7 @@ static int
enetfec_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_rx_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool)
{
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 118/227] net/enic: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (116 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 117/227] net/enetfec: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 119/227] net/failsafe: " Chengwen Feng
` (109 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/enic/base/vnic_cq.c | 8 +++----
drivers/net/enic/base/vnic_cq.h | 4 ++--
drivers/net/enic/base/vnic_dev.c | 4 ++--
drivers/net/enic/base/vnic_dev.h | 2 +-
drivers/net/enic/base/vnic_rq.c | 6 ++---
drivers/net/enic/base/vnic_rq.h | 2 +-
drivers/net/enic/base/vnic_wq.c | 8 +++----
drivers/net/enic/base/vnic_wq.h | 2 +-
drivers/net/enic/enic.h | 4 ++--
drivers/net/enic/enic_ethdev.c | 8 +++----
drivers/net/enic/enic_main.c | 32 +++++++++++++-------------
drivers/net/enic/enic_sriov.c | 10 ++++----
drivers/net/enic/enic_vf_representor.c | 8 +++----
13 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/drivers/net/enic/base/vnic_cq.c b/drivers/net/enic/base/vnic_cq.c
index e966de2f67..2c538a4b5d 100644
--- a/drivers/net/enic/base/vnic_cq.c
+++ b/drivers/net/enic/base/vnic_cq.c
@@ -15,7 +15,7 @@ void vnic_cq_free(struct vnic_cq *cq)
}
int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
- unsigned int socket_id,
+ unsigned int numa_id,
unsigned int desc_count, unsigned int desc_size)
{
int err;
@@ -34,7 +34,7 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
snprintf(res_name, sizeof(res_name), "%d-cq-%u", instance++, index);
err = vnic_dev_alloc_desc_ring(vdev, &cq->ring, desc_count, desc_size,
- socket_id, res_name);
+ numa_id, res_name);
if (err)
return err;
@@ -42,7 +42,7 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
}
int vnic_admin_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
- unsigned int socket_id, unsigned int desc_count, unsigned int desc_size)
+ unsigned int numa_id, unsigned int desc_count, unsigned int desc_size)
{
int err;
char res_name[RTE_MEMZONE_NAMESIZE];
@@ -60,7 +60,7 @@ int vnic_admin_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int
snprintf(res_name, sizeof(res_name), "%d-admin-cq-%u", instance++, index);
err = vnic_dev_alloc_desc_ring(vdev, &cq->ring, desc_count, desc_size,
- socket_id, res_name);
+ numa_id, res_name);
if (err)
return err;
diff --git a/drivers/net/enic/base/vnic_cq.h b/drivers/net/enic/base/vnic_cq.h
index 6469a5c12a..9b3462ba4f 100644
--- a/drivers/net/enic/base/vnic_cq.h
+++ b/drivers/net/enic/base/vnic_cq.h
@@ -64,10 +64,10 @@ struct vnic_cq {
void vnic_cq_free(struct vnic_cq *cq);
int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
- unsigned int socket_id,
+ unsigned int numa_id,
unsigned int desc_count, unsigned int desc_size);
int vnic_admin_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
- unsigned int socket_id, unsigned int desc_count, unsigned int desc_size);
+ unsigned int numa_id, unsigned int desc_count, unsigned int desc_size);
void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,
unsigned int color_enable, unsigned int cq_head, unsigned int cq_tail,
unsigned int cq_tail_color, unsigned int interrupt_enable,
diff --git a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c
index ba8ecc16f2..73596fd62b 100644
--- a/drivers/net/enic/base/vnic_dev.c
+++ b/drivers/net/enic/base/vnic_dev.c
@@ -260,7 +260,7 @@ void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring)
int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev,
struct vnic_dev_ring *ring,
unsigned int desc_count, unsigned int desc_size,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
char *z_name)
{
void *alloc_addr;
@@ -1199,7 +1199,7 @@ struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
char name[RTE_MEMZONE_NAMESIZE];
snprintf((char *)name, sizeof(name), "%s-vnic",
pdev->device.name);
- vdev = (struct vnic_dev *)rte_zmalloc_socket(name,
+ vdev = (struct vnic_dev *)rte_zmalloc_numa(name,
sizeof(struct vnic_dev),
RTE_CACHE_LINE_SIZE,
pdev->device.numa_node);
diff --git a/drivers/net/enic/base/vnic_dev.h b/drivers/net/enic/base/vnic_dev.h
index 0336e07ffc..d8ab91ac15 100644
--- a/drivers/net/enic/base/vnic_dev.h
+++ b/drivers/net/enic/base/vnic_dev.h
@@ -96,7 +96,7 @@ unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring,
unsigned int desc_count, unsigned int desc_size);
void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring);
int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,
- unsigned int desc_count, unsigned int desc_size, unsigned int socket_id,
+ unsigned int desc_count, unsigned int desc_size, unsigned int numa_id,
char *z_name);
void vnic_dev_free_desc_ring(struct vnic_dev *vdev,
struct vnic_dev_ring *ring);
diff --git a/drivers/net/enic/base/vnic_rq.c b/drivers/net/enic/base/vnic_rq.c
index 88def104ad..933a00b14e 100644
--- a/drivers/net/enic/base/vnic_rq.c
+++ b/drivers/net/enic/base/vnic_rq.c
@@ -39,7 +39,7 @@ int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
snprintf(res_name, sizeof(res_name), "%d-rq-%u", instance++, index);
rc = vnic_dev_alloc_desc_ring(vdev, &rq->ring, desc_count, desc_size,
- rq->socket_id, res_name);
+ rq->numa_id, res_name);
return rc;
}
@@ -53,7 +53,7 @@ int vnic_admin_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq,
rq->index = 0;
rq->vdev = vdev;
rq->admin_chan = true;
- rq->socket_id = SOCKET_ID_ANY;
+ rq->numa_id = RTE_NUMA_ID_ANY;
rq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_ADMIN_RQ, 0);
if (!rq->ctrl) {
@@ -65,7 +65,7 @@ int vnic_admin_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq,
snprintf(res_name, sizeof(res_name), "%d-admin-rq", instance++);
rc = vnic_dev_alloc_desc_ring(vdev, &rq->ring, desc_count, desc_size,
- rq->socket_id, res_name);
+ rq->numa_id, res_name);
return rc;
}
diff --git a/drivers/net/enic/base/vnic_rq.h b/drivers/net/enic/base/vnic_rq.h
index 0f068d2e18..985dfae9ac 100644
--- a/drivers/net/enic/base/vnic_rq.h
+++ b/drivers/net/enic/base/vnic_rq.h
@@ -60,7 +60,7 @@ struct vnic_rq {
unsigned int pkts_outstanding;
uint16_t rx_nb_hold;
uint16_t rx_free_thresh;
- unsigned int socket_id;
+ unsigned int numa_id;
struct rte_mempool *mp;
uint16_t rxst_idx;
uint32_t tot_pkts;
diff --git a/drivers/net/enic/base/vnic_wq.c b/drivers/net/enic/base/vnic_wq.c
index 04eabefae7..cca99151e1 100644
--- a/drivers/net/enic/base/vnic_wq.c
+++ b/drivers/net/enic/base/vnic_wq.c
@@ -26,16 +26,16 @@ int vnic_wq_alloc_ring(struct vnic_dev *vdev, struct vnic_wq *wq,
snprintf(res_name, sizeof(res_name), "%d-%swq-%u",
instance++, wq->admin_chan ? "admin-" : "", wq->index);
return vnic_dev_alloc_desc_ring(vdev, &wq->ring, desc_count, desc_size,
- wq->socket_id, res_name);
+ wq->numa_id, res_name);
}
static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
{
unsigned int count = wq->ring.desc_count;
/* Allocate the mbuf ring */
- wq->bufs = (struct rte_mbuf **)rte_zmalloc_socket(wq->admin_chan ? "admin-wq-bufs" : "wq-bufs",
+ wq->bufs = (struct rte_mbuf **)rte_zmalloc_numa(wq->admin_chan ? "admin-wq-bufs" : "wq-bufs",
sizeof(struct rte_mbuf *) * count,
- RTE_CACHE_LINE_SIZE, wq->socket_id);
+ RTE_CACHE_LINE_SIZE, wq->numa_id);
wq->head_idx = 0;
wq->tail_idx = 0;
if (wq->bufs == NULL)
@@ -94,7 +94,7 @@ int vnic_admin_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
wq->index = 0;
wq->vdev = vdev;
wq->admin_chan = true;
- wq->socket_id = SOCKET_ID_ANY;
+ wq->numa_id = RTE_NUMA_ID_ANY;
err = vnic_wq_get_ctrl(vdev, wq, 0, RES_TYPE_ADMIN_WQ);
if (err) {
diff --git a/drivers/net/enic/base/vnic_wq.h b/drivers/net/enic/base/vnic_wq.h
index 381f78431c..8529a8d0f9 100644
--- a/drivers/net/enic/base/vnic_wq.h
+++ b/drivers/net/enic/base/vnic_wq.h
@@ -46,7 +46,7 @@ struct vnic_wq {
unsigned int head_idx;
unsigned int cq_pend;
unsigned int tail_idx;
- unsigned int socket_id;
+ unsigned int numa_id;
const struct rte_memzone *cqmsg_rz;
uint16_t last_completed_index;
uint64_t offloads;
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 0a8d4a29ca..d2806c8a89 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -399,14 +399,14 @@ void enic_free_wq(void *txq);
int enic_alloc_intr_resources(struct enic *enic);
int enic_setup_finish(struct enic *enic);
int enic_alloc_wq(struct enic *enic, uint16_t queue_idx,
- unsigned int socket_id, uint16_t nb_desc);
+ unsigned int numa_id, uint16_t nb_desc);
void enic_start_wq(struct enic *enic, uint16_t queue_idx);
int enic_stop_wq(struct enic *enic, uint16_t queue_idx);
void enic_start_rq(struct enic *enic, uint16_t queue_idx);
int enic_stop_rq(struct enic *enic, uint16_t queue_idx);
void enic_free_rq(void *rxq);
int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
- unsigned int socket_id, struct rte_mempool *mp,
+ unsigned int numa_id, struct rte_mempool *mp,
uint16_t nb_desc, uint16_t free_thresh);
int enic_set_vnic_res(struct enic *enic);
int enic_init_rss_nic_cfg(struct enic *enic);
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index 648aa67a85..ea34a05a06 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -166,7 +166,7 @@ static int enicpmd_dev_setup_intr(struct enic *enic)
static int enicpmd_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
int ret;
@@ -183,7 +183,7 @@ static int enicpmd_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
eth_dev->data->dev_conf.txmode.offloads;
eth_dev->data->tx_queues[queue_idx] = (void *)wq;
- ret = enic_alloc_wq(enic, queue_idx, socket_id, nb_desc);
+ ret = enic_alloc_wq(enic, queue_idx, numa_id, nb_desc);
if (ret) {
dev_err(enic, "error in allocating wq\n");
return ret;
@@ -285,7 +285,7 @@ static int enicpmd_dev_rx_queue_count(void *rx_queue)
static int enicpmd_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -300,7 +300,7 @@ static int enicpmd_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
eth_dev->data->rx_queues[queue_idx] =
(void *)&enic->rq[enic_rte_rq_idx_to_sop_idx(queue_idx)];
- ret = enic_alloc_rq(enic, queue_idx, socket_id, mp, nb_desc,
+ ret = enic_alloc_rq(enic, queue_idx, numa_id, mp, nb_desc,
rx_conf->rx_free_thresh);
if (ret) {
dev_err(enic, "error in allocating rq\n");
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 0c7f085d66..414ee5e3b9 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -333,7 +333,7 @@ enic_alloc_consistent(void *priv, size_t size,
struct enic_memzone_entry *mze;
rz = rte_memzone_reserve_aligned((const char *)name, size,
- SOCKET_ID_ANY, RTE_MEMZONE_IOVA_CONTIG, ENIC_PAGE_SIZE);
+ RTE_NUMA_ID_ANY, RTE_MEMZONE_IOVA_CONTIG, ENIC_PAGE_SIZE);
if (!rz) {
pr_err("%s : Failed to allocate memory requested for %s\n",
__func__, name);
@@ -787,7 +787,7 @@ int enic_stop_rq(struct enic *enic, uint16_t queue_idx)
}
int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
- unsigned int socket_id, struct rte_mempool *mp,
+ unsigned int numa_id, struct rte_mempool *mp,
uint16_t nb_desc, uint16_t free_thresh)
{
struct enic_vf_representor *vf;
@@ -824,9 +824,9 @@ int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
rq_sop->data_queue_idx = data_queue_idx;
rq_data->is_sop = 0;
rq_data->data_queue_idx = 0;
- rq_sop->socket_id = socket_id;
+ rq_sop->numa_id = numa_id;
rq_sop->mp = mp;
- rq_data->socket_id = socket_id;
+ rq_data->numa_id = numa_id;
rq_data->mp = mp;
rq_sop->in_use = 1;
rq_sop->rx_free_thresh = free_thresh;
@@ -952,7 +952,7 @@ int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
}
rc = vnic_cq_alloc(enic->vdev, &enic->cq[cq_idx], cq_idx,
- socket_id, nb_sop_desc + nb_data_desc,
+ numa_id, nb_sop_desc + nb_data_desc,
enic->cq64 ? sizeof(struct cq_enet_rq_desc_64) :
sizeof(struct cq_enet_rq_desc));
if (rc) {
@@ -962,26 +962,26 @@ int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
/* Allocate the mbuf rings */
rq_sop->mbuf_ring = (struct rte_mbuf **)
- rte_zmalloc_socket("rq->mbuf_ring",
+ rte_zmalloc_numa("rq->mbuf_ring",
sizeof(struct rte_mbuf *) * nb_sop_desc,
- RTE_CACHE_LINE_SIZE, rq_sop->socket_id);
+ RTE_CACHE_LINE_SIZE, rq_sop->numa_id);
if (rq_sop->mbuf_ring == NULL)
goto err_free_cq;
if (rq_data->in_use) {
rq_data->mbuf_ring = (struct rte_mbuf **)
- rte_zmalloc_socket("rq->mbuf_ring",
+ rte_zmalloc_numa("rq->mbuf_ring",
sizeof(struct rte_mbuf *) * nb_data_desc,
- RTE_CACHE_LINE_SIZE, rq_sop->socket_id);
+ RTE_CACHE_LINE_SIZE, rq_sop->numa_id);
if (rq_data->mbuf_ring == NULL)
goto err_free_sop_mbuf;
}
rq_sop->free_mbufs = (struct rte_mbuf **)
- rte_zmalloc_socket("rq->free_mbufs",
+ rte_zmalloc_numa("rq->free_mbufs",
sizeof(struct rte_mbuf *) *
ENIC_RX_BURST_MAX,
- RTE_CACHE_LINE_SIZE, rq_sop->socket_id);
+ RTE_CACHE_LINE_SIZE, rq_sop->numa_id);
if (rq_sop->free_mbufs == NULL)
goto err_free_data_mbuf;
rq_sop->num_free_mbufs = 0;
@@ -1022,7 +1022,7 @@ void enic_free_wq(void *txq)
}
int enic_alloc_wq(struct enic *enic, uint16_t queue_idx,
- unsigned int socket_id, uint16_t nb_desc)
+ unsigned int numa_id, uint16_t nb_desc)
{
struct enic_vf_representor *vf;
int err;
@@ -1045,7 +1045,7 @@ int enic_alloc_wq(struct enic *enic, uint16_t queue_idx,
cq_index = enic_cq_wq(enic, queue_idx);
}
wq = &enic->wq[queue_idx];
- wq->socket_id = socket_id;
+ wq->numa_id = numa_id;
/*
* rte_eth_tx_queue_setup() checks min, max, and alignment. So just
* print an info message for diagnostics.
@@ -1062,7 +1062,7 @@ int enic_alloc_wq(struct enic *enic, uint16_t queue_idx,
}
err = vnic_cq_alloc(enic->vdev, &enic->cq[cq_index], cq_index,
- socket_id, nb_desc,
+ numa_id, nb_desc,
sizeof(struct cq_enet_wq_desc));
if (err) {
vnic_wq_free(wq);
@@ -1075,7 +1075,7 @@ int enic_alloc_wq(struct enic *enic, uint16_t queue_idx,
instance++);
wq->cqmsg_rz = rte_memzone_reserve_aligned((const char *)name,
- sizeof(uint32_t), SOCKET_ID_ANY,
+ sizeof(uint32_t), RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG, ENIC_PAGE_SIZE);
if (!wq->cqmsg_rz)
return -ENOMEM;
@@ -1682,7 +1682,7 @@ int enic_set_mtu(struct enic *enic, uint16_t new_mtu)
continue;
enic_free_rq(rq);
- rc = enic_alloc_rq(enic, rq_idx, rq->socket_id, rq->mp,
+ rc = enic_alloc_rq(enic, rq_idx, rq->numa_id, rq->mp,
rq->tot_nb_desc, rq->rx_free_thresh);
if (rc) {
dev_err(enic,
diff --git a/drivers/net/enic/enic_sriov.c b/drivers/net/enic/enic_sriov.c
index 29faa31512..42b6440357 100644
--- a/drivers/net/enic/enic_sriov.c
+++ b/drivers/net/enic/enic_sriov.c
@@ -79,7 +79,7 @@ static int enic_enable_admin_rq(struct enic *enic)
return err;
}
err = vnic_admin_cq_alloc(enic->vdev, cq, cq_idx,
- SOCKET_ID_ANY, desc_count, sizeof(struct cq_enet_rq_desc));
+ RTE_NUMA_ID_ANY, desc_count, sizeof(struct cq_enet_rq_desc));
if (err) {
dev_err(enic, "failed to allocate CQ for admin RQ\n");
return err;
@@ -106,7 +106,7 @@ static int enic_enable_admin_rq(struct enic *enic)
*/
snprintf((char *)name, sizeof(name), "admin-rq-buf-%d", instance++);
rq->admin_msg_rz = rte_memzone_reserve_aligned((const char *)name,
- desc_count * rqbuf_size, SOCKET_ID_ANY,
+ desc_count * rqbuf_size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG, ENIC_PAGE_SIZE);
if (!rq->admin_msg_rz)
return -ENOMEM;
@@ -151,7 +151,7 @@ static int enic_enable_admin_wq(struct enic *enic)
return err;
}
err = vnic_admin_cq_alloc(enic->vdev, cq, cq_idx,
- SOCKET_ID_ANY, desc_count, sizeof(struct cq_enet_wq_desc));
+ RTE_NUMA_ID_ANY, desc_count, sizeof(struct cq_enet_wq_desc));
if (err) {
vnic_wq_free(wq);
dev_err(enic, "failed to allocate CQ for admin WQ\n");
@@ -160,7 +160,7 @@ static int enic_enable_admin_wq(struct enic *enic)
snprintf((char *)name, sizeof(name),
"vnic_cqmsg-%s-admin-wq-%d", enic->bdf_name, instance++);
wq->cqmsg_rz = rte_memzone_reserve_aligned((const char *)name,
- sizeof(uint32_t), SOCKET_ID_ANY,
+ sizeof(uint32_t), RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG, ENIC_PAGE_SIZE);
if (!wq->cqmsg_rz)
return -ENOMEM;
@@ -183,7 +183,7 @@ static int enic_enable_admin_wq(struct enic *enic)
snprintf((char *)name, sizeof(name), "admin-wq-buf-%d", instance++);
wq->admin_msg_rz = rte_memzone_reserve_aligned((const char *)name,
- desc_count * wqbuf_size, SOCKET_ID_ANY,
+ desc_count * wqbuf_size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG, ENIC_PAGE_SIZE);
if (!wq->admin_msg_rz)
return -ENOMEM;
diff --git a/drivers/net/enic/enic_vf_representor.c b/drivers/net/enic/enic_vf_representor.c
index fc836100b4..bb6adb3e6c 100644
--- a/drivers/net/enic/enic_vf_representor.c
+++ b/drivers/net/enic/enic_vf_representor.c
@@ -41,7 +41,7 @@ static uint16_t enic_vf_xmit_pkts(void *tx_queue,
static int enic_vf_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct enic_vf_representor *vf;
@@ -62,7 +62,7 @@ static int enic_vf_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
eth_dev->data->dev_conf.txmode.offloads;
eth_dev->data->tx_queues[0] = (void *)wq;
/* Pass vf not pf because of cq index calculation. See enic_alloc_wq */
- err = enic_alloc_wq(&vf->enic, queue_idx, socket_id, nb_desc);
+ err = enic_alloc_wq(&vf->enic, queue_idx, numa_id, nb_desc);
if (err) {
ENICPMD_LOG(ERR, "error in allocating wq");
return err;
@@ -83,7 +83,7 @@ static void enic_vf_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
static int enic_vf_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -101,7 +101,7 @@ static int enic_vf_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
pf = vf->pf;
eth_dev->data->rx_queues[queue_idx] =
(void *)&pf->rq[vf->pf_rq_sop_idx];
- ret = enic_alloc_rq(&vf->enic, queue_idx, socket_id, mp, nb_desc,
+ ret = enic_alloc_rq(&vf->enic, queue_idx, numa_id, mp, nb_desc,
rx_conf->rx_free_thresh);
if (ret) {
ENICPMD_LOG(ERR, "error in allocating rq");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 119/227] net/failsafe: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (117 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 118/227] net/enic: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 120/227] net/gve: " Chengwen Feng
` (108 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/failsafe/failsafe.c | 6 +++---
drivers/net/failsafe/failsafe_ether.c | 4 ++--
drivers/net/failsafe/failsafe_ops.c | 12 ++++++------
drivers/net/failsafe/failsafe_private.h | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 3ba143924d..5f2555ee76 100644
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -168,14 +168,14 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
struct fs_priv *priv;
struct sub_device *sdev;
const char *params;
- unsigned int socket_id;
+ unsigned int numa_id;
uint8_t i;
int ret;
dev = NULL;
priv = NULL;
- socket_id = rte_socket_id();
- INFO("Creating fail-safe device on NUMA socket %u", socket_id);
+ numa_id = rte_numa_id();
+ INFO("Creating fail-safe device on NUMA socket %u", numa_id);
params = rte_vdev_device_args(vdev);
if (params == NULL) {
ERROR("This PMD requires sub-devices, none provided");
diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index 307f2abfa5..0215970492 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -87,7 +87,7 @@ fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
rxq = dev->data->rx_queues[i];
ret = rte_eth_rx_queue_setup(PORT_ID(sdev), i,
- rxq->info.nb_desc, rxq->socket_id,
+ rxq->info.nb_desc, rxq->numa_id,
&rxq->info.conf, rxq->info.mp);
if (ret) {
ERROR("rx_queue_setup failed");
@@ -100,7 +100,7 @@ fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
txq = dev->data->tx_queues[i];
ret = rte_eth_tx_queue_setup(PORT_ID(sdev), i,
- txq->info.nb_desc, txq->socket_id,
+ txq->info.nb_desc, txq->numa_id,
&txq->info.conf);
if (ret) {
ERROR("tx_queue_setup failed");
diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index 5680451f21..b993b804e0 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -431,7 +431,7 @@ static int
fs_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -467,7 +467,7 @@ fs_rx_queue_setup(struct rte_eth_dev *dev,
}
rxq->qid = rx_queue_id;
- rxq->socket_id = socket_id;
+ rxq->numa_id = numa_id;
rxq->info.mp = mb_pool;
rxq->info.conf = *rx_conf;
rxq->info.nb_desc = nb_rx_desc;
@@ -487,7 +487,7 @@ fs_rx_queue_setup(struct rte_eth_dev *dev,
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
ret = rte_eth_rx_queue_setup(PORT_ID(sdev),
rx_queue_id,
- nb_rx_desc, socket_id,
+ nb_rx_desc, numa_id,
rx_conf, mb_pool);
if ((ret = fs_err(sdev, ret))) {
ERROR("RX queue setup failed for sub_device %d", i);
@@ -608,7 +608,7 @@ static int
fs_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct sub_device *sdev;
@@ -643,7 +643,7 @@ fs_tx_queue_setup(struct rte_eth_dev *dev,
}
txq->qid = tx_queue_id;
- txq->socket_id = socket_id;
+ txq->numa_id = numa_id;
txq->info.conf = *tx_conf;
txq->info.nb_desc = nb_tx_desc;
txq->priv = PRIV(dev);
@@ -651,7 +651,7 @@ fs_tx_queue_setup(struct rte_eth_dev *dev,
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
ret = rte_eth_tx_queue_setup(PORT_ID(sdev),
tx_queue_id,
- nb_tx_desc, socket_id,
+ nb_tx_desc, numa_id,
tx_conf);
if ((ret = fs_err(sdev, ret))) {
ERROR("TX queue setup failed for sub_device %d", i);
diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index a565ee2fbc..4235764dc9 100644
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -71,7 +71,7 @@ struct rxq {
uint16_t qid;
/* next sub_device to poll */
struct sub_device *sdev;
- unsigned int socket_id;
+ unsigned int numa_id;
int event_fd;
unsigned int enable_events:1;
struct rte_eth_rxq_info info;
@@ -81,7 +81,7 @@ struct rxq {
struct txq {
struct fs_priv *priv;
uint16_t qid;
- unsigned int socket_id;
+ unsigned int numa_id;
struct rte_eth_txq_info info;
RTE_ATOMIC(uint64_t) refcnt[];
};
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 120/227] net/gve: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (118 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 119/227] net/failsafe: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 121/227] net/hinic: " Chengwen Feng
` (107 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/gve/base/gve_osdep.h | 2 +-
drivers/net/gve/gve_ethdev.c | 14 +++++++-------
drivers/net/gve/gve_ethdev.h | 8 ++++----
drivers/net/gve/gve_rx.c | 16 ++++++++--------
drivers/net/gve/gve_rx_dqo.c | 24 ++++++++++++------------
drivers/net/gve/gve_tx.c | 18 +++++++++---------
drivers/net/gve/gve_tx_dqo.c | 16 ++++++++--------
7 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h
index 55629a0e1a..c9e3272881 100644
--- a/drivers/net/gve/base/gve_osdep.h
+++ b/drivers/net/gve/base/gve_osdep.h
@@ -184,7 +184,7 @@ gve_alloc_dma_mem(struct gve_dma_mem *mem, u64 size)
snprintf(z_name, sizeof(z_name), "gve_dma_%" PRIu64,
rte_atomic_fetch_add_explicit(&gve_dma_memzone_id, 1, rte_memory_order_relaxed));
- mz = rte_memzone_reserve_aligned(z_name, size, SOCKET_ID_ANY,
+ mz = rte_memzone_reserve_aligned(z_name, size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG,
PAGE_SIZE);
if (!mz)
diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
index 8ee52fdd47..045692437e 100644
--- a/drivers/net/gve/gve_ethdev.c
+++ b/drivers/net/gve/gve_ethdev.c
@@ -32,7 +32,7 @@ gve_alloc_using_mz(const char *name, uint32_t num_pages)
{
const struct rte_memzone *mz;
mz = rte_memzone_reserve_aligned(name, num_pages * PAGE_SIZE,
- rte_socket_id(),
+ rte_numa_id(),
RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE);
if (mz == NULL)
PMD_DRV_LOG(ERR, "Failed to alloc memzone %s.", name);
@@ -45,7 +45,7 @@ gve_alloc_using_malloc(void **bufs, uint32_t num_entries)
uint32_t i;
for (i = 0; i < num_entries; i++) {
- bufs[i] = rte_malloc_socket(NULL, PAGE_SIZE, PAGE_SIZE, rte_socket_id());
+ bufs[i] = rte_malloc_numa(NULL, PAGE_SIZE, PAGE_SIZE, rte_numa_id());
if (bufs[i] == NULL) {
PMD_DRV_LOG(ERR, "Failed to malloc");
goto free_bufs;
@@ -339,7 +339,7 @@ gve_alloc_stats_report(struct gve_priv *priv,
priv->pci_dev->device.name);
priv->stats_report_mem = rte_memzone_reserve_aligned(z_name,
priv->stats_report_len,
- rte_socket_id(),
+ rte_numa_id(),
RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE);
if (!priv->stats_report_mem)
@@ -629,7 +629,7 @@ gve_alloc_nic_ts_report(struct gve_priv *priv)
snprintf(z_name, sizeof(z_name), "gve_%s_nic_ts_report",
priv->pci_dev->device.name);
priv->nic_ts_report_mz = rte_memzone_reserve_aligned(z_name,
- sizeof(struct gve_nic_ts_report), rte_socket_id(),
+ sizeof(struct gve_nic_ts_report), rte_numa_id(),
RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE);
if (!priv->nic_ts_report_mz) {
@@ -886,7 +886,7 @@ gve_verify_driver_compatibility(struct gve_priv *priv)
driver_info_mem = rte_memzone_reserve_aligned("verify_driver_compatibility",
sizeof(struct gve_driver_info),
- rte_socket_id(),
+ rte_numa_id(),
RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE);
if (driver_info_mem == NULL) {
@@ -1575,7 +1575,7 @@ gve_setup_device_resources(struct gve_priv *priv)
snprintf(z_name, sizeof(z_name), "gve_%s_cnt_arr", priv->pci_dev->device.name);
mz = rte_memzone_reserve_aligned(z_name,
priv->num_event_counters * sizeof(*priv->cnt_array),
- rte_socket_id(), RTE_MEMZONE_IOVA_CONTIG,
+ rte_numa_id(), RTE_MEMZONE_IOVA_CONTIG,
PAGE_SIZE);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Could not alloc memzone for count array");
@@ -1587,7 +1587,7 @@ gve_setup_device_resources(struct gve_priv *priv)
snprintf(z_name, sizeof(z_name), "gve_%s_irqmz", priv->pci_dev->device.name);
mz = rte_memzone_reserve_aligned(z_name,
sizeof(*priv->irq_dbs) * (priv->num_ntfy_blks),
- rte_socket_id(), RTE_MEMZONE_IOVA_CONTIG,
+ rte_numa_id(), RTE_MEMZONE_IOVA_CONTIG,
PAGE_SIZE);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Could not alloc memzone for irq_dbs");
diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h
index 3a8ddfbbb6..60375598c3 100644
--- a/drivers/net/gve/gve_ethdev.h
+++ b/drivers/net/gve/gve_ethdev.h
@@ -560,11 +560,11 @@ gve_clear_flow_subsystem_ok(struct gve_priv *priv)
int
gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc,
- unsigned int socket_id, const struct rte_eth_rxconf *conf,
+ unsigned int numa_id, const struct rte_eth_rxconf *conf,
struct rte_mempool *pool);
int
gve_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc,
- unsigned int socket_id, const struct rte_eth_txconf *conf);
+ unsigned int numa_id, const struct rte_eth_txconf *conf);
void
gve_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
@@ -613,12 +613,12 @@ gve_teardown_queue_page_list(struct gve_priv *priv,
int
gve_rx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *conf,
struct rte_mempool *pool);
int
gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *conf);
void
diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c
index 31c187ca83..b21cd175be 100644
--- a/drivers/net/gve/gve_rx.c
+++ b/drivers/net/gve/gve_rx.c
@@ -324,7 +324,7 @@ gve_rx_buf_len_gqi(struct rte_mempool *pool)
int
gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *conf, struct rte_mempool *pool)
{
struct gve_priv *hw = dev->data->dev_private;
@@ -361,10 +361,10 @@ gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
}
/* Allocate the RX queue data structure. */
- rxq = rte_zmalloc_socket("gve rxq",
+ rxq = rte_zmalloc_numa("gve rxq",
sizeof(struct gve_rx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for rx queue structure");
err = -ENOMEM;
@@ -393,8 +393,8 @@ gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
rxq->scatter = !!(offloads & RTE_ETH_RX_OFFLOAD_SCATTER);
/* Allocate software ring */
- rxq->sw_ring = rte_zmalloc_socket("gve rx sw ring", sizeof(struct rte_mbuf *) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq->sw_ring = rte_zmalloc_numa("gve rx sw ring", sizeof(struct rte_mbuf *) * nb_desc,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->sw_ring) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for SW RX ring");
err = -ENOMEM;
@@ -403,7 +403,7 @@ gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
mz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_id,
nb_desc * sizeof(struct gve_rx_desc),
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for RX");
err = -ENOMEM;
@@ -415,7 +415,7 @@ gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
mz = rte_eth_dma_zone_reserve(dev, "gve rx data ring", queue_id,
sizeof(union gve_rx_data_slot) * nb_desc,
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for RX data ring");
err = -ENOMEM;
@@ -439,7 +439,7 @@ gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
mz = rte_eth_dma_zone_reserve(dev, "rxq_res", queue_id,
sizeof(struct gve_queue_resources),
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for RX resource");
err = -ENOMEM;
diff --git a/drivers/net/gve/gve_rx_dqo.c b/drivers/net/gve/gve_rx_dqo.c
index 03c62edee6..50e26af229 100644
--- a/drivers/net/gve/gve_rx_dqo.c
+++ b/drivers/net/gve/gve_rx_dqo.c
@@ -320,7 +320,7 @@ gve_reset_rx_ring_state_dqo(struct gve_rx_queue *rxq)
int
gve_rx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *conf,
struct rte_mempool *pool)
{
@@ -338,10 +338,10 @@ gve_rx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
}
/* Allocate the RX queue data structure. */
- rxq = rte_zmalloc_socket("gve rxq",
+ rxq = rte_zmalloc_numa("gve rxq",
sizeof(struct gve_rx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (rxq == NULL) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for rx queue structure");
return -ENOMEM;
@@ -379,9 +379,9 @@ gve_rx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
RTE_ALIGN_FLOOR(mbuf_len, GVE_RX_BUF_ALIGN_DQO));
/* Allocate software ring */
- rxq->sw_ring = rte_zmalloc_socket("gve rx sw ring",
+ rxq->sw_ring = rte_zmalloc_numa("gve rx sw ring",
nb_desc * sizeof(struct rte_mbuf *),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq->sw_ring == NULL) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for SW RX ring");
err = -ENOMEM;
@@ -389,9 +389,9 @@ gve_rx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
}
/* Allocate completed bufs list */
- rxq->completed_buf_list = rte_zmalloc_socket("gve completed buf list",
+ rxq->completed_buf_list = rte_zmalloc_numa("gve completed buf list",
nb_desc * sizeof(*rxq->completed_buf_list), RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (rxq->completed_buf_list == NULL) {
PMD_DRV_LOG(ERR, "Failed to allocate completed buffer list.");
err = -ENOMEM;
@@ -399,9 +399,9 @@ gve_rx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
}
/* Allocate buffer for reallocating mbufs */
- rxq->refill_bufs = rte_zmalloc_socket("gve rx refill bufs",
+ rxq->refill_bufs = rte_zmalloc_numa("gve rx refill bufs",
nb_desc * sizeof(*rxq->refill_bufs), RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (rxq->refill_bufs == NULL) {
PMD_DRV_LOG(ERR, "Failed to allocate rx refill bufs.");
err = -ENOMEM;
@@ -411,7 +411,7 @@ gve_rx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
/* Allocate RX buffer queue */
mz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_id,
nb_desc * sizeof(struct gve_rx_desc_dqo),
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for RX buffer queue");
err = -ENOMEM;
@@ -424,7 +424,7 @@ gve_rx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
/* Allocate RX completion queue */
mz = rte_eth_dma_zone_reserve(dev, "compl_ring", queue_id,
nb_desc * sizeof(struct gve_rx_compl_desc_dqo),
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for RX completion queue");
err = -ENOMEM;
@@ -438,7 +438,7 @@ gve_rx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
mz = rte_eth_dma_zone_reserve(dev, "rxq_res", queue_id,
sizeof(struct gve_queue_resources),
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for RX resource");
err = -ENOMEM;
diff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c
index 279669165f..6cb31a0b80 100644
--- a/drivers/net/gve/gve_tx.c
+++ b/drivers/net/gve/gve_tx.c
@@ -561,7 +561,7 @@ gve_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
int
gve_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc,
- unsigned int socket_id, const struct rte_eth_txconf *conf)
+ unsigned int numa_id, const struct rte_eth_txconf *conf)
{
struct gve_priv *hw = dev->data->dev_private;
const struct rte_memzone *mz;
@@ -583,8 +583,8 @@ gve_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc,
}
/* Allocate the TX queue data structure. */
- txq = rte_zmalloc_socket("gve txq", sizeof(struct gve_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("gve txq", sizeof(struct gve_tx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for tx queue structure");
err = -ENOMEM;
@@ -609,9 +609,9 @@ gve_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc,
txq->ntfy_addr = &hw->db_bar[rte_be_to_cpu_32(hw->irq_dbs[txq->ntfy_id].id)];
/* Allocate software ring */
- txq->sw_ring = rte_zmalloc_socket("gve tx sw ring",
+ txq->sw_ring = rte_zmalloc_numa("gve tx sw ring",
sizeof(struct rte_mbuf *) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq->sw_ring) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for SW TX ring");
err = -ENOMEM;
@@ -620,7 +620,7 @@ gve_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc,
mz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_id,
nb_desc * sizeof(union gve_tx_desc),
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for TX");
err = -ENOMEM;
@@ -632,9 +632,9 @@ gve_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc,
/* QPL-specific allocations. */
if (txq->is_gqi_qpl) {
- txq->iov_ring = rte_zmalloc_socket("gve tx iov ring",
+ txq->iov_ring = rte_zmalloc_numa("gve tx iov ring",
sizeof(struct gve_tx_iovec) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq->iov_ring) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for SW TX ring");
err = -ENOMEM;
@@ -652,7 +652,7 @@ gve_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc,
}
mz = rte_eth_dma_zone_reserve(dev, "txq_res", queue_id, sizeof(struct gve_queue_resources),
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for TX resource");
err = -ENOMEM;
diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c
index 52fcdb285a..93a595188f 100644
--- a/drivers/net/gve/gve_tx_dqo.c
+++ b/drivers/net/gve/gve_tx_dqo.c
@@ -511,7 +511,7 @@ gve_reset_tx_ring_state_dqo(struct gve_tx_queue *txq)
int
gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *conf)
{
struct gve_priv *hw = dev->data->dev_private;
@@ -529,9 +529,9 @@ gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
}
/* Allocate the TX queue data structure. */
- txq = rte_zmalloc_socket("gve txq",
+ txq = rte_zmalloc_numa("gve txq",
sizeof(struct gve_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for tx queue structure");
return -ENOMEM;
@@ -557,9 +557,9 @@ gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
/* Allocate software ring */
sw_size = nb_desc;
- txq->pkt_ring_dqo = rte_zmalloc_socket("gve tx sw ring",
+ txq->pkt_ring_dqo = rte_zmalloc_numa("gve tx sw ring",
sw_size * sizeof(struct gve_tx_pkt),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->pkt_ring_dqo == NULL) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for SW TX ring");
err = -ENOMEM;
@@ -570,7 +570,7 @@ gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
/* Allocate TX hardware ring descriptors. */
mz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_id,
nb_desc * sizeof(union gve_tx_desc_dqo),
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for TX");
err = -ENOMEM;
@@ -583,7 +583,7 @@ gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
/* Allocate TX completion ring descriptors. */
mz = rte_eth_dma_zone_reserve(dev, "tx_compl_ring", queue_id,
txq->nb_complq_desc * sizeof(struct gve_tx_compl_desc),
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for TX completion queue");
err = -ENOMEM;
@@ -595,7 +595,7 @@ gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id,
mz = rte_eth_dma_zone_reserve(dev, "txq_res", queue_id,
sizeof(struct gve_queue_resources),
- PAGE_SIZE, socket_id);
+ PAGE_SIZE, numa_id);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for TX resource");
err = -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 121/227] net/hinic: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (119 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 120/227] net/gve: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 122/227] net/hinic3: " Chengwen Feng
` (106 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/hinic/base/hinic_compat.h | 6 ++---
drivers/net/hinic/base/hinic_pmd_api_cmd.c | 6 ++---
drivers/net/hinic/base/hinic_pmd_eqs.c | 2 +-
drivers/net/hinic/base/hinic_pmd_hwdev.c | 18 +++++++--------
drivers/net/hinic/base/hinic_pmd_mbox.c | 2 +-
drivers/net/hinic/base/hinic_pmd_wq.c | 10 ++++-----
drivers/net/hinic/base/hinic_pmd_wq.h | 2 +-
drivers/net/hinic/hinic_pmd_ethdev.c | 26 +++++++++++-----------
drivers/net/hinic/hinic_pmd_rx.c | 16 ++++++-------
drivers/net/hinic/hinic_pmd_rx.h | 4 ++--
drivers/net/hinic/hinic_pmd_tx.c | 8 +++----
drivers/net/hinic/hinic_pmd_tx.h | 4 ++--
12 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/drivers/net/hinic/base/hinic_compat.h b/drivers/net/hinic/base/hinic_compat.h
index c37d970f59..a93def90a7 100644
--- a/drivers/net/hinic/base/hinic_compat.h
+++ b/drivers/net/hinic/base/hinic_compat.h
@@ -113,13 +113,13 @@ extern int hinic_logtype;
#define HINIC_PAGE_SIZE_DPDK 6
void *dma_zalloc_coherent(void *dev, size_t size, dma_addr_t *dma_handle,
- unsigned int socket_id);
+ unsigned int numa_id);
void *dma_zalloc_coherent_aligned(void *hwdev, size_t size,
- dma_addr_t *dma_handle, unsigned int socket_id);
+ dma_addr_t *dma_handle, unsigned int numa_id);
void *dma_zalloc_coherent_aligned256k(void *hwdev, size_t size,
- dma_addr_t *dma_handle, unsigned int socket_id);
+ dma_addr_t *dma_handle, unsigned int numa_id);
void dma_free_coherent(void *dev, size_t size, void *virt, dma_addr_t phys);
diff --git a/drivers/net/hinic/base/hinic_pmd_api_cmd.c b/drivers/net/hinic/base/hinic_pmd_api_cmd.c
index b72edc0652..ef1798485f 100644
--- a/drivers/net/hinic/base/hinic_pmd_api_cmd.c
+++ b/drivers/net/hinic/base/hinic_pmd_api_cmd.c
@@ -658,7 +658,7 @@ static int alloc_cmd_buf(struct hinic_api_cmd_chain *chain,
cmd_vaddr_alloc = dma_zalloc_coherent(dev, (API_CMD_BUF_SIZE +
API_PAYLOAD_ALIGN_SIZE),
- &cmd_paddr, SOCKET_ID_ANY);
+ &cmd_paddr, RTE_NUMA_ID_ANY);
if (!cmd_vaddr_alloc) {
PMD_DRV_LOG(ERR, "Allocate API CMD dma memory failed");
return -ENOMEM;
@@ -712,7 +712,7 @@ static int api_cmd_create_cell(struct hinic_api_cmd_chain *chain,
node_vaddr_alloc = dma_zalloc_coherent(dev, (chain->cell_size +
API_CMD_NODE_ALIGN_SIZE),
- &node_paddr, SOCKET_ID_ANY);
+ &node_paddr, RTE_NUMA_ID_ANY);
if (!node_vaddr_alloc) {
PMD_DRV_LOG(ERR, "Allocate dma API CMD cell failed");
return -ENOMEM;
@@ -889,7 +889,7 @@ static int api_chain_init(struct hinic_api_cmd_chain *chain,
chain->wb_status = (struct hinic_api_cmd_status *)
dma_zalloc_coherent(dev, sizeof(*chain->wb_status),
- &chain->wb_status_paddr, SOCKET_ID_ANY);
+ &chain->wb_status_paddr, RTE_NUMA_ID_ANY);
if (!chain->wb_status) {
PMD_DRV_LOG(ERR, "Allocate DMA wb status failed");
err = -ENOMEM;
diff --git a/drivers/net/hinic/base/hinic_pmd_eqs.c b/drivers/net/hinic/base/hinic_pmd_eqs.c
index f0e1139a98..ebd05c7585 100644
--- a/drivers/net/hinic/base/hinic_pmd_eqs.c
+++ b/drivers/net/hinic/base/hinic_pmd_eqs.c
@@ -240,7 +240,7 @@ static int alloc_eq_pages(struct hinic_eq *eq)
eq->virt_addr[pg_num] =
(u8 *)dma_zalloc_coherent_aligned(eq->hwdev,
eq->page_size, &eq->dma_addr[pg_num],
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!eq->virt_addr[pg_num]) {
err = -ENOMEM;
goto dma_alloc_err;
diff --git a/drivers/net/hinic/base/hinic_pmd_hwdev.c b/drivers/net/hinic/base/hinic_pmd_hwdev.c
index 3aca40d17d..ac65b8ce29 100644
--- a/drivers/net/hinic/base/hinic_pmd_hwdev.c
+++ b/drivers/net/hinic/base/hinic_pmd_hwdev.c
@@ -114,7 +114,7 @@ void hinic_be32_to_cpu(void *data, u32 len)
static void *hinic_dma_mem_zalloc(struct hinic_hwdev *hwdev, size_t size,
dma_addr_t *dma_handle, unsigned int align,
- unsigned int socket_id)
+ unsigned int numa_id)
{
int rc;
uint32_t alloc_cnt;
@@ -131,7 +131,7 @@ static void *hinic_dma_mem_zalloc(struct hinic_hwdev *hwdev, size_t size,
snprintf(z_name, sizeof(z_name), "%s_%u",
hwdev->pcidev_hdl->name, alloc_cnt);
- mz = rte_memzone_reserve_aligned(z_name, size, socket_id,
+ mz = rte_memzone_reserve_aligned(z_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, align);
if (!mz) {
PMD_DRV_LOG(ERR, "Alloc dma able memory failed, errno: %d, ma_name: %s, size: 0x%zx",
@@ -212,25 +212,25 @@ hinic_dma_mem_free(struct hinic_hwdev *hwdev, size_t size,
}
void *dma_zalloc_coherent(void *hwdev, size_t size, dma_addr_t *dma_handle,
- unsigned int socket_id)
+ unsigned int numa_id)
{
return hinic_dma_mem_zalloc(hwdev, size, dma_handle,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
}
void *dma_zalloc_coherent_aligned(void *hwdev, size_t size,
- dma_addr_t *dma_handle, unsigned int socket_id)
+ dma_addr_t *dma_handle, unsigned int numa_id)
{
return hinic_dma_mem_zalloc(hwdev, size, dma_handle, HINIC_PAGE_SIZE,
- socket_id);
+ numa_id);
}
void *dma_zalloc_coherent_aligned256k(void *hwdev, size_t size,
dma_addr_t *dma_handle,
- unsigned int socket_id)
+ unsigned int numa_id)
{
return hinic_dma_mem_zalloc(hwdev, size, dma_handle,
- HINIC_PAGE_SIZE * 64, socket_id);
+ HINIC_PAGE_SIZE * 64, numa_id);
}
void dma_free_coherent(void *hwdev, size_t size, void *virt, dma_addr_t phys)
@@ -314,7 +314,7 @@ void *dma_pool_alloc(struct pci_pool *pool, dma_addr_t *dma_addr)
void *buf;
buf = hinic_dma_mem_zalloc(pool->hwdev, pool->elem_size, dma_addr,
- (u32)pool->align, SOCKET_ID_ANY);
+ (u32)pool->align, RTE_NUMA_ID_ANY);
if (buf)
rte_atomic_fetch_add_explicit(&pool->inuse, 1, rte_memory_order_relaxed);
diff --git a/drivers/net/hinic/base/hinic_pmd_mbox.c b/drivers/net/hinic/base/hinic_pmd_mbox.c
index 7418c9b602..270bed05c3 100644
--- a/drivers/net/hinic/base/hinic_pmd_mbox.c
+++ b/drivers/net/hinic/base/hinic_pmd_mbox.c
@@ -443,7 +443,7 @@ static int alloc_mbox_wb_status(struct hinic_mbox_func_to_func *func_to_func)
u32 addr_h, addr_l;
send_mbox->wb_vaddr = dma_zalloc_coherent(hwdev, MBOX_WB_STATUS_LEN,
- &send_mbox->wb_paddr, SOCKET_ID_ANY);
+ &send_mbox->wb_paddr, RTE_NUMA_ID_ANY);
if (!send_mbox->wb_vaddr) {
PMD_DRV_LOG(ERR, "Allocating memory for mailbox wb status failed");
return -ENOMEM;
diff --git a/drivers/net/hinic/base/hinic_pmd_wq.c b/drivers/net/hinic/base/hinic_pmd_wq.c
index 345248c3ea..1197ec0082 100644
--- a/drivers/net/hinic/base/hinic_pmd_wq.c
+++ b/drivers/net/hinic/base/hinic_pmd_wq.c
@@ -16,13 +16,13 @@ static void free_wq_pages(struct hinic_hwdev *hwdev, struct hinic_wq *wq)
}
static int alloc_wq_pages(struct hinic_hwdev *hwdev, struct hinic_wq *wq,
- unsigned int socket_id)
+ unsigned int numa_id)
{
dma_addr_t dma_addr = 0;
wq->queue_buf_vaddr = (u64)(u64 *)
dma_zalloc_coherent_aligned256k(hwdev, wq->wq_buf_size,
- &dma_addr, socket_id);
+ &dma_addr, numa_id);
if (!wq->queue_buf_vaddr) {
PMD_DRV_LOG(ERR, "Failed to allocate wq page");
return -ENOMEM;
@@ -41,7 +41,7 @@ static int alloc_wq_pages(struct hinic_hwdev *hwdev, struct hinic_wq *wq,
}
int hinic_wq_allocate(struct hinic_hwdev *hwdev, struct hinic_wq *wq,
- u32 wqebb_shift, u16 q_depth, unsigned int socket_id)
+ u32 wqebb_shift, u16 q_depth, unsigned int numa_id)
{
int err;
@@ -61,7 +61,7 @@ int hinic_wq_allocate(struct hinic_hwdev *hwdev, struct hinic_wq *wq,
return -EINVAL;
}
- err = alloc_wq_pages(hwdev, wq, socket_id);
+ err = alloc_wq_pages(hwdev, wq, numa_id);
if (err) {
PMD_DRV_LOG(ERR, "Failed to allocate wq pages");
return err;
@@ -115,7 +115,7 @@ int hinic_cmdq_alloc(struct hinic_wq *wq, struct hinic_hwdev *hwdev,
wq[i].wq_buf_size = wq_buf_size;
wq[i].q_depth = q_depth;
- err = alloc_wq_pages(hwdev, &wq[i], SOCKET_ID_ANY);
+ err = alloc_wq_pages(hwdev, &wq[i], RTE_NUMA_ID_ANY);
if (err) {
PMD_DRV_LOG(ERR, "Failed to alloc CMDQ blocks");
goto cmdq_block_err;
diff --git a/drivers/net/hinic/base/hinic_pmd_wq.h b/drivers/net/hinic/base/hinic_pmd_wq.h
index 354d0338de..80bcfc43ec 100644
--- a/drivers/net/hinic/base/hinic_pmd_wq.h
+++ b/drivers/net/hinic/base/hinic_pmd_wq.h
@@ -122,7 +122,7 @@ void hinic_cmdq_free(struct hinic_hwdev *hwdev, struct hinic_wq *wq,
int cmdq_blocks);
int hinic_wq_allocate(struct hinic_hwdev *hwdev, struct hinic_wq *wq,
- u32 wqebb_shift, u16 q_depth, unsigned int socket_id);
+ u32 wqebb_shift, u16 q_depth, unsigned int numa_id);
void hinic_wq_free(struct hinic_hwdev *hwdev, struct hinic_wq *wq);
diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c
index 016d632e64..e552c471d0 100644
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -361,7 +361,7 @@ static int hinic_dev_configure(struct rte_eth_dev *dev)
* RX queue index.
* @param nb_desc
* Number of descriptors for receive queue.
- * @param socket_id
+ * @param numa_id
* NUMA socket on which memory must be allocated.
* @param rx_conf
* Thresholds parameters (unused_).
@@ -372,7 +372,7 @@ static int hinic_dev_configure(struct rte_eth_dev *dev)
* 0 on success, negative error value otherwise.
*/
static int hinic_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -423,8 +423,8 @@ static int hinic_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
return -EINVAL;
}
- rxq = rte_zmalloc_socket("hinic_rx_queue", sizeof(struct hinic_rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("hinic_rx_queue", sizeof(struct hinic_rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq) {
PMD_DRV_LOG(ERR, "Allocate rxq[%d] failed, dev_name: %s",
queue_idx, dev->data->name);
@@ -433,7 +433,7 @@ static int hinic_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
nic_dev->rxqs[queue_idx] = rxq;
/* alloc rx sq hw wqe page */
- rc = hinic_create_rq(hwdev, queue_idx, rq_depth, socket_id);
+ rc = hinic_create_rq(hwdev, queue_idx, rq_depth, numa_id);
if (rc) {
PMD_DRV_LOG(ERR, "Create rxq[%d] failed, dev_name: %s, rq_depth: %d",
queue_idx, dev->data->name, rq_depth);
@@ -460,7 +460,7 @@ static int hinic_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
rxq->q_depth = rq_depth;
rxq->buf_len = (u16)buf_size;
rxq->rx_free_thresh = rx_free_thresh;
- rxq->socket_id = socket_id;
+ rxq->numa_id = numa_id;
/* the last point cant do mbuf rearm in bulk */
rxq->rxinfo_align_end = rxq->q_depth - rxq->rx_free_thresh;
@@ -521,7 +521,7 @@ static void hinic_reset_rx_queue(struct rte_eth_dev *dev)
* Transmit queue index.
* @param nb_desc
* Number of descriptors for transmit queue.
- * @param socket_id
+ * @param numa_id
* NUMA socket on which memory must be allocated.
* @param tx_conf
* Tx queue configuration parameters.
@@ -530,7 +530,7 @@ static void hinic_reset_rx_queue(struct rte_eth_dev *dev)
* 0 on success, negative error value otherwise.
*/
static int hinic_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
__rte_unused const struct rte_eth_txconf *tx_conf)
{
int rc;
@@ -578,8 +578,8 @@ static int hinic_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
return -EINVAL;
}
- txq = rte_zmalloc_socket("hinic_tx_queue", sizeof(struct hinic_txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("hinic_tx_queue", sizeof(struct hinic_txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq) {
PMD_DRV_LOG(ERR, "Allocate txq[%d] failed, dev_name: %s",
queue_idx, dev->data->name);
@@ -588,7 +588,7 @@ static int hinic_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
nic_dev->txqs[queue_idx] = txq;
/* alloc tx sq hw wqepage */
- rc = hinic_create_sq(hwdev, queue_idx, sq_depth, socket_id);
+ rc = hinic_create_sq(hwdev, queue_idx, sq_depth, numa_id);
if (rc) {
PMD_DRV_LOG(ERR, "Create txq[%d] failed, dev_name: %s, sq_depth: %d",
queue_idx, dev->data->name, sq_depth);
@@ -607,7 +607,7 @@ static int hinic_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
txq->sq_bot_sge_addr = HINIC_GET_WQ_TAIL(txq) -
sizeof(struct hinic_sq_bufdesc);
txq->cos = nic_dev->default_cos;
- txq->socket_id = socket_id;
+ txq->numa_id = numa_id;
/* alloc software txinfo */
rc = hinic_setup_tx_resources(txq);
@@ -2678,7 +2678,7 @@ static int hinic_copy_mempool_init(struct hinic_nic_dev *nic_dev)
HINIC_COPY_MEMPOOL_DEPTH,
0, 0,
HINIC_COPY_MBUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (!nic_dev->cpy_mpool) {
PMD_DRV_LOG(ERR, "Create copy mempool failed, errno: %d, dev_name: %s",
rte_errno, nic_dev->proc_dev_name);
diff --git a/drivers/net/hinic/hinic_pmd_rx.c b/drivers/net/hinic/hinic_pmd_rx.c
index c2cd295033..5df252e789 100644
--- a/drivers/net/hinic/hinic_pmd_rx.c
+++ b/drivers/net/hinic/hinic_pmd_rx.c
@@ -210,7 +210,7 @@ void hinic_get_func_rx_buf_size(struct hinic_nic_dev *nic_dev)
}
int hinic_create_rq(struct hinic_hwdev *hwdev, u16 q_id,
- u16 rq_depth, unsigned int socket_id)
+ u16 rq_depth, unsigned int numa_id)
{
int err;
struct hinic_nic_io *nic_io = hwdev->nic_io;
@@ -224,7 +224,7 @@ int hinic_create_rq(struct hinic_hwdev *hwdev, u16 q_id,
nic_io->rq_depth = rq_depth;
err = hinic_wq_allocate(hwdev, &nic_io->rq_wq[q_id],
- HINIC_RQ_WQEBB_SHIFT, nic_io->rq_depth, socket_id);
+ HINIC_RQ_WQEBB_SHIFT, nic_io->rq_depth, numa_id);
if (err) {
PMD_DRV_LOG(ERR, "Failed to allocate WQ for RQ");
return err;
@@ -232,7 +232,7 @@ int hinic_create_rq(struct hinic_hwdev *hwdev, u16 q_id,
rq->wq = &nic_io->rq_wq[q_id];
rq->pi_virt_addr = (volatile u16 *)dma_zalloc_coherent(hwdev,
- HINIC_PAGE_SIZE, &rq->pi_dma_addr, socket_id);
+ HINIC_PAGE_SIZE, &rq->pi_dma_addr, numa_id);
if (!rq->pi_virt_addr) {
PMD_DRV_LOG(ERR, "Failed to allocate rq pi virt addr");
err = -ENOMEM;
@@ -304,13 +304,13 @@ void hinic_rxq_stats_reset(struct hinic_rxq *rxq)
memset(rxq_stats, 0, sizeof(*rxq_stats));
}
-static int hinic_rx_alloc_cqe(struct hinic_rxq *rxq, unsigned int socket_id)
+static int hinic_rx_alloc_cqe(struct hinic_rxq *rxq, unsigned int numa_id)
{
size_t cqe_mem_size;
cqe_mem_size = sizeof(struct hinic_rq_cqe) * rxq->q_depth;
rxq->cqe_start_vaddr = dma_zalloc_coherent(rxq->nic_dev->hwdev,
- cqe_mem_size, &rxq->cqe_start_paddr, socket_id);
+ cqe_mem_size, &rxq->cqe_start_paddr, numa_id);
if (!rxq->cqe_start_vaddr) {
PMD_DRV_LOG(ERR, "Allocate cqe dma memory failed");
return -ENOMEM;
@@ -366,12 +366,12 @@ int hinic_setup_rx_resources(struct hinic_rxq *rxq)
int err, pkts;
rx_info_sz = rxq->q_depth * sizeof(*rxq->rx_info);
- rxq->rx_info = rte_zmalloc_socket("rx_info", rx_info_sz,
- RTE_CACHE_LINE_SIZE, rxq->socket_id);
+ rxq->rx_info = rte_zmalloc_numa("rx_info", rx_info_sz,
+ RTE_CACHE_LINE_SIZE, rxq->numa_id);
if (!rxq->rx_info)
return -ENOMEM;
- err = hinic_rx_alloc_cqe(rxq, rxq->socket_id);
+ err = hinic_rx_alloc_cqe(rxq, rxq->numa_id);
if (err) {
PMD_DRV_LOG(ERR, "Allocate rx cqe failed");
goto rx_cqe_err;
diff --git a/drivers/net/hinic/hinic_pmd_rx.h b/drivers/net/hinic/hinic_pmd_rx.h
index 43c236b46c..88a0c09950 100644
--- a/drivers/net/hinic/hinic_pmd_rx.h
+++ b/drivers/net/hinic/hinic_pmd_rx.h
@@ -86,7 +86,7 @@ struct hinic_rxq {
u16 rx_free_thresh;
u16 rxinfo_align_end;
- u32 socket_id;
+ u32 numa_id;
unsigned long status;
struct hinic_rxq_stats rxq_stats;
@@ -128,7 +128,7 @@ void hinic_rx_remove_configure(struct rte_eth_dev *dev);
void hinic_get_func_rx_buf_size(struct hinic_nic_dev *nic_dev);
int hinic_create_rq(struct hinic_hwdev *hwdev, u16 q_id,
- u16 rq_depth, unsigned int socket_id);
+ u16 rq_depth, unsigned int numa_id);
void hinic_destroy_rq(struct hinic_hwdev *hwdev, u16 q_id);
diff --git a/drivers/net/hinic/hinic_pmd_tx.c b/drivers/net/hinic/hinic_pmd_tx.c
index 22fb0bffaf..e4987c2e14 100644
--- a/drivers/net/hinic/hinic_pmd_tx.c
+++ b/drivers/net/hinic/hinic_pmd_tx.c
@@ -1279,8 +1279,8 @@ int hinic_setup_tx_resources(struct hinic_txq *txq)
u64 tx_info_sz;
tx_info_sz = txq->q_depth * sizeof(*txq->tx_info);
- txq->tx_info = rte_zmalloc_socket("tx_info", tx_info_sz,
- RTE_CACHE_LINE_SIZE, txq->socket_id);
+ txq->tx_info = rte_zmalloc_numa("tx_info", tx_info_sz,
+ RTE_CACHE_LINE_SIZE, txq->numa_id);
if (!txq->tx_info)
return -ENOMEM;
@@ -1297,7 +1297,7 @@ void hinic_free_tx_resources(struct hinic_txq *txq)
}
int hinic_create_sq(struct hinic_hwdev *hwdev, u16 q_id,
- u16 sq_depth, unsigned int socket_id)
+ u16 sq_depth, unsigned int numa_id)
{
int err;
struct hinic_nic_io *nic_io = hwdev->nic_io;
@@ -1312,7 +1312,7 @@ int hinic_create_sq(struct hinic_hwdev *hwdev, u16 q_id,
/* alloc wq */
err = hinic_wq_allocate(nic_io->hwdev, &nic_io->sq_wq[q_id],
HINIC_SQ_WQEBB_SHIFT, nic_io->sq_depth,
- socket_id);
+ numa_id);
if (err) {
PMD_DRV_LOG(ERR, "Failed to allocate WQ for SQ");
return err;
diff --git a/drivers/net/hinic/hinic_pmd_tx.h b/drivers/net/hinic/hinic_pmd_tx.h
index 152f7abc53..939c82730a 100644
--- a/drivers/net/hinic/hinic_pmd_tx.h
+++ b/drivers/net/hinic/hinic_pmd_tx.h
@@ -115,7 +115,7 @@ struct hinic_txq {
u16 q_id;
u16 q_depth;
u32 cos;
- u32 socket_id;
+ u32 numa_id;
/* cacheline1 */
struct hinic_txq_stats txq_stats;
@@ -140,7 +140,7 @@ void hinic_txq_get_stats(struct hinic_txq *txq, struct hinic_txq_stats *stats);
void hinic_txq_stats_reset(struct hinic_txq *txq);
int hinic_create_sq(struct hinic_hwdev *hwdev, u16 q_id,
- u16 sq_depth, unsigned int socket_id);
+ u16 sq_depth, unsigned int numa_id);
void hinic_destroy_sq(struct hinic_hwdev *hwdev, u16 q_id);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 122/227] net/hinic3: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (120 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 121/227] net/hinic: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 123/227] net/hns3: " Chengwen Feng
` (105 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/hinic3/base/hinic3_cmdq.c | 2 +-
drivers/net/hinic3/base/hinic3_eqs.c | 2 +-
drivers/net/hinic3/base/hinic3_hwdev.c | 4 +--
drivers/net/hinic3/base/hinic3_hwdev.h | 2 +-
drivers/net/hinic3/base/hinic3_mbox.c | 4 +--
drivers/net/hinic3/base/hinic3_wq.c | 2 +-
drivers/net/hinic3/hinic3_ethdev.c | 38 +++++++++++++-------------
7 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/drivers/net/hinic3/base/hinic3_cmdq.c b/drivers/net/hinic3/base/hinic3_cmdq.c
index 9c27c6f54c..42eee08570 100644
--- a/drivers/net/hinic3/base/hinic3_cmdq.c
+++ b/drivers/net/hinic3/base/hinic3_cmdq.c
@@ -743,7 +743,7 @@ hinic3_cmdq_init(struct hinic3_hwdev *hwdev)
cmdqs->cmd_buf_pool = rte_pktmbuf_pool_create(cmdq_pool_name,
HINIC3_CMDQ_DEPTH * HINIC3_MAX_CMDQ_TYPES, 0, 0,
- HINIC3_CMDQ_BUF_SIZE, (int)rte_socket_id());
+ HINIC3_CMDQ_BUF_SIZE, (int)rte_numa_id());
if (!cmdqs->cmd_buf_pool) {
PMD_DRV_LOG(ERR, "Create cmdq buffer pool failed");
err = -ENOMEM;
diff --git a/drivers/net/hinic3/base/hinic3_eqs.c b/drivers/net/hinic3/base/hinic3_eqs.c
index 1fc78adc85..23fcf7e1cc 100644
--- a/drivers/net/hinic3/base/hinic3_eqs.c
+++ b/drivers/net/hinic3/base/hinic3_eqs.c
@@ -248,7 +248,7 @@ set_eq_pages(struct hinic3_eq *eq)
/* Allocate memory for each page. */
eq->eq_mz[pg_num] = hinic3_dma_zone_reserve(eq->hwdev->eth_dev,
"eq_mz", eq->q_id, eq->page_size,
- eq->page_size, SOCKET_ID_ANY);
+ eq->page_size, RTE_NUMA_ID_ANY);
if (!eq->eq_mz[pg_num]) {
err = -ENOMEM;
goto dma_alloc_err;
diff --git a/drivers/net/hinic3/base/hinic3_hwdev.c b/drivers/net/hinic3/base/hinic3_hwdev.c
index 9406b6cff2..0ee1f7552b 100644
--- a/drivers/net/hinic3/base/hinic3_hwdev.c
+++ b/drivers/net/hinic3/base/hinic3_hwdev.c
@@ -546,9 +546,9 @@ hinic3_free_hwdev(struct hinic3_hwdev *hwdev)
const struct rte_memzone *
hinic3_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,
- uint16_t queue_id, size_t size, unsigned int align, int socket_id)
+ uint16_t queue_id, size_t size, unsigned int align, int numa_id)
{
- return rte_eth_dma_zone_reserve(dev, ring_name, queue_id, size, align, socket_id);
+ return rte_eth_dma_zone_reserve(dev, ring_name, queue_id, size, align, numa_id);
}
int
diff --git a/drivers/net/hinic3/base/hinic3_hwdev.h b/drivers/net/hinic3/base/hinic3_hwdev.h
index c6661aa1a6..602b106ee1 100644
--- a/drivers/net/hinic3/base/hinic3_hwdev.h
+++ b/drivers/net/hinic3/base/hinic3_hwdev.h
@@ -177,7 +177,7 @@ void hinic3_free_hwdev(struct hinic3_hwdev *hwdev);
const struct rte_memzone *
hinic3_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,
- uint16_t queue_id, size_t size, unsigned int align, int socket_id);
+ uint16_t queue_id, size_t size, unsigned int align, int numa_id);
int hinic3_memzone_free(const struct rte_memzone *mz);
diff --git a/drivers/net/hinic3/base/hinic3_mbox.c b/drivers/net/hinic3/base/hinic3_mbox.c
index c4ca2ed7ba..c166d7d7f2 100644
--- a/drivers/net/hinic3/base/hinic3_mbox.c
+++ b/drivers/net/hinic3/base/hinic3_mbox.c
@@ -1054,7 +1054,7 @@ alloc_mbox_wb_status(struct hinic3_mbox *func_to_func)
/* Reserved DMA area. */
send_mbox->wb_mz = hinic3_dma_zone_reserve(hwdev->eth_dev,
"wb_mz", 0, MBOX_WB_STATUS_LEN,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!send_mbox->wb_mz)
return -ENOMEM;
@@ -1091,7 +1091,7 @@ alloc_mbox_tlp_buffer(struct hinic3_mbox *func_to_func)
struct hinic3_hwdev *hwdev = func_to_func->hwdev;
send_mbox->sbuff_mz = hinic3_dma_zone_reserve(hwdev->eth_dev, "sbuff_mz",
- 0, MBOX_MAX_BUF_SZ, MBOX_MAX_BUF_SZ, SOCKET_ID_ANY);
+ 0, MBOX_MAX_BUF_SZ, MBOX_MAX_BUF_SZ, RTE_NUMA_ID_ANY);
if (!send_mbox->sbuff_mz)
return -ENOMEM;
diff --git a/drivers/net/hinic3/base/hinic3_wq.c b/drivers/net/hinic3/base/hinic3_wq.c
index cce22e672f..d76668678d 100644
--- a/drivers/net/hinic3/base/hinic3_wq.c
+++ b/drivers/net/hinic3/base/hinic3_wq.c
@@ -21,7 +21,7 @@ alloc_wq_pages(struct hinic3_hwdev *hwdev, struct hinic3_wq *wq, int qid)
const struct rte_memzone *wq_mz;
wq_mz = hinic3_dma_zone_reserve(hwdev->eth_dev, "hinic3_wq_mz",
- qid, wq->wq_buf_size, RTE_PGSIZE_256K, SOCKET_ID_ANY);
+ qid, wq->wq_buf_size, RTE_PGSIZE_256K, RTE_NUMA_ID_ANY);
if (!wq_mz) {
PMD_DRV_LOG(ERR, "Allocate wq[%d] rq_mz failed", qid);
return -ENOMEM;
diff --git a/drivers/net/hinic3/hinic3_ethdev.c b/drivers/net/hinic3/hinic3_ethdev.c
index eb5ddd9de6..cf28bb7292 100644
--- a/drivers/net/hinic3/hinic3_ethdev.c
+++ b/drivers/net/hinic3/hinic3_ethdev.c
@@ -573,7 +573,7 @@ hinic3_copy_mempool_init(struct hinic3_nic_dev *nic_dev)
if (nic_dev->cpy_mpool == NULL) {
nic_dev->cpy_mpool = rte_pktmbuf_pool_create(HINCI3_CPY_MEMPOOL_NAME,
HINIC3_COPY_MEMPOOL_DEPTH, HINIC3_COPY_MEMPOOL_CACHE,
- 0, HINIC3_COPY_MBUF_SIZE, rte_socket_id());
+ 0, HINIC3_COPY_MBUF_SIZE, rte_numa_id());
if (nic_dev->cpy_mpool == NULL) {
PMD_DRV_LOG(ERR,
"Create copy mempool failed, errno: %d, dev_name: %s",
@@ -923,7 +923,7 @@ hinic3_reset_tx_queue(struct rte_eth_dev *dev)
* Receive queue index.
* @param[in] nb_desc
* Number of descriptors for receive queue.
- * @param[in] socket_id
+ * @param[in] numa_id
* Socket index on which memory must be allocated.
* @param[in] rx_conf
* Thresholds parameters (unused_).
@@ -935,7 +935,7 @@ hinic3_reset_tx_queue(struct rte_eth_dev *dev)
*/
static int
hinic3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
- unsigned int socket_id, const struct rte_eth_rxconf *rx_conf,
+ unsigned int numa_id, const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
struct hinic3_nic_dev *nic_dev;
@@ -999,8 +999,8 @@ hinic3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
return -EINVAL;
}
- rxq = rte_zmalloc_socket("hinic3_rq", sizeof(struct hinic3_rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("hinic3_rq", sizeof(struct hinic3_rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq) {
PMD_DRV_LOG(ERR, "Allocate rxq[%d] failed, dev_name: %s", qid,
dev->data->name);
@@ -1048,7 +1048,7 @@ hinic3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
rxq->rx_buff_shift = rte_log2_u32(rxq->buf_len);
pi_mz = hinic3_dma_zone_reserve(dev, "hinic3_rq_pi", qid, RTE_PGSIZE_4K,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!pi_mz) {
PMD_DRV_LOG(ERR, "Allocate rxq[%d] pi_mz failed, dev_name: %s",
qid, dev->data->name);
@@ -1068,7 +1068,7 @@ hinic3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
queue_buf_size = RTE_BIT32(rxq->wqebb_shift) * rq_depth;
rq_mz = hinic3_dma_zone_reserve(dev, "hinic3_rq_mz", qid,
- queue_buf_size, RTE_PGSIZE_256K, socket_id);
+ queue_buf_size, RTE_PGSIZE_256K, numa_id);
if (!rq_mz) {
PMD_DRV_LOG(ERR, "Allocate rxq[%d] rq_mz failed, dev_name: %s",
qid, dev->data->name);
@@ -1081,9 +1081,9 @@ hinic3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
rxq->queue_buf_paddr = rq_mz->iova;
rxq->queue_buf_vaddr = rq_mz->addr;
- rxq->rx_info = rte_zmalloc_socket("rx_info",
+ rxq->rx_info = rte_zmalloc_numa("rx_info",
rq_depth * sizeof(*rxq->rx_info),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->rx_info) {
PMD_DRV_LOG(ERR, "Allocate rx_info failed, dev_name: %s",
dev->data->name);
@@ -1094,7 +1094,7 @@ hinic3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
if (HINIC3_SUPPORT_RX_HW_COMPACT_CQE(nic_dev)) {
ci_mz = hinic3_dma_zone_reserve(dev, "hinic3_ci_mz", qid,
sizeof(*rxq->rq_ci),
- RTE_CACHE_LINE_SIZE, (int)socket_id);
+ RTE_CACHE_LINE_SIZE, (int)numa_id);
if (!ci_mz) {
PMD_DRV_LOG(ERR, "Allocate ci mem zone failed, dev_name: %s",
@@ -1110,7 +1110,7 @@ hinic3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
} else {
cqe_mz = hinic3_dma_zone_reserve(dev, "hinic3_cqe_mz", qid,
rq_depth * sizeof(*rxq->rx_cqe),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!cqe_mz) {
PMD_DRV_LOG(ERR, "Allocate cqe mem zone failed, dev_name: %s",
dev->data->name);
@@ -1163,7 +1163,7 @@ hinic3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
* Transmit queue index.
* @param[in] nb_desc
* Number of descriptors for transmit queue.
- * @param[in] socket_id
+ * @param[in] numa_id
* Socket index on which memory must be allocated.
* @param[in] tx_conf
* Tx queue configuration parameters (unused_).
@@ -1173,7 +1173,7 @@ hinic3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
*/
static int
hinic3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
- unsigned int socket_id, const struct rte_eth_txconf *tx_conf)
+ unsigned int numa_id, const struct rte_eth_txconf *tx_conf)
{
struct hinic3_nic_dev *nic_dev;
struct hinic3_hwdev *hwdev;
@@ -1226,8 +1226,8 @@ hinic3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
return -EINVAL;
}
- txq = rte_zmalloc_socket("hinic3_tx_queue", sizeof(struct hinic3_txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("hinic3_tx_queue", sizeof(struct hinic3_txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq) {
PMD_DRV_LOG(ERR, "Allocate txq[%d] failed, dev_name: %s", qid,
dev->data->name);
@@ -1248,7 +1248,7 @@ hinic3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
ci_mz = hinic3_dma_zone_reserve(dev, "hinic3_sq_ci", qid,
HINIC3_CI_Q_ADDR_SIZE,
- HINIC3_CI_Q_ADDR_SIZE, socket_id);
+ HINIC3_CI_Q_ADDR_SIZE, numa_id);
if (!ci_mz) {
PMD_DRV_LOG(ERR, "Allocate txq[%d] ci_mz failed, dev_name: %s",
qid, dev->data->name);
@@ -1261,7 +1261,7 @@ hinic3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
queue_buf_size = RTE_BIT32(txq->wqebb_shift) * sq_depth;
sq_mz = hinic3_dma_zone_reserve(dev, "hinic3_sq_mz", qid,
- queue_buf_size, RTE_PGSIZE_256K, socket_id);
+ queue_buf_size, RTE_PGSIZE_256K, numa_id);
if (!sq_mz) {
PMD_DRV_LOG(ERR, "Allocate txq[%d] sq_mz failed, dev_name: %s",
qid, dev->data->name);
@@ -1282,9 +1282,9 @@ hinic3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qid, uint16_t nb_desc,
}
txq->db_addr = db_addr;
- txq->tx_info = rte_zmalloc_socket("tx_info",
+ txq->tx_info = rte_zmalloc_numa("tx_info",
sq_depth * sizeof(*txq->tx_info),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq->tx_info) {
PMD_DRV_LOG(ERR, "Allocate tx_info failed, dev_name: %s",
dev->data->name);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 123/227] net/hns3: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (121 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 122/227] net/hinic3: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 124/227] net/intel: " Chengwen Feng
` (104 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/hns3/hns3_cmd.c | 2 +-
drivers/net/hns3/hns3_rxtx.c | 44 ++++++++++++++++++------------------
drivers/net/hns3/hns3_rxtx.h | 6 ++---
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index 34e12e7359..fdc8d827ad 100644
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -50,7 +50,7 @@ hns3_allocate_dma_mem(struct hns3_hw *hw, struct hns3_cmq_ring *ring,
snprintf(z_name, sizeof(z_name), "hns3_dma_%" PRIu64,
rte_atomic_fetch_add_explicit(&hns3_dma_memzone_id, 1, rte_memory_order_relaxed));
- mz = rte_memzone_reserve_bounded(z_name, size, SOCKET_ID_ANY,
+ mz = rte_memzone_reserve_bounded(z_name, size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG, alignment,
RTE_PGSIZE_2M);
if (mz == NULL)
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 8060c37f23..5e5e2ac5d0 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -1416,8 +1416,8 @@ hns3_alloc_rxq_and_dma_zone(struct rte_eth_dev *dev,
struct hns3_rx_queue *rxq;
unsigned int rx_desc;
- rxq = rte_zmalloc_socket(q_info->type, sizeof(struct hns3_rx_queue),
- RTE_CACHE_LINE_SIZE, q_info->socket_id);
+ rxq = rte_zmalloc_numa(q_info->type, sizeof(struct hns3_rx_queue),
+ RTE_CACHE_LINE_SIZE, q_info->numa_id);
if (rxq == NULL) {
hns3_err(hw, "Failed to allocate memory for No.%u rx ring!",
q_info->idx);
@@ -1436,7 +1436,7 @@ hns3_alloc_rxq_and_dma_zone(struct rte_eth_dev *dev,
sizeof(struct hns3_desc);
rx_mz = rte_eth_dma_zone_reserve(dev, q_info->ring_name, q_info->idx,
rx_desc, HNS3_RING_BASE_ALIGN,
- q_info->socket_id);
+ q_info->numa_id);
if (rx_mz == NULL) {
hns3_err(hw, "Failed to reserve DMA memory for No.%u rx ring!",
q_info->idx);
@@ -1452,7 +1452,7 @@ hns3_alloc_rxq_and_dma_zone(struct rte_eth_dev *dev,
static int
hns3_fake_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx,
- uint16_t nb_desc, unsigned int socket_id)
+ uint16_t nb_desc, unsigned int numa_id)
{
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
@@ -1466,7 +1466,7 @@ hns3_fake_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx,
}
q_info.idx = idx;
- q_info.socket_id = socket_id;
+ q_info.numa_id = numa_id;
q_info.nb_desc = nb_desc;
q_info.type = "hns3 fake RX queue";
q_info.ring_name = "rx_fake_ring";
@@ -1506,8 +1506,8 @@ hns3_alloc_txq_and_dma_zone(struct rte_eth_dev *dev,
unsigned int tx_desc;
uint16_t i;
- txq = rte_zmalloc_socket(q_info->type, sizeof(struct hns3_tx_queue),
- RTE_CACHE_LINE_SIZE, q_info->socket_id);
+ txq = rte_zmalloc_numa(q_info->type, sizeof(struct hns3_tx_queue),
+ RTE_CACHE_LINE_SIZE, q_info->numa_id);
if (txq == NULL) {
hns3_err(hw, "Failed to allocate memory for No.%u tx ring!",
q_info->idx);
@@ -1520,7 +1520,7 @@ hns3_alloc_txq_and_dma_zone(struct rte_eth_dev *dev,
tx_desc = txq->nb_tx_desc * sizeof(struct hns3_desc);
tx_mz = rte_eth_dma_zone_reserve(dev, q_info->ring_name, q_info->idx,
tx_desc, HNS3_RING_BASE_ALIGN,
- q_info->socket_id);
+ q_info->numa_id);
if (tx_mz == NULL) {
hns3_err(hw, "Failed to reserve DMA memory for No.%u tx ring!",
q_info->idx);
@@ -1543,7 +1543,7 @@ hns3_alloc_txq_and_dma_zone(struct rte_eth_dev *dev,
static int
hns3_fake_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx,
- uint16_t nb_desc, unsigned int socket_id)
+ uint16_t nb_desc, unsigned int numa_id)
{
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
@@ -1557,7 +1557,7 @@ hns3_fake_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx,
}
q_info.idx = idx;
- q_info.socket_id = socket_id;
+ q_info.numa_id = numa_id;
q_info.nb_desc = nb_desc;
q_info.type = "hns3 fake TX queue";
q_info.ring_name = "tx_fake_ring";
@@ -1711,7 +1711,7 @@ hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev, uint16_t nb_rx_q,
port_id = hw->data->port_id;
for (q = 0; q < rx_need_add_nb_q; q++) {
ret = hns3_fake_rx_queue_setup(dev, q, HNS3_MIN_RING_DESC,
- rte_eth_dev_socket_id(port_id));
+ rte_eth_dev_numa_id(port_id));
if (ret)
goto setup_fake_rx_q_fail;
}
@@ -1719,7 +1719,7 @@ hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev, uint16_t nb_rx_q,
/* Allocate and set up fake TX queue per Ethernet port. */
for (q = 0; q < tx_need_add_nb_q; q++) {
ret = hns3_fake_tx_queue_setup(dev, q, HNS3_MIN_RING_DESC,
- rte_eth_dev_socket_id(port_id));
+ rte_eth_dev_numa_id(port_id));
if (ret)
goto setup_fake_tx_q_fail;
}
@@ -1909,7 +1909,7 @@ hns3_get_tqp_reg_offset(uint16_t queue_id)
int
hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
- unsigned int socket_id, const struct rte_eth_rxconf *conf,
+ unsigned int numa_id, const struct rte_eth_rxconf *conf,
struct rte_mempool *mp)
{
struct hns3_adapter *hns = dev->data->dev_private;
@@ -1930,7 +1930,7 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
}
q_info.idx = idx;
- q_info.socket_id = socket_id;
+ q_info.numa_id = numa_id;
q_info.nb_desc = nb_desc;
q_info.type = "hns3 RX queue";
q_info.ring_name = "rx_ring";
@@ -1956,8 +1956,8 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
rx_entry_len = (rxq->nb_rx_desc + HNS3_DEFAULT_RX_BURST) *
sizeof(struct hns3_entry);
- rxq->sw_ring = rte_zmalloc_socket("hns3 RX sw ring", rx_entry_len,
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq->sw_ring = rte_zmalloc_numa("hns3 RX sw ring", rx_entry_len,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq->sw_ring == NULL) {
hns3_err(hw, "Failed to allocate memory for rx sw ring!");
hns3_rx_queue_release(rxq);
@@ -3124,7 +3124,7 @@ hns3_tx_push_queue_init(struct rte_eth_dev *dev,
int
hns3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
- unsigned int socket_id, const struct rte_eth_txconf *conf)
+ unsigned int numa_id, const struct rte_eth_txconf *conf)
{
struct hns3_adapter *hns = dev->data->dev_private;
uint16_t tx_rs_thresh, tx_free_thresh;
@@ -3145,7 +3145,7 @@ hns3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
}
q_info.idx = idx;
- q_info.socket_id = socket_id;
+ q_info.numa_id = numa_id;
q_info.nb_desc = nb_desc;
q_info.type = "hns3 TX queue";
q_info.ring_name = "tx_ring";
@@ -3163,8 +3163,8 @@ hns3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
}
tx_entry_len = sizeof(struct hns3_entry) * txq->nb_tx_desc;
- txq->sw_ring = rte_zmalloc_socket("hns3 TX sw ring", tx_entry_len,
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq->sw_ring = rte_zmalloc_numa("hns3 TX sw ring", tx_entry_len,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL) {
hns3_err(hw, "Failed to allocate memory for tx sw ring!");
hns3_tx_queue_release(txq);
@@ -3177,9 +3177,9 @@ hns3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
txq->tx_bd_ready = txq->nb_tx_desc - 1;
txq->tx_free_thresh = tx_free_thresh;
txq->tx_rs_thresh = tx_rs_thresh;
- txq->free = rte_zmalloc_socket("hns3 TX mbuf free array",
+ txq->free = rte_zmalloc_numa("hns3 TX mbuf free array",
sizeof(struct rte_mbuf *) * txq->tx_rs_thresh,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq->free) {
hns3_err(hw, "failed to allocate tx mbuf free array!");
hns3_tx_queue_release(txq);
diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
index c046ff21ee..2ba7ac0034 100644
--- a/drivers/net/hns3/hns3_rxtx.h
+++ b/drivers/net/hns3/hns3_rxtx.h
@@ -596,7 +596,7 @@ struct hns3_queue_info {
const char *ring_name; /* point to hardware ring name */
uint16_t idx;
uint16_t nb_desc;
- unsigned int socket_id;
+ unsigned int numa_id;
};
#define HNS3_TX_CKSUM_OFFLOAD_MASK (RTE_MBUF_F_TX_OUTER_UDP_CKSUM | \
@@ -745,11 +745,11 @@ int hns3_rxq_iterate(struct rte_eth_dev *dev,
int (*callback)(struct hns3_rx_queue *, void *), void *arg);
void hns3_dev_release_mbufs(struct hns3_adapter *hns);
int hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *conf,
struct rte_mempool *mp);
int hns3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *conf);
int hns3_rx_queue_count(void *rx_queue);
int hns3_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 124/227] net/intel: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (122 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 123/227] net/hns3: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 125/227] net/ionic: " Chengwen Feng
` (103 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/intel/cpfl/cpfl_representor.c | 4 +-
drivers/net/intel/cpfl/cpfl_rxtx.c | 74 +++++++++----------
drivers/net/intel/cpfl/cpfl_rxtx.h | 4 +-
drivers/net/intel/e1000/e1000_ethdev.h | 8 +-
drivers/net/intel/e1000/em_rxtx.c | 8 +-
drivers/net/intel/e1000/igb_rxtx.c | 8 +-
drivers/net/intel/e1000/igc_txrx.c | 8 +-
drivers/net/intel/e1000/igc_txrx.h | 4 +-
drivers/net/intel/fm10k/fm10k_ethdev.c | 28 +++----
drivers/net/intel/i40e/i40e_ethdev.c | 2 +-
drivers/net/intel/i40e/i40e_ethdev.h | 2 +-
drivers/net/intel/i40e/i40e_fdir.c | 6 +-
drivers/net/intel/i40e/i40e_rxtx.c | 44 +++++------
drivers/net/intel/i40e/i40e_rxtx.h | 4 +-
drivers/net/intel/i40e/i40e_vf_representor.c | 4 +-
drivers/net/intel/iavf/iavf_osdep.c | 2 +-
drivers/net/intel/iavf/iavf_rxtx.c | 32 ++++----
drivers/net/intel/iavf/iavf_rxtx.h | 4 +-
.../net/intel/ice/ice_dcf_vf_representor.c | 4 +-
drivers/net/intel/ice/ice_fdir_filter.c | 6 +-
drivers/net/intel/ice/ice_osdep.h | 2 +-
drivers/net/intel/ice/ice_rxtx.c | 46 ++++++------
drivers/net/intel/ice/ice_rxtx.h | 4 +-
drivers/net/intel/idpf/idpf_common_rxtx.c | 6 +-
drivers/net/intel/idpf/idpf_common_rxtx.h | 2 +-
drivers/net/intel/idpf/idpf_osdep.h | 2 +-
drivers/net/intel/idpf/idpf_rxtx.c | 60 +++++++--------
drivers/net/intel/idpf/idpf_rxtx.h | 4 +-
drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 2 +-
drivers/net/intel/ipn3ke/ipn3ke_representor.c | 4 +-
drivers/net/intel/ixgbe/ixgbe_ethdev.h | 4 +-
drivers/net/intel/ixgbe/ixgbe_rxtx.c | 32 ++++----
.../net/intel/ixgbe/ixgbe_vf_representor.c | 4 +-
33 files changed, 214 insertions(+), 214 deletions(-)
diff --git a/drivers/net/intel/cpfl/cpfl_representor.c b/drivers/net/intel/cpfl/cpfl_representor.c
index bb28c0b989..e7c631dbd6 100644
--- a/drivers/net/intel/cpfl/cpfl_representor.c
+++ b/drivers/net/intel/cpfl/cpfl_representor.c
@@ -292,7 +292,7 @@ static int
cpfl_repr_rx_queue_setup(__rte_unused struct rte_eth_dev *dev,
__rte_unused uint16_t queue_id,
__rte_unused uint16_t nb_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *conf,
__rte_unused struct rte_mempool *pool)
{
@@ -304,7 +304,7 @@ static int
cpfl_repr_tx_queue_setup(__rte_unused struct rte_eth_dev *dev,
__rte_unused uint16_t queue_id,
__rte_unused uint16_t nb_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_txconf *conf)
{
/* Dummy */
diff --git a/drivers/net/intel/cpfl/cpfl_rxtx.c b/drivers/net/intel/cpfl/cpfl_rxtx.c
index a358beca23..5082a5d6b7 100644
--- a/drivers/net/intel/cpfl/cpfl_rxtx.c
+++ b/drivers/net/intel/cpfl/cpfl_rxtx.c
@@ -119,7 +119,7 @@ static const struct idpf_rxq_ops def_rxq_ops = {
static const struct rte_memzone *
cpfl_dma_zone_reserve(struct rte_eth_dev *dev, uint16_t queue_idx,
uint16_t len, uint16_t queue_type,
- unsigned int socket_id, bool splitq)
+ unsigned int numa_id, bool splitq)
{
char ring_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz;
@@ -162,7 +162,7 @@ cpfl_dma_zone_reserve(struct rte_eth_dev *dev, uint16_t queue_idx,
mz = rte_eth_dma_zone_reserve(dev, ring_name, queue_idx,
ring_size, CPFL_RING_BASE_ALIGN,
- socket_id);
+ numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "Failed to reserve DMA memory for ring");
return NULL;
@@ -183,7 +183,7 @@ cpfl_dma_zone_release(const struct rte_memzone *mz)
static int
cpfl_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq,
uint16_t queue_idx, uint16_t rx_free_thresh,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
struct rte_mempool *mp, uint8_t bufq_id)
{
struct cpfl_vport *cpfl_vport = dev->data->dev_private;
@@ -195,10 +195,10 @@ cpfl_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq,
uint16_t len;
int ret;
- bufq = rte_zmalloc_socket("cpfl bufq",
+ bufq = rte_zmalloc_numa("cpfl bufq",
sizeof(struct idpf_rx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (bufq == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for rx buffer queue.");
ret = -ENOMEM;
@@ -222,7 +222,7 @@ cpfl_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq,
mz = cpfl_dma_zone_reserve(dev, queue_idx, len,
VIRTCHNL2_QUEUE_TYPE_RX_BUFFER,
- socket_id, true);
+ numa_id, true);
if (mz == NULL) {
ret = -ENOMEM;
goto err_mz_reserve;
@@ -233,10 +233,10 @@ cpfl_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq,
bufq->mz = mz;
bufq->sw_ring =
- rte_zmalloc_socket("cpfl rx bufq sw ring",
+ rte_zmalloc_numa("cpfl rx bufq sw ring",
sizeof(struct rte_mbuf *) * len,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (bufq->sw_ring == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW ring");
ret = -ENOMEM;
@@ -339,7 +339,7 @@ cpfl_tx_queue_release(void *txq)
int
cpfl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -382,10 +382,10 @@ cpfl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
/* Setup Rx queue */
- cpfl_rxq = rte_zmalloc_socket("cpfl rxq",
+ cpfl_rxq = rte_zmalloc_numa("cpfl rxq",
sizeof(struct cpfl_rx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (cpfl_rxq == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for rx queue data structure");
ret = -ENOMEM;
@@ -412,7 +412,7 @@ cpfl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
/* Allocate a little more to support bulk allocate. */
len = nb_desc + IDPF_RX_MAX_BURST;
mz = cpfl_dma_zone_reserve(dev, queue_idx, len, VIRTCHNL2_QUEUE_TYPE_RX,
- socket_id, is_splitq);
+ numa_id, is_splitq);
if (mz == NULL) {
ret = -ENOMEM;
goto err_mz_reserve;
@@ -422,10 +422,10 @@ cpfl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
rxq->mz = mz;
if (!is_splitq) {
- rxq->sw_ring = rte_zmalloc_socket("cpfl rxq sw ring",
+ rxq->sw_ring = rte_zmalloc_numa("cpfl rxq sw ring",
sizeof(struct rte_mbuf *) * len,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (rxq->sw_ring == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW ring");
ret = -ENOMEM;
@@ -442,7 +442,7 @@ cpfl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
/* Setup Rx buffer queues */
ret = cpfl_rx_split_bufq_setup(dev, rxq, 2 * queue_idx,
rx_free_thresh, nb_desc,
- socket_id, mp, 1);
+ numa_id, mp, 1);
if (ret != 0) {
PMD_INIT_LOG(ERR, "Failed to setup buffer queue 1");
ret = -EINVAL;
@@ -451,7 +451,7 @@ cpfl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
ret = cpfl_rx_split_bufq_setup(dev, rxq, 2 * queue_idx + 1,
rx_free_thresh, nb_desc,
- socket_id, mp, 2);
+ numa_id, mp, 2);
if (ret != 0) {
PMD_INIT_LOG(ERR, "Failed to setup buffer queue 2");
ret = -EINVAL;
@@ -479,7 +479,7 @@ cpfl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
static int
cpfl_tx_complq_setup(struct rte_eth_dev *dev, struct ci_tx_queue *txq,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id)
+ unsigned int numa_id)
{
struct cpfl_vport *cpfl_vport = dev->data->dev_private;
struct idpf_vport *vport = &cpfl_vport->base;
@@ -487,10 +487,10 @@ cpfl_tx_complq_setup(struct rte_eth_dev *dev, struct ci_tx_queue *txq,
struct idpf_complq *cq;
int ret;
- cq = rte_zmalloc_socket("cpfl splitq cq",
+ cq = rte_zmalloc_numa("cpfl splitq cq",
sizeof(*cq),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (cq == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for Tx compl queue");
ret = -ENOMEM;
@@ -505,7 +505,7 @@ cpfl_tx_complq_setup(struct rte_eth_dev *dev, struct ci_tx_queue *txq,
mz = cpfl_dma_zone_reserve(dev, queue_idx, nb_desc,
VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION,
- socket_id, true);
+ numa_id, true);
if (mz == NULL) {
ret = -ENOMEM;
goto err_mz_reserve;
@@ -527,7 +527,7 @@ cpfl_tx_complq_setup(struct rte_eth_dev *dev, struct ci_tx_queue *txq,
int
cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct cpfl_vport *cpfl_vport = dev->data->dev_private;
@@ -558,10 +558,10 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
/* Allocate the TX queue data structure. */
- cpfl_txq = rte_zmalloc_socket("cpfl txq",
+ cpfl_txq = rte_zmalloc_numa("cpfl txq",
sizeof(struct cpfl_tx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (cpfl_txq == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for tx queue structure");
ret = -ENOMEM;
@@ -587,7 +587,7 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
/* Allocate TX hardware ring descriptors. */
mz = cpfl_dma_zone_reserve(dev, queue_idx, nb_desc, VIRTCHNL2_QUEUE_TYPE_TX,
- socket_id, is_splitq);
+ numa_id, is_splitq);
if (mz == NULL) {
ret = -ENOMEM;
goto err_mz_reserve;
@@ -596,9 +596,9 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
txq->mz = mz;
if (!is_splitq) {
- txq->sw_ring = rte_zmalloc_socket("cpfl tx sw ring",
+ txq->sw_ring = rte_zmalloc_numa("cpfl tx sw ring",
sizeof(struct ci_tx_entry) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW TX ring");
ret = -ENOMEM;
@@ -607,9 +607,9 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
/* Allocate RS last_id tracking array */
const uint16_t num_rs_buckets = nb_desc / tx_rs_thresh;
- txq->rs_last_id = rte_zmalloc_socket("cpfl tx rs_last_id",
+ txq->rs_last_id = rte_zmalloc_numa("cpfl tx rs_last_id",
sizeof(txq->rs_last_id[0]) * num_rs_buckets,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->rs_last_id == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for RS last_id array");
ret = -ENOMEM;
@@ -620,14 +620,14 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
idpf_qc_single_tx_queue_reset(txq);
} else {
txq->desc_ring = mz->addr;
- ret = idpf_qc_split_tx_pending_alloc(txq, socket_id);
+ ret = idpf_qc_split_tx_pending_alloc(txq, numa_id);
if (ret != 0)
goto err_sw_ring_alloc;
idpf_qc_split_tx_descq_reset(txq);
/* Setup tx completion queue if split model */
ret = cpfl_tx_complq_setup(dev, txq, queue_idx,
- 2 * nb_desc, socket_id);
+ 2 * nb_desc, numa_id);
if (ret != 0)
goto err_complq_setup;
}
@@ -735,10 +735,10 @@ cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
/* Setup Rx description queue */
- cpfl_rxq = rte_zmalloc_socket("cpfl hairpin rxq",
+ cpfl_rxq = rte_zmalloc_numa("cpfl hairpin rxq",
sizeof(struct cpfl_rx_queue),
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!cpfl_rxq) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for rx queue data structure");
return -ENOMEM;
@@ -761,10 +761,10 @@ cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
cpfl_vport->p2p_manual_bind = false;
if (cpfl_vport->p2p_rx_bufq == NULL) {
- bufq1 = rte_zmalloc_socket("hairpin rx bufq1",
+ bufq1 = rte_zmalloc_numa("hairpin rx bufq1",
sizeof(struct idpf_rx_queue),
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!bufq1) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for hairpin Rx buffer queue 1.");
ret = -ENOMEM;
@@ -847,10 +847,10 @@ cpfl_tx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
/* Allocate the TX queue data structure. */
- cpfl_txq = rte_zmalloc_socket("cpfl hairpin txq",
+ cpfl_txq = rte_zmalloc_numa("cpfl hairpin txq",
sizeof(struct cpfl_tx_queue),
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!cpfl_txq) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for tx queue structure");
return -ENOMEM;
@@ -893,7 +893,7 @@ cpfl_tx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
cpfl_hw_qtail_get(cpfl_vport->p2p_q_chunks_info->tx_qtail_start,
logic_qid, cpfl_vport->p2p_q_chunks_info->tx_qtail_spacing);
if (cpfl_vport->p2p_tx_complq == NULL) {
- cq = rte_zmalloc_socket("cpfl hairpin cq",
+ cq = rte_zmalloc_numa("cpfl hairpin cq",
sizeof(struct idpf_complq),
RTE_CACHE_LINE_SIZE,
dev->device->numa_node);
diff --git a/drivers/net/intel/cpfl/cpfl_rxtx.h b/drivers/net/intel/cpfl/cpfl_rxtx.h
index 52cdecac88..6ae03b1a75 100644
--- a/drivers/net/intel/cpfl/cpfl_rxtx.h
+++ b/drivers/net/intel/cpfl/cpfl_rxtx.h
@@ -88,10 +88,10 @@ cpfl_hw_qtail_get(uint64_t tail_start, uint16_t offset, uint64_t tail_spacing)
}
int cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int cpfl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
int cpfl_rx_queue_init(struct rte_eth_dev *dev, uint16_t rx_queue_id);
diff --git a/drivers/net/intel/e1000/e1000_ethdev.h b/drivers/net/intel/e1000/e1000_ethdev.h
index 0907c7c259..539fe1e028 100644
--- a/drivers/net/intel/e1000/e1000_ethdev.h
+++ b/drivers/net/intel/e1000/e1000_ethdev.h
@@ -410,7 +410,7 @@ uint64_t igb_get_rx_port_offloads_capa(struct rte_eth_dev *dev);
uint64_t igb_get_rx_queue_offloads_capa(struct rte_eth_dev *dev);
int eth_igb_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
@@ -423,7 +423,7 @@ uint64_t igb_get_tx_port_offloads_capa(struct rte_eth_dev *dev);
uint64_t igb_get_tx_queue_offloads_capa(struct rte_eth_dev *dev);
int eth_igb_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int eth_igb_tx_done_cleanup(void *txq, uint32_t free_cnt);
@@ -484,7 +484,7 @@ uint64_t em_get_rx_port_offloads_capa(void);
uint64_t em_get_rx_queue_offloads_capa(void);
int eth_em_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
@@ -497,7 +497,7 @@ uint64_t em_get_tx_port_offloads_capa(struct rte_eth_dev *dev);
uint64_t em_get_tx_queue_offloads_capa(struct rte_eth_dev *dev);
int eth_em_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int eth_em_rx_init(struct rte_eth_dev *dev);
diff --git a/drivers/net/intel/e1000/em_rxtx.c b/drivers/net/intel/e1000/em_rxtx.c
index 3e18ac994a..47891e96a8 100644
--- a/drivers/net/intel/e1000/em_rxtx.c
+++ b/drivers/net/intel/e1000/em_rxtx.c
@@ -1193,7 +1193,7 @@ int
eth_em_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
const struct rte_memzone *tz;
@@ -1274,7 +1274,7 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,
*/
tsize = sizeof(txq->tx_ring[0]) * E1000_MAX_RING_DESC;
tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, tsize,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (tz == NULL)
return -ENOMEM;
@@ -1393,7 +1393,7 @@ int
eth_em_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -1437,7 +1437,7 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,
/* Allocate RX ring for max possible mumber of hardware descriptors. */
rsize = sizeof(rxq->rx_ring[0]) * E1000_MAX_RING_DESC;
rz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx, rsize,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rz == NULL)
return -ENOMEM;
diff --git a/drivers/net/intel/e1000/igb_rxtx.c b/drivers/net/intel/e1000/igb_rxtx.c
index ef531f1cd4..c91c7fc6fd 100644
--- a/drivers/net/intel/e1000/igb_rxtx.c
+++ b/drivers/net/intel/e1000/igb_rxtx.c
@@ -1498,7 +1498,7 @@ int
eth_igb_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
const struct rte_memzone *tz;
@@ -1556,7 +1556,7 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,
*/
size = sizeof(union e1000_adv_tx_desc) * E1000_MAX_RING_DESC;
tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, size,
- E1000_ALIGN, socket_id);
+ E1000_ALIGN, numa_id);
if (tz == NULL) {
igb_tx_queue_release(txq);
return -ENOMEM;
@@ -1697,7 +1697,7 @@ int
eth_igb_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -1760,7 +1760,7 @@ eth_igb_rx_queue_setup(struct rte_eth_dev *dev,
*/
size = sizeof(union e1000_adv_rx_desc) * E1000_MAX_RING_DESC;
rz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx, size,
- E1000_ALIGN, socket_id);
+ E1000_ALIGN, numa_id);
if (rz == NULL) {
igb_rx_queue_release(rxq);
return -ENOMEM;
diff --git a/drivers/net/intel/e1000/igc_txrx.c b/drivers/net/intel/e1000/igc_txrx.c
index dca66c3c2c..468327287f 100644
--- a/drivers/net/intel/e1000/igc_txrx.c
+++ b/drivers/net/intel/e1000/igc_txrx.c
@@ -1260,7 +1260,7 @@ int
eth_igc_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -1313,7 +1313,7 @@ eth_igc_rx_queue_setup(struct rte_eth_dev *dev,
*/
size = sizeof(union e1000_adv_rx_desc) * IGC_MAX_RXD;
rz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx, size,
- IGC_ALIGN, socket_id);
+ IGC_ALIGN, numa_id);
if (rz == NULL) {
igc_rx_queue_release(rxq);
return -ENOMEM;
@@ -2072,7 +2072,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
}
int eth_igc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
const struct rte_memzone *tz;
@@ -2124,7 +2124,7 @@ int eth_igc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
*/
size = sizeof(union e1000_adv_tx_desc) * IGC_MAX_TXD;
tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, size,
- IGC_ALIGN, socket_id);
+ IGC_ALIGN, numa_id);
if (tz == NULL) {
igc_tx_queue_release(txq);
return -ENOMEM;
diff --git a/drivers/net/intel/e1000/igc_txrx.h b/drivers/net/intel/e1000/igc_txrx.h
index 29cb138312..5d0ddca3e6 100644
--- a/drivers/net/intel/e1000/igc_txrx.h
+++ b/drivers/net/intel/e1000/igc_txrx.h
@@ -146,7 +146,7 @@ void eth_igc_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
void eth_igc_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
void igc_dev_clear_queues(struct rte_eth_dev *dev);
int eth_igc_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
@@ -157,7 +157,7 @@ int eth_igc_rx_descriptor_status(void *rx_queue, uint16_t offset);
int eth_igc_tx_descriptor_status(void *tx_queue, uint16_t offset);
int eth_igc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int eth_igc_tx_done_cleanup(void *txqueue, uint32_t free_cnt);
diff --git a/drivers/net/intel/fm10k/fm10k_ethdev.c b/drivers/net/intel/fm10k/fm10k_ethdev.c
index 5aa15a8dba..ce6fb14d91 100644
--- a/drivers/net/intel/fm10k/fm10k_ethdev.c
+++ b/drivers/net/intel/fm10k/fm10k_ethdev.c
@@ -1783,7 +1783,7 @@ static uint64_t fm10k_get_rx_port_offloads_capa(struct rte_eth_dev *dev)
static int
fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *conf, struct rte_mempool *mp)
{
struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -1826,8 +1826,8 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
}
/* allocate memory for the queue structure */
- q = rte_zmalloc_socket("fm10k", sizeof(*q), RTE_CACHE_LINE_SIZE,
- socket_id);
+ q = rte_zmalloc_numa("fm10k", sizeof(*q), RTE_CACHE_LINE_SIZE,
+ numa_id);
if (q == NULL) {
PMD_INIT_LOG(ERR, "Cannot allocate queue structure");
return -ENOMEM;
@@ -1847,9 +1847,9 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
return -EINVAL;
}
/* allocate memory for the software ring */
- q->sw_ring = rte_zmalloc_socket("fm10k sw ring",
+ q->sw_ring = rte_zmalloc_numa("fm10k sw ring",
(nb_desc + q->nb_fake_desc) * sizeof(struct rte_mbuf *),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (q->sw_ring == NULL) {
PMD_INIT_LOG(ERR, "Cannot allocate software ring");
rte_free(q);
@@ -1863,7 +1863,7 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
*/
mz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_id,
FM10K_MAX_RX_RING_SZ, FM10K_ALIGN_RX_DESC,
- socket_id);
+ numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "Cannot allocate hardware ring");
rte_free(q->sw_ring);
@@ -1973,7 +1973,7 @@ static uint64_t fm10k_get_tx_port_offloads_capa(struct rte_eth_dev *dev)
static int
fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *conf)
{
struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -2010,8 +2010,8 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
}
/* allocate memory for the queue structure */
- q = rte_zmalloc_socket("fm10k", sizeof(*q), RTE_CACHE_LINE_SIZE,
- socket_id);
+ q = rte_zmalloc_numa("fm10k", sizeof(*q), RTE_CACHE_LINE_SIZE,
+ numa_id);
if (q == NULL) {
PMD_INIT_LOG(ERR, "Cannot allocate queue structure");
return -ENOMEM;
@@ -2031,9 +2031,9 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
}
/* allocate memory for the software ring */
- q->sw_ring = rte_zmalloc_socket("fm10k sw ring",
+ q->sw_ring = rte_zmalloc_numa("fm10k sw ring",
nb_desc * sizeof(struct rte_mbuf *),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (q->sw_ring == NULL) {
PMD_INIT_LOG(ERR, "Cannot allocate software ring");
rte_free(q);
@@ -2047,7 +2047,7 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
*/
mz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_id,
FM10K_MAX_TX_RING_SZ, FM10K_ALIGN_TX_DESC,
- socket_id);
+ numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "Cannot allocate hardware ring");
rte_free(q->sw_ring);
@@ -2061,10 +2061,10 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
* allocate memory for the RS bit tracker. Enough slots to hold the
* descriptor index for each RS bit needing to be set are required.
*/
- q->rs_tracker.list = rte_zmalloc_socket("fm10k rs tracker",
+ q->rs_tracker.list = rte_zmalloc_numa("fm10k rs tracker",
((nb_desc + 1) / q->rs_thresh) *
sizeof(uint16_t),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (q->rs_tracker.list == NULL) {
PMD_INIT_LOG(ERR, "Cannot allocate RS bit tracker");
rte_free(q->sw_ring);
diff --git a/drivers/net/intel/i40e/i40e_ethdev.c b/drivers/net/intel/i40e/i40e_ethdev.c
index 66db44aaa1..a1eeccad23 100644
--- a/drivers/net/intel/i40e/i40e_ethdev.c
+++ b/drivers/net/intel/i40e/i40e_ethdev.c
@@ -4462,7 +4462,7 @@ i40e_allocate_dma_mem_d(__rte_unused struct i40e_hw *hw,
snprintf(z_name, sizeof(z_name), "i40e_dma_%" PRIu64,
rte_atomic_fetch_add_explicit(&i40e_dma_memzone_id, 1, rte_memory_order_relaxed));
- mz = rte_memzone_reserve_bounded(z_name, size, SOCKET_ID_ANY,
+ mz = rte_memzone_reserve_bounded(z_name, size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG, alignment, RTE_PGSIZE_2M);
if (!mz)
return I40E_ERR_NO_MEMORY;
diff --git a/drivers/net/intel/i40e/i40e_ethdev.h b/drivers/net/intel/i40e/i40e_ethdev.h
index e5e136f554..8ba51c923e 100644
--- a/drivers/net/intel/i40e/i40e_ethdev.h
+++ b/drivers/net/intel/i40e/i40e_ethdev.h
@@ -1383,7 +1383,7 @@ int i40e_fdir_setup(struct i40e_pf *pf);
void i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi);
const struct rte_memzone *i40e_memzone_reserve(const char *name,
uint32_t len,
- int socket_id);
+ int numa_id);
void i40e_fdir_rx_proc_sync(struct rte_eth_dev_data *dev_data);
void i40e_fdir_teardown(struct i40e_pf *pf);
int i40e_fdir_engine_init(struct i40e_pf *pf);
diff --git a/drivers/net/intel/i40e/i40e_fdir.c b/drivers/net/intel/i40e/i40e_fdir.c
index 11e11b6713..f3323d194b 100644
--- a/drivers/net/intel/i40e/i40e_fdir.c
+++ b/drivers/net/intel/i40e/i40e_fdir.c
@@ -228,7 +228,7 @@ i40e_fdir_setup(struct i40e_pf *pf)
I40E_FDIR_MZ_NAME,
eth_dev->data->port_id);
mz = i40e_memzone_reserve(z_name, I40E_FDIR_PKT_LEN *
- I40E_FDIR_PRG_PKT_CNT, SOCKET_ID_ANY);
+ I40E_FDIR_PRG_PKT_CNT, RTE_NUMA_ID_ANY);
if (!mz) {
PMD_DRV_LOG(ERR, "Cannot init memzone for "
"flow director program packet.");
@@ -978,7 +978,7 @@ i40e_fdir_flow_store_init(struct rte_eth_dev *dev)
.key_len = sizeof(struct i40e_fdir_input),
.hash_func = rte_hash_crc,
.hash_func_init_val = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
};
char fdir_pool_name[RTE_MEMPOOL_NAMESIZE];
int ret;
@@ -1006,7 +1006,7 @@ i40e_fdir_flow_store_init(struct rte_eth_dev *dev)
RTE_MAX(i40e_flow_engine_fdir.flow_size,
i40e_flow_engine_fdir_ethertype.flow_size),
0, 0, NULL, NULL, NULL, NULL,
- rte_socket_id(),
+ rte_numa_id(),
/* pack flows tightly */
RTE_MEMPOOL_F_NO_SPREAD | RTE_MEMPOOL_F_NO_CACHE_ALIGN |
RTE_MEMPOOL_F_NO_IOVA_CONTIG |
diff --git a/drivers/net/intel/i40e/i40e_rxtx.c b/drivers/net/intel/i40e/i40e_rxtx.c
index 8bfd1e07d2..389f1448c9 100644
--- a/drivers/net/intel/i40e/i40e_rxtx.c
+++ b/drivers/net/intel/i40e/i40e_rxtx.c
@@ -1637,7 +1637,7 @@ int
i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -1689,10 +1689,10 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
}
/* Allocate the rx queue data structure */
- rxq = rte_zmalloc_socket("i40e rx queue",
+ rxq = rte_zmalloc_numa("i40e rx queue",
sizeof(struct ci_rx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for "
"rx queue data structure");
@@ -1726,7 +1726,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
I40E_DMA_MEM_ALIGN);
rz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx,
- ring_size, I40E_RING_BASE_ALIGN, socket_id);
+ ring_size, I40E_RING_BASE_ALIGN, numa_id);
if (!rz) {
i40e_rx_queue_release(rxq);
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for RX");
@@ -1744,10 +1744,10 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
/* Allocate the software ring. */
rxq->sw_ring =
- rte_zmalloc_socket("i40e rx sw ring",
+ rte_zmalloc_numa("i40e rx sw ring",
sizeof(struct ci_rx_entry) * len,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq->sw_ring) {
i40e_rx_queue_release(rxq);
PMD_DRV_LOG(ERR, "Failed to allocate memory for SW ring");
@@ -1965,7 +1965,7 @@ int
i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct i40e_vsi *vsi;
@@ -2106,10 +2106,10 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
}
/* Allocate the TX queue data structure. */
- txq = rte_zmalloc_socket("i40e tx queue",
+ txq = rte_zmalloc_numa("i40e tx queue",
sizeof(struct ci_tx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!txq) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for "
"tx queue structure");
@@ -2120,7 +2120,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
ring_size = sizeof(struct ci_tx_desc) * I40E_MAX_RING_DESC;
ring_size = RTE_ALIGN(ring_size, I40E_DMA_MEM_ALIGN);
tz = rte_eth_dma_zone_reserve(dev, "ci_tx_ring", queue_idx,
- ring_size, I40E_RING_BASE_ALIGN, socket_id);
+ ring_size, I40E_RING_BASE_ALIGN, numa_id);
if (!tz) {
i40e_tx_queue_release(txq);
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for TX");
@@ -2146,10 +2146,10 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
/* Allocate software ring */
txq->sw_ring =
- rte_zmalloc_socket("i40e tx sw ring",
+ rte_zmalloc_numa("i40e tx sw ring",
sizeof(struct ci_tx_entry) * nb_desc,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!txq->sw_ring) {
i40e_tx_queue_release(txq);
PMD_DRV_LOG(ERR, "Failed to allocate memory for SW TX ring");
@@ -2158,8 +2158,8 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
/* Allocate RS last_id tracking array */
uint16_t num_rs_buckets = nb_desc / tx_rs_thresh;
- txq->rs_last_id = rte_zmalloc_socket(NULL, sizeof(txq->rs_last_id[0]) * num_rs_buckets,
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq->rs_last_id = rte_zmalloc_numa(NULL, sizeof(txq->rs_last_id[0]) * num_rs_buckets,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->rs_last_id == NULL) {
i40e_tx_queue_release(txq);
PMD_DRV_LOG(ERR, "Failed to allocate memory for RS last_id array");
@@ -2217,7 +2217,7 @@ i40e_tx_queue_release(void *txq)
}
const struct rte_memzone *
-i40e_memzone_reserve(const char *name, uint32_t len, int socket_id)
+i40e_memzone_reserve(const char *name, uint32_t len, int numa_id)
{
const struct rte_memzone *mz;
@@ -2225,7 +2225,7 @@ i40e_memzone_reserve(const char *name, uint32_t len, int socket_id)
if (mz)
return mz;
- mz = rte_memzone_reserve_aligned(name, len, socket_id,
+ mz = rte_memzone_reserve_aligned(name, len, numa_id,
RTE_MEMZONE_IOVA_CONTIG, I40E_RING_BASE_ALIGN);
return mz;
}
@@ -2720,10 +2720,10 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf)
dev = &rte_eth_devices[pf->dev_data->port_id];
/* Allocate the TX queue data structure. */
- txq = rte_zmalloc_socket("i40e fdir tx queue",
+ txq = rte_zmalloc_numa("i40e fdir tx queue",
sizeof(struct ci_tx_queue),
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!txq) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for "
"tx queue structure.");
@@ -2736,7 +2736,7 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf)
tz = rte_eth_dma_zone_reserve(dev, "fdir_tx_ring",
I40E_FDIR_QUEUE_ID, ring_size,
- I40E_RING_BASE_ALIGN, SOCKET_ID_ANY);
+ I40E_RING_BASE_ALIGN, RTE_NUMA_ID_ANY);
if (!tz) {
i40e_tx_queue_release(txq);
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for TX.");
@@ -2779,10 +2779,10 @@ i40e_fdir_setup_rx_resources(struct i40e_pf *pf)
dev = &rte_eth_devices[pf->dev_data->port_id];
/* Allocate the RX queue data structure. */
- rxq = rte_zmalloc_socket("i40e fdir rx queue",
+ rxq = rte_zmalloc_numa("i40e fdir rx queue",
sizeof(struct ci_rx_queue),
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!rxq) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for "
"rx queue structure.");
@@ -2795,7 +2795,7 @@ i40e_fdir_setup_rx_resources(struct i40e_pf *pf)
rz = rte_eth_dma_zone_reserve(dev, "fdir_rx_ring",
I40E_FDIR_QUEUE_ID, ring_size,
- I40E_RING_BASE_ALIGN, SOCKET_ID_ANY);
+ I40E_RING_BASE_ALIGN, RTE_NUMA_ID_ANY);
if (!rz) {
i40e_rx_queue_release(rxq);
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for RX.");
diff --git a/drivers/net/intel/i40e/i40e_rxtx.h b/drivers/net/intel/i40e/i40e_rxtx.h
index 0977342064..c4eb1b43de 100644
--- a/drivers/net/intel/i40e/i40e_rxtx.h
+++ b/drivers/net/intel/i40e/i40e_rxtx.h
@@ -116,13 +116,13 @@ const uint32_t *i40e_dev_supported_ptypes_get(struct rte_eth_dev *dev,
int i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
int i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
void i40e_rx_queue_release(void *rxq);
void i40e_tx_queue_release(void *txq);
diff --git a/drivers/net/intel/i40e/i40e_vf_representor.c b/drivers/net/intel/i40e/i40e_vf_representor.c
index e8f0bb62a0..35f2d2abf3 100644
--- a/drivers/net/intel/i40e/i40e_vf_representor.c
+++ b/drivers/net/intel/i40e/i40e_vf_representor.c
@@ -131,7 +131,7 @@ static int
i40e_vf_representor_rx_queue_setup(__rte_unused struct rte_eth_dev *dev,
__rte_unused uint16_t rx_queue_id,
__rte_unused uint16_t nb_rx_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
__rte_unused struct rte_mempool *mb_pool)
{
@@ -142,7 +142,7 @@ static int
i40e_vf_representor_tx_queue_setup(__rte_unused struct rte_eth_dev *dev,
__rte_unused uint16_t rx_queue_id,
__rte_unused uint16_t nb_rx_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_txconf *tx_conf)
{
return 0;
diff --git a/drivers/net/intel/iavf/iavf_osdep.c b/drivers/net/intel/iavf/iavf_osdep.c
index c0ff301be5..732118dadb 100644
--- a/drivers/net/intel/iavf/iavf_osdep.c
+++ b/drivers/net/intel/iavf/iavf_osdep.c
@@ -27,7 +27,7 @@ iavf_allocate_dma_mem_d(__rte_unused struct iavf_hw *hw,
snprintf(z_name, sizeof(z_name), "iavf_dma_%" PRIu64,
rte_atomic_fetch_add_explicit(&iavf_dma_memzone_id, 1, rte_memory_order_relaxed));
- mz = rte_memzone_reserve_bounded(z_name, size, SOCKET_ID_ANY,
+ mz = rte_memzone_reserve_bounded(z_name, size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG, alignment,
RTE_PGSIZE_2M);
if (!mz)
diff --git a/drivers/net/intel/iavf/iavf_rxtx.c b/drivers/net/intel/iavf/iavf_rxtx.c
index 84b931e78a..6be1870099 100644
--- a/drivers/net/intel/iavf/iavf_rxtx.c
+++ b/drivers/net/intel/iavf/iavf_rxtx.c
@@ -534,7 +534,7 @@ iavf_select_rxd_to_pkt_fields_handler(struct ci_rx_queue *rxq, uint32_t rxdid)
int
iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -588,10 +588,10 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
/* Allocate the rx queue data structure */
- rxq = rte_zmalloc_socket("iavf rxq",
+ rxq = rte_zmalloc_numa("iavf rxq",
sizeof(struct ci_rx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for "
"rx queue data structure");
@@ -599,10 +599,10 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
/* Allocate stats */
- rxq->stats = rte_zmalloc_socket("iavf rxq stats",
+ rxq->stats = rte_zmalloc_numa("iavf rxq stats",
sizeof(struct iavf_rx_queue_stats),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq->stats) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for "
"rx queue stats");
@@ -662,10 +662,10 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
/* Allocate the software ring. */
len = nb_desc + IAVF_RX_MAX_BURST;
rxq->sw_ring =
- rte_zmalloc_socket("iavf rx sw ring",
+ rte_zmalloc_numa("iavf rx sw ring",
sizeof(struct rte_mbuf *) * len,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq->sw_ring) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW ring");
rte_free(rxq->stats);
@@ -681,7 +681,7 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
IAVF_DMA_MEM_ALIGN);
mz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx,
ring_size, IAVF_RING_BASE_ALIGN,
- socket_id);
+ numa_id);
if (!mz) {
PMD_INIT_LOG(ERR, "Failed to reserve DMA memory for RX");
rte_free(rxq->sw_ring);
@@ -729,7 +729,7 @@ int
iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -773,10 +773,10 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
}
/* Allocate the TX queue data structure. */
- txq = rte_zmalloc_socket("iavf txq",
+ txq = rte_zmalloc_numa("iavf txq",
sizeof(struct ci_tx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!txq) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for "
"tx queue structure");
@@ -822,10 +822,10 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
/* Allocate software ring */
txq->sw_ring =
- rte_zmalloc_socket("iavf tx sw ring",
+ rte_zmalloc_numa("iavf tx sw ring",
sizeof(struct ci_tx_entry) * nb_desc,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!txq->sw_ring) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW TX ring");
rte_free(txq);
@@ -834,8 +834,8 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
/* Allocate RS last_id tracking array */
uint16_t num_rs_buckets = nb_desc / tx_rs_thresh;
- txq->rs_last_id = rte_zmalloc_socket(NULL, sizeof(txq->rs_last_id[0]) * num_rs_buckets,
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq->rs_last_id = rte_zmalloc_numa(NULL, sizeof(txq->rs_last_id[0]) * num_rs_buckets,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->rs_last_id == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for RS last_id array");
rte_free(txq->sw_ring);
@@ -848,7 +848,7 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
ring_size = RTE_ALIGN(ring_size, IAVF_DMA_MEM_ALIGN);
mz = rte_eth_dma_zone_reserve(dev, "ci_tx_ring", queue_idx,
ring_size, IAVF_RING_BASE_ALIGN,
- socket_id);
+ numa_id);
if (!mz) {
PMD_INIT_LOG(ERR, "Failed to reserve DMA memory for TX");
rte_free(txq->sw_ring);
diff --git a/drivers/net/intel/iavf/iavf_rxtx.h b/drivers/net/intel/iavf/iavf_rxtx.h
index 812d7e23ee..2ebad546ae 100644
--- a/drivers/net/intel/iavf/iavf_rxtx.h
+++ b/drivers/net/intel/iavf/iavf_rxtx.h
@@ -452,7 +452,7 @@ enum iavf_rx_flex_desc_ipsec_crypto_status {
int iavf_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
@@ -466,7 +466,7 @@ int iavf_tx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id,
int iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int iavf_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id);
int iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id);
diff --git a/drivers/net/intel/ice/ice_dcf_vf_representor.c b/drivers/net/intel/ice/ice_dcf_vf_representor.c
index 564ff02fd8..d7dcac9f6b 100644
--- a/drivers/net/intel/ice/ice_dcf_vf_representor.c
+++ b/drivers/net/intel/ice/ice_dcf_vf_representor.c
@@ -79,7 +79,7 @@ static int
ice_dcf_vf_repr_rx_queue_setup(__rte_unused struct rte_eth_dev *dev,
__rte_unused uint16_t queue_id,
__rte_unused uint16_t nb_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *conf,
__rte_unused struct rte_mempool *pool)
{
@@ -90,7 +90,7 @@ static int
ice_dcf_vf_repr_tx_queue_setup(__rte_unused struct rte_eth_dev *dev,
__rte_unused uint16_t queue_id,
__rte_unused uint16_t nb_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_txconf *conf)
{
return 0;
diff --git a/drivers/net/intel/ice/ice_fdir_filter.c b/drivers/net/intel/ice/ice_fdir_filter.c
index 3a15abe422..34ab9fe68f 100644
--- a/drivers/net/intel/ice/ice_fdir_filter.c
+++ b/drivers/net/intel/ice/ice_fdir_filter.c
@@ -188,7 +188,7 @@ static int
ice_fdir_is_tunnel_profile(enum ice_fdir_tunnel_type tunnel_type);
static const struct rte_memzone *
-ice_memzone_reserve(const char *name, uint32_t len, int socket_id)
+ice_memzone_reserve(const char *name, uint32_t len, int numa_id)
{
const struct rte_memzone *mz;
@@ -196,7 +196,7 @@ ice_memzone_reserve(const char *name, uint32_t len, int socket_id)
if (mz)
return mz;
- return rte_memzone_reserve_aligned(name, len, socket_id,
+ return rte_memzone_reserve_aligned(name, len, numa_id,
RTE_MEMZONE_IOVA_CONTIG,
ICE_RING_BASE_ALIGN);
}
@@ -521,7 +521,7 @@ ice_fdir_setup(struct ice_pf *pf)
snprintf(z_name, sizeof(z_name), "ICE_%s_%d",
ICE_FDIR_MZ_NAME,
eth_dev->data->port_id);
- mz = ice_memzone_reserve(z_name, ICE_FDIR_PKT_LEN, SOCKET_ID_ANY);
+ mz = ice_memzone_reserve(z_name, ICE_FDIR_PKT_LEN, RTE_NUMA_ID_ANY);
if (!mz) {
PMD_DRV_LOG(ERR, "Cannot init memzone for "
"flow director program packet.");
diff --git a/drivers/net/intel/ice/ice_osdep.h b/drivers/net/intel/ice/ice_osdep.h
index f4ec8b8994..b07834e03b 100644
--- a/drivers/net/intel/ice/ice_osdep.h
+++ b/drivers/net/intel/ice/ice_osdep.h
@@ -257,7 +257,7 @@ ice_alloc_dma_mem(__rte_unused struct ice_hw *hw,
snprintf(z_name, sizeof(z_name), "ice_dma_%" PRIu64,
rte_atomic_fetch_add_explicit(&ice_dma_memzone_id, 1, rte_memory_order_relaxed));
- mz = rte_memzone_reserve_bounded(z_name, size, SOCKET_ID_ANY, 0,
+ mz = rte_memzone_reserve_bounded(z_name, size, RTE_NUMA_ID_ANY, 0,
0, RTE_PGSIZE_2M);
if (!mz)
return NULL;
diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c
index 6f19e070ee..5b3dc6fe44 100644
--- a/drivers/net/intel/ice/ice_rxtx.c
+++ b/drivers/net/intel/ice/ice_rxtx.c
@@ -1278,7 +1278,7 @@ int
ice_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -1332,10 +1332,10 @@ ice_rx_queue_setup(struct rte_eth_dev *dev,
}
/* Allocate the rx queue data structure */
- rxq = rte_zmalloc_socket(NULL,
+ rxq = rte_zmalloc_numa(NULL,
sizeof(struct ci_rx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for "
@@ -1390,7 +1390,7 @@ ice_rx_queue_setup(struct rte_eth_dev *dev,
ring_size = RTE_ALIGN(ring_size, ICE_DMA_MEM_ALIGN);
rz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx,
ring_size, ICE_RING_BASE_ALIGN,
- socket_id);
+ numa_id);
if (!rz) {
ice_rx_queue_release(rxq);
PMD_INIT_LOG(ERR, "Failed to reserve DMA memory for RX");
@@ -1413,10 +1413,10 @@ ice_rx_queue_setup(struct rte_eth_dev *dev,
tlen += len;
/* Allocate the software ring. */
- rxq->sw_ring = rte_zmalloc_socket(NULL,
+ rxq->sw_ring = rte_zmalloc_numa(NULL,
sizeof(struct ci_rx_entry) * tlen,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!rxq->sw_ring) {
ice_rx_queue_release(rxq);
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW ring");
@@ -1499,7 +1499,7 @@ int
ice_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -1624,10 +1624,10 @@ ice_tx_queue_setup(struct rte_eth_dev *dev,
}
/* Allocate the TX queue data structure. */
- txq = rte_zmalloc_socket(NULL,
+ txq = rte_zmalloc_numa(NULL,
sizeof(struct ci_tx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!txq) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for "
"tx queue structure");
@@ -1639,7 +1639,7 @@ ice_tx_queue_setup(struct rte_eth_dev *dev,
ring_size = RTE_ALIGN(ring_size, ICE_DMA_MEM_ALIGN);
tz = rte_eth_dma_zone_reserve(dev, "ci_tx_ring", queue_idx,
ring_size, ICE_RING_BASE_ALIGN,
- socket_id);
+ numa_id);
if (!tz) {
ice_tx_queue_release(txq);
PMD_INIT_LOG(ERR, "Failed to reserve DMA memory for TX");
@@ -1666,10 +1666,10 @@ ice_tx_queue_setup(struct rte_eth_dev *dev,
/* Allocate software ring */
txq->sw_ring =
- rte_zmalloc_socket(NULL,
+ rte_zmalloc_numa(NULL,
sizeof(struct ci_tx_entry) * nb_desc,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!txq->sw_ring) {
ice_tx_queue_release(txq);
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW TX ring");
@@ -1678,8 +1678,8 @@ ice_tx_queue_setup(struct rte_eth_dev *dev,
/* Allocate RS last_id tracking array */
uint16_t num_rs_buckets = nb_desc / tx_rs_thresh;
- txq->rs_last_id = rte_zmalloc_socket(NULL, sizeof(txq->rs_last_id[0]) * num_rs_buckets,
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq->rs_last_id = rte_zmalloc_numa(NULL, sizeof(txq->rs_last_id[0]) * num_rs_buckets,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->rs_last_id == NULL) {
ice_tx_queue_release(txq);
PMD_INIT_LOG(ERR, "Failed to allocate memory for RS last_id array");
@@ -1693,8 +1693,8 @@ ice_tx_queue_setup(struct rte_eth_dev *dev,
return -EINVAL;
}
- txq->tsq = rte_zmalloc_socket(NULL, sizeof(struct ice_txtime),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq->tsq = rte_zmalloc_numa(NULL, sizeof(struct ice_txtime),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq->tsq) {
ice_tx_queue_release(txq);
PMD_INIT_LOG(ERR, "Failed to allocate memory for tx time queue structure");
@@ -1714,7 +1714,7 @@ ice_tx_queue_setup(struct rte_eth_dev *dev,
ring_size = sizeof(struct ice_ts_desc) * txq->tsq->nb_ts_desc;
ring_size = RTE_ALIGN(ring_size, ICE_DMA_MEM_ALIGN);
const struct rte_memzone *ts_z = rte_eth_dma_zone_reserve(dev, "ice_tstamp_ring",
- queue_idx, ring_size, ICE_RING_BASE_ALIGN, socket_id);
+ queue_idx, ring_size, ICE_RING_BASE_ALIGN, numa_id);
if (!ts_z) {
ice_tx_queue_release(txq);
PMD_INIT_LOG(ERR, "Failed to reserve DMA memory for TX timestamp");
@@ -2633,10 +2633,10 @@ ice_fdir_setup_tx_resources(struct ice_pf *pf)
dev = &rte_eth_devices[pf->adapter->pf.dev_data->port_id];
/* Allocate the TX queue data structure. */
- txq = rte_zmalloc_socket("ice fdir tx queue",
+ txq = rte_zmalloc_numa("ice fdir tx queue",
sizeof(struct ci_tx_queue),
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!txq) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for "
"tx queue structure.");
@@ -2649,7 +2649,7 @@ ice_fdir_setup_tx_resources(struct ice_pf *pf)
tz = rte_eth_dma_zone_reserve(dev, "fdir_tx_ring",
ICE_FDIR_QUEUE_ID, ring_size,
- ICE_RING_BASE_ALIGN, SOCKET_ID_ANY);
+ ICE_RING_BASE_ALIGN, RTE_NUMA_ID_ANY);
if (!tz) {
ice_tx_queue_release(txq);
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for TX.");
@@ -2691,10 +2691,10 @@ ice_fdir_setup_rx_resources(struct ice_pf *pf)
dev = &rte_eth_devices[pf->adapter->pf.dev_data->port_id];
/* Allocate the RX queue data structure. */
- rxq = rte_zmalloc_socket("ice fdir rx queue",
+ rxq = rte_zmalloc_numa("ice fdir rx queue",
sizeof(struct ci_rx_queue),
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!rxq) {
PMD_DRV_LOG(ERR, "Failed to allocate memory for "
"rx queue structure.");
@@ -2707,7 +2707,7 @@ ice_fdir_setup_rx_resources(struct ice_pf *pf)
rz = rte_eth_dma_zone_reserve(dev, "fdir_rx_ring",
ICE_FDIR_QUEUE_ID, ring_size,
- ICE_RING_BASE_ALIGN, SOCKET_ID_ANY);
+ ICE_RING_BASE_ALIGN, RTE_NUMA_ID_ANY);
if (!rz) {
ice_rx_queue_release(rxq);
PMD_DRV_LOG(ERR, "Failed to reserve DMA memory for RX.");
diff --git a/drivers/net/intel/ice/ice_rxtx.h b/drivers/net/intel/ice/ice_rxtx.h
index 3332053d3d..15ebe0b7ad 100644
--- a/drivers/net/intel/ice/ice_rxtx.h
+++ b/drivers/net/intel/ice/ice_rxtx.h
@@ -209,13 +209,13 @@ struct ice_32b_rx_flex_desc_comms_ovs {
int ice_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
int ice_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int ice_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id);
int ice_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id);
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx.c b/drivers/net/intel/idpf/idpf_common_rxtx.c
index eb29024547..2cf7be6060 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx.c
+++ b/drivers/net/intel/idpf/idpf_common_rxtx.c
@@ -230,12 +230,12 @@ idpf_qc_split_tx_descq_reset(struct ci_tx_queue *txq)
RTE_EXPORT_INTERNAL_SYMBOL(idpf_qc_split_tx_pending_alloc)
int
-idpf_qc_split_tx_pending_alloc(struct ci_tx_queue *txq, unsigned int socket_id)
+idpf_qc_split_tx_pending_alloc(struct ci_tx_queue *txq, unsigned int numa_id)
{
/* Scalar completion tags and vector descriptor indices both use nb_tx_desc pointers. */
- txq->tx_pending_pkts = rte_zmalloc_socket("idpf_tx_pending",
+ txq->tx_pending_pkts = rte_zmalloc_numa("idpf_tx_pending",
sizeof(struct rte_mbuf *) * txq->nb_tx_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->tx_pending_pkts == NULL) {
DRV_LOG(ERR, "Failed to alloc idpf tx_pending shadow ring");
return -ENOMEM;
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx.h b/drivers/net/intel/idpf/idpf_common_rxtx.h
index a4843c9f69..a74179d233 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx.h
+++ b/drivers/net/intel/idpf/idpf_common_rxtx.h
@@ -216,7 +216,7 @@ void idpf_qc_single_rx_queue_reset(struct idpf_rx_queue *rxq);
__rte_internal
void idpf_qc_split_tx_descq_reset(struct ci_tx_queue *txq);
__rte_internal
-int idpf_qc_split_tx_pending_alloc(struct ci_tx_queue *txq, unsigned int socket_id);
+int idpf_qc_split_tx_pending_alloc(struct ci_tx_queue *txq, unsigned int numa_id);
__rte_internal
void idpf_qc_split_tx_release_mbufs(struct ci_tx_queue *txq);
__rte_internal
diff --git a/drivers/net/intel/idpf/idpf_osdep.h b/drivers/net/intel/idpf/idpf_osdep.h
index 7d99a23cf8..68b8b7bc53 100644
--- a/drivers/net/intel/idpf/idpf_osdep.h
+++ b/drivers/net/intel/idpf/idpf_osdep.h
@@ -241,7 +241,7 @@ idpf_alloc_dma_mem(__rte_unused struct idpf_hw *hw,
return NULL;
snprintf(z_name, sizeof(z_name), "idpf_dma_%"PRIu64, rte_rand());
- mz = rte_memzone_reserve_aligned(z_name, size, SOCKET_ID_ANY,
+ mz = rte_memzone_reserve_aligned(z_name, size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG, RTE_PGSIZE_4K);
if (!mz)
return NULL;
diff --git a/drivers/net/intel/idpf/idpf_rxtx.c b/drivers/net/intel/idpf/idpf_rxtx.c
index 3bee388c17..124826dc85 100644
--- a/drivers/net/intel/idpf/idpf_rxtx.c
+++ b/drivers/net/intel/idpf/idpf_rxtx.c
@@ -59,7 +59,7 @@ static const struct idpf_rxq_ops def_rxq_ops = {
static const struct rte_memzone *
idpf_dma_zone_reserve(struct rte_eth_dev *dev, uint16_t queue_idx,
uint16_t len, uint16_t queue_type,
- unsigned int socket_id, bool splitq)
+ unsigned int numa_id, bool splitq)
{
char ring_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz;
@@ -102,7 +102,7 @@ idpf_dma_zone_reserve(struct rte_eth_dev *dev, uint16_t queue_idx,
mz = rte_eth_dma_zone_reserve(dev, ring_name, queue_idx,
ring_size, IDPF_RING_BASE_ALIGN,
- socket_id);
+ numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "Failed to reserve DMA memory for ring");
return NULL;
@@ -123,7 +123,7 @@ idpf_dma_zone_release(const struct rte_memzone *mz)
static int
idpf_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq,
uint16_t queue_idx, uint16_t rx_free_thresh,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
struct rte_mempool *mp, uint8_t bufq_id)
{
struct idpf_vport *vport = dev->data->dev_private;
@@ -134,10 +134,10 @@ idpf_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq,
uint16_t len;
int ret;
- bufq = rte_zmalloc_socket("idpf bufq",
+ bufq = rte_zmalloc_numa("idpf bufq",
sizeof(struct idpf_rx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (bufq == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for rx buffer queue.");
ret = -ENOMEM;
@@ -161,7 +161,7 @@ idpf_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq,
mz = idpf_dma_zone_reserve(dev, queue_idx, len,
VIRTCHNL2_QUEUE_TYPE_RX_BUFFER,
- socket_id, true);
+ numa_id, true);
if (mz == NULL) {
ret = -ENOMEM;
goto err_mz_reserve;
@@ -172,10 +172,10 @@ idpf_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq,
bufq->mz = mz;
bufq->sw_ring =
- rte_zmalloc_socket("idpf rx bufq sw ring",
+ rte_zmalloc_numa("idpf rx bufq sw ring",
sizeof(struct rte_mbuf *) * len,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (bufq->sw_ring == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW ring");
ret = -ENOMEM;
@@ -220,7 +220,7 @@ idpf_rx_split_bufq_release(struct idpf_rx_queue *bufq)
int
idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -261,10 +261,10 @@ idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
/* Setup Rx queue */
- rxq = rte_zmalloc_socket("idpf rxq",
+ rxq = rte_zmalloc_numa("idpf rxq",
sizeof(struct idpf_rx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (rxq == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for rx queue data structure");
ret = -ENOMEM;
@@ -290,7 +290,7 @@ idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
/* Allocate a little more to support bulk allocate. */
len = nb_desc + IDPF_RX_MAX_BURST;
mz = idpf_dma_zone_reserve(dev, queue_idx, len, VIRTCHNL2_QUEUE_TYPE_RX,
- socket_id, is_splitq);
+ numa_id, is_splitq);
if (mz == NULL) {
ret = -ENOMEM;
goto err_mz_reserve;
@@ -300,10 +300,10 @@ idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
rxq->mz = mz;
if (!is_splitq) {
- rxq->sw_ring = rte_zmalloc_socket("idpf rxq sw ring",
+ rxq->sw_ring = rte_zmalloc_numa("idpf rxq sw ring",
sizeof(struct rte_mbuf *) * len,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (rxq->sw_ring == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW ring");
ret = -ENOMEM;
@@ -320,7 +320,7 @@ idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
/* Setup Rx buffer queues */
ret = idpf_rx_split_bufq_setup(dev, rxq, 2 * queue_idx,
rx_free_thresh, nb_desc,
- socket_id, mp, 1);
+ numa_id, mp, 1);
if (ret != 0) {
PMD_INIT_LOG(ERR, "Failed to setup buffer queue 1");
ret = -EINVAL;
@@ -329,7 +329,7 @@ idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
ret = idpf_rx_split_bufq_setup(dev, rxq, 2 * queue_idx + 1,
rx_free_thresh, nb_desc,
- socket_id, mp, 2);
+ numa_id, mp, 2);
if (ret != 0) {
PMD_INIT_LOG(ERR, "Failed to setup buffer queue 2");
ret = -EINVAL;
@@ -356,17 +356,17 @@ idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
static int
idpf_tx_complq_setup(struct rte_eth_dev *dev, struct ci_tx_queue *txq,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id)
+ unsigned int numa_id)
{
struct idpf_vport *vport = dev->data->dev_private;
const struct rte_memzone *mz;
struct idpf_complq *cq;
int ret;
- cq = rte_zmalloc_socket("idpf splitq cq",
+ cq = rte_zmalloc_numa("idpf splitq cq",
sizeof(*cq),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (cq == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for Tx compl queue");
ret = -ENOMEM;
@@ -381,7 +381,7 @@ idpf_tx_complq_setup(struct rte_eth_dev *dev, struct ci_tx_queue *txq,
mz = idpf_dma_zone_reserve(dev, queue_idx, nb_desc,
VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION,
- socket_id, true);
+ numa_id, true);
if (mz == NULL) {
ret = -ENOMEM;
goto err_mz_reserve;
@@ -403,7 +403,7 @@ idpf_tx_complq_setup(struct rte_eth_dev *dev, struct ci_tx_queue *txq,
int
idpf_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct idpf_vport *vport = dev->data->dev_private;
@@ -432,10 +432,10 @@ idpf_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
/* Allocate the TX queue data structure. */
- txq = rte_zmalloc_socket("idpf txq",
+ txq = rte_zmalloc_numa("idpf txq",
sizeof(struct ci_tx_queue),
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (txq == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for tx queue structure");
ret = -ENOMEM;
@@ -459,7 +459,7 @@ idpf_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
/* Allocate TX hardware ring descriptors. */
mz = idpf_dma_zone_reserve(dev, queue_idx, nb_desc, VIRTCHNL2_QUEUE_TYPE_TX,
- socket_id, is_splitq);
+ numa_id, is_splitq);
if (mz == NULL) {
ret = -ENOMEM;
goto err_mz_reserve;
@@ -468,18 +468,18 @@ idpf_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
txq->mz = mz;
if (!is_splitq) {
- txq->sw_ring = rte_zmalloc_socket("idpf tx sw ring",
+ txq->sw_ring = rte_zmalloc_numa("idpf tx sw ring",
sizeof(struct ci_tx_entry) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW TX ring");
ret = -ENOMEM;
goto err_sw_ring_alloc;
}
- txq->rs_last_id = rte_zmalloc_socket("idpf tx rs_last_id",
+ txq->rs_last_id = rte_zmalloc_numa("idpf tx rs_last_id",
sizeof(txq->rs_last_id[0]) * (nb_desc >> txq->log2_rs_thresh),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->rs_last_id == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for TX RS tracking");
ret = -ENOMEM;
@@ -490,14 +490,14 @@ idpf_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
idpf_qc_single_tx_queue_reset(txq);
} else {
txq->desc_ring = mz->addr;
- ret = idpf_qc_split_tx_pending_alloc(txq, socket_id);
+ ret = idpf_qc_split_tx_pending_alloc(txq, numa_id);
if (ret != 0)
goto err_sw_ring_alloc;
idpf_qc_split_tx_descq_reset(txq);
/* Setup tx completion queue if split model */
ret = idpf_tx_complq_setup(dev, txq, queue_idx,
- 2 * nb_desc, socket_id);
+ 2 * nb_desc, numa_id);
if (ret != 0)
goto err_complq_setup;
}
diff --git a/drivers/net/intel/idpf/idpf_rxtx.h b/drivers/net/intel/idpf/idpf_rxtx.h
index b456b8705d..0a5f0dd490 100644
--- a/drivers/net/intel/idpf/idpf_rxtx.h
+++ b/drivers/net/intel/idpf/idpf_rxtx.h
@@ -27,7 +27,7 @@
#define IDPF_SUPPORT_CHAIN_NUM 5
int idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
int idpf_rx_queue_init(struct rte_eth_dev *dev, uint16_t rx_queue_id);
@@ -36,7 +36,7 @@ int idpf_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id);
void idpf_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
int idpf_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int idpf_tx_queue_init(struct rte_eth_dev *dev, uint16_t tx_queue_id);
int idpf_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id);
diff --git a/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c b/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c
index 2ee87c94c2..d6cc367dce 100644
--- a/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c
+++ b/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c
@@ -462,7 +462,7 @@ static int ipn3ke_vswitch_probe(struct rte_afu_device *afu_dev)
if (!afu_dev->shared.data) {
snprintf(name, sizeof(name), "net_%s_hw",
afu_dev->device.name);
- hw = rte_zmalloc_socket(name,
+ hw = rte_zmalloc_numa(name,
sizeof(struct ipn3ke_hw),
RTE_CACHE_LINE_SIZE,
afu_dev->device.numa_node);
diff --git a/drivers/net/intel/ipn3ke/ipn3ke_representor.c b/drivers/net/intel/ipn3ke/ipn3ke_representor.c
index 05aad6cd15..50ab7df99d 100644
--- a/drivers/net/intel/ipn3ke/ipn3ke_representor.c
+++ b/drivers/net/intel/ipn3ke/ipn3ke_representor.c
@@ -293,7 +293,7 @@ ipn3ke_rpst_tx_queue_stop(__rte_unused struct rte_eth_dev *dev,
static int
ipn3ke_rpst_rx_queue_setup(__rte_unused struct rte_eth_dev *dev,
__rte_unused uint16_t queue_idx, __rte_unused uint16_t nb_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
__rte_unused struct rte_mempool *mp)
{
@@ -303,7 +303,7 @@ ipn3ke_rpst_rx_queue_setup(__rte_unused struct rte_eth_dev *dev,
static int
ipn3ke_rpst_tx_queue_setup(__rte_unused struct rte_eth_dev *dev,
__rte_unused uint16_t queue_idx, __rte_unused uint16_t nb_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_txconf *tx_conf)
{
return 0;
diff --git a/drivers/net/intel/ixgbe/ixgbe_ethdev.h b/drivers/net/intel/ixgbe/ixgbe_ethdev.h
index a646909b4e..2758f9338d 100644
--- a/drivers/net/intel/ixgbe/ixgbe_ethdev.h
+++ b/drivers/net/intel/ixgbe/ixgbe_ethdev.h
@@ -552,12 +552,12 @@ void ixgbe_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
void ixgbe_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
int ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
int ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int ixgbe_dev_rx_queue_count(void *rx_queue);
diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx.c b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
index 4cf43fae16..440c9cee96 100644
--- a/drivers/net/intel/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
@@ -2685,7 +2685,7 @@ int __rte_cold
ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
const struct rte_memzone *tz;
@@ -2818,9 +2818,9 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
}
/* First allocate the tx queue data structure */
- txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct ci_tx_queue) +
+ txq = rte_zmalloc_numa("ethdev TX queue", sizeof(struct ci_tx_queue) +
sizeof(struct ixgbe_advctx_info) * IXGBE_CTX_NUM,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL)
return -ENOMEM;
txq->ctx_cache = RTE_PTR_ADD(txq, sizeof(struct ci_tx_queue));
@@ -2832,7 +2832,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
*/
tz = rte_eth_dma_zone_reserve(dev, "ixgbe_tx_ring", queue_idx,
sizeof(union ixgbe_adv_tx_desc) * IXGBE_MAX_RING_DESC,
- IXGBE_ALIGN, socket_id);
+ IXGBE_ALIGN, numa_id);
if (tz == NULL) {
ixgbe_tx_queue_release(txq);
return -ENOMEM;
@@ -2873,9 +2873,9 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
txq->ixgbe_tx_ring = (union ixgbe_adv_tx_desc *)tz->addr;
/* Allocate software ring */
- txq->sw_ring = rte_zmalloc_socket("txq->sw_ring",
+ txq->sw_ring = rte_zmalloc_numa("txq->sw_ring",
sizeof(struct ci_tx_entry) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL) {
ixgbe_tx_queue_release(txq);
return -ENOMEM;
@@ -2885,8 +2885,8 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
/* Allocate RS last_id tracking array */
uint16_t num_rs_buckets = nb_desc / tx_rs_thresh;
- txq->rs_last_id = rte_zmalloc_socket(NULL, sizeof(txq->rs_last_id[0]) * num_rs_buckets,
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq->rs_last_id = rte_zmalloc_numa(NULL, sizeof(txq->rs_last_id[0]) * num_rs_buckets,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->rs_last_id == NULL) {
ixgbe_tx_queue_release(txq);
PMD_DRV_LOG(ERR, "Failed to allocate memory for RS last_id array");
@@ -3160,7 +3160,7 @@ int __rte_cold
ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -3204,8 +3204,8 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
}
/* First allocate the rx queue data structure */
- rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct ci_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("ethdev RX queue", sizeof(struct ci_rx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL)
return -ENOMEM;
rxq->mp = mp;
@@ -3252,7 +3252,7 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
* resizing in later calls to the queue setup function.
*/
rz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx,
- RX_RING_SZ, IXGBE_ALIGN, socket_id);
+ RX_RING_SZ, IXGBE_ALIGN, numa_id);
if (rz == NULL) {
ixgbe_rx_queue_release(rxq);
return -ENOMEM;
@@ -3299,9 +3299,9 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
if (adapter->rx_bulk_alloc_allowed)
len += IXGBE_RX_MAX_BURST;
- rxq->sw_ring = rte_zmalloc_socket("rxq->sw_ring",
+ rxq->sw_ring = rte_zmalloc_numa("rxq->sw_ring",
sizeof(struct ci_rx_entry) * len,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->sw_ring) {
ixgbe_rx_queue_release(rxq);
return -ENOMEM;
@@ -3316,9 +3316,9 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
* dev_start() flow.
*/
rxq->sw_sc_ring =
- rte_zmalloc_socket("rxq->sw_sc_ring",
+ rte_zmalloc_numa("rxq->sw_sc_ring",
sizeof(struct ci_rx_entry_sc) * len,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->sw_sc_ring) {
ixgbe_rx_queue_release(rxq);
return -ENOMEM;
diff --git a/drivers/net/intel/ixgbe/ixgbe_vf_representor.c b/drivers/net/intel/ixgbe/ixgbe_vf_representor.c
index c11983e307..d9032c0f3d 100644
--- a/drivers/net/intel/ixgbe/ixgbe_vf_representor.c
+++ b/drivers/net/intel/ixgbe/ixgbe_vf_representor.c
@@ -111,7 +111,7 @@ static int ixgbe_vf_representor_rx_queue_setup(
__rte_unused struct rte_eth_dev *dev,
__rte_unused uint16_t rx_queue_id,
__rte_unused uint16_t nb_rx_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
__rte_unused struct rte_mempool *mb_pool)
{
@@ -122,7 +122,7 @@ static int ixgbe_vf_representor_tx_queue_setup(
__rte_unused struct rte_eth_dev *dev,
__rte_unused uint16_t rx_queue_id,
__rte_unused uint16_t nb_rx_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_txconf *tx_conf)
{
return 0;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 125/227] net/ionic: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (123 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 124/227] net/intel: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 126/227] net/mana: " Chengwen Feng
` (102 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/ionic/ionic_lif.c | 38 +++++++++++++++++-----------------
drivers/net/ionic/ionic_lif.h | 4 ++--
drivers/net/ionic/ionic_main.c | 6 +++---
drivers/net/ionic/ionic_rxtx.c | 12 +++++------
drivers/net/ionic/ionic_rxtx.h | 4 ++--
5 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c
index 2443c98881..d41c347dd2 100644
--- a/drivers/net/ionic/ionic_lif.c
+++ b/drivers/net/ionic/ionic_lif.c
@@ -585,7 +585,7 @@ static int
ionic_qcq_alloc(struct ionic_lif *lif,
uint8_t type,
size_t struct_size,
- uint32_t socket_id,
+ uint32_t numa_id,
uint32_t index,
const char *type_name,
uint16_t flags,
@@ -626,8 +626,8 @@ ionic_qcq_alloc(struct ionic_lif *lif,
total_size += page_size;
}
- new = rte_zmalloc_socket("ionic", struct_size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ new = rte_zmalloc_numa("ionic", struct_size,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!new) {
IONIC_PRINT(ERR, "Cannot allocate queue structure");
return -ENOMEM;
@@ -636,9 +636,9 @@ ionic_qcq_alloc(struct ionic_lif *lif,
new->lif = lif;
/* Most queue types will store 1 ptr per descriptor */
- new->q.info = rte_calloc_socket("ionic",
+ new->q.info = rte_calloc_numa("ionic",
(uint64_t)num_descs * num_segs,
- sizeof(void *), page_size, socket_id);
+ sizeof(void *), page_size, numa_id);
if (!new->q.info) {
IONIC_PRINT(ERR, "Cannot allocate queue info");
err = -ENOMEM;
@@ -662,7 +662,7 @@ ionic_qcq_alloc(struct ionic_lif *lif,
new->base_z = rte_eth_dma_zone_reserve(lif->eth_dev,
type_name, index /* queue_idx */,
- total_size, IONIC_ALIGN, socket_id);
+ total_size, IONIC_ALIGN, numa_id);
if (!new->base_z) {
IONIC_PRINT(ERR, "Cannot reserve queue DMA memory");
@@ -778,7 +778,7 @@ ionic_rx_seg_rearm_data(struct ionic_lif *lif)
}
int
-ionic_rx_qcq_alloc(struct ionic_lif *lif, uint32_t socket_id, uint32_t index,
+ionic_rx_qcq_alloc(struct ionic_lif *lif, uint32_t numa_id, uint32_t index,
uint16_t nrxq_descs, struct rte_mempool *mb_pool,
struct ionic_rx_qcq **rxq_out)
{
@@ -829,7 +829,7 @@ ionic_rx_qcq_alloc(struct ionic_lif *lif, uint32_t socket_id, uint32_t index,
err = ionic_qcq_alloc(lif,
IONIC_QTYPE_RXQ,
sizeof(struct ionic_rx_qcq),
- socket_id,
+ numa_id,
index,
"rx",
flags,
@@ -855,7 +855,7 @@ ionic_rx_qcq_alloc(struct ionic_lif *lif, uint32_t socket_id, uint32_t index,
}
int
-ionic_tx_qcq_alloc(struct ionic_lif *lif, uint32_t socket_id, uint32_t index,
+ionic_tx_qcq_alloc(struct ionic_lif *lif, uint32_t numa_id, uint32_t index,
uint16_t ntxq_descs, struct ionic_tx_qcq **txq_out)
{
struct ionic_tx_qcq *txq;
@@ -874,7 +874,7 @@ ionic_tx_qcq_alloc(struct ionic_lif *lif, uint32_t socket_id, uint32_t index,
err = ionic_qcq_alloc(lif,
IONIC_QTYPE_TXQ,
sizeof(struct ionic_tx_qcq),
- socket_id,
+ numa_id,
index,
"tx",
flags,
@@ -905,7 +905,7 @@ ionic_admin_qcq_alloc(struct ionic_lif *lif)
err = ionic_qcq_alloc(lif,
IONIC_QTYPE_ADMINQ,
sizeof(struct ionic_admin_qcq),
- rte_socket_id(),
+ rte_numa_id(),
0,
"admin",
flags,
@@ -932,7 +932,7 @@ ionic_notify_qcq_alloc(struct ionic_lif *lif)
err = ionic_qcq_alloc(lif,
IONIC_QTYPE_NOTIFYQ,
sizeof(struct ionic_notify_qcq),
- rte_socket_id(),
+ rte_numa_id(),
0,
"notify",
flags,
@@ -1045,7 +1045,7 @@ int
ionic_lif_alloc(struct ionic_lif *lif)
{
struct ionic_adapter *adapter = lif->adapter;
- uint32_t socket_id = rte_socket_id();
+ uint32_t numa_id = rte_numa_id();
int err;
/*
@@ -1087,19 +1087,19 @@ ionic_lif_alloc(struct ionic_lif *lif)
return -ENOMEM;
}
- lif->txqcqs = rte_calloc_socket("ionic",
+ lif->txqcqs = rte_calloc_numa("ionic",
adapter->max_ntxqs_per_lif,
sizeof(*lif->txqcqs),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!lif->txqcqs) {
IONIC_PRINT(ERR, "Cannot allocate tx queues array");
return -ENOMEM;
}
- lif->rxqcqs = rte_calloc_socket("ionic",
+ lif->rxqcqs = rte_calloc_numa("ionic",
adapter->max_nrxqs_per_lif,
sizeof(*lif->rxqcqs),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!lif->rxqcqs) {
IONIC_PRINT(ERR, "Cannot allocate rx queues array");
return -ENOMEM;
@@ -1127,7 +1127,7 @@ ionic_lif_alloc(struct ionic_lif *lif)
lif->info_z = rte_eth_dma_zone_reserve(lif->eth_dev,
"lif_info", 0 /* queue_idx*/,
- lif->info_sz, IONIC_ALIGN, socket_id);
+ lif->info_sz, IONIC_ALIGN, numa_id);
if (!lif->info_z) {
IONIC_PRINT(ERR, "Cannot allocate lif info memory");
return -ENOMEM;
@@ -1239,7 +1239,7 @@ ionic_lif_rss_setup(struct ionic_lif *lif)
lif->rss_ind_tbl_z = rte_eth_dma_zone_reserve(lif->eth_dev,
"rss_ind_tbl", 0 /* queue_idx */,
sizeof(*lif->rss_ind_tbl) * tbl_sz,
- IONIC_ALIGN, rte_socket_id());
+ IONIC_ALIGN, rte_numa_id());
if (!lif->rss_ind_tbl_z) {
IONIC_PRINT(ERR, "OOM");
return -ENOMEM;
diff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h
index 2d85ebbcae..38b7b12645 100644
--- a/drivers/net/ionic/ionic_lif.h
+++ b/drivers/net/ionic/ionic_lif.h
@@ -221,10 +221,10 @@ int ionic_dev_promiscuous_disable(struct rte_eth_dev *dev);
int ionic_dev_allmulticast_enable(struct rte_eth_dev *dev);
int ionic_dev_allmulticast_disable(struct rte_eth_dev *dev);
-int ionic_rx_qcq_alloc(struct ionic_lif *lif, uint32_t socket_id,
+int ionic_rx_qcq_alloc(struct ionic_lif *lif, uint32_t numa_id,
uint32_t index, uint16_t nrxq_descs, struct rte_mempool *mp,
struct ionic_rx_qcq **qcq_out);
-int ionic_tx_qcq_alloc(struct ionic_lif *lif, uint32_t socket_id,
+int ionic_tx_qcq_alloc(struct ionic_lif *lif, uint32_t numa_id,
uint32_t index, uint16_t ntxq_descs,
struct ionic_tx_qcq **qcq_out);
void ionic_qcq_free(struct ionic_qcq *qcq);
diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c
index d5545b1ecb..f11e16ac8c 100644
--- a/drivers/net/ionic/ionic_main.c
+++ b/drivers/net/ionic/ionic_main.c
@@ -463,7 +463,7 @@ ionic_port_identify(struct ionic_adapter *adapter)
}
static const struct rte_memzone *
-ionic_memzone_reserve(const char *name, uint32_t len, int socket_id)
+ionic_memzone_reserve(const char *name, uint32_t len, int numa_id)
{
const struct rte_memzone *mz;
@@ -471,7 +471,7 @@ ionic_memzone_reserve(const char *name, uint32_t len, int socket_id)
if (mz)
return mz;
- mz = rte_memzone_reserve_aligned(name, len, socket_id,
+ mz = rte_memzone_reserve_aligned(name, len, numa_id,
RTE_MEMZONE_IOVA_CONTIG, IONIC_ALIGN);
return mz;
}
@@ -497,7 +497,7 @@ ionic_port_init(struct ionic_adapter *adapter)
IONIC_DRV_NAME, adapter->name);
idev->port_info_z = ionic_memzone_reserve(z_name, idev->port_info_sz,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!idev->port_info_z) {
IONIC_PRINT(ERR, "Cannot reserve port info DMA memory");
return -ENOMEM;
diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c
index 339b20f113..d028b7d066 100644
--- a/drivers/net/ionic/ionic_rxtx.c
+++ b/drivers/net/ionic/ionic_rxtx.c
@@ -132,7 +132,7 @@ ionic_dev_tx_queue_stop_secondhalf(struct rte_eth_dev *dev,
int __rte_cold
ionic_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id,
- uint16_t nb_desc, uint32_t socket_id,
+ uint16_t nb_desc, uint32_t numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
@@ -150,7 +150,7 @@ ionic_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id,
offloads = tx_conf->offloads | eth_dev->data->dev_conf.txmode.offloads;
IONIC_PRINT(DEBUG,
"Configuring skt %u TX queue %u with %u buffers, offloads %jx",
- socket_id, tx_queue_id, nb_desc, offloads);
+ numa_id, tx_queue_id, nb_desc, offloads);
/* Validate number of receive descriptors */
if (!rte_is_power_of_2(nb_desc) || nb_desc < IONIC_MIN_RING_DESC)
@@ -172,7 +172,7 @@ ionic_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id,
eth_dev->data->tx_queue_state[tx_queue_id] =
RTE_ETH_QUEUE_STATE_STOPPED;
- err = ionic_tx_qcq_alloc(lif, socket_id, tx_queue_id, nb_desc, &txq);
+ err = ionic_tx_qcq_alloc(lif, numa_id, tx_queue_id, nb_desc, &txq);
if (err) {
IONIC_PRINT(DEBUG, "Queue allocation failure");
return -EINVAL;
@@ -536,7 +536,7 @@ int __rte_cold
ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t rx_queue_id,
uint16_t nb_desc,
- uint32_t socket_id,
+ uint32_t numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -555,7 +555,7 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
offloads = rx_conf->offloads | eth_dev->data->dev_conf.rxmode.offloads;
IONIC_PRINT(DEBUG,
"Configuring skt %u RX queue %u with %u buffers, offloads %jx",
- socket_id, rx_queue_id, nb_desc, offloads);
+ numa_id, rx_queue_id, nb_desc, offloads);
if (!rx_conf->rx_drop_en)
IONIC_PRINT(WARNING, "No-drop mode is not supported");
@@ -579,7 +579,7 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
eth_dev->data->rx_queue_state[rx_queue_id] =
RTE_ETH_QUEUE_STATE_STOPPED;
- err = ionic_rx_qcq_alloc(lif, socket_id, rx_queue_id, nb_desc, mp,
+ err = ionic_rx_qcq_alloc(lif, numa_id, rx_queue_id, nb_desc, mp,
&rxq);
if (err) {
IONIC_PRINT(ERR, "Queue %d allocation failure", rx_queue_id);
diff --git a/drivers/net/ionic/ionic_rxtx.h b/drivers/net/ionic/ionic_rxtx.h
index b3e4e5e5b3..d8337a247d 100644
--- a/drivers/net/ionic/ionic_rxtx.h
+++ b/drivers/net/ionic/ionic_rxtx.h
@@ -33,14 +33,14 @@ extern const uint32_t ionic_ptype_table[IONIC_RXQ_COMP_PKT_TYPE_MASK];
/* ionic_rxtx.c */
int ionic_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_desc, uint32_t socket_id,
+ uint16_t nb_desc, uint32_t numa_id,
const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp);
void ionic_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
int ionic_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id);
int ionic_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id);
int ionic_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_desc, uint32_t socket_id,
+ uint16_t nb_desc, uint32_t numa_id,
const struct rte_eth_txconf *tx_conf);
void ionic_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
int ionic_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 126/227] net/mana: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (124 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 125/227] net/ionic: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 127/227] net/memif: " Chengwen Feng
` (101 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/mana/mana.c | 54 ++++++++++++++++++++---------------------
drivers/net/mana/mr.c | 4 +--
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/drivers/net/mana/mana.c b/drivers/net/mana/mana.c
index c14b522b8a..de92e377a6 100644
--- a/drivers/net/mana/mana.c
+++ b/drivers/net/mana/mana.c
@@ -68,7 +68,7 @@ mana_alloc_verbs_buf(size_t size, void *data)
return NULL;
}
- ret = rte_zmalloc_socket("mana_verb_buf", size, alignment, socket);
+ ret = rte_zmalloc_numa("mana_verb_buf", size, alignment, socket);
if (!ret && size)
rte_errno = ENOMEM;
return ret;
@@ -565,7 +565,7 @@ mana_rss_hash_conf_get(struct rte_eth_dev *dev,
static int
mana_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
@@ -573,27 +573,27 @@ mana_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
struct mana_txq *txq;
int ret;
- txq = rte_zmalloc_socket("mana_txq", sizeof(*txq), 0, socket_id);
+ txq = rte_zmalloc_numa("mana_txq", sizeof(*txq), 0, numa_id);
if (!txq) {
DRV_LOG(ERR, "failed to allocate txq");
return -ENOMEM;
}
- txq->socket = socket_id;
+ txq->socket = numa_id;
- txq->desc_ring = rte_malloc_socket("mana_tx_desc_ring",
+ txq->desc_ring = rte_malloc_numa("mana_tx_desc_ring",
sizeof(struct mana_txq_desc) *
nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq->desc_ring) {
DRV_LOG(ERR, "failed to allocate txq desc_ring");
ret = -ENOMEM;
goto fail;
}
- txq->gdma_comp_buf = rte_malloc_socket("mana_txq_comp",
+ txq->gdma_comp_buf = rte_malloc_numa("mana_txq_comp",
sizeof(*txq->gdma_comp_buf) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq->gdma_comp_buf) {
DRV_LOG(ERR, "failed to allocate txq comp");
ret = -ENOMEM;
@@ -601,14 +601,14 @@ mana_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
ret = mana_mr_btree_init(&txq->mr_btree,
- MANA_MR_BTREE_PER_QUEUE_N, socket_id);
+ MANA_MR_BTREE_PER_QUEUE_N, numa_id);
if (ret) {
DRV_LOG(ERR, "Failed to init TXQ MR btree");
goto fail;
}
DRV_LOG(DEBUG, "idx %u nb_desc %u socket %u txq->desc_ring %p",
- queue_idx, nb_desc, socket_id, txq->desc_ring);
+ queue_idx, nb_desc, numa_id, txq->desc_ring);
txq->desc_ring_head = 0;
txq->desc_ring_tail = 0;
@@ -627,7 +627,7 @@ mana_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
static int
mana_dev_tx_queue_setup_lock(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct mana_priv *priv = dev->data->dev_private;
@@ -636,7 +636,7 @@ mana_dev_tx_queue_setup_lock(struct rte_eth_dev *dev, uint16_t queue_idx,
if (mana_reset_trylock(priv))
return -EBUSY;
ret = mana_dev_tx_queue_setup(dev, queue_idx,
- nb_desc, socket_id, tx_conf);
+ nb_desc, numa_id, tx_conf);
pthread_mutex_unlock(&priv->reset_ops_lock);
return ret;
}
@@ -655,7 +655,7 @@ mana_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
static int
mana_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mp)
{
@@ -663,21 +663,21 @@ mana_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
struct mana_rxq *rxq;
int ret;
- rxq = rte_zmalloc_socket("mana_rxq", sizeof(*rxq), 0, socket_id);
+ rxq = rte_zmalloc_numa("mana_rxq", sizeof(*rxq), 0, numa_id);
if (!rxq) {
DRV_LOG(ERR, "failed to allocate rxq");
return -ENOMEM;
}
DRV_LOG(DEBUG, "idx %u nb_desc %u socket %u",
- queue_idx, nb_desc, socket_id);
+ queue_idx, nb_desc, numa_id);
- rxq->socket = socket_id;
+ rxq->socket = numa_id;
- rxq->desc_ring = rte_zmalloc_socket("mana_rx_mbuf_ring",
+ rxq->desc_ring = rte_zmalloc_numa("mana_rx_mbuf_ring",
sizeof(struct mana_rxq_desc) *
nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->desc_ring) {
DRV_LOG(ERR, "failed to allocate rxq desc_ring");
@@ -688,9 +688,9 @@ mana_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
rxq->desc_ring_head = 0;
rxq->desc_ring_tail = 0;
- rxq->gdma_comp_buf = rte_malloc_socket("mana_rxq_comp",
+ rxq->gdma_comp_buf = rte_malloc_numa("mana_rxq_comp",
sizeof(*rxq->gdma_comp_buf) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->gdma_comp_buf) {
DRV_LOG(ERR, "failed to allocate rxq comp");
ret = -ENOMEM;
@@ -698,7 +698,7 @@ mana_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
ret = mana_mr_btree_init(&rxq->mr_btree,
- MANA_MR_BTREE_PER_QUEUE_N, socket_id);
+ MANA_MR_BTREE_PER_QUEUE_N, numa_id);
if (ret) {
DRV_LOG(ERR, "Failed to init RXQ MR btree");
goto fail;
@@ -720,7 +720,7 @@ mana_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
static int
mana_dev_rx_queue_setup_lock(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mp)
{
@@ -730,7 +730,7 @@ mana_dev_rx_queue_setup_lock(struct rte_eth_dev *dev, uint16_t queue_idx,
if (mana_reset_trylock(priv))
return -EBUSY;
ret = mana_dev_rx_queue_setup(dev, queue_idx, nb_desc,
- socket_id, rx_conf, mp);
+ numa_id, rx_conf, mp);
pthread_mutex_unlock(&priv->reset_ops_lock);
return ret;
}
@@ -1999,7 +1999,7 @@ mana_proc_priv_init(struct rte_eth_dev *dev)
{
struct mana_process_priv *priv;
- priv = rte_zmalloc_socket("mana_proc_priv",
+ priv = rte_zmalloc_numa("mana_proc_priv",
sizeof(struct mana_process_priv),
RTE_CACHE_LINE_SIZE,
dev->device->numa_node);
@@ -2054,7 +2054,7 @@ mana_init_shared_data(void)
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
mana_shared_mz = rte_memzone_reserve(MZ_MANA_SHARED_DATA,
sizeof(*mana_shared_data),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (!mana_shared_mz) {
DRV_LOG(ERR, "Cannot allocate mana shared data");
ret = -rte_errno;
@@ -2168,8 +2168,8 @@ mana_probe_port(struct ibv_device *ibdev, struct ibv_device_attr_ex *dev_attr,
DRV_LOG(DEBUG, "Device reset for eth_dev %p priv %p",
eth_dev, priv);
} else {
- priv = rte_zmalloc_socket(NULL, sizeof(*priv), RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ priv = rte_zmalloc_numa(NULL, sizeof(*priv), RTE_CACHE_LINE_SIZE,
+ RTE_NUMA_ID_ANY);
if (!priv)
return -ENOMEM;
}
diff --git a/drivers/net/mana/mr.c b/drivers/net/mana/mr.c
index 0ce1a76ed5..3de6a901dc 100644
--- a/drivers/net/mana/mr.c
+++ b/drivers/net/mana/mr.c
@@ -219,7 +219,7 @@ mana_mr_btree_expand(struct mana_mr_btree *bt, int n)
{
void *mem;
- mem = rte_realloc_socket(bt->table, n * sizeof(struct mana_mr_cache),
+ mem = rte_realloc_numa(bt->table, n * sizeof(struct mana_mr_cache),
0, bt->socket);
if (!mem) {
DP_LOG(ERR, "Failed to expand btree size %d", n);
@@ -287,7 +287,7 @@ int
mana_mr_btree_init(struct mana_mr_btree *bt, int n, int socket)
{
memset(bt, 0, sizeof(*bt));
- bt->table = rte_calloc_socket("MANA B-tree table",
+ bt->table = rte_calloc_numa("MANA B-tree table",
n,
sizeof(struct mana_mr_cache),
0, socket);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 127/227] net/memif: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (125 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 126/227] net/mana: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 128/227] net/mlx4: " Chengwen Feng
` (100 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/memif/rte_eth_memif.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c
index 0680dc3947..7df31141c2 100644
--- a/drivers/net/memif/rte_eth_memif.c
+++ b/drivers/net/memif/rte_eth_memif.c
@@ -1765,7 +1765,7 @@ static int
memif_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t qid,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct pmd_internals *pmd = dev->data->dev_private;
@@ -1802,7 +1802,7 @@ static int
memif_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t qid,
uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool)
{
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 128/227] net/mlx4: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (126 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 127/227] net/memif: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 129/227] net/mvneta: " Chengwen Feng
` (99 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/mlx4/mlx4.c | 8 ++++----
drivers/net/mlx4/mlx4_mr.c | 12 ++++++------
drivers/net/mlx4/mlx4_utils.c | 14 +++++++-------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index dbcd98d49f..eb70d96136 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -104,7 +104,7 @@ mlx4_init_shared_data(void)
/* Allocate shared memory. */
mz = rte_memzone_reserve(MZ_MLX4_PMD_SHARED_DATA,
sizeof(*mlx4_shared_data),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mz == NULL) {
ERROR("Cannot allocate mlx4 shared data");
ret = -rte_errno;
@@ -151,7 +151,7 @@ mlx4_alloc_verbs_buf(size_t size, void *data)
struct mlx4_priv *priv = data;
void *ret;
size_t alignment = sysconf(_SC_PAGESIZE);
- unsigned int socket = SOCKET_ID_ANY;
+ unsigned int socket = RTE_NUMA_ID_ANY;
if (priv->verbs_alloc_ctx.type == MLX4_VERBS_ALLOC_TYPE_TX_QUEUE) {
const struct txq *txq = priv->verbs_alloc_ctx.obj;
@@ -164,7 +164,7 @@ mlx4_alloc_verbs_buf(size_t size, void *data)
socket = rxq->socket;
}
MLX4_ASSERT(data != NULL);
- ret = rte_malloc_socket(__func__, size, alignment, socket);
+ ret = rte_malloc_numa(__func__, size, alignment, socket);
if (!ret && size)
rte_errno = ENOMEM;
return ret;
@@ -208,7 +208,7 @@ mlx4_proc_priv_init(struct rte_eth_dev *dev)
*/
ppriv_size = sizeof(struct mlx4_proc_priv) +
dev->data->nb_tx_queues * sizeof(void *);
- ppriv = rte_zmalloc_socket("mlx4_proc_priv", ppriv_size,
+ ppriv = rte_zmalloc_numa("mlx4_proc_priv", ppriv_size,
RTE_CACHE_LINE_SIZE, dev->device->numa_node);
if (!ppriv) {
rte_errno = ENOMEM;
diff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c
index 5e2c2dbf85..5499029159 100644
--- a/drivers/net/mlx4/mlx4_mr.c
+++ b/drivers/net/mlx4/mlx4_mr.c
@@ -71,7 +71,7 @@ mr_btree_expand(struct mlx4_mr_btree *bt, int n)
if (n <= bt->size)
return ret;
/*
- * Downside of directly using rte_realloc() is that SOCKET_ID_ANY is
+ * Downside of directly using rte_realloc() is that RTE_NUMA_ID_ANY is
* used inside if there's no room to expand. Because this is a quite
* rare case and a part of very slow path, it is very acceptable.
* Initially cache_bh[] will be given practically enough space and once
@@ -206,7 +206,7 @@ mlx4_mr_btree_init(struct mlx4_mr_btree *bt, int n, int socket)
return -rte_errno;
}
memset(bt, 0, sizeof(*bt));
- bt->table = rte_calloc_socket("B-tree table",
+ bt->table = rte_calloc_numa("B-tree table",
n, sizeof(struct mlx4_mr_cache),
0, socket);
if (bt->table == NULL) {
@@ -658,11 +658,11 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,
data.start, data.end, msl->page_sz, ms_n);
/* Size of memory for bitmap. */
bmp_size = rte_bitmap_get_memory_footprint(ms_n);
- mr = rte_zmalloc_socket(NULL,
+ mr = rte_zmalloc_numa(NULL,
RTE_ALIGN_CEIL(sizeof(*mr),
RTE_CACHE_LINE_SIZE) +
bmp_size,
- RTE_CACHE_LINE_SIZE, msl->socket_id);
+ RTE_CACHE_LINE_SIZE, msl->numa_id);
if (mr == NULL) {
WARN("port %u unable to allocate memory for a new MR of"
" address (%p).",
@@ -773,7 +773,7 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,
/*
* Finally create a verbs MR for the memory chunk. ibv_reg_mr() can be
* called with holding the memory lock because it doesn't use
- * mlx4_alloc_buf_extern() which eventually calls rte_malloc_socket()
+ * mlx4_alloc_buf_extern() which eventually calls rte_malloc_numa()
* through mlx4_alloc_verbs_buf().
*/
mr->ibv_mr = mlx4_glue->reg_mr(priv->pd, (void *)data.start, len,
@@ -1223,7 +1223,7 @@ mlx4_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,
rte_rwlock_read_unlock(&priv->mr.rwlock);
if (lkey != UINT32_MAX)
return;
- mr = rte_zmalloc_socket(NULL,
+ mr = rte_zmalloc_numa(NULL,
RTE_ALIGN_CEIL(sizeof(*mr),
RTE_CACHE_LINE_SIZE),
RTE_CACHE_LINE_SIZE, mp->numa_id);
diff --git a/drivers/net/mlx4/mlx4_utils.c b/drivers/net/mlx4/mlx4_utils.c
index 614dc197d9..3615bfa5b9 100644
--- a/drivers/net/mlx4/mlx4_utils.c
+++ b/drivers/net/mlx4/mlx4_utils.c
@@ -81,9 +81,9 @@ mlx4_mallocv_inline(const char *type, const struct mlx4_malloc_vec *vec,
if (fill)
return size;
if (!zero)
- data = rte_malloc_socket(type, size, least, socket);
+ data = rte_malloc_numa(type, size, least, socket);
else
- data = rte_zmalloc_socket(type, size, least, socket);
+ data = rte_zmalloc_numa(type, size, least, socket);
if (data) {
fill = 1;
goto fill;
@@ -138,7 +138,7 @@ size_t
mlx4_mallocv(const char *type, const struct mlx4_malloc_vec *vec,
unsigned int cnt)
{
- return mlx4_mallocv_inline(type, vec, cnt, 0, SOCKET_ID_ANY);
+ return mlx4_mallocv_inline(type, vec, cnt, 0, RTE_NUMA_ID_ANY);
}
/**
@@ -151,7 +151,7 @@ size_t
mlx4_zmallocv(const char *type, const struct mlx4_malloc_vec *vec,
unsigned int cnt)
{
- return mlx4_mallocv_inline(type, vec, cnt, 1, SOCKET_ID_ANY);
+ return mlx4_mallocv_inline(type, vec, cnt, 1, RTE_NUMA_ID_ANY);
}
/**
@@ -160,11 +160,11 @@ mlx4_zmallocv(const char *type, const struct mlx4_malloc_vec *vec,
* This function takes one additional parameter.
*
* @param socket
- * NUMA socket to allocate memory on. If SOCKET_ID_ANY is used, this
+ * NUMA socket to allocate memory on. If RTE_NUMA_ID_ANY is used, this
* function will behave the same as mlx4_mallocv().
*
* @see mlx4_mallocv()
- * @see rte_malloc_socket()
+ * @see rte_malloc_numa()
*/
size_t
mlx4_mallocv_socket(const char *type, const struct mlx4_malloc_vec *vec,
@@ -178,7 +178,7 @@ mlx4_mallocv_socket(const char *type, const struct mlx4_malloc_vec *vec,
* mlx4_zmalloc_socket().
*
* @see mlx4_mallocv_socket()
- * @see rte_zmalloc_socket()
+ * @see rte_zmalloc_numa()
*/
size_t
mlx4_zmallocv_socket(const char *type, const struct mlx4_malloc_vec *vec,
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 129/227] net/mvneta: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (127 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 128/227] net/mlx4: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 130/227] net/mvpp2: " Chengwen Feng
` (98 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/mvneta/mvneta_ethdev.c | 2 +-
drivers/net/mvneta/mvneta_rxtx.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index 975d3da81e..a58a5df6d9 100644
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -814,7 +814,7 @@ mvneta_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
if (!eth_dev)
return -ENOMEM;
- priv = rte_zmalloc_socket(name, sizeof(*priv), 0, rte_socket_id());
+ priv = rte_zmalloc_numa(name, sizeof(*priv), 0, rte_numa_id());
if (!priv) {
ret = -ENOMEM;
goto out_free;
diff --git a/drivers/net/mvneta/mvneta_rxtx.c b/drivers/net/mvneta/mvneta_rxtx.c
index 952e982275..e46050bd76 100644
--- a/drivers/net/mvneta/mvneta_rxtx.c
+++ b/drivers/net/mvneta/mvneta_rxtx.c
@@ -731,7 +731,7 @@ mvneta_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
dev->data->rx_queues[idx] = NULL;
}
- rxq = rte_zmalloc_socket("rxq", sizeof(*rxq), 0, socket);
+ rxq = rte_zmalloc_numa("rxq", sizeof(*rxq), 0, socket);
if (!rxq)
return -ENOMEM;
@@ -780,7 +780,7 @@ mvneta_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
dev->data->tx_queues[idx] = NULL;
}
- txq = rte_zmalloc_socket("txq", sizeof(*txq), 0, socket);
+ txq = rte_zmalloc_numa("txq", sizeof(*txq), 0, socket);
if (!txq)
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 130/227] net/mvpp2: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (128 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 129/227] net/mvneta: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 131/227] net/nbl: " Chengwen Feng
` (97 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/mvpp2/mrvl_ethdev.c | 6 +++---
drivers/net/mvpp2/mrvl_flow.c | 8 ++++----
drivers/net/mvpp2/mrvl_mtr.c | 4 ++--
drivers/net/mvpp2/mrvl_qos.c | 4 ++--
drivers/net/mvpp2/mrvl_tm.c | 6 +++---
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 9be3e5a92d..695031ca6c 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -2021,7 +2021,7 @@ mrvl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
dev->data->rx_queues[idx] = NULL;
}
- rxq = rte_zmalloc_socket("rxq", sizeof(*rxq), 0, socket);
+ rxq = rte_zmalloc_numa("rxq", sizeof(*rxq), 0, socket);
if (!rxq)
return -ENOMEM;
@@ -2124,7 +2124,7 @@ mrvl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
dev->data->tx_queues[idx] = NULL;
}
- txq = rte_zmalloc_socket("txq", sizeof(*txq), 0, socket);
+ txq = rte_zmalloc_numa("txq", sizeof(*txq), 0, socket);
if (!txq)
return -ENOMEM;
@@ -3060,7 +3060,7 @@ mrvl_priv_create(const char *dev_name)
uint16_t max_frame_size;
int ret, bpool_bit;
- priv = rte_zmalloc_socket(dev_name, sizeof(*priv), 0, rte_socket_id());
+ priv = rte_zmalloc_numa(dev_name, sizeof(*priv), 0, rte_numa_id());
if (!priv)
return NULL;
diff --git a/drivers/net/mvpp2/mrvl_flow.c b/drivers/net/mvpp2/mrvl_flow.c
index 9932e28edc..14b691eaf4 100644
--- a/drivers/net/mvpp2/mrvl_flow.c
+++ b/drivers/net/mvpp2/mrvl_flow.c
@@ -35,13 +35,13 @@
static int
mrvl_alloc_key_mask(struct pp2_cls_rule_key_field *field)
{
- unsigned int id = rte_socket_id();
+ unsigned int id = rte_numa_id();
- field->key = rte_zmalloc_socket(NULL, MRVL_CLS_STR_SIZE_MAX, 0, id);
+ field->key = rte_zmalloc_numa(NULL, MRVL_CLS_STR_SIZE_MAX, 0, id);
if (!field->key)
goto out;
- field->mask = rte_zmalloc_socket(NULL, MRVL_CLS_STR_SIZE_MAX, 0, id);
+ field->mask = rte_zmalloc_numa(NULL, MRVL_CLS_STR_SIZE_MAX, 0, id);
if (!field->mask)
goto out_mask;
@@ -1721,7 +1721,7 @@ mrvl_flow_create(struct rte_eth_dev *dev,
return NULL;
}
- flow = rte_zmalloc_socket(NULL, sizeof(*flow), 0, rte_socket_id());
+ flow = rte_zmalloc_numa(NULL, sizeof(*flow), 0, rte_numa_id());
if (!flow)
return NULL;
diff --git a/drivers/net/mvpp2/mrvl_mtr.c b/drivers/net/mvpp2/mrvl_mtr.c
index c07ac95ddc..f8ca04118b 100644
--- a/drivers/net/mvpp2/mrvl_mtr.c
+++ b/drivers/net/mvpp2/mrvl_mtr.c
@@ -100,7 +100,7 @@ mrvl_meter_profile_add(struct rte_eth_dev *dev, uint32_t meter_profile_id,
RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
NULL, "Profile id already exists\n");
- prof = rte_zmalloc_socket(NULL, sizeof(*prof), 0, rte_socket_id());
+ prof = rte_zmalloc_numa(NULL, sizeof(*prof), 0, rte_numa_id());
if (!prof)
return -rte_mtr_error_set(error, ENOMEM,
RTE_MTR_ERROR_TYPE_UNSPECIFIED,
@@ -347,7 +347,7 @@ mrvl_create(struct rte_eth_dev *dev, uint32_t mtr_id,
RTE_MTR_ERROR_TYPE_MTR_ID, NULL,
"Meter id already exists\n");
- mtr = rte_zmalloc_socket(NULL, sizeof(*mtr), 0, rte_socket_id());
+ mtr = rte_zmalloc_numa(NULL, sizeof(*mtr), 0, rte_numa_id());
if (!mtr)
return -rte_mtr_error_set(error, ENOMEM,
RTE_MTR_ERROR_TYPE_UNSPECIFIED,
diff --git a/drivers/net/mvpp2/mrvl_qos.c b/drivers/net/mvpp2/mrvl_qos.c
index e298da2724..d53a5c8d65 100644
--- a/drivers/net/mvpp2/mrvl_qos.c
+++ b/drivers/net/mvpp2/mrvl_qos.c
@@ -936,9 +936,9 @@ setup_tc(struct pp2_ppio_tc_params *param, uint8_t inqs,
param->pools[0][1] = dummy_pool[bpool->pp2_id];
param->default_color = color;
- inq_params = rte_zmalloc_socket("inq_params",
+ inq_params = rte_zmalloc_numa("inq_params",
inqs * sizeof(*inq_params),
- 0, rte_socket_id());
+ 0, rte_numa_id());
if (!inq_params)
return -ENOMEM;
diff --git a/drivers/net/mvpp2/mrvl_tm.c b/drivers/net/mvpp2/mrvl_tm.c
index c5046490ae..09d349a794 100644
--- a/drivers/net/mvpp2/mrvl_tm.c
+++ b/drivers/net/mvpp2/mrvl_tm.c
@@ -429,8 +429,8 @@ mrvl_shaper_profile_add(struct rte_eth_dev *dev, uint32_t shaper_profile_id,
RTE_TM_ERROR_TYPE_SHAPER_PROFILE_ID,
NULL, "Profile id already exists\n");
- profile = rte_zmalloc_socket(NULL, sizeof(*profile), 0,
- rte_socket_id());
+ profile = rte_zmalloc_numa(NULL, sizeof(*profile), 0,
+ rte_numa_id());
if (!profile)
return -rte_tm_error_set(error, ENOMEM,
RTE_TM_ERROR_TYPE_UNSPECIFIED,
@@ -657,7 +657,7 @@ mrvl_node_add(struct rte_eth_dev *dev, uint32_t node_id,
RTE_TM_ERROR_TYPE_NODE_ID,
NULL, "Node id already exists\n");
- node = rte_zmalloc_socket(NULL, sizeof(*node), 0, rte_socket_id());
+ node = rte_zmalloc_numa(NULL, sizeof(*node), 0, rte_numa_id());
if (!node)
return -rte_tm_error_set(error, ENOMEM,
RTE_TM_ERROR_TYPE_UNSPECIFIED,
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 131/227] net/nbl: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (129 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 130/227] net/mvpp2: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 132/227] net/netvsc: " Chengwen Feng
` (96 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/nbl/nbl_common/nbl_common.c | 2 +-
drivers/net/nbl/nbl_dev/nbl_dev.c | 8 ++++----
drivers/net/nbl/nbl_dev/nbl_dev.h | 4 ++--
drivers/net/nbl/nbl_hw/nbl_txrx.c | 14 +++++++-------
drivers/net/nbl/nbl_include/nbl_include.h | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/net/nbl/nbl_common/nbl_common.c b/drivers/net/nbl/nbl_common/nbl_common.c
index bded42c358..0d63a04b74 100644
--- a/drivers/net/nbl/nbl_common/nbl_common.c
+++ b/drivers/net/nbl/nbl_common/nbl_common.c
@@ -21,7 +21,7 @@ void *nbl_alloc_dma_mem(struct nbl_dma_mem *mem, uint32_t size)
return NULL;
snprintf(z_name, sizeof(z_name), "nbl_dma_%u", nbl_dma_memzone_id++);
- mz = rte_memzone_reserve_bounded(z_name, size, SOCKET_ID_ANY, 0,
+ mz = rte_memzone_reserve_bounded(z_name, size, RTE_NUMA_ID_ANY, 0,
0, RTE_PGSIZE_2M);
if (!mz)
return NULL;
diff --git a/drivers/net/nbl/nbl_dev/nbl_dev.c b/drivers/net/nbl/nbl_dev/nbl_dev.c
index d28eea082f..81d90a14e7 100644
--- a/drivers/net/nbl/nbl_dev/nbl_dev.c
+++ b/drivers/net/nbl/nbl_dev/nbl_dev.c
@@ -355,7 +355,7 @@ int nbl_dev_port_close(struct rte_eth_dev *eth_dev)
}
int nbl_tx_queue_setup(struct rte_eth_dev *eth_dev, u16 queue_idx,
- u16 nb_desc, unsigned int socket_id, const struct rte_eth_txconf *conf)
+ u16 nb_desc, unsigned int numa_id, const struct rte_eth_txconf *conf)
{
struct nbl_adapter *adapter = ETH_DEV_TO_NBL_DEV_PF_PRIV(eth_dev);
struct nbl_dev_mgt *dev_mgt = NBL_ADAPTER_TO_DEV_MGT(adapter);
@@ -367,7 +367,7 @@ int nbl_tx_queue_setup(struct rte_eth_dev *eth_dev, u16 queue_idx,
param.queue_idx = queue_idx;
param.nb_desc = nb_desc;
- param.socket_id = socket_id;
+ param.numa_id = numa_id;
param.conf = conf;
param.product = adapter->caps.product_type;
param.bond_broadcast_check = NULL;
@@ -383,7 +383,7 @@ int nbl_tx_queue_setup(struct rte_eth_dev *eth_dev, u16 queue_idx,
}
int nbl_rx_queue_setup(struct rte_eth_dev *eth_dev, u16 queue_idx,
- u16 nb_desc, unsigned int socket_id,
+ u16 nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *conf, struct rte_mempool *mempool)
{
struct nbl_adapter *adapter = ETH_DEV_TO_NBL_DEV_PF_PRIV(eth_dev);
@@ -396,7 +396,7 @@ int nbl_rx_queue_setup(struct rte_eth_dev *eth_dev, u16 queue_idx,
param.queue_idx = queue_idx;
param.nb_desc = nb_desc;
- param.socket_id = socket_id;
+ param.numa_id = numa_id;
param.conf = conf;
param.mempool = mempool;
param.product = adapter->caps.product_type;
diff --git a/drivers/net/nbl/nbl_dev/nbl_dev.h b/drivers/net/nbl/nbl_dev/nbl_dev.h
index bfe2b06deb..bdf2129b04 100644
--- a/drivers/net/nbl/nbl_dev/nbl_dev.h
+++ b/drivers/net/nbl/nbl_dev/nbl_dev.h
@@ -78,9 +78,9 @@ int nbl_dev_port_start(struct rte_eth_dev *eth_dev);
int nbl_dev_port_stop(struct rte_eth_dev *eth_dev);
int nbl_dev_port_close(struct rte_eth_dev *eth_dev);
int nbl_tx_queue_setup(struct rte_eth_dev *eth_dev, u16 queue_idx,
- u16 nb_desc, unsigned int socket_id, const struct rte_eth_txconf *conf);
+ u16 nb_desc, unsigned int numa_id, const struct rte_eth_txconf *conf);
int nbl_rx_queue_setup(struct rte_eth_dev *eth_dev, u16 queue_idx,
- u16 nb_desc, unsigned int socket_id,
+ u16 nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *conf, struct rte_mempool *mempool);
void nbl_tx_queues_release(struct rte_eth_dev *eth_dev, uint16_t queue_id);
void nbl_rx_queues_release(struct rte_eth_dev *eth_dev, uint16_t queue_id);
diff --git a/drivers/net/nbl/nbl_hw/nbl_txrx.c b/drivers/net/nbl/nbl_hw/nbl_txrx.c
index 7beae85177..9587045832 100644
--- a/drivers/net/nbl/nbl_hw/nbl_txrx.c
+++ b/drivers/net/nbl/nbl_hw/nbl_txrx.c
@@ -165,7 +165,7 @@ static int nbl_res_txrx_start_tx_ring(void *priv,
size = RTE_ALIGN_CEIL(sizeof(tx_ring->desc[0]) * param->nb_desc, 4096);
memzone = rte_eth_dma_zone_reserve(eth_dev, "tx_ring", param->queue_idx,
size, RTE_CACHE_LINE_SIZE,
- param->socket_id);
+ param->numa_id);
if (memzone == NULL) {
NBL_LOG(ERR, "reserve dma zone for tx ring failed");
goto alloc_dma_zone_failed;
@@ -176,7 +176,7 @@ static int nbl_res_txrx_start_tx_ring(void *priv,
snprintf(vq_hdr_name, sizeof(vq_hdr_name), "port%d_vq%d_hdr",
eth_dev->data->port_id, param->queue_idx);
net_hdr_mz = rte_memzone_reserve_aligned(vq_hdr_name, size,
- param->socket_id,
+ param->numa_id,
RTE_MEMZONE_IOVA_CONTIG,
RTE_CACHE_LINE_SIZE);
if (net_hdr_mz == NULL) {
@@ -312,17 +312,17 @@ static int nbl_res_txrx_start_rx_ring(void *priv,
eth_dev->data->rx_queues[param->queue_idx] = NULL;
}
- rx_ring = rte_zmalloc_socket("nbl_rxring", sizeof(*rx_ring),
- RTE_CACHE_LINE_SIZE, param->socket_id);
+ rx_ring = rte_zmalloc_numa("nbl_rxring", sizeof(*rx_ring),
+ RTE_CACHE_LINE_SIZE, param->numa_id);
if (rx_ring == NULL) {
NBL_LOG(ERR, "allocate rx queue data structure failed");
return -ENOMEM;
}
size = sizeof(rx_ring->rx_entry[0]) * (param->nb_desc + NBL_DESC_PER_LOOP_VEC_MAX);
- rx_ring->rx_entry = rte_zmalloc_socket("rxq rx_entry", size,
+ rx_ring->rx_entry = rte_zmalloc_numa("rxq rx_entry", size,
RTE_CACHE_LINE_SIZE,
- param->socket_id);
+ param->numa_id);
if (rx_ring->rx_entry == NULL) {
NBL_LOG(ERR, "allocate rx queue %d software ring failed", param->queue_idx);
goto alloc_rx_entry_failed;
@@ -331,7 +331,7 @@ static int nbl_res_txrx_start_rx_ring(void *priv,
size = sizeof(rx_ring->desc[0]) * (param->nb_desc + NBL_DESC_PER_LOOP_VEC_MAX);
memzone = rte_eth_dma_zone_reserve(eth_dev, "rx_ring", param->queue_idx,
size, RTE_CACHE_LINE_SIZE,
- param->socket_id);
+ param->numa_id);
if (memzone == NULL) {
NBL_LOG(ERR, "reserve dma zone for rx ring failed");
goto alloc_dma_zone_failed;
diff --git a/drivers/net/nbl/nbl_include/nbl_include.h b/drivers/net/nbl/nbl_include/nbl_include.h
index ba99b9f8e7..07549cf2f9 100644
--- a/drivers/net/nbl/nbl_include/nbl_include.h
+++ b/drivers/net/nbl/nbl_include/nbl_include.h
@@ -82,7 +82,7 @@ struct nbl_func_caps {
struct nbl_start_rx_ring_param {
u16 queue_idx;
u16 nb_desc;
- u32 socket_id;
+ u32 numa_id;
enum nbl_product_type product;
const struct rte_eth_rxconf *conf;
struct rte_mempool *mempool;
@@ -91,7 +91,7 @@ struct nbl_start_rx_ring_param {
struct nbl_start_tx_ring_param {
u16 queue_idx;
u16 nb_desc;
- u32 socket_id;
+ u32 numa_id;
enum nbl_product_type product;
const struct rte_eth_txconf *conf;
bool (*bond_broadcast_check)(struct rte_mbuf *mbuf);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 132/227] net/netvsc: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (130 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 131/227] net/nbl: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 133/227] net/nfb: " Chengwen Feng
` (95 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/netvsc/hn_ethdev.c | 6 +++---
drivers/net/netvsc/hn_rxtx.c | 30 +++++++++++++++---------------
drivers/net/netvsc/hn_var.h | 10 +++++-----
drivers/net/netvsc/hn_vf.c | 8 ++++----
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index 5dc91f9503..ae21ade424 100644
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -163,7 +163,7 @@ eth_dev_vmbus_allocate(struct rte_vmbus_device *dev, size_t private_data_size)
if (private_data_size) {
eth_dev->data->dev_private =
- rte_zmalloc_socket(name, private_data_size,
+ rte_zmalloc_numa(name, private_data_size,
RTE_CACHE_LINE_SIZE, dev->device.numa_node);
if (!eth_dev->data->dev_private) {
PMD_DRV_LOG(NOTICE, "can not allocate driver data");
@@ -1987,7 +1987,7 @@ static int netvsc_init_once(void)
switch (rte_eal_process_type()) {
case RTE_PROC_PRIMARY:
netvsc_shared_mz = rte_memzone_reserve(MZ_NETVSC_SHARED_DATA,
- sizeof(*netvsc_shared_data), SOCKET_ID_ANY, 0);
+ sizeof(*netvsc_shared_data), RTE_NUMA_ID_ANY, 0);
if (!netvsc_shared_mz) {
PMD_DRV_LOG(ERR, "Cannot allocate netvsc shared data");
return -rte_errno;
@@ -2091,7 +2091,7 @@ static int eth_hn_probe(struct rte_vmbus_driver *drv __rte_unused,
goto vmbus_alloc_failed;
}
- process_priv = rte_zmalloc_socket("netvsc_proc_priv",
+ process_priv = rte_zmalloc_numa("netvsc_proc_priv",
sizeof(struct hn_nvs_process_priv),
RTE_CACHE_LINE_SIZE,
dev->device.numa_node);
diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 7987b70ce5..e18fb64f2e 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -236,7 +236,7 @@ hn_rx_queue_free_common(struct hn_rx_queue *rxq)
int
hn_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
@@ -263,8 +263,8 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev,
return -EINVAL;
}
- txq = rte_zmalloc_socket("HN_TXQ", sizeof(*txq), RTE_CACHE_LINE_SIZE,
- socket_id);
+ txq = rte_zmalloc_numa("HN_TXQ", sizeof(*txq), RTE_CACHE_LINE_SIZE,
+ numa_id);
if (!txq)
return -ENOMEM;
@@ -281,7 +281,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev,
name, nb_desc, sizeof(struct hn_txdesc));
txq->tx_rndis_mz = rte_memzone_reserve_aligned(name,
- nb_desc * HN_RNDIS_PKT_ALIGNED, rte_socket_id(),
+ nb_desc * HN_RNDIS_PKT_ALIGNED, rte_numa_id(),
RTE_MEMZONE_IOVA_CONTIG, HN_RNDIS_PKT_ALIGNED);
if (!txq->tx_rndis_mz) {
err = -rte_errno;
@@ -307,7 +307,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev,
* received
*/
if (queue_idx >= dev->data->nb_rx_queues) {
- rxq = hn_rx_queue_alloc(hv, queue_idx, socket_id);
+ rxq = hn_rx_queue_alloc(hv, queue_idx, numa_id);
if (!rxq) {
err = -ENOMEM;
@@ -329,7 +329,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev,
hn_reset_txagg(txq);
err = hn_vf_tx_queue_setup(dev, queue_idx, nb_desc,
- socket_id, tx_conf);
+ numa_id, tx_conf);
if (err == 0) {
dev->data->tx_queues[queue_idx] = txq;
if (rxq != NULL)
@@ -906,12 +906,12 @@ static void hn_nvs_handle_notify(struct rte_eth_dev *dev,
struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv,
uint16_t queue_id,
- unsigned int socket_id)
+ unsigned int numa_id)
{
struct hn_rx_queue *rxq;
- rxq = rte_zmalloc_socket("HN_RXQ", sizeof(*rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("HN_RXQ", sizeof(*rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq)
return NULL;
@@ -921,8 +921,8 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv,
rxq->port_id = hv->port_id;
rxq->queue_id = queue_id;
rxq->event_sz = HN_RXQ_EVENT_DEFAULT;
- rxq->event_buf = rte_malloc_socket("HN_EVENTS", HN_RXQ_EVENT_DEFAULT,
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq->event_buf = rte_malloc_numa("HN_EVENTS", HN_RXQ_EVENT_DEFAULT,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->event_buf) {
rte_free(rxq);
return NULL;
@@ -962,7 +962,7 @@ hn_dev_rx_queue_info(struct rte_eth_dev *dev, uint16_t queue_id,
int
hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -982,7 +982,7 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
* number of Rx queues, we may already have allocated an rxq.
*/
if (!dev->data->rx_queues[queue_idx])
- rxq = hn_rx_queue_alloc(hv, queue_idx, socket_id);
+ rxq = hn_rx_queue_alloc(hv, queue_idx, numa_id);
else
rxq = dev->data->rx_queues[queue_idx];
@@ -1004,12 +1004,12 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
"hn_rx_%u_%u", dev->data->port_id, queue_idx);
rxq->rx_ring = rte_ring_create(ring_name,
rte_align32pow2(nb_desc),
- socket_id, 0);
+ numa_id, 0);
if (!rxq->rx_ring)
goto fail;
error = hn_vf_rx_queue_setup(dev, queue_idx, nb_desc,
- socket_id, rx_conf, mp);
+ numa_id, rx_conf, mp);
if (error)
goto fail;
diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h
index 7d9a950816..ad6180ef09 100644
--- a/drivers/net/netvsc/hn_var.h
+++ b/drivers/net/netvsc/hn_var.h
@@ -205,7 +205,7 @@ int hn_chim_init(struct rte_eth_dev *dev);
void hn_chim_uninit(struct rte_eth_dev *dev);
int hn_dev_link_update(struct rte_eth_dev *dev, int wait);
int hn_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
void hn_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
void hn_dev_tx_queue_info(struct rte_eth_dev *dev, uint16_t queue_idx,
@@ -215,10 +215,10 @@ int hn_dev_tx_descriptor_status(void *arg, uint16_t offset);
struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv,
uint16_t queue_id,
- unsigned int socket_id);
+ unsigned int numa_id);
int hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
void hn_dev_rx_queue_info(struct rte_eth_dev *dev, uint16_t queue_id,
@@ -263,14 +263,14 @@ int hn_vf_mc_addr_list(struct rte_eth_dev *dev,
int hn_vf_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
void hn_vf_tx_queue_release(struct hn_data *hv, uint16_t queue_id);
int hn_vf_tx_queue_status(struct hn_data *hv, uint16_t queue_id, uint16_t offset);
int hn_vf_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
void hn_vf_rx_queue_release(struct hn_data *hv, uint16_t queue_id);
diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c
index 96e811278a..f226acfedb 100644
--- a/drivers/net/netvsc/hn_vf.c
+++ b/drivers/net/netvsc/hn_vf.c
@@ -848,7 +848,7 @@ int hn_vf_mc_addr_list(struct rte_eth_dev *dev,
int hn_vf_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct hn_data *hv = dev->data->dev_private;
@@ -860,7 +860,7 @@ int hn_vf_tx_queue_setup(struct rte_eth_dev *dev,
if (vf_dev)
ret = rte_eth_tx_queue_setup(vf_dev->data->port_id,
queue_idx, nb_desc,
- socket_id, tx_conf);
+ numa_id, tx_conf);
rte_rwlock_read_unlock(&hv->vf_lock);
return ret;
}
@@ -881,7 +881,7 @@ void hn_vf_tx_queue_release(struct hn_data *hv, uint16_t queue_id)
int hn_vf_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -894,7 +894,7 @@ int hn_vf_rx_queue_setup(struct rte_eth_dev *dev,
if (vf_dev)
ret = rte_eth_rx_queue_setup(vf_dev->data->port_id,
queue_idx, nb_desc,
- socket_id, rx_conf, mp);
+ numa_id, rx_conf, mp);
rte_rwlock_read_unlock(&hv->vf_lock);
return ret;
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 133/227] net/nfb: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (131 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 132/227] net/netvsc: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 134/227] net/nfp: " Chengwen Feng
` (94 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/nfb/nfb_ethdev.c | 2 +-
drivers/net/nfb/nfb_rx.c | 8 ++++----
drivers/net/nfb/nfb_rx.h | 2 +-
drivers/net/nfb/nfb_tx.c | 8 ++++----
drivers/net/nfb/nfb_tx.h | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c
index ba7c849a4b..795abcd9ac 100644
--- a/drivers/net/nfb/nfb_ethdev.c
+++ b/drivers/net/nfb/nfb_ethdev.c
@@ -763,7 +763,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev, void *init_data)
struct rte_ether_addr eth_addr_init;
uint16_t max_rx_queues, max_tx_queues;
- internals = rte_zmalloc_socket("nfb_internals",
+ internals = rte_zmalloc_numa("nfb_internals",
sizeof(struct pmd_internals), RTE_CACHE_LINE_SIZE,
dev->device->numa_node);
if (internals == NULL) {
diff --git a/drivers/net/nfb/nfb_rx.c b/drivers/net/nfb/nfb_rx.c
index 5b8579e280..0d8a515a1f 100644
--- a/drivers/net/nfb/nfb_rx.c
+++ b/drivers/net/nfb/nfb_rx.c
@@ -56,7 +56,7 @@ int
nfb_eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool)
{
@@ -70,11 +70,11 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev,
if (rx_queue_id >= priv->max_rx_queues)
return -EINVAL;
- rxq = rte_zmalloc_socket("ndp rx queue", sizeof(struct ndp_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("ndp rx queue", sizeof(struct ndp_rx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL) {
- NFB_LOG(ERR, "rte_zmalloc_socket() failed for rx queue id %" PRIu16,
+ NFB_LOG(ERR, "rte_zmalloc_numa() failed for rx queue id %u",
rx_queue_id);
return -ENOMEM;
}
diff --git a/drivers/net/nfb/nfb_rx.h b/drivers/net/nfb/nfb_rx.h
index 831945c577..453245f6fe 100644
--- a/drivers/net/nfb/nfb_rx.h
+++ b/drivers/net/nfb/nfb_rx.h
@@ -87,7 +87,7 @@ int
nfb_eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool);
diff --git a/drivers/net/nfb/nfb_tx.c b/drivers/net/nfb/nfb_tx.c
index 1a7dcc3d30..fb9791eab9 100644
--- a/drivers/net/nfb/nfb_tx.c
+++ b/drivers/net/nfb/nfb_tx.c
@@ -50,7 +50,7 @@ int
nfb_eth_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct pmd_internals *internals = dev->process_private;
@@ -63,11 +63,11 @@ nfb_eth_tx_queue_setup(struct rte_eth_dev *dev,
if (tx_queue_id >= priv->max_tx_queues)
return -EINVAL;
- txq = rte_zmalloc_socket("ndp tx queue", sizeof(struct ndp_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("ndp tx queue", sizeof(struct ndp_tx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL) {
- NFB_LOG(ERR, "rte_zmalloc_socket() failed for tx queue id %" PRIu16,
+ NFB_LOG(ERR, "rte_zmalloc_numa() failed for tx queue id %u",
tx_queue_id);
return -ENOMEM;
}
diff --git a/drivers/net/nfb/nfb_tx.h b/drivers/net/nfb/nfb_tx.h
index c253af1a86..0b6aad50e6 100644
--- a/drivers/net/nfb/nfb_tx.h
+++ b/drivers/net/nfb/nfb_tx.h
@@ -45,7 +45,7 @@ int
nfb_eth_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused);
/**
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 134/227] net/nfp: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (132 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 133/227] net/nfb: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 135/227] net/ngbe: " Chengwen Feng
` (93 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/nfp/flower/nfp_flower.c | 16 +++++++--------
.../net/nfp/flower/nfp_flower_representor.c | 20 +++++++++----------
drivers/net/nfp/nfd3/nfp_nfd3.h | 2 +-
drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 12 +++++------
drivers/net/nfp/nfdk/nfp_nfdk.h | 2 +-
drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 12 +++++------
drivers/net/nfp/nfp_net_common.c | 2 +-
drivers/net/nfp/nfp_rxtx.c | 18 ++++++++---------
drivers/net/nfp/nfp_rxtx.h | 4 ++--
drivers/net/nfp/nfpcore/nfp_sync.c | 2 +-
10 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c
index 14a8992376..b8c061c657 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -380,7 +380,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower,
pci_name = strchr(pf_dev->pci_dev->name, ':') + 1;
/* Create a mbuf pool for the ctrl vNIC */
- numa_node = rte_socket_id();
+ numa_node = rte_numa_id();
snprintf(ctrl_pktmbuf_pool_name, sizeof(ctrl_pktmbuf_pool_name),
"%s_ctrlmp", pci_name);
app_fw_flower->ctrl_pktmbuf_pool =
@@ -424,7 +424,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower,
snprintf(ctrl_rxring_name, sizeof(ctrl_rxring_name), "%s_ctrx_ring", pci_name);
/* Set up the Rx queues */
for (i = 0; i < n_rxq; i++) {
- rxq = rte_zmalloc_socket("ethdev RX queue",
+ rxq = rte_zmalloc_numa("ethdev RX queue",
sizeof(struct nfp_net_rxq), RTE_CACHE_LINE_SIZE,
numa_node);
if (rxq == NULL) {
@@ -473,7 +473,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower,
rxq->rxds = tz->addr;
/* Mbuf pointers array for referencing mbufs linked to RX descriptors */
- rxq->rxbufs = rte_zmalloc_socket("rxq->rxbufs",
+ rxq->rxbufs = rte_zmalloc_numa("rxq->rxbufs",
sizeof(*rxq->rxbufs) * CTRL_VNIC_NB_DESC,
RTE_CACHE_LINE_SIZE, numa_node);
if (rxq->rxbufs == NULL) {
@@ -499,7 +499,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower,
snprintf(ctrl_txring_name, sizeof(ctrl_txring_name), "%s_cttx_ring", pci_name);
/* Set up the Tx queues */
for (i = 0; i < n_txq; i++) {
- txq = rte_zmalloc_socket("ethdev TX queue",
+ txq = rte_zmalloc_numa("ethdev TX queue",
sizeof(struct nfp_net_txq), RTE_CACHE_LINE_SIZE,
numa_node);
if (txq == NULL) {
@@ -539,7 +539,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower,
txq->txds = tz->addr;
/* Mbuf pointers array for referencing mbufs linked to TX descriptors */
- txq->txbufs = rte_zmalloc_socket("txq->txbufs",
+ txq->txbufs = rte_zmalloc_numa("txq->txbufs",
sizeof(*txq->txbufs) * CTRL_VNIC_NB_DESC,
RTE_CACHE_LINE_SIZE, numa_node);
if (txq->txbufs == NULL) {
@@ -744,11 +744,11 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv)
struct nfp_app_fw_flower *app_fw_flower;
struct nfp_pf_dev *pf_dev = hw_priv->pf_dev;
- numa_node = rte_socket_id();
+ numa_node = rte_numa_id();
id = nfp_function_id_get(pf_dev, 0);
/* Allocate memory for the Flower app */
- app_fw_flower = rte_zmalloc_socket("nfp_app_fw_flower", sizeof(*app_fw_flower),
+ app_fw_flower = rte_zmalloc_numa("nfp_app_fw_flower", sizeof(*app_fw_flower),
RTE_CACHE_LINE_SIZE, numa_node);
if (app_fw_flower == NULL) {
PMD_INIT_LOG(ERR, "Could not malloc app fw flower.");
@@ -770,7 +770,7 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv)
}
/* Allocate memory for the PF AND ctrl vNIC here (hence the * 2) */
- pf_hw = rte_zmalloc_socket("nfp_pf_vnic", 2 * sizeof(struct nfp_net_hw),
+ pf_hw = rte_zmalloc_numa("nfp_pf_vnic", 2 * sizeof(struct nfp_net_hw),
RTE_CACHE_LINE_SIZE, numa_node);
if (pf_hw == NULL) {
PMD_INIT_LOG(ERR, "Could not malloc nfp pf vnic.");
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index 231a76980d..d75dbcbd4b 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -249,7 +249,7 @@ static int
nfp_flower_repr_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
__rte_unused struct rte_mempool *mb_pool)
{
@@ -262,14 +262,14 @@ nfp_flower_repr_rx_queue_setup(struct rte_eth_dev *dev,
pf_hw = repr->app_fw_flower->pf_hw;
/* Allocating rx queue data structure */
- rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct nfp_net_rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("ethdev RX queue", sizeof(struct nfp_net_rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL)
return -ENOMEM;
snprintf(ring_name, sizeof(ring_name), "%s-%s-%u", repr->name, "Rx", rx_queue_id);
repr->ring[rx_queue_id] = rte_ring_create(ring_name, nb_rx_desc,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (repr->ring[rx_queue_id] == NULL) {
PMD_DRV_LOG(ERR, "The rte_ring_create failed for rx queue %u.", rx_queue_id);
rte_free(rxq);
@@ -288,7 +288,7 @@ static int
nfp_flower_repr_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
__rte_unused uint16_t nb_tx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
__rte_unused const struct rte_eth_txconf *tx_conf)
{
struct nfp_net_txq *txq;
@@ -299,8 +299,8 @@ nfp_flower_repr_tx_queue_setup(struct rte_eth_dev *dev,
pf_hw = repr->app_fw_flower->pf_hw;
/* Allocating tx queue data structure */
- txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct nfp_net_txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("ethdev TX queue", sizeof(struct nfp_net_txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL)
return -ENOMEM;
@@ -886,8 +886,8 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev,
* representor PMD will try to read from the ring.
*/
snprintf(ring_name, sizeof(ring_name), "%s_%s", init_repr_data->name, "ring");
- numa_node = rte_socket_id();
- repr->ring = rte_zmalloc_socket(ring_name,
+ numa_node = rte_numa_id();
+ repr->ring = rte_zmalloc_numa(ring_name,
sizeof(struct rte_ring *) * app_fw_flower->pf_hw->max_rx_queues,
RTE_CACHE_LINE_SIZE, numa_node);
if (repr->ring == NULL) {
@@ -897,7 +897,7 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev,
repr->repr_nb_qstats = RTE_MAX(app_fw_flower->pf_hw->max_rx_queues,
app_fw_flower->pf_hw->max_tx_queues);
- repr->repr_qstats = rte_zmalloc_socket("nfp_repr_qstats",
+ repr->repr_qstats = rte_zmalloc_numa("nfp_repr_qstats",
sizeof(struct eth_queue_stats) * repr->repr_nb_qstats,
RTE_CACHE_LINE_SIZE, numa_node);
if (repr->repr_qstats == NULL) {
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3.h b/drivers/net/nfp/nfd3/nfp_nfd3.h
index dc24f4fa1d..b8a42dcf15 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3.h
+++ b/drivers/net/nfp/nfd3/nfp_nfd3.h
@@ -81,7 +81,7 @@ uint16_t nfp_net_nfd3_xmit_pkts(void *tx_queue,
int nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
#endif /* __NFP_NFD3_H__ */
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
index 6466a5a4fb..1503934667 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
@@ -374,7 +374,7 @@ int
nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
size_t size;
@@ -421,8 +421,8 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev,
}
/* Allocating tx queue data structure */
- txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct nfp_net_txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("ethdev TX queue", sizeof(struct nfp_net_txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL) {
PMD_DRV_LOG(ERR, "Error allocating tx dma.");
return -ENOMEM;
@@ -437,7 +437,7 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev,
*/
size = sizeof(struct nfp_net_nfd3_tx_desc) * NFD3_TX_DESC_PER_PKT * max_tx_desc;
tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, size,
- NFP_MEMZONE_ALIGN, socket_id);
+ NFP_MEMZONE_ALIGN, numa_id);
if (tz == NULL) {
PMD_DRV_LOG(ERR, "Error allocating tx dma.");
nfp_net_tx_queue_release(dev, queue_idx);
@@ -459,9 +459,9 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev,
txq->txds = tz->addr;
/* Mbuf pointers array for referencing mbufs linked to TX descriptors */
- txq->txbufs = rte_zmalloc_socket("txq->txbufs",
+ txq->txbufs = rte_zmalloc_numa("txq->txbufs",
sizeof(*txq->txbufs) * txq->tx_count,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->txbufs == NULL) {
nfp_net_tx_queue_release(dev, queue_idx);
dev->data->tx_queues[queue_idx] = NULL;
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk.h b/drivers/net/nfp/nfdk/nfp_nfdk.h
index d843162be0..b0f5224acf 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk.h
+++ b/drivers/net/nfp/nfdk/nfp_nfdk.h
@@ -216,7 +216,7 @@ uint16_t nfp_net_nfdk_xmit_pkts(void *tx_queue,
int nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq,
struct rte_mbuf *pkt);
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index 777550b6df..a039de9135 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -408,7 +408,7 @@ int
nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
size_t size;
@@ -457,8 +457,8 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev,
}
/* Allocating tx queue data structure */
- txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct nfp_net_txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("ethdev TX queue", sizeof(struct nfp_net_txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL) {
PMD_DRV_LOG(ERR, "Error allocating tx dma.");
return -ENOMEM;
@@ -472,7 +472,7 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev,
size = sizeof(struct nfp_net_nfdk_tx_desc) * max_tx_desc *
NFDK_TX_DESC_PER_SIMPLE_PKT;
tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, size,
- NFP_MEMZONE_ALIGN, socket_id);
+ NFP_MEMZONE_ALIGN, numa_id);
if (tz == NULL) {
PMD_DRV_LOG(ERR, "Error allocating tx dma.");
nfp_net_tx_queue_release(dev, queue_idx);
@@ -493,9 +493,9 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev,
txq->ktxds = tz->addr;
/* Mbuf pointers array for referencing mbufs linked to TX descriptors */
- txq->txbufs = rte_zmalloc_socket("txq->txbufs",
+ txq->txbufs = rte_zmalloc_numa("txq->txbufs",
sizeof(*txq->txbufs) * txq->tx_count,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->txbufs == NULL) {
nfp_net_tx_queue_release(dev, queue_idx);
return -ENOMEM;
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 97841c00b5..ab0aa14ff4 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -2269,7 +2269,7 @@ nfp_net_txrwb_alloc(struct rte_eth_dev *eth_dev)
snprintf(mz_name, sizeof(mz_name), "%s_TXRWB", eth_dev->data->name);
net_hw->txrwb_mz = rte_memzone_reserve_aligned(mz_name,
net_hw->max_tx_queues * sizeof(uint64_t),
- rte_socket_id(),
+ rte_numa_id(),
RTE_MEMZONE_IOVA_CONTIG, RTE_CACHE_LINE_SIZE);
if (net_hw->txrwb_mz == NULL) {
PMD_INIT_LOG(ERR, "Failed to alloc %s for TX ring write back.",
diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index 19c8324549..b76c6ea7ed 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -620,7 +620,7 @@ int
nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -655,8 +655,8 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
}
/* Allocating rx queue data structure */
- rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct nfp_net_rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("ethdev RX queue", sizeof(struct nfp_net_rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL)
return -ENOMEM;
@@ -687,7 +687,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
*/
tz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx,
sizeof(struct nfp_net_rx_desc) * max_rx_desc,
- NFP_MEMZONE_ALIGN, socket_id);
+ NFP_MEMZONE_ALIGN, numa_id);
if (tz == NULL) {
PMD_DRV_LOG(ERR, "Error allocating rx dma.");
nfp_net_rx_queue_release(dev, queue_idx);
@@ -700,9 +700,9 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
rxq->rxds = tz->addr;
/* Mbuf pointers array for referencing mbufs linked to RX descriptors */
- rxq->rxbufs = rte_zmalloc_socket("rxq->rxbufs",
+ rxq->rxbufs = rte_zmalloc_numa("rxq->rxbufs",
sizeof(*rxq->rxbufs) * nb_desc, RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (rxq->rxbufs == NULL) {
nfp_net_rx_queue_release(dev, queue_idx);
dev->data->rx_queues[queue_idx] = NULL;
@@ -838,7 +838,7 @@ int
nfp_net_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct nfp_net_hw_priv *hw_priv;
@@ -847,10 +847,10 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev,
if (hw_priv->pf_dev->ver.extend == NFP_NET_CFG_VERSION_DP_NFD3)
return nfp_net_nfd3_tx_queue_setup(dev, queue_idx,
- nb_desc, socket_id, tx_conf);
+ nb_desc, numa_id, tx_conf);
else
return nfp_net_nfdk_tx_queue_setup(dev, queue_idx,
- nb_desc, socket_id, tx_conf);
+ nb_desc, numa_id, tx_conf);
}
void
diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h
index 95c7a85053..a4cde4d4dd 100644
--- a/drivers/net/nfp/nfp_rxtx.h
+++ b/drivers/net/nfp/nfp_rxtx.h
@@ -226,7 +226,7 @@ uint16_t nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
void nfp_net_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx);
void nfp_net_reset_rx_queue(struct nfp_net_rxq *rxq);
int nfp_net_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
void nfp_net_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx);
@@ -235,7 +235,7 @@ void nfp_net_reset_tx_queue(struct nfp_net_txq *txq);
int nfp_net_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
uint32_t nfp_net_tx_free_bufs(struct nfp_net_txq *txq);
void nfp_net_rx_queue_info_get(struct rte_eth_dev *dev,
diff --git a/drivers/net/nfp/nfpcore/nfp_sync.c b/drivers/net/nfp/nfpcore/nfp_sync.c
index 1b594257c6..a7a9465f65 100644
--- a/drivers/net/nfp/nfpcore/nfp_sync.c
+++ b/drivers/net/nfp/nfpcore/nfp_sync.c
@@ -56,7 +56,7 @@ nfp_sync_alloc(void)
return sync;
}
- mz = rte_memzone_reserve("nfp_sync", sizeof(*sync), SOCKET_ID_ANY,
+ mz = rte_memzone_reserve("nfp_sync", sizeof(*sync), RTE_NUMA_ID_ANY,
RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL)
return NULL;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 135/227] net/ngbe: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (133 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 134/227] net/nfp: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 136/227] net/ntnic: " Chengwen Feng
` (92 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/ngbe/ngbe_ethdev.c | 2 +-
drivers/net/ngbe/ngbe_ethdev.h | 4 ++--
drivers/net/ngbe/ngbe_rxtx.c | 28 ++++++++++++++--------------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index dc8e65ecc2..2ad76e7a3c 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -388,7 +388,7 @@ eth_ngbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
/* Reserve memory for interrupt status block */
mz = rte_eth_dma_zone_reserve(eth_dev, "ngbe_driver", -1,
- NGBE_ISB_SIZE, NGBE_ALIGN, SOCKET_ID_ANY);
+ NGBE_ISB_SIZE, NGBE_ALIGN, RTE_NUMA_ID_ANY);
if (mz == NULL)
return -ENOMEM;
diff --git a/drivers/net/ngbe/ngbe_ethdev.h b/drivers/net/ngbe/ngbe_ethdev.h
index 12ee884ce1..6e6bee6391 100644
--- a/drivers/net/ngbe/ngbe_ethdev.h
+++ b/drivers/net/ngbe/ngbe_ethdev.h
@@ -186,12 +186,12 @@ void ngbe_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
void ngbe_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
int ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
int ngbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int ngbe_dev_rx_queue_count(void *rx_queue);
diff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c
index a1389de9c0..e4be3edc95 100644
--- a/drivers/net/ngbe/ngbe_rxtx.c
+++ b/drivers/net/ngbe/ngbe_rxtx.c
@@ -2007,7 +2007,7 @@ int
ngbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
const struct rte_memzone *tz;
@@ -2055,16 +2055,16 @@ ngbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
}
/* First allocate the Tx queue data structure */
- txq = rte_zmalloc_socket("ethdev Tx queue",
+ txq = rte_zmalloc_numa("ethdev Tx queue",
sizeof(struct ngbe_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL)
return -ENOMEM;
/* Allocate Tx ring hardware descriptors. */
tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx,
sizeof(struct ngbe_tx_desc) * nb_desc,
- NGBE_ALIGN, socket_id);
+ NGBE_ALIGN, numa_id);
if (tz == NULL) {
ngbe_tx_queue_release(txq);
return -ENOMEM;
@@ -2091,9 +2091,9 @@ ngbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
txq->tx_ring = (struct ngbe_tx_desc *)TMZ_VADDR(tz);
/* Allocate software ring */
- txq->sw_ring = rte_zmalloc_socket("txq->sw_ring",
+ txq->sw_ring = rte_zmalloc_numa("txq->sw_ring",
sizeof(struct ngbe_tx_entry) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL) {
ngbe_tx_queue_release(txq);
return -ENOMEM;
@@ -2313,7 +2313,7 @@ int
ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -2337,9 +2337,9 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
}
/* First allocate the Rx queue data structure */
- rxq = rte_zmalloc_socket("ethdev RX queue",
+ rxq = rte_zmalloc_numa("ethdev RX queue",
sizeof(struct ngbe_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL)
return -ENOMEM;
rxq->mb_pool = mp;
@@ -2360,7 +2360,7 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
/* Allocate Rx ring hardware descriptors. */
size = (nb_desc + RTE_PMD_NGBE_RX_MAX_BURST) * sizeof(struct ngbe_rx_desc);
rz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx,
- size, NGBE_ALIGN, socket_id);
+ size, NGBE_ALIGN, numa_id);
if (rz == NULL) {
ngbe_rx_queue_release(rxq);
return -ENOMEM;
@@ -2399,9 +2399,9 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
if (adapter->rx_bulk_alloc_allowed)
len += RTE_PMD_NGBE_RX_MAX_BURST;
- rxq->sw_ring = rte_zmalloc_socket("rxq->sw_ring",
+ rxq->sw_ring = rte_zmalloc_numa("rxq->sw_ring",
sizeof(struct ngbe_rx_entry) * len,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq->sw_ring == NULL) {
ngbe_rx_queue_release(rxq);
return -ENOMEM;
@@ -2416,9 +2416,9 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
* dev_start() flow.
*/
rxq->sw_sc_ring =
- rte_zmalloc_socket("rxq->sw_sc_ring",
+ rte_zmalloc_numa("rxq->sw_sc_ring",
sizeof(struct ngbe_scattered_rx_entry) * len,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq->sw_sc_ring == NULL) {
ngbe_rx_queue_release(rxq);
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 136/227] net/ntnic: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (134 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 135/227] net/ngbe: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 137/227] net/null: " Chengwen Feng
` (91 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c | 4 ++--
.../link_mgmt/link_100g/nt4ga_link_100g.c | 2 +-
.../link_agx_100g/nt4ga_agx_link_100g.c | 2 +-
.../flow_api/profile_inline/flm_age_queue.c | 2 +-
.../flow_api/profile_inline/flm_evt_queue.c | 2 +-
.../flow_api/profile_inline/flm_lrn_queue.c | 2 +-
drivers/net/ntnic/ntnic_ethdev.c | 24 +++++++++----------
drivers/net/ntnic/ntutil/nt_util.c | 4 ++--
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c b/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c
index ef8ad29aa1..d009f0e6a0 100644
--- a/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c
+++ b/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c
@@ -180,7 +180,7 @@ static int dbs_numa_node(const nthw_dbs_t *p_nthw_dbs)
/* Allocate a zeroed queue object and bind it to its DBS module */
static struct nthw_virt_queue *dbs_alloc_virt_queue(nthw_dbs_t *p_nthw_dbs)
{
- struct nthw_virt_queue *vq = rte_zmalloc_socket("ntnic_vq",
+ struct nthw_virt_queue *vq = rte_zmalloc_numa("ntnic_vq",
sizeof(struct nthw_virt_queue), RTE_CACHE_LINE_SIZE,
dbs_numa_node(p_nthw_dbs));
@@ -202,7 +202,7 @@ static int dbs_copy_packet_buffers(struct nthw_virt_queue *vq,
if (n == 0)
return -1; /* don't allocate memory with size of 0 bytes */
- vq->p_virtual_addr = rte_zmalloc_socket("ntnic_vq_bufs", size, RTE_CACHE_LINE_SIZE,
+ vq->p_virtual_addr = rte_zmalloc_numa("ntnic_vq_bufs", size, RTE_CACHE_LINE_SIZE,
dbs_numa_node(vq->mp_nthw_dbs));
if (vq->p_virtual_addr == NULL)
diff --git a/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c b/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c
index 0f36c30e5f..b9b3738454 100644
--- a/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c
+++ b/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c
@@ -721,7 +721,7 @@ static int nt4ga_link_100g_ports_init(struct adapter_info_s *p_adapter_info, nth
struct rte_service_spec adapter_monitor_service = {
.name = "ntnic-adapter-monitor",
.callback = nt4ga_link_100g_mon,
- .socket_id = SOCKET_ID_ANY,
+ .socket_id = RTE_NUMA_ID_ANY,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
.callback_userdata = p_adapter_info,
};
diff --git a/drivers/net/ntnic/link_mgmt/link_agx_100g/nt4ga_agx_link_100g.c b/drivers/net/ntnic/link_mgmt/link_agx_100g/nt4ga_agx_link_100g.c
index f0c07c80ad..c4e12b1c25 100644
--- a/drivers/net/ntnic/link_mgmt/link_agx_100g/nt4ga_agx_link_100g.c
+++ b/drivers/net/ntnic/link_mgmt/link_agx_100g/nt4ga_agx_link_100g.c
@@ -1023,7 +1023,7 @@ int nt4ga_agx_link_100g_ports_init(struct adapter_info_s *p_adapter_info, nthw_f
struct rte_service_spec adapter_monitor_service = {
.name = "ntnic-adapter_agx-monitor",
.callback = nt4ga_agx_link_100g_mon,
- .socket_id = SOCKET_ID_ANY,
+ .socket_id = RTE_NUMA_ID_ANY,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
.callback_userdata = p_adapter_info,
};
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
index b9c93a293c..ac1f8b0005 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
@@ -95,7 +95,7 @@ struct rte_ring *nthw_flm_age_queue_create(uint8_t port, uint16_t caller_id, uns
q = rte_ring_create_elem(name,
FLM_AGE_ELEM_SIZE,
count,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (q == NULL) {
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
index e2f3b31ad0..869680173e 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
@@ -179,7 +179,7 @@ static struct rte_ring *flm_evt_queue_create(uint8_t port, uint8_t caller)
q = rte_ring_create_elem(name,
elem_size,
queue_size,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (q == NULL) {
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_lrn_queue.c b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_lrn_queue.c
index cb4504a6e0..98c7825fb1 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_lrn_queue.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_lrn_queue.c
@@ -21,7 +21,7 @@ void *nthw_flm_lrn_queue_create(void)
struct rte_ring *q = rte_ring_create_elem("RFQ",
ELEM_SIZE,
QUEUE_SIZE,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RING_F_MP_HTS_ENQ | RING_F_SC_DEQ);
RTE_ASSERT(q != NULL);
return q;
diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c
index e0d84705f5..02c3be52e8 100644
--- a/drivers/net/ntnic/ntnic_ethdev.c
+++ b/drivers/net/ntnic/ntnic_ethdev.c
@@ -789,7 +789,7 @@ static int allocate_hw_virtio_queues(struct rte_eth_dev *eth_dev, int vf_num, st
uint64_t tot_alloc_size = 0x100000 + (uint64_t)buf_size * (uint64_t)num_descr;
void *virt =
- rte_malloc_socket("VirtQDescr", tot_alloc_size,
+ rte_malloc_numa("VirtQDescr", tot_alloc_size,
nthw_util_align_size(tot_alloc_size),
eth_dev->data->numa_node);
@@ -820,7 +820,7 @@ static int allocate_hw_virtio_queues(struct rte_eth_dev *eth_dev, int vf_num, st
/* Just allocate 1MB to hold all combined descr rings */
size = 0x100000;
- void *virt = rte_malloc_socket("VirtQDescr", size, 4096, eth_dev->data->numa_node);
+ void *virt = rte_malloc_numa("VirtQDescr", size, 4096, eth_dev->data->numa_node);
if (!virt)
return -1;
@@ -843,7 +843,7 @@ static int allocate_hw_virtio_queues(struct rte_eth_dev *eth_dev, int vf_num, st
size = num_descr * sizeof(struct nthw_memory_descriptor);
hwq->pkt_buffers =
- rte_zmalloc_socket("rx_pkt_buffers", size, 64, eth_dev->data->numa_node);
+ rte_zmalloc_numa("rx_pkt_buffers", size, 64, eth_dev->data->numa_node);
if (!hwq->pkt_buffers) {
NT_LOG(ERR, NTNIC,
@@ -856,7 +856,7 @@ static int allocate_hw_virtio_queues(struct rte_eth_dev *eth_dev, int vf_num, st
size = buf_size * num_descr;
void *virt_addr =
- rte_malloc_socket("pkt_buffer_pkts", size, 4096, eth_dev->data->numa_node);
+ rte_malloc_numa("pkt_buffer_pkts", size, 4096, eth_dev->data->numa_node);
if (!virt_addr) {
NT_LOG(ERR, NTNIC,
@@ -916,7 +916,7 @@ static int allocate_hw_virtio_queues(struct rte_eth_dev *eth_dev, int vf_num, st
size = num_descr * sizeof(struct nthw_memory_descriptor);
hwq->pkt_buffers =
- rte_zmalloc_socket("rx_pkt_buffers", size, 64, eth_dev->data->numa_node);
+ rte_zmalloc_numa("rx_pkt_buffers", size, 64, eth_dev->data->numa_node);
if (!hwq->pkt_buffers) {
NT_LOG(ERR, NTNIC,
@@ -1028,7 +1028,7 @@ static int allocate_queue(int num)
static int eth_rx_scg_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -1107,7 +1107,7 @@ static int eth_rx_scg_queue_setup(struct rte_eth_dev *eth_dev,
static int eth_tx_scg_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf)
{
const struct port_ops *port_ops = nthw_get_port_ops();
@@ -2323,7 +2323,7 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev)
/* alloc */
- p_drv = rte_zmalloc_socket(pci_dev->name, sizeof(struct drv_s), RTE_CACHE_LINE_SIZE,
+ p_drv = rte_zmalloc_numa(pci_dev->name, sizeof(struct drv_s), RTE_CACHE_LINE_SIZE,
pci_dev->device.numa_node);
if (!p_drv) {
@@ -2443,7 +2443,7 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev)
struct rte_service_spec flm_update_spec = {
.name = "ntnic-flm_update_service",
.callback = adapter_flm_update_service,
- .socket_id = SOCKET_ID_ANY,
+ .socket_id = RTE_NUMA_ID_ANY,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
.callback_userdata = p_drv
};
@@ -2460,7 +2460,7 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev)
struct rte_service_spec stat_spec = {
.name = "ntnic-stat_collect_service",
.callback = adapter_stat_service,
- .socket_id = SOCKET_ID_ANY,
+ .socket_id = RTE_NUMA_ID_ANY,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
.callback_userdata = p_drv
};
@@ -2494,7 +2494,7 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev)
NT_LOG_DBGX(DBG, NTNIC, "%s: interface #%d: %s: '%s'", p_port_id_str,
n_intf_no, (pci_dev->name[0] ? pci_dev->name : "NA"), name);
- internals = rte_zmalloc_socket(name, sizeof(struct pmd_internals),
+ internals = rte_zmalloc_numa(name, sizeof(struct pmd_internals),
RTE_CACHE_LINE_SIZE, pci_dev->device.numa_node);
if (!internals) {
@@ -2634,7 +2634,7 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev)
if (fpga_info->profile == FPGA_INFO_PROFILE_INLINE) {
struct rte_service_spec port_event_spec = {
.callback = port_event_service,
- .socket_id = SOCKET_ID_ANY,
+ .socket_id = RTE_NUMA_ID_ANY,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
.callback_userdata = internals
};
diff --git a/drivers/net/ntnic/ntutil/nt_util.c b/drivers/net/ntnic/ntutil/nt_util.c
index 8014b218b5..450c35c00c 100644
--- a/drivers/net/ntnic/ntutil/nt_util.c
+++ b/drivers/net/ntnic/ntutil/nt_util.c
@@ -56,11 +56,11 @@ struct nt_dma_s *nthw_dma_alloc(uint64_t size, uint64_t align, int numa)
return NULL;
}
- void *addr = rte_malloc_socket(NULL, size, align, numa);
+ void *addr = rte_malloc_numa(NULL, size, align, numa);
if (!addr) {
rte_free(vfio_addr);
- NT_LOG(ERR, GENERAL, "VFIO rte_malloc_socket failed");
+ NT_LOG(ERR, GENERAL, "VFIO rte_malloc_numa failed");
return NULL;
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 137/227] net/null: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (135 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 136/227] net/ntnic: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 138/227] net/octeon_ep: " Chengwen Feng
` (90 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/null/rte_eth_null.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index a2f70fee79..dd90d51e9b 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -223,7 +223,7 @@ eth_dev_stop(struct rte_eth_dev *dev)
static int
eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool)
{
@@ -244,7 +244,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
internals->rx_null_queues[rx_queue_id].mb_pool = mb_pool;
dev->data->rx_queues[rx_queue_id] =
&internals->rx_null_queues[rx_queue_id];
- dummy_packet = rte_zmalloc_socket(NULL,
+ dummy_packet = rte_zmalloc_numa(NULL,
packet_size, 0, dev->data->numa_node);
if (dummy_packet == NULL)
return -ENOMEM;
@@ -258,7 +258,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
static int
eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct rte_mbuf *dummy_packet;
@@ -277,7 +277,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
dev->data->tx_queues[tx_queue_id] =
&internals->tx_null_queues[tx_queue_id];
- dummy_packet = rte_zmalloc_socket(NULL,
+ dummy_packet = rte_zmalloc_numa(NULL,
packet_size, 0, dev->data->numa_node);
if (dummy_packet == NULL)
return -ENOMEM;
@@ -500,7 +500,7 @@ static int
eth_dev_close(struct rte_eth_dev *dev)
{
PMD_LOG(INFO, "Closing null ethdev on NUMA socket %u",
- rte_socket_id());
+ rte_numa_id());
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
@@ -548,8 +548,8 @@ eth_dev_null_create(struct rte_vdev_device *dev, struct pmd_options *args)
0xBE, 0xAC, 0x01, 0xFA
};
- if (dev->device.numa_node == SOCKET_ID_ANY)
- dev->device.numa_node = rte_socket_id();
+ if (dev->device.numa_node == RTE_NUMA_ID_ANY)
+ dev->device.numa_node = rte_numa_id();
PMD_LOG(INFO, "Creating null ethdev on numa socket %u",
dev->device.numa_node);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 138/227] net/octeon_ep: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (136 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 137/227] net/null: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 139/227] net/octeontx: " Chengwen Feng
` (89 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/octeon_ep/otx_ep_common.h | 4 ++--
drivers/net/octeon_ep/otx_ep_ethdev.c | 12 +++++-----
drivers/net/octeon_ep/otx_ep_rxtx.c | 32 +++++++++++++--------------
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/net/octeon_ep/otx_ep_common.h b/drivers/net/octeon_ep/otx_ep_common.h
index 406155078b..d9bca31770 100644
--- a/drivers/net/octeon_ep/otx_ep_common.h
+++ b/drivers/net/octeon_ep/otx_ep_common.h
@@ -584,12 +584,12 @@ struct otx_ep_device {
};
int otx_ep_setup_iqs(struct otx_ep_device *otx_ep, uint32_t iq_no,
- int num_descs, unsigned int socket_id);
+ int num_descs, unsigned int numa_id);
int otx_ep_delete_iqs(struct otx_ep_device *otx_ep, uint32_t iq_no);
int otx_ep_setup_oqs(struct otx_ep_device *otx_ep, int oq_no, int num_descs,
int desc_size, struct rte_mempool *mpool,
- unsigned int socket_id);
+ unsigned int numa_id);
int otx_ep_delete_oqs(struct otx_ep_device *otx_ep, uint32_t oq_no);
#define OTX_EP_MAX_PKT_SZ 65498U
diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c
index ddd3d092c3..10d2adfa87 100644
--- a/drivers/net/octeon_ep/otx_ep_ethdev.c
+++ b/drivers/net/octeon_ep/otx_ep_ethdev.c
@@ -475,7 +475,7 @@ otx_ep_dev_configure(struct rte_eth_dev *eth_dev)
* Queue number
* @param num_rx_descs
* Number of entries in the queue
- * @param socket_id
+ * @param numa_id
* Where to allocate memory
* @param rx_conf
* Pointer to the struction rte_eth_rxconf
@@ -488,7 +488,7 @@ otx_ep_dev_configure(struct rte_eth_dev *eth_dev)
*/
static int
otx_ep_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t q_no,
- uint16_t num_rx_descs, unsigned int socket_id,
+ uint16_t num_rx_descs, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mp)
{
@@ -518,7 +518,7 @@ otx_ep_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t q_no,
buf_size = mbp_priv->mbuf_data_room_size - RTE_PKTMBUF_HEADROOM;
if (otx_ep_setup_oqs(otx_epvf, q_no, num_rx_descs, buf_size, mp,
- socket_id)) {
+ numa_id)) {
otx_ep_err("droq allocation failed");
return -1;
}
@@ -563,7 +563,7 @@ otx_ep_rx_queue_release(struct rte_eth_dev *dev, uint16_t q_no)
* @param num_tx_descs
* Number of ringbuffer descriptors
*
- * @param socket_id
+ * @param numa_id
* NUMA socket id, used for memory allocations
*
* @param tx_conf
@@ -575,7 +575,7 @@ otx_ep_rx_queue_release(struct rte_eth_dev *dev, uint16_t q_no)
*/
static int
otx_ep_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t q_no,
- uint16_t num_tx_descs, unsigned int socket_id,
+ uint16_t num_tx_descs, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct otx_ep_device *otx_epvf = OTX_EP_DEV(eth_dev);
@@ -596,7 +596,7 @@ otx_ep_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t q_no,
return -EINVAL;
}
- retval = otx_ep_setup_iqs(otx_epvf, q_no, num_tx_descs, socket_id);
+ retval = otx_ep_setup_iqs(otx_epvf, q_no, num_tx_descs, numa_id);
if (retval) {
otx_ep_err("IQ(TxQ) creation failed.");
diff --git a/drivers/net/octeon_ep/otx_ep_rxtx.c b/drivers/net/octeon_ep/otx_ep_rxtx.c
index a21764868d..ded787268d 100644
--- a/drivers/net/octeon_ep/otx_ep_rxtx.c
+++ b/drivers/net/octeon_ep/otx_ep_rxtx.c
@@ -77,7 +77,7 @@ otx_ep_delete_iqs(struct otx_ep_device *otx_ep, uint32_t iq_no)
/* IQ initialization */
static int
otx_ep_init_instr_queue(struct otx_ep_device *otx_ep, int iq_no, int num_descs,
- unsigned int socket_id)
+ unsigned int numa_id)
{
const struct otx_ep_config *conf;
struct otx_ep_instr_queue *iq;
@@ -93,7 +93,7 @@ otx_ep_init_instr_queue(struct otx_ep_device *otx_ep, int iq_no, int num_descs,
iq->iq_mz = rte_eth_dma_zone_reserve(otx_ep->eth_dev,
"instr_queue", iq_no, q_size,
OTX_EP_PCI_RING_ALIGN,
- socket_id);
+ numa_id);
if (iq->iq_mz == NULL) {
otx_ep_err("IQ[%d] memzone alloc failed", iq_no);
goto iq_init_fail;
@@ -113,18 +113,18 @@ otx_ep_init_instr_queue(struct otx_ep_device *otx_ep, int iq_no, int num_descs,
* posted to OCTEON 9. This list will be used for freeing the IQ
* data buffer(s) later once the OCTEON 9 fetched the requests.
*/
- iq->req_list = rte_zmalloc_socket("request_list",
+ iq->req_list = rte_zmalloc_numa("request_list",
(iq->nb_desc * OTX_EP_IQREQ_LIST_SIZE),
RTE_CACHE_LINE_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (iq->req_list == NULL) {
otx_ep_err("IQ[%d] req_list alloc failed", iq_no);
goto iq_init_fail;
}
for (i = 0; i < iq->nb_desc; i++) {
- sg = rte_zmalloc_socket("sg_entry", (OTX_EP_MAX_SG_LISTS * OTX_EP_SG_ENTRY_SIZE),
- OTX_EP_SG_ALIGN, rte_socket_id());
+ sg = rte_zmalloc_numa("sg_entry", (OTX_EP_MAX_SG_LISTS * OTX_EP_SG_ENTRY_SIZE),
+ OTX_EP_SG_ALIGN, rte_numa_id());
if (sg == NULL) {
otx_ep_err("IQ[%d] sg_entries alloc failed", iq_no);
goto iq_init_fail;
@@ -138,8 +138,8 @@ otx_ep_init_instr_queue(struct otx_ep_device *otx_ep, int iq_no, int num_descs,
iq_no, iq->base_addr, (unsigned long)iq->base_addr_dma,
iq->nb_desc);
- iq->mbuf_list = rte_zmalloc_socket("mbuf_list", (iq->nb_desc * sizeof(struct rte_mbuf *)),
- RTE_CACHE_LINE_SIZE, rte_socket_id());
+ iq->mbuf_list = rte_zmalloc_numa("mbuf_list", (iq->nb_desc * sizeof(struct rte_mbuf *)),
+ RTE_CACHE_LINE_SIZE, rte_numa_id());
if (!iq->mbuf_list) {
otx_ep_err("IQ[%d] mbuf_list alloc failed", iq_no);
goto iq_init_fail;
@@ -175,7 +175,7 @@ otx_ep_init_instr_queue(struct otx_ep_device *otx_ep, int iq_no, int num_descs,
int
otx_ep_setup_iqs(struct otx_ep_device *otx_ep, uint32_t iq_no, int num_descs,
- unsigned int socket_id)
+ unsigned int numa_id)
{
struct otx_ep_instr_queue *iq;
@@ -186,7 +186,7 @@ otx_ep_setup_iqs(struct otx_ep_device *otx_ep, uint32_t iq_no, int num_descs,
otx_ep->instr_queue[iq_no] = iq;
- if (otx_ep_init_instr_queue(otx_ep, iq_no, num_descs, socket_id)) {
+ if (otx_ep_init_instr_queue(otx_ep, iq_no, num_descs, numa_id)) {
otx_ep_err("IQ init is failed");
goto delete_IQ;
}
@@ -316,7 +316,7 @@ otx_ep_set_rearm_data(struct otx_ep_device *otx_ep)
static int
otx_ep_init_droq(struct otx_ep_device *otx_ep, uint32_t q_no,
uint32_t num_descs, uint32_t desc_size,
- struct rte_mempool *mpool, unsigned int socket_id)
+ struct rte_mempool *mpool, unsigned int numa_id)
{
const struct otx_ep_config *conf = otx_ep->conf;
uint32_t c_refill_threshold;
@@ -341,7 +341,7 @@ otx_ep_init_droq(struct otx_ep_device *otx_ep, uint32_t q_no,
droq->desc_ring_mz = rte_eth_dma_zone_reserve(otx_ep->eth_dev, "droq",
q_no, desc_ring_size,
OTX_EP_PCI_RING_ALIGN,
- socket_id);
+ numa_id);
if (droq->desc_ring_mz == NULL) {
otx_ep_err("OQ:%d desc_ring allocation failed", q_no);
@@ -356,9 +356,9 @@ otx_ep_init_droq(struct otx_ep_device *otx_ep, uint32_t q_no,
otx_ep_dbg("OQ[%d]: num_desc: %d", q_no, droq->nb_desc);
/* OQ buf_list set up */
- droq->recv_buf_list = rte_zmalloc_socket("recv_buf_list",
+ droq->recv_buf_list = rte_zmalloc_numa("recv_buf_list",
(droq->nb_desc * sizeof(struct rte_mbuf *)),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (droq->recv_buf_list == NULL) {
otx_ep_err("OQ recv_buf_list alloc failed");
goto init_droq_fail;
@@ -391,7 +391,7 @@ otx_ep_init_droq(struct otx_ep_device *otx_ep, uint32_t q_no,
int
otx_ep_setup_oqs(struct otx_ep_device *otx_ep, int oq_no, int num_descs,
int desc_size, struct rte_mempool *mpool,
- unsigned int socket_id)
+ unsigned int numa_id)
{
struct otx_ep_droq *droq;
@@ -405,7 +405,7 @@ otx_ep_setup_oqs(struct otx_ep_device *otx_ep, int oq_no, int num_descs,
otx_ep->droq[oq_no] = droq;
if (otx_ep_init_droq(otx_ep, oq_no, num_descs, desc_size, mpool,
- socket_id)) {
+ numa_id)) {
otx_ep_err("Droq[%d] Initialization failed", oq_no);
goto delete_OQ;
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 139/227] net/octeontx: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (137 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 138/227] net/octeon_ep: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 140/227] net/pcap: " Chengwen Feng
` (88 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/octeontx/octeontx_ethdev.c | 40 +++++++++++++-------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
index bde4c2c615..4e83b81de9 100644
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -1223,7 +1223,7 @@ octeontx_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
static int
octeontx_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct octeontx_nic *nic = octeontx_pmd_priv(dev);
@@ -1232,15 +1232,15 @@ octeontx_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
int res = 0;
RTE_SET_USED(nb_desc);
- RTE_SET_USED(socket_id);
+ RTE_SET_USED(numa_id);
dq_num = (nic->pko_vfid * PKO_VF_NUM_DQ) + qidx;
/* Socket id check */
- if (socket_id != (unsigned int)SOCKET_ID_ANY &&
- socket_id != (unsigned int)nic->node)
- PMD_TX_LOG(INFO, "socket_id expected %d, configured %d",
- socket_id, nic->node);
+ if (numa_id != (unsigned int)RTE_NUMA_ID_ANY &&
+ numa_id != (unsigned int)nic->node)
+ PMD_TX_LOG(INFO, "numa_id expected %d, configured %d",
+ numa_id, nic->node);
/* Free memory prior to re-allocation if needed. */
if (dev->data->tx_queues[qidx] != NULL) {
@@ -1251,7 +1251,7 @@ octeontx_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
}
/* Allocating tx queue data structure */
- txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct octeontx_txq),
+ txq = rte_zmalloc_numa("ethdev TX queue", sizeof(struct octeontx_txq),
RTE_CACHE_LINE_SIZE, nic->node);
if (txq == NULL) {
octeontx_log_err("failed to allocate txq=%d", qidx);
@@ -1289,7 +1289,7 @@ octeontx_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
static int
octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -1340,13 +1340,13 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
}
/* Socket id check */
- if (socket_id != (unsigned int)SOCKET_ID_ANY &&
- socket_id != (unsigned int)nic->node)
- PMD_RX_LOG(INFO, "socket_id expected %d, configured %d",
- socket_id, nic->node);
+ if (numa_id != (unsigned int)RTE_NUMA_ID_ANY &&
+ numa_id != (unsigned int)nic->node)
+ PMD_RX_LOG(INFO, "numa_id expected %d, configured %d",
+ numa_id, nic->node);
/* Allocating rx queue data structure */
- rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct octeontx_rxq),
+ rxq = rte_zmalloc_numa("ethdev RX queue", sizeof(struct octeontx_rxq),
RTE_CACHE_LINE_SIZE, nic->node);
if (rxq == NULL) {
octeontx_log_err("failed to allocate rxq=%d", qidx);
@@ -1531,7 +1531,7 @@ static const struct eth_dev_ops octeontx_dev_ops = {
/* Create Ethdev interface per BGX LMAC ports */
static int
octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
- int socket_id)
+ int numa_id)
{
int res;
size_t pko_vfid;
@@ -1567,7 +1567,7 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
}
data = eth_dev->data;
- nic = rte_zmalloc_socket(octtx_name, sizeof(*nic), 0, socket_id);
+ nic = rte_zmalloc_numa(octtx_name, sizeof(*nic), 0, numa_id);
if (nic == NULL) {
octeontx_log_err("failed to allocate nic structure");
res = -ENOMEM;
@@ -1624,9 +1624,9 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
goto err;
}
- data->mac_addrs = rte_zmalloc_socket(octtx_name, max_entries *
+ data->mac_addrs = rte_zmalloc_numa(octtx_name, max_entries *
RTE_ETHER_ADDR_LEN, 0,
- socket_id);
+ numa_id);
if (data->mac_addrs == NULL) {
octeontx_log_err("failed to allocate memory for mac_addrs");
res = -ENOMEM;
@@ -1733,7 +1733,7 @@ octeontx_probe(struct rte_vdev_device *dev)
{
const char *dev_name;
static int probe_once;
- uint8_t socket_id, qlist;
+ uint8_t numa_id, qlist;
int tx_vfcnt, port_id, evdev, qnum, pnum, res, i;
struct rte_event_dev_config dev_conf;
const char *eventdev_name = "event_octeontx";
@@ -1772,7 +1772,7 @@ octeontx_probe(struct rte_vdev_device *dev)
PMD_INIT_LOG(DEBUG, "initializing %s pmd", dev_name);
- socket_id = rte_socket_id();
+ numa_id = rte_numa_id();
tx_vfcnt = octeontx_pko_vf_count();
@@ -1856,7 +1856,7 @@ octeontx_probe(struct rte_vdev_device *dev)
/* Create ethdev interface */
for (i = 0; i < init_params.nr_port; i++) {
- port_id = octeontx_create(dev, i, evdev, socket_id);
+ port_id = octeontx_create(dev, i, evdev, numa_id);
if (port_id < 0) {
octeontx_log_err("failed to create device %s",
dev_name);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 140/227] net/pcap: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (138 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 139/227] net/octeontx: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 141/227] net/pfe: " Chengwen Feng
` (87 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/pcap/pcap_ethdev.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c
index 1e114e0008..5307979da2 100644
--- a/drivers/net/pcap/pcap_ethdev.c
+++ b/drivers/net/pcap/pcap_ethdev.c
@@ -1150,7 +1150,7 @@ eth_dev_close(struct rte_eth_dev *dev)
struct pmd_internals *internals = dev->data->dev_private;
PMD_LOG(INFO, "Closing pcap ethdev on NUMA socket %d",
- rte_socket_id());
+ rte_numa_id());
eth_dev_stop(dev);
@@ -1212,7 +1212,7 @@ static int
eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool)
{
@@ -1335,7 +1335,7 @@ static int
eth_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct pmd_internals *internals = dev->data->dev_private;
@@ -1343,8 +1343,8 @@ eth_tx_queue_setup(struct rte_eth_dev *dev,
pcap_q->port_id = dev->data->port_id;
pcap_q->queue_id = tx_queue_id;
- pcap_q->bounce_buf = rte_malloc_socket(NULL, internals->snapshot_len,
- RTE_CACHE_LINE_SIZE, socket_id);
+ pcap_q->bounce_buf = rte_malloc_numa(NULL, internals->snapshot_len,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (pcap_q->bounce_buf == NULL)
return -ENOMEM;
@@ -1641,7 +1641,7 @@ pmd_init_internals(struct rte_vdev_device *vdev,
PMD_LOG(INFO, "Creating pcap-backed ethdev on numa socket %u",
numa_node);
- pp = rte_zmalloc_socket("pcap_private", sizeof(struct pmd_process_private),
+ pp = rte_zmalloc_numa("pcap_private", sizeof(struct pmd_process_private),
RTE_CACHE_LINE_SIZE, numa_node);
if (pp == NULL) {
PMD_LOG(ERR,
@@ -1709,7 +1709,7 @@ eth_pcap_update_mac(const char *if_name, struct rte_eth_dev *eth_dev,
if (osdep_iface_mac_get(if_name, &mac) < 0)
return -1;
- mac_addrs = rte_zmalloc_socket("pcap_mac", RTE_ETHER_ADDR_LEN, 0, numa_node);
+ mac_addrs = rte_zmalloc_numa("pcap_mac", RTE_ETHER_ADDR_LEN, 0, numa_node);
if (mac_addrs == NULL)
return -1;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 141/227] net/pfe: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (139 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 140/227] net/pcap: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 142/227] net/qede: " Chengwen Feng
` (86 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/pfe/pfe_ethdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c
index 1b183ab1f3..dec48ff42b 100644
--- a/drivers/net/pfe/pfe_ethdev.c
+++ b/drivers/net/pfe/pfe_ethdev.c
@@ -450,7 +450,7 @@ pfe_eth_info(struct rte_eth_dev *dev,
static int
pfe_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
__rte_unused uint16_t nb_rx_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -493,7 +493,7 @@ static int
pfe_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
__rte_unused uint16_t nb_desc,
- __rte_unused unsigned int socket_id,
+ __rte_unused unsigned int numa_id,
__rte_unused const struct rte_eth_txconf *tx_conf)
{
struct pfe_eth_priv_s *priv = dev->data->dev_private;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 142/227] net/qede: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (140 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 141/227] net/pfe: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 143/227] net/r8169: " Chengwen Feng
` (85 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/qede/base/bcm_osal.c | 12 +++----
drivers/net/qede/qede_filter.c | 2 +-
drivers/net/qede/qede_rxtx.c | 54 ++++++++++++++++----------------
drivers/net/qede/qede_rxtx.h | 4 +--
4 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c
index abd11860b7..024c4b1f76 100644
--- a/drivers/net/qede/base/bcm_osal.c
+++ b/drivers/net/qede/base/bcm_osal.c
@@ -153,7 +153,7 @@ void *osal_dma_alloc_coherent(struct ecore_dev *p_dev,
const struct rte_memzone *mz;
char mz_name[RTE_MEMZONE_NAMESIZE];
uint32_t core_id = rte_lcore_id();
- unsigned int socket_id;
+ unsigned int numa_id;
if (ecore_mz_count >= rte_memzone_max_get()) {
DP_ERR(p_dev, "Memzone allocation count exceeds %zu\n",
@@ -167,8 +167,8 @@ void *osal_dma_alloc_coherent(struct ecore_dev *p_dev,
(unsigned long)rte_get_timer_cycles());
if (core_id == (unsigned int)LCORE_ID_ANY)
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,
+ numa_id = rte_lcore_to_numa_id(core_id);
+ mz = rte_memzone_reserve_aligned(mz_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, RTE_CACHE_LINE_SIZE);
if (!mz) {
DP_ERR(p_dev, "Unable to allocate DMA memory "
@@ -192,7 +192,7 @@ void *osal_dma_alloc_coherent_aligned(struct ecore_dev *p_dev,
const struct rte_memzone *mz;
char mz_name[RTE_MEMZONE_NAMESIZE];
uint32_t core_id = rte_lcore_id();
- unsigned int socket_id;
+ unsigned int numa_id;
if (ecore_mz_count >= rte_memzone_max_get()) {
DP_ERR(p_dev, "Memzone allocation count exceeds %zu\n",
@@ -206,8 +206,8 @@ void *osal_dma_alloc_coherent_aligned(struct ecore_dev *p_dev,
(unsigned long)rte_get_timer_cycles());
if (core_id == (unsigned int)LCORE_ID_ANY)
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,
+ numa_id = rte_lcore_to_numa_id(core_id);
+ mz = rte_memzone_reserve_aligned(mz_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, align);
if (!mz) {
DP_ERR(p_dev, "Unable to allocate DMA memory "
diff --git a/drivers/net/qede/qede_filter.c b/drivers/net/qede/qede_filter.c
index cecb58c997..82563085e3 100644
--- a/drivers/net/qede/qede_filter.c
+++ b/drivers/net/qede/qede_filter.c
@@ -199,7 +199,7 @@ qede_config_arfs_filter(struct rte_eth_dev *eth_dev,
snprintf(mz_name, sizeof(mz_name), "%lx",
(unsigned long)rte_get_timer_cycles());
mz = rte_memzone_reserve_aligned(mz_name, QEDE_MAX_FDIR_PKT_LEN,
- SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
+ RTE_NUMA_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
if (!mz) {
DP_ERR(edev, "Failed to allocate memzone for fdir, err = %s\n",
rte_strerror(rte_errno));
diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index 25e28fd9f6..5ecca0c0b6 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -123,7 +123,7 @@ static struct qede_rx_queue *
qede_alloc_rx_queue_mem(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
struct rte_mempool *mp,
uint16_t bufsz)
{
@@ -134,12 +134,12 @@ qede_alloc_rx_queue_mem(struct rte_eth_dev *dev,
int rc;
/* First allocate the rx queue data structure */
- rxq = rte_zmalloc_socket("qede_rx_queue", sizeof(struct qede_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("qede_rx_queue", sizeof(struct qede_rx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq) {
DP_ERR(edev, "Unable to allocate memory for rxq on socket %u",
- socket_id);
+ numa_id);
return NULL;
}
@@ -157,11 +157,11 @@ qede_alloc_rx_queue_mem(struct rte_eth_dev *dev,
/* Allocate the parallel driver ring for Rx buffers */
size = sizeof(*rxq->sw_rx_ring) * rxq->nb_rx_desc;
- rxq->sw_rx_ring = rte_zmalloc_socket("sw_rx_ring", size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq->sw_rx_ring = rte_zmalloc_numa("sw_rx_ring", size,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->sw_rx_ring) {
DP_ERR(edev, "Memory allocation fails for sw_rx_ring on"
- " socket %u\n", socket_id);
+ " socket %u\n", numa_id);
rte_free(rxq);
return NULL;
}
@@ -178,7 +178,7 @@ qede_alloc_rx_queue_mem(struct rte_eth_dev *dev,
if (rc != ECORE_SUCCESS) {
DP_ERR(edev, "Memory allocation fails for RX BD ring"
- " on socket %u\n", socket_id);
+ " on socket %u\n", numa_id);
rte_free(rxq->sw_rx_ring);
rte_free(rxq);
return NULL;
@@ -196,7 +196,7 @@ qede_alloc_rx_queue_mem(struct rte_eth_dev *dev,
if (rc != ECORE_SUCCESS) {
DP_ERR(edev, "Memory allocation fails for RX CQE ring"
- " on socket %u\n", socket_id);
+ " on socket %u\n", numa_id);
qdev->ops->common->chain_free(edev, &rxq->rx_bd_ring);
rte_free(rxq->sw_rx_ring);
rte_free(rxq);
@@ -208,7 +208,7 @@ qede_alloc_rx_queue_mem(struct rte_eth_dev *dev,
int
qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -257,13 +257,13 @@ qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid,
if (ECORE_IS_CMT(edev)) {
rxq = qede_alloc_rx_queue_mem(dev, qid * 2, nb_desc,
- socket_id, mp, bufsz);
+ numa_id, mp, bufsz);
if (!rxq)
return -ENOMEM;
qdev->fp_array[qid * 2].rxq = rxq;
rxq = qede_alloc_rx_queue_mem(dev, qid * 2 + 1, nb_desc,
- socket_id, mp, bufsz);
+ numa_id, mp, bufsz);
if (!rxq)
return -ENOMEM;
@@ -272,7 +272,7 @@ qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid,
dev->data->rx_queues[qid] = &qdev->fp_array_cmt[qid];
} else {
rxq = qede_alloc_rx_queue_mem(dev, qid, nb_desc,
- socket_id, mp, bufsz);
+ numa_id, mp, bufsz);
if (!rxq)
return -ENOMEM;
@@ -281,7 +281,7 @@ qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qid,
}
DP_INFO(edev, "rxq %d num_desc %u rx_buf_size=%u socket %u\n",
- qid, nb_desc, rxq->rx_buf_size, socket_id);
+ qid, nb_desc, rxq->rx_buf_size, numa_id);
return 0;
}
@@ -381,7 +381,7 @@ static struct qede_tx_queue *
qede_alloc_tx_queue_mem(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct qede_dev *qdev = dev->data->dev_private;
@@ -390,13 +390,13 @@ qede_alloc_tx_queue_mem(struct rte_eth_dev *dev,
int rc;
size_t sw_tx_ring_size;
- txq = rte_zmalloc_socket("qede_tx_queue", sizeof(struct qede_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("qede_tx_queue", sizeof(struct qede_tx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL) {
DP_ERR(edev,
"Unable to allocate memory for txq on socket %u",
- socket_id);
+ numa_id);
return NULL;
}
@@ -415,21 +415,21 @@ qede_alloc_tx_queue_mem(struct rte_eth_dev *dev,
if (rc != ECORE_SUCCESS) {
DP_ERR(edev,
"Unable to allocate memory for txbd ring on socket %u",
- socket_id);
+ numa_id);
qede_tx_queue_release(txq);
return NULL;
}
/* Allocate software ring */
sw_tx_ring_size = sizeof(txq->sw_tx_ring) * txq->nb_tx_desc;
- txq->sw_tx_ring = rte_zmalloc_socket("txq->sw_tx_ring",
+ txq->sw_tx_ring = rte_zmalloc_numa("txq->sw_tx_ring",
sw_tx_ring_size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq->sw_tx_ring) {
DP_ERR(edev,
"Unable to allocate memory for txbd ring on socket %u",
- socket_id);
+ numa_id);
qdev->ops->common->chain_free(edev, &txq->tx_pbl);
qede_tx_queue_release(txq);
return NULL;
@@ -445,7 +445,7 @@ qede_alloc_tx_queue_mem(struct rte_eth_dev *dev,
DP_INFO(edev,
"txq %u num_desc %u tx_free_thresh %u socket %u\n",
- queue_idx, nb_desc, txq->tx_free_thresh, socket_id);
+ queue_idx, nb_desc, txq->tx_free_thresh, numa_id);
return txq;
}
@@ -453,7 +453,7 @@ int
qede_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct qede_dev *qdev = dev->data->dev_private;
@@ -476,13 +476,13 @@ qede_tx_queue_setup(struct rte_eth_dev *dev,
if (ECORE_IS_CMT(edev)) {
txq = qede_alloc_tx_queue_mem(dev, queue_idx * 2, nb_desc,
- socket_id, tx_conf);
+ numa_id, tx_conf);
if (!txq)
return -ENOMEM;
qdev->fp_array[queue_idx * 2].txq = txq;
txq = qede_alloc_tx_queue_mem(dev, (queue_idx * 2) + 1, nb_desc,
- socket_id, tx_conf);
+ numa_id, tx_conf);
if (!txq)
return -ENOMEM;
@@ -491,7 +491,7 @@ qede_tx_queue_setup(struct rte_eth_dev *dev,
&qdev->fp_array_cmt[queue_idx];
} else {
txq = qede_alloc_tx_queue_mem(dev, queue_idx, nb_desc,
- socket_id, tx_conf);
+ numa_id, tx_conf);
if (!txq)
return -ENOMEM;
diff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h
index 013a4a07c7..54b35deca4 100644
--- a/drivers/net/qede/qede_rxtx.h
+++ b/drivers/net/qede/qede_rxtx.h
@@ -241,14 +241,14 @@ struct qede_fastpath_cmt {
* RX/TX function prototypes
*/
int qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
int qede_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
void qede_rx_queue_release(void *rx_queue);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 143/227] net/r8169: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (141 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 142/227] net/qede: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 144/227] net/ring: " Chengwen Feng
` (84 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/r8169/r8169_ethdev.h | 4 ++--
drivers/net/r8169/r8169_hw.c | 2 +-
drivers/net/r8169/r8169_rxtx.c | 16 ++++++++--------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/r8169/r8169_ethdev.h b/drivers/net/r8169/r8169_ethdev.h
index d3676ee7d2..d73c96e5cf 100644
--- a/drivers/net/r8169/r8169_ethdev.h
+++ b/drivers/net/r8169/r8169_ethdev.h
@@ -289,11 +289,11 @@ uint64_t rtl_get_rx_port_offloads(struct rtl_hw *hw);
uint64_t rtl_get_tx_port_offloads(void);
int rtl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
int rtl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int rtl_tx_done_cleanup(void *tx_queue, uint32_t free_cnt);
diff --git a/drivers/net/r8169/r8169_hw.c b/drivers/net/r8169/r8169_hw.c
index f15bd579fd..4de7aa4ac1 100644
--- a/drivers/net/r8169/r8169_hw.c
+++ b/drivers/net/r8169/r8169_hw.c
@@ -2597,7 +2597,7 @@ rtl_tally_init(struct rte_eth_dev *dev)
const struct rte_memzone *mz;
mz = rte_eth_dma_zone_reserve(dev, "tally_counters", 0,
- sizeof(struct rtl_counters), 64, rte_socket_id());
+ sizeof(struct rtl_counters), 64, rte_numa_id());
if (mz == NULL)
return -ENOMEM;
diff --git a/drivers/net/r8169/r8169_rxtx.c b/drivers/net/r8169/r8169_rxtx.c
index 00de0471f4..7d39e56b8c 100644
--- a/drivers/net/r8169/r8169_rxtx.c
+++ b/drivers/net/r8169/r8169_rxtx.c
@@ -328,7 +328,7 @@ rtl_get_rx_port_offloads(struct rtl_hw *hw)
int
rtl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -351,8 +351,8 @@ rtl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
/* First allocate the rx queue data structure */
- rxq = rte_zmalloc_socket("r8169 RX queue", sizeof(struct rtl_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("r8169 RX queue", sizeof(struct rtl_rx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL) {
PMD_INIT_LOG(ERR, "Cannot allocate Rx queue structure");
@@ -385,7 +385,7 @@ rtl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
*/
size = hw->RxDescLength * (nb_rx_desc + 1);
mz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx, size,
- RTL_RING_ALIGN, socket_id);
+ RTL_RING_ALIGN, numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR,
"Port %d: Cannot allocate software ring for queue %d",
@@ -1258,7 +1258,7 @@ rtl_get_tx_port_offloads(void)
int
rtl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct rtl_tx_queue *txq;
@@ -1279,8 +1279,8 @@ rtl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
dev->data->tx_queues[queue_idx] = NULL;
}
- txq = rte_zmalloc_socket("r8169 TX queue", sizeof(struct rtl_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("r8169 TX queue", sizeof(struct rtl_tx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq) {
PMD_INIT_LOG(ERR, "Cannot allocate Tx queue structure");
@@ -1312,7 +1312,7 @@ rtl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
*/
size = sizeof(struct rtl_tx_desc) * (nb_tx_desc + 1);
mz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, size,
- RTL_RING_ALIGN, socket_id);
+ RTL_RING_ALIGN, numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR,
"Port %d: Cannot allocate hardware ring for queue %d",
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 144/227] net/ring: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (142 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 143/227] net/r8169: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 145/227] net/rnp: " Chengwen Feng
` (83 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/ring/rte_eth_ring.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index d75ae2cbed..9af86f4226 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -155,7 +155,7 @@ eth_dev_set_link_up(struct rte_eth_dev *dev)
static int
eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool __rte_unused)
{
@@ -168,7 +168,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
static int
eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct pmd_internals *internals = dev->data->dev_private;
@@ -374,21 +374,21 @@ do_eth_dev_ring_create(const char *name,
PMD_LOG(INFO, "Creating rings-backed ethdev on numa socket %u",
numa_node);
- rx_queues_local = rte_calloc_socket(name, nb_rx_queues,
+ rx_queues_local = rte_calloc_numa(name, nb_rx_queues,
sizeof(void *), 0, numa_node);
if (rx_queues_local == NULL) {
rte_errno = ENOMEM;
goto error;
}
- tx_queues_local = rte_calloc_socket(name, nb_tx_queues,
+ tx_queues_local = rte_calloc_numa(name, nb_tx_queues,
sizeof(void *), 0, numa_node);
if (tx_queues_local == NULL) {
rte_errno = ENOMEM;
goto error;
}
- internals = rte_zmalloc_socket(name, sizeof(*internals), 0, numa_node);
+ internals = rte_zmalloc_numa(name, sizeof(*internals), 0, numa_node);
if (internals == NULL) {
rte_errno = ENOMEM;
goto error;
@@ -520,7 +520,7 @@ int
rte_eth_from_ring(struct rte_ring *r)
{
return rte_eth_from_rings(r->name, &r, 1, &r, 1,
- r->memzone ? r->memzone->socket_id : SOCKET_ID_ANY);
+ r->memzone ? r->memzone->socket_id : RTE_NUMA_ID_ANY);
}
static int
@@ -693,12 +693,12 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
}
if (params == NULL || params[0] == '\0') {
- ret = eth_dev_ring_create(name, dev, rte_socket_id(), DEV_CREATE,
+ ret = eth_dev_ring_create(name, dev, rte_numa_id(), DEV_CREATE,
ð_dev);
if (ret == -1) {
PMD_LOG(INFO,
"Attach to pmd_ring for %s", name);
- ret = eth_dev_ring_create(name, dev, rte_socket_id(),
+ ret = eth_dev_ring_create(name, dev, rte_numa_id(),
DEV_ATTACH, ð_dev);
}
} else {
@@ -707,13 +707,13 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
if (!kvlist) {
PMD_LOG(INFO,
"Ignoring unsupported parameters when creating rings-backed ethernet device");
- ret = eth_dev_ring_create(name, dev, rte_socket_id(),
+ ret = eth_dev_ring_create(name, dev, rte_numa_id(),
DEV_CREATE, ð_dev);
if (ret == -1) {
PMD_LOG(INFO,
"Attach to pmd_ring for %s",
name);
- ret = eth_dev_ring_create(name, dev, rte_socket_id(),
+ ret = eth_dev_ring_create(name, dev, rte_numa_id(),
DEV_ATTACH, ð_dev);
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 145/227] net/rnp: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (143 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 144/227] net/ring: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 146/227] net/sfc: " Chengwen Feng
` (82 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/rnp/base/rnp_osdep.h | 2 +-
drivers/net/rnp/rnp_ethdev.c | 4 ++--
drivers/net/rnp/rnp_rxtx.c | 40 ++++++++++++++++----------------
drivers/net/rnp/rnp_rxtx.h | 4 ++--
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/net/rnp/base/rnp_osdep.h b/drivers/net/rnp/base/rnp_osdep.h
index c03de79e7e..5c6952b1ef 100644
--- a/drivers/net/rnp/base/rnp_osdep.h
+++ b/drivers/net/rnp/base/rnp_osdep.h
@@ -129,7 +129,7 @@ rnp_dma_mem_alloc(__rte_unused struct rnp_hw *hw,
(uint64_t)rte_atomic_fetch_add_explicit(&rnp_dma_memzone_id, 1,
rte_memory_order_relaxed));
}
- mz = rte_memzone_reserve_bounded(z_name, size, SOCKET_ID_ANY, 0,
+ mz = rte_memzone_reserve_bounded(z_name, size, RTE_NUMA_ID_ANY, 0,
0, RTE_PGSIZE_2M);
if (!mz)
return NULL;
diff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c
index 125134f8d4..ccb92b299f 100644
--- a/drivers/net/rnp/rnp_ethdev.c
+++ b/drivers/net/rnp/rnp_ethdev.c
@@ -33,7 +33,7 @@ rnp_alloc_eth_port(struct rte_pci_device *pci, char *name)
RNP_PMD_ERR("Could not allocate eth_dev for %s", name);
return NULL;
}
- port = rte_zmalloc_socket(name,
+ port = rte_zmalloc_numa(name,
sizeof(*port),
RTE_CACHE_LINE_SIZE,
pci->device.numa_node);
@@ -1633,7 +1633,7 @@ rnp_proc_priv_init(struct rte_eth_dev *dev)
{
struct rnp_proc_priv *priv;
- priv = rte_zmalloc_socket("rnp_proc_priv",
+ priv = rte_zmalloc_numa("rnp_proc_priv",
sizeof(struct rnp_proc_priv),
RTE_CACHE_LINE_SIZE,
dev->device->numa_node);
diff --git a/drivers/net/rnp/rnp_rxtx.c b/drivers/net/rnp/rnp_rxtx.c
index 143cd11ffe..07a810a3dd 100644
--- a/drivers/net/rnp/rnp_rxtx.c
+++ b/drivers/net/rnp/rnp_rxtx.c
@@ -156,19 +156,19 @@ rnp_rx_queue_reset(struct rnp_eth_port *port,
static int
rnp_alloc_rxbdr(struct rte_eth_dev *dev,
struct rnp_rx_queue *rxq,
- uint16_t nb_rx_desc, int socket_id)
+ uint16_t nb_rx_desc, int numa_id)
{
const struct rte_memzone *rz = NULL;
uint32_t size = 0;
size = (nb_rx_desc + RNP_RX_MAX_BURST_SIZE) *
sizeof(struct rnp_rxsw_entry);
- rxq->sw_ring = rte_zmalloc_socket("rx_swring", size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq->sw_ring = rte_zmalloc_numa("rx_swring", size,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq->sw_ring == NULL)
return -ENOMEM;
rz = rte_eth_dma_zone_reserve(dev, "rx_ring", rxq->attr.queue_id,
- RNP_RX_MAX_RING_SZ, RNP_BD_RING_ALIGN, socket_id);
+ RNP_RX_MAX_RING_SZ, RNP_BD_RING_ALIGN, numa_id);
if (rz == NULL) {
rte_free(rxq->sw_ring);
rxq->sw_ring = NULL;
@@ -200,7 +200,7 @@ rnp_rx_queue_sw_reset(struct rnp_rx_queue *rxq)
int rnp_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t qidx,
uint16_t nb_rx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -225,8 +225,8 @@ int rnp_rx_queue_setup(struct rte_eth_dev *eth_dev,
rnp_rx_queue_release(data->rx_queues[qidx]);
data->rx_queues[qidx] = NULL;
}
- rxq = rte_zmalloc_socket("rnp_rxq", sizeof(struct rnp_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("rnp_rxq", sizeof(struct rnp_rx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL) {
RNP_PMD_ERR("Failed to allocate rx ring memory");
return -ENOMEM;
@@ -247,14 +247,14 @@ int rnp_rx_queue_setup(struct rte_eth_dev *eth_dev,
rxq->rx_buf_len = (uint16_t)(rte_pktmbuf_data_room_size(mb_pool) -
RTE_PKTMBUF_HEADROOM);
rxq->mb_pool = mb_pool;
- err = rnp_alloc_rxbdr(eth_dev, rxq, nb_rx_desc, socket_id);
+ err = rnp_alloc_rxbdr(eth_dev, rxq, nb_rx_desc, numa_id);
if (err)
goto fail;
RNP_PMD_LOG(INFO, "PF[%u] dev:[%u] hw-lane[%u] rx_qid[%u] "
"hw_ridx %u socket %u",
hw->mbx.pf_num, rxq->attr.port_id,
rxq->attr.lane_id, qidx,
- rxq->attr.index, socket_id);
+ rxq->attr.index, numa_id);
rxq->rx_free_thresh = (rx_conf->rx_free_thresh) ?
rx_conf->rx_free_thresh : RNP_DEFAULT_RX_FREE_THRESH;
rxq->pthresh = (rx_conf->rx_thresh.pthresh) ?
@@ -329,19 +329,19 @@ rnp_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
static int rnp_alloc_txbdr(struct rte_eth_dev *dev,
struct rnp_tx_queue *txq,
- uint16_t nb_desc, int socket_id)
+ uint16_t nb_desc, int numa_id)
{
const struct rte_memzone *rz = NULL;
int size;
size = nb_desc * sizeof(struct rnp_txsw_entry);
- txq->sw_ring = rte_zmalloc_socket("tx_swq", size,
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq->sw_ring = rte_zmalloc_numa("tx_swq", size,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL)
return -ENOMEM;
rz = rte_eth_dma_zone_reserve(dev, "tx_ring", txq->attr.queue_id,
- RNP_TX_MAX_RING_SZ, RNP_BD_RING_ALIGN, socket_id);
+ RNP_TX_MAX_RING_SZ, RNP_BD_RING_ALIGN, numa_id);
if (rz == NULL) {
rte_free(txq->sw_ring);
txq->sw_ring = NULL;
@@ -384,7 +384,7 @@ rnp_tx_queue_sw_reset(struct rnp_tx_queue *txq)
int
rnp_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t qidx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);
@@ -408,8 +408,8 @@ rnp_tx_queue_setup(struct rte_eth_dev *dev,
rnp_tx_queue_release(data->tx_queues[qidx]);
data->tx_queues[qidx] = NULL;
}
- txq = rte_zmalloc_socket("rnp_txq", sizeof(struct rnp_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("rnp_txq", sizeof(struct rnp_tx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq) {
RNP_PMD_ERR("Failed to allocate TX ring memory");
return -ENOMEM;
@@ -440,9 +440,9 @@ rnp_tx_queue_setup(struct rte_eth_dev *dev,
tx_conf->tx_thresh.pthresh : RNP_TX_DESC_FETCH_TH;
txq->pburst = (tx_conf->tx_thresh.hthresh) ?
tx_conf->tx_thresh.hthresh : RNP_TX_DESC_FETCH_BURST;
- txq->free_mbufs = rte_zmalloc_socket("txq->free_mbufs",
+ txq->free_mbufs = rte_zmalloc_numa("txq->free_mbufs",
sizeof(struct rte_mbuf *) * txq->tx_rs_thresh,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
txq->attr.index = rnp_get_dma_ring_index(port, qidx);
txq->attr.lane_id = port->attr.nr_lane;
txq->attr.port_id = dev->data->port_id;
@@ -451,7 +451,7 @@ rnp_tx_queue_setup(struct rte_eth_dev *dev,
txq->attr.nb_desc = nb_desc;
txq->attr.queue_id = qidx;
- err = rnp_alloc_txbdr(dev, txq, nb_desc, socket_id);
+ err = rnp_alloc_txbdr(dev, txq, nb_desc, numa_id);
if (err)
goto txbd_setup_failed;
rnp_setup_txbdr(hw, txq);
@@ -462,7 +462,7 @@ rnp_tx_queue_setup(struct rte_eth_dev *dev,
"dma_idx %u socket %u",
hw->mbx.pf_num, txq->attr.port_id,
txq->attr.lane_id, qidx,
- txq->attr.index, socket_id);
+ txq->attr.index, numa_id);
if (qidx < dev->data->nb_tx_queues)
data->tx_queues[qidx] = txq;
port->tx_queues[qidx] = txq;
diff --git a/drivers/net/rnp/rnp_rxtx.h b/drivers/net/rnp/rnp_rxtx.h
index 1309a49a3e..831dc48abe 100644
--- a/drivers/net/rnp/rnp_rxtx.h
+++ b/drivers/net/rnp/rnp_rxtx.h
@@ -136,14 +136,14 @@ rnp_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
int rnp_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t qidx,
uint16_t nb_rx_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
int rnp_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t qidx);
int rnp_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t qidx);
int rnp_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t qidx, uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int rnp_rx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t qidx);
int rnp_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t qidx);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 146/227] net/sfc: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (144 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 145/227] net/rnp: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 147/227] net/softnic: " Chengwen Feng
` (81 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/sfc/sfc.c | 20 ++++++++++----------
drivers/net/sfc/sfc.h | 4 ++--
drivers/net/sfc/sfc_dp_rx.h | 4 ++--
drivers/net/sfc/sfc_dp_tx.h | 4 ++--
drivers/net/sfc/sfc_ef100_rx.c | 10 +++++-----
drivers/net/sfc/sfc_ef100_tx.c | 10 +++++-----
drivers/net/sfc/sfc_ef10_essb_rx.c | 10 +++++-----
drivers/net/sfc/sfc_ef10_rx.c | 10 +++++-----
drivers/net/sfc/sfc_ef10_tx.c | 14 +++++++-------
drivers/net/sfc/sfc_ethdev.c | 16 ++++++++--------
drivers/net/sfc/sfc_ev.c | 10 +++++-----
drivers/net/sfc/sfc_ev.h | 2 +-
drivers/net/sfc/sfc_mae.c | 2 +-
drivers/net/sfc/sfc_mae_counter.c | 26 +++++++++++++-------------
drivers/net/sfc/sfc_mcdi.c | 2 +-
drivers/net/sfc/sfc_port.c | 10 +++++-----
drivers/net/sfc/sfc_repr.c | 20 ++++++++++----------
drivers/net/sfc/sfc_repr_proxy.c | 18 +++++++++---------
drivers/net/sfc/sfc_rx.c | 26 +++++++++++++-------------
drivers/net/sfc/sfc_rx.h | 2 +-
drivers/net/sfc/sfc_service.c | 22 +++++++++++-----------
drivers/net/sfc/sfc_service.h | 2 +-
drivers/net/sfc/sfc_sw_stats.c | 4 ++--
drivers/net/sfc/sfc_tso.c | 6 +++---
drivers/net/sfc/sfc_tx.c | 28 ++++++++++++++--------------
drivers/net/sfc/sfc_tx.h | 4 ++--
26 files changed, 143 insertions(+), 143 deletions(-)
diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index f13c5e2460..2281d5ebc3 100644
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -36,12 +36,12 @@ sfc_repr_supported(const struct sfc_adapter *sa)
/*
* Representor proxy should use service lcore on PF's socket
- * (sa->socket_id) to be efficient. But the proxy will fall back
+ * (sa->numa_id) to be efficient. But the proxy will fall back
* to any socket if it is not possible to get the service core
* on the same socket. Check that at least service core on any
* socket is available.
*/
- if (sfc_get_service_lcore(SOCKET_ID_ANY) == RTE_MAX_LCORE)
+ if (sfc_get_service_lcore(RTE_NUMA_ID_ANY) == RTE_MAX_LCORE)
return false;
return true;
@@ -55,20 +55,20 @@ sfc_repr_available(const struct sfc_adapter_shared *sas)
int
sfc_dma_alloc(struct sfc_adapter *sa, const char *name, uint16_t id,
- efx_nic_dma_addr_type_t addr_type, size_t len, int socket_id,
+ efx_nic_dma_addr_type_t addr_type, size_t len, int numa_id,
efsys_mem_t *esmp)
{
const struct rte_memzone *mz;
int rc;
- sfc_log_init(sa, "name=%s id=%u len=%zu socket_id=%d",
- name, id, len, socket_id);
+ sfc_log_init(sa, "name=%s id=%u len=%zu numa_id=%d",
+ name, id, len, numa_id);
mz = rte_eth_dma_zone_reserve(sa->eth_dev, name, id, len,
- sysconf(_SC_PAGESIZE), socket_id);
+ sysconf(_SC_PAGESIZE), numa_id);
if (mz == NULL) {
sfc_err(sa, "cannot reserve DMA zone for %s:%u %#x@%d: %s",
- name, (unsigned int)id, (unsigned int)len, socket_id,
+ name, (unsigned int)id, (unsigned int)len, numa_id,
rte_strerror(rte_errno));
return ENOMEM;
}
@@ -87,8 +87,8 @@ sfc_dma_alloc(struct sfc_adapter *sa, const char *name, uint16_t id,
esmp->esm_base = mz->addr;
sfc_info(sa,
- "DMA name=%s id=%u len=%lu socket_id=%d => virt=%p iova=%lx",
- name, id, len, socket_id, esmp->esm_base,
+ "DMA name=%s id=%u len=%lu numa_id=%d => virt=%p iova=%lx",
+ name, id, len, numa_id, esmp->esm_base,
(unsigned long)esmp->esm_addr);
return 0;
@@ -1292,7 +1292,7 @@ sfc_probe(struct sfc_adapter *sa)
SFC_ASSERT(sfc_adapter_is_locked(sa));
- sa->socket_id = rte_socket_id();
+ sa->numa_id = rte_numa_id();
sa->restart_required = false;
sfc_log_init(sa, "get family");
diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index 510790a5f6..c6137d206a 100644
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -251,7 +251,7 @@ struct sfc_adapter {
enum sfc_ethdev_state state;
struct rte_eth_dev *eth_dev;
struct rte_kvargs *kvargs;
- int socket_id;
+ int numa_id;
efsys_bar_t mem_bar;
/* Function control window offset */
efsys_dma_addr_t fcw_offset;
@@ -399,7 +399,7 @@ sfc_get_system_msecs(void)
}
int sfc_dma_alloc(struct sfc_adapter *sa, const char *name, uint16_t id,
- efx_nic_dma_addr_type_t addr_type, size_t len, int socket_id,
+ efx_nic_dma_addr_type_t addr_type, size_t len, int numa_id,
efsys_mem_t *esmp);
void sfc_dma_free(const struct sfc_adapter *sa, efsys_mem_t *esmp);
diff --git a/drivers/net/sfc/sfc_dp_rx.h b/drivers/net/sfc/sfc_dp_rx.h
index ed667c68d1..edcf93a16d 100644
--- a/drivers/net/sfc/sfc_dp_rx.h
+++ b/drivers/net/sfc/sfc_dp_rx.h
@@ -147,7 +147,7 @@ typedef int (sfc_dp_rx_qsize_up_rings_t)(uint16_t nb_rx_desc,
* @param port_id The port identifier
* @param queue_id The queue identifier
* @param pci_addr PCI function address
- * @param socket_id Socket identifier to allocate memory
+ * @param numa_id Socket identifier to allocate memory
* @param info Receive queue information
* @param dp_rxqp Location for generic datapath receive queue pointer
*
@@ -155,7 +155,7 @@ typedef int (sfc_dp_rx_qsize_up_rings_t)(uint16_t nb_rx_desc,
*/
typedef int (sfc_dp_rx_qcreate_t)(uint16_t port_id, uint16_t queue_id,
const struct rte_pci_addr *pci_addr,
- int socket_id,
+ int numa_id,
const struct sfc_dp_rx_qcreate_info *info,
struct sfc_dp_rxq **dp_rxqp);
diff --git a/drivers/net/sfc/sfc_dp_tx.h b/drivers/net/sfc/sfc_dp_tx.h
index 0baf8c7dd6..8c3ea29393 100644
--- a/drivers/net/sfc/sfc_dp_tx.h
+++ b/drivers/net/sfc/sfc_dp_tx.h
@@ -119,7 +119,7 @@ typedef int (sfc_dp_tx_qsize_up_rings_t)(uint16_t nb_tx_desc,
* @param port_id The port identifier
* @param queue_id The queue identifier
* @param pci_addr PCI function address
- * @param socket_id Socket identifier to allocate memory
+ * @param numa_id Socket identifier to allocate memory
* @param info Tx queue details wrapped in structure
* @param dp_txqp Location for generic datapath transmit queue pointer
*
@@ -127,7 +127,7 @@ typedef int (sfc_dp_tx_qsize_up_rings_t)(uint16_t nb_tx_desc,
*/
typedef int (sfc_dp_tx_qcreate_t)(uint16_t port_id, uint16_t queue_id,
const struct rte_pci_addr *pci_addr,
- int socket_id,
+ int numa_id,
const struct sfc_dp_tx_qcreate_info *info,
struct sfc_dp_txq **dp_txqp);
diff --git a/drivers/net/sfc/sfc_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c
index e283879e6b..dec7220b7c 100644
--- a/drivers/net/sfc/sfc_ef100_rx.c
+++ b/drivers/net/sfc/sfc_ef100_rx.c
@@ -767,7 +767,7 @@ sfc_ef100_mk_mbuf_rearm_data(uint16_t port_id, uint16_t prefix_size)
static sfc_dp_rx_qcreate_t sfc_ef100_rx_qcreate;
static int
sfc_ef100_rx_qcreate(uint16_t port_id, uint16_t queue_id,
- const struct rte_pci_addr *pci_addr, int socket_id,
+ const struct rte_pci_addr *pci_addr, int numa_id,
const struct sfc_dp_rx_qcreate_info *info,
struct sfc_dp_rxq **dp_rxqp)
{
@@ -779,18 +779,18 @@ sfc_ef100_rx_qcreate(uint16_t port_id, uint16_t queue_id,
goto fail_rxq_args;
rc = ENOMEM;
- rxq = rte_zmalloc_socket("sfc-ef100-rxq", sizeof(*rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("sfc-ef100-rxq", sizeof(*rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL)
goto fail_rxq_alloc;
sfc_dp_queue_init(&rxq->dp.dpq, port_id, queue_id, pci_addr);
rc = ENOMEM;
- rxq->sw_ring = rte_calloc_socket("sfc-ef100-rxq-sw_ring",
+ rxq->sw_ring = rte_calloc_numa("sfc-ef100-rxq-sw_ring",
info->rxq_entries,
sizeof(*rxq->sw_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq->sw_ring == NULL)
goto fail_desc_alloc;
diff --git a/drivers/net/sfc/sfc_ef100_tx.c b/drivers/net/sfc/sfc_ef100_tx.c
index c88ab96454..20ef9d01bc 100644
--- a/drivers/net/sfc/sfc_ef100_tx.c
+++ b/drivers/net/sfc/sfc_ef100_tx.c
@@ -834,7 +834,7 @@ sfc_ef100_tx_qsize_up_rings(uint16_t nb_tx_desc,
static sfc_dp_tx_qcreate_t sfc_ef100_tx_qcreate;
static int
sfc_ef100_tx_qcreate(uint16_t port_id, uint16_t queue_id,
- const struct rte_pci_addr *pci_addr, int socket_id,
+ const struct rte_pci_addr *pci_addr, int numa_id,
const struct sfc_dp_tx_qcreate_info *info,
struct sfc_dp_txq **dp_txqp)
{
@@ -846,18 +846,18 @@ sfc_ef100_tx_qcreate(uint16_t port_id, uint16_t queue_id,
goto fail_bad_args;
rc = ENOMEM;
- txq = rte_zmalloc_socket("sfc-ef100-txq", sizeof(*txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("sfc-ef100-txq", sizeof(*txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL)
goto fail_txq_alloc;
sfc_dp_queue_init(&txq->dp.dpq, port_id, queue_id, pci_addr);
rc = ENOMEM;
- txq->sw_ring = rte_calloc_socket("sfc-ef100-txq-sw_ring",
+ txq->sw_ring = rte_calloc_numa("sfc-ef100-txq-sw_ring",
info->txq_entries,
sizeof(*txq->sw_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL)
goto fail_sw_ring_alloc;
diff --git a/drivers/net/sfc/sfc_ef10_essb_rx.c b/drivers/net/sfc/sfc_ef10_essb_rx.c
index 6b31cb55d0..bc17abd4c2 100644
--- a/drivers/net/sfc/sfc_ef10_essb_rx.c
+++ b/drivers/net/sfc/sfc_ef10_essb_rx.c
@@ -564,7 +564,7 @@ sfc_ef10_essb_rx_qsize_up_rings(uint16_t nb_rx_desc,
static sfc_dp_rx_qcreate_t sfc_ef10_essb_rx_qcreate;
static int
sfc_ef10_essb_rx_qcreate(uint16_t port_id, uint16_t queue_id,
- const struct rte_pci_addr *pci_addr, int socket_id,
+ const struct rte_pci_addr *pci_addr, int numa_id,
const struct sfc_dp_rx_qcreate_info *info,
struct sfc_dp_rxq **dp_rxqp)
{
@@ -590,18 +590,18 @@ sfc_ef10_essb_rx_qcreate(uint16_t port_id, uint16_t queue_id,
goto fail_no_block_dequeue;
rc = ENOMEM;
- rxq = rte_zmalloc_socket("sfc-ef10-rxq", sizeof(*rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("sfc-ef10-rxq", sizeof(*rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL)
goto fail_rxq_alloc;
sfc_dp_queue_init(&rxq->dp.dpq, port_id, queue_id, pci_addr);
rc = ENOMEM;
- rxq->sw_ring = rte_calloc_socket("sfc-ef10-rxq-sw_ring",
+ rxq->sw_ring = rte_calloc_numa("sfc-ef10-rxq-sw_ring",
info->rxq_entries,
sizeof(*rxq->sw_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq->sw_ring == NULL)
goto fail_desc_alloc;
diff --git a/drivers/net/sfc/sfc_ef10_rx.c b/drivers/net/sfc/sfc_ef10_rx.c
index 60442930b3..938d6a516f 100644
--- a/drivers/net/sfc/sfc_ef10_rx.c
+++ b/drivers/net/sfc/sfc_ef10_rx.c
@@ -640,7 +640,7 @@ sfc_ef10_mk_mbuf_rearm_data(uint16_t port_id, uint16_t prefix_size)
static sfc_dp_rx_qcreate_t sfc_ef10_rx_qcreate;
static int
sfc_ef10_rx_qcreate(uint16_t port_id, uint16_t queue_id,
- const struct rte_pci_addr *pci_addr, int socket_id,
+ const struct rte_pci_addr *pci_addr, int numa_id,
const struct sfc_dp_rx_qcreate_info *info,
struct sfc_dp_rxq **dp_rxqp)
{
@@ -656,18 +656,18 @@ sfc_ef10_rx_qcreate(uint16_t port_id, uint16_t queue_id,
goto fail_nic_dma;
rc = ENOMEM;
- rxq = rte_zmalloc_socket("sfc-ef10-rxq", sizeof(*rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("sfc-ef10-rxq", sizeof(*rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL)
goto fail_rxq_alloc;
sfc_dp_queue_init(&rxq->dp.dpq, port_id, queue_id, pci_addr);
rc = ENOMEM;
- rxq->sw_ring = rte_calloc_socket("sfc-ef10-rxq-sw_ring",
+ rxq->sw_ring = rte_calloc_numa("sfc-ef10-rxq-sw_ring",
info->rxq_entries,
sizeof(*rxq->sw_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq->sw_ring == NULL)
goto fail_desc_alloc;
diff --git a/drivers/net/sfc/sfc_ef10_tx.c b/drivers/net/sfc/sfc_ef10_tx.c
index 5543dc495f..b11dfb4357 100644
--- a/drivers/net/sfc/sfc_ef10_tx.c
+++ b/drivers/net/sfc/sfc_ef10_tx.c
@@ -933,7 +933,7 @@ sfc_ef10_tx_qsize_up_rings(uint16_t nb_tx_desc,
static sfc_dp_tx_qcreate_t sfc_ef10_tx_qcreate;
static int
sfc_ef10_tx_qcreate(uint16_t port_id, uint16_t queue_id,
- const struct rte_pci_addr *pci_addr, int socket_id,
+ const struct rte_pci_addr *pci_addr, int numa_id,
const struct sfc_dp_tx_qcreate_info *info,
struct sfc_dp_txq **dp_txqp)
{
@@ -949,29 +949,29 @@ sfc_ef10_tx_qcreate(uint16_t port_id, uint16_t queue_id,
goto fail_nic_dma;
rc = ENOMEM;
- txq = rte_zmalloc_socket("sfc-ef10-txq", sizeof(*txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("sfc-ef10-txq", sizeof(*txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL)
goto fail_txq_alloc;
sfc_dp_queue_init(&txq->dp.dpq, port_id, queue_id, pci_addr);
rc = ENOMEM;
- txq->sw_ring = rte_calloc_socket("sfc-ef10-txq-sw_ring",
+ txq->sw_ring = rte_calloc_numa("sfc-ef10-txq-sw_ring",
info->txq_entries,
sizeof(*txq->sw_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL)
goto fail_sw_ring_alloc;
if (info->offloads & (RTE_ETH_TX_OFFLOAD_TCP_TSO |
RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |
RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO)) {
- txq->tsoh = rte_calloc_socket("sfc-ef10-txq-tsoh",
+ txq->tsoh = rte_calloc_numa("sfc-ef10-txq-tsoh",
info->txq_entries,
SFC_TSOH_STD_LEN,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (txq->tsoh == NULL)
goto fail_tsoh_alloc;
diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 02231e4bce..9fe9c1eef8 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -633,7 +633,7 @@ sfc_dev_allmulti_disable(struct rte_eth_dev *dev)
static int
sfc_rx_queue_setup(struct rte_eth_dev *dev, uint16_t ethdev_qid,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -644,13 +644,13 @@ sfc_rx_queue_setup(struct rte_eth_dev *dev, uint16_t ethdev_qid,
sfc_sw_index_t sw_index;
int rc;
- sfc_log_init(sa, "RxQ=%u nb_rx_desc=%u socket_id=%u",
- ethdev_qid, nb_rx_desc, socket_id);
+ sfc_log_init(sa, "RxQ=%u nb_rx_desc=%u numa_id=%u",
+ ethdev_qid, nb_rx_desc, numa_id);
sfc_adapter_lock(sa);
sw_index = sfc_rxq_sw_index_by_ethdev_rx_qid(sas, sfc_ethdev_qid);
- rc = sfc_rx_qinit(sa, sw_index, nb_rx_desc, socket_id,
+ rc = sfc_rx_qinit(sa, sw_index, nb_rx_desc, numa_id,
rx_conf, mb_pool);
if (rc != 0)
goto fail_rx_qinit;
@@ -694,7 +694,7 @@ sfc_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
static int
sfc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t ethdev_qid,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
@@ -703,13 +703,13 @@ sfc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t ethdev_qid,
sfc_sw_index_t sw_index;
int rc;
- sfc_log_init(sa, "TxQ = %u, nb_tx_desc = %u, socket_id = %u",
- ethdev_qid, nb_tx_desc, socket_id);
+ sfc_log_init(sa, "TxQ = %u, nb_tx_desc = %u, numa_id = %u",
+ ethdev_qid, nb_tx_desc, numa_id);
sfc_adapter_lock(sa);
sw_index = sfc_txq_sw_index_by_ethdev_tx_qid(sas, ethdev_qid);
- rc = sfc_tx_qinit(sa, sw_index, nb_tx_desc, socket_id, tx_conf);
+ rc = sfc_tx_qinit(sa, sw_index, nb_tx_desc, numa_id, tx_conf);
if (rc != 0)
goto fail_tx_qinit;
diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c
index f058b3cb9b..6c2938adeb 100644
--- a/drivers/net/sfc/sfc_ev.c
+++ b/drivers/net/sfc/sfc_ev.c
@@ -945,7 +945,7 @@ sfc_ev_stop(struct sfc_adapter *sa)
int
sfc_ev_qinit(struct sfc_adapter *sa,
enum sfc_evq_type type, unsigned int type_index,
- unsigned int entries, int socket_id, struct sfc_evq **evqp)
+ unsigned int entries, int numa_id, struct sfc_evq **evqp)
{
struct sfc_evq *evq;
int rc;
@@ -956,8 +956,8 @@ sfc_ev_qinit(struct sfc_adapter *sa,
SFC_ASSERT(rte_is_power_of_2(entries));
rc = ENOMEM;
- evq = rte_zmalloc_socket("sfc-evq", sizeof(*evq), RTE_CACHE_LINE_SIZE,
- socket_id);
+ evq = rte_zmalloc_numa("sfc-evq", sizeof(*evq), RTE_CACHE_LINE_SIZE,
+ numa_id);
if (evq == NULL)
goto fail_evq_alloc;
@@ -969,7 +969,7 @@ sfc_ev_qinit(struct sfc_adapter *sa,
rc = sfc_dma_alloc(sa, sfc_evq_type2str(type), type_index,
EFX_NIC_DMA_ADDR_EVENT_RING,
efx_evq_size(sa->nic, evq->entries, sa->evq_flags),
- socket_id, &evq->mem);
+ numa_id, &evq->mem);
if (rc != 0)
goto fail_dma_alloc;
@@ -1044,7 +1044,7 @@ sfc_ev_attach(struct sfc_adapter *sa)
rte_spinlock_init(&sa->mgmt_evq_lock);
rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_MGMT, 0, sa->evq_min_entries,
- sa->socket_id, &sa->mgmt_evq);
+ sa->numa_id, &sa->mgmt_evq);
if (rc != 0)
goto fail_mgmt_evq_init;
diff --git a/drivers/net/sfc/sfc_ev.h b/drivers/net/sfc/sfc_ev.h
index a4ababc2bc..663a8d7153 100644
--- a/drivers/net/sfc/sfc_ev.h
+++ b/drivers/net/sfc/sfc_ev.h
@@ -214,7 +214,7 @@ void sfc_ev_stop(struct sfc_adapter *sa);
int sfc_ev_qinit(struct sfc_adapter *sa,
enum sfc_evq_type type, unsigned int type_index,
- unsigned int entries, int socket_id, struct sfc_evq **evqp);
+ unsigned int entries, int numa_id, struct sfc_evq **evqp);
void sfc_ev_qfini(struct sfc_evq *evq);
int sfc_ev_qstart(struct sfc_evq *evq, unsigned int hw_index);
void sfc_ev_qstop(struct sfc_evq *evq);
diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index b0e8b02b41..4e9cc8e7a9 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -4418,7 +4418,7 @@ sfc_mae_rule_parse_action_count(struct sfc_adapter *sa,
goto fail_counter_queue_uninit;
}
- if (sfc_get_service_lcore(SOCKET_ID_ANY) == RTE_MAX_LCORE) {
+ if (sfc_get_service_lcore(RTE_NUMA_ID_ANY) == RTE_MAX_LCORE) {
rc = EINVAL;
goto fail_no_service_core;
}
diff --git a/drivers/net/sfc/sfc_mae_counter.c b/drivers/net/sfc/sfc_mae_counter.c
index ba17295719..fc500527bc 100644
--- a/drivers/net/sfc/sfc_mae_counter.c
+++ b/drivers/net/sfc/sfc_mae_counter.c
@@ -47,19 +47,19 @@ sfc_mae_counter_get_service_lcore(struct sfc_adapter *sa)
{
uint32_t cid;
- cid = sfc_get_service_lcore(sa->socket_id);
+ cid = sfc_get_service_lcore(sa->numa_id);
if (cid != RTE_MAX_LCORE)
return cid;
- if (sa->socket_id != SOCKET_ID_ANY)
- cid = sfc_get_service_lcore(SOCKET_ID_ANY);
+ if (sa->numa_id != RTE_NUMA_ID_ANY)
+ cid = sfc_get_service_lcore(RTE_NUMA_ID_ANY);
if (cid == RTE_MAX_LCORE) {
sfc_warn(sa, "failed to get service lcore for counter service");
- } else if (sa->socket_id != SOCKET_ID_ANY) {
+ } else if (sa->numa_id != RTE_NUMA_ID_ANY) {
sfc_warn(sa,
"failed to get service lcore for counter service at socket %d, but got at socket %u",
- sa->socket_id, rte_lcore_to_socket_id(cid));
+ sa->numa_id, rte_lcore_to_numa_id(cid));
}
return cid;
}
@@ -589,20 +589,20 @@ sfc_mae_counter_service_register(struct sfc_adapter *sa,
/* Prepare service info */
memset(&service, 0, sizeof(service));
rte_strscpy(service.name, counter_service_name, sizeof(service.name));
- service.socket_id = sa->socket_id;
+ service.socket_id = sa->numa_id;
service.callback = sfc_mae_counter_service_routine;
service.callback_userdata = sa;
sfc_mae_counter_registry_prepare(counter_registry, sa,
counter_stream_flags);
- cid = sfc_get_service_lcore(sa->socket_id);
- if (cid == RTE_MAX_LCORE && sa->socket_id != SOCKET_ID_ANY) {
+ cid = sfc_get_service_lcore(sa->numa_id);
+ if (cid == RTE_MAX_LCORE && sa->numa_id != RTE_NUMA_ID_ANY) {
/* Warn and try to allocate on any NUMA node */
sfc_warn(sa,
"failed to get service lcore for counter service at socket %d",
- sa->socket_id);
+ sa->numa_id);
- cid = sfc_get_service_lcore(SOCKET_ID_ANY);
+ cid = sfc_get_service_lcore(RTE_NUMA_ID_ANY);
}
if (cid == RTE_MAX_LCORE) {
rc = ENOTSUP;
@@ -795,7 +795,7 @@ sfc_mae_counter_rxq_attach(struct sfc_adapter *sa)
* mempool backend is chosen since backend is unused.
*/
mp = rte_pktmbuf_pool_create(name, n_elements, cache_size,
- priv_size, data_room_size, sa->socket_id);
+ priv_size, data_room_size, sa->numa_id);
if (mp == NULL) {
sfc_err(sa, "failed to create counter RxQ mempool");
rc = rte_errno;
@@ -873,7 +873,7 @@ sfc_mae_counter_rxq_init(struct sfc_adapter *sa)
goto fail_counter_rxq_init_info;
rc = sfc_rx_qinit(sa, sa->counter_rxq.sw_index, nb_rx_desc,
- sa->socket_id, &rxconf, sa->counter_rxq.mp);
+ sa->numa_id, &rxconf, sa->counter_rxq.mp);
if (rc != 0) {
sfc_err(sa, "failed to init counter RxQ");
goto fail_counter_rxq_init;
@@ -1058,7 +1058,7 @@ bool
sfc_mae_counter_stream_enabled(struct sfc_adapter *sa)
{
if ((sa->counter_rxq.state & SFC_COUNTER_RXQ_INITIALIZED) == 0 ||
- sfc_get_service_lcore(SOCKET_ID_ANY) == RTE_MAX_LCORE)
+ sfc_get_service_lcore(RTE_NUMA_ID_ANY) == RTE_MAX_LCORE)
return B_FALSE;
else
return B_TRUE;
diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index 65e5e3817c..4dc6c32da6 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -22,7 +22,7 @@ sfc_mcdi_dma_alloc(void *cookie, const char *name, size_t len,
struct sfc_adapter *sa = cookie;
return sfc_dma_alloc(sa, name, 0, EFX_NIC_DMA_ADDR_MCDI_BUF, len,
- sa->socket_id, esmp);
+ sa->numa_id, esmp);
}
static sfc_efx_mcdi_dma_free_cb sfc_mcdi_dma_free;
diff --git a/drivers/net/sfc/sfc_port.c b/drivers/net/sfc/sfc_port.c
index d84648d454..466bf23778 100644
--- a/drivers/net/sfc/sfc_port.c
+++ b/drivers/net/sfc/sfc_port.c
@@ -454,19 +454,19 @@ sfc_port_attach(struct sfc_adapter *sa)
port->max_mcast_addrs = EFX_MAC_MULTICAST_LIST_MAX;
port->nb_mcast_addrs = 0;
- port->mcast_addrs = rte_calloc_socket("mcast_addr_list_buf",
+ port->mcast_addrs = rte_calloc_numa("mcast_addr_list_buf",
port->max_mcast_addrs,
EFX_MAC_ADDR_LEN, 0,
- sa->socket_id);
+ sa->numa_id);
if (port->mcast_addrs == NULL) {
rc = ENOMEM;
goto fail_mcast_addr_list_buf_alloc;
}
rc = ENOMEM;
- port->mac_stats_buf = rte_calloc_socket("mac_stats_buf", EFX_MAC_NSTATS,
+ port->mac_stats_buf = rte_calloc_numa("mac_stats_buf", EFX_MAC_NSTATS,
sizeof(uint64_t), 0,
- sa->socket_id);
+ sa->numa_id);
if (port->mac_stats_buf == NULL)
goto fail_mac_stats_buf_alloc;
@@ -474,7 +474,7 @@ sfc_port_attach(struct sfc_adapter *sa)
mac_stats_size = RTE_ALIGN(mac_nstats * sizeof(uint64_t), EFX_BUF_SIZE);
rc = sfc_dma_alloc(sa, "mac_stats", 0, EFX_NIC_DMA_ADDR_MAC_STATS_BUF,
mac_stats_size,
- sa->socket_id, &port->mac_stats_dma_mem);
+ sa->numa_id, &port->mac_stats_dma_mem);
if (rc != 0)
goto fail_mac_stats_dma_alloc;
diff --git a/drivers/net/sfc/sfc_repr.c b/drivers/net/sfc/sfc_repr.c
index 629cb7af1c..3313cacba7 100644
--- a/drivers/net/sfc/sfc_repr.c
+++ b/drivers/net/sfc/sfc_repr.c
@@ -513,7 +513,7 @@ sfc_repr_dev_link_update(struct rte_eth_dev *dev,
static int
sfc_repr_ring_create(uint16_t pf_port_id, uint16_t repr_id,
const char *type_name, uint16_t qid, uint16_t nb_desc,
- unsigned int socket_id, struct rte_ring **ring)
+ unsigned int numa_id, struct rte_ring **ring)
{
char ring_name[RTE_RING_NAMESIZE];
int ret;
@@ -529,7 +529,7 @@ sfc_repr_ring_create(uint16_t pf_port_id, uint16_t repr_id,
* a single thread, and the user of the other end (representor proxy)
* is also single-threaded.
*/
- *ring = rte_ring_create(ring_name, nb_desc, socket_id,
+ *ring = rte_ring_create(ring_name, nb_desc, numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (*ring == NULL)
return -rte_errno;
@@ -570,7 +570,7 @@ sfc_repr_rx_qcheck_conf(struct sfc_repr *sr,
static int
sfc_repr_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -586,8 +586,8 @@ sfc_repr_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
goto fail_check_conf;
ret = -ENOMEM;
- rxq = rte_zmalloc_socket("sfc-repr-rxq", sizeof(*rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("sfc-repr-rxq", sizeof(*rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL) {
sfcr_err(sr, "%s() failed to alloc RxQ", __func__);
goto fail_rxq_alloc;
@@ -595,7 +595,7 @@ sfc_repr_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
ret = sfc_repr_ring_create(srs->pf_port_id, srs->repr_id,
"rx", rx_queue_id, nb_rx_desc,
- socket_id, &rxq->ring);
+ numa_id, &rxq->ring);
if (ret != 0) {
sfcr_err(sr, "%s() failed to create ring", __func__);
goto fail_ring_create;
@@ -672,7 +672,7 @@ sfc_repr_tx_qcheck_conf(struct sfc_repr *sr,
static int
sfc_repr_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct sfc_repr_shared *srs = sfc_repr_shared_by_eth_dev(dev);
@@ -687,14 +687,14 @@ sfc_repr_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
goto fail_check_conf;
ret = -ENOMEM;
- txq = rte_zmalloc_socket("sfc-repr-txq", sizeof(*txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("sfc-repr-txq", sizeof(*txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL)
goto fail_txq_alloc;
ret = sfc_repr_ring_create(srs->pf_port_id, srs->repr_id,
"tx", tx_queue_id, nb_tx_desc,
- socket_id, &txq->ring);
+ numa_id, &txq->ring);
if (ret != 0)
goto fail_ring_create;
diff --git a/drivers/net/sfc/sfc_repr_proxy.c b/drivers/net/sfc/sfc_repr_proxy.c
index ff13795c97..3e9615911a 100644
--- a/drivers/net/sfc/sfc_repr_proxy.c
+++ b/drivers/net/sfc/sfc_repr_proxy.c
@@ -393,7 +393,7 @@ sfc_repr_proxy_txq_init(struct sfc_adapter *sa)
sfc_tx_qinit_info(sa, txq->sw_index);
rc = sfc_tx_qinit(sa, txq->sw_index,
- SFC_REPR_PROXY_TX_DESC_COUNT, sa->socket_id,
+ SFC_REPR_PROXY_TX_DESC_COUNT, sa->numa_id,
&tx_conf);
if (rc != 0) {
@@ -559,7 +559,7 @@ sfc_repr_proxy_rxq_init(struct sfc_adapter *sa,
goto fail_repr_rxq_init_info;
}
- rc = sfc_rx_qinit(sa, rxq->sw_index, nb_rx_desc, sa->socket_id, &rxconf,
+ rc = sfc_rx_qinit(sa, rxq->sw_index, nb_rx_desc, sa->numa_id, &rxconf,
rxq->mp);
if (rc != 0) {
sfc_err(sa, "failed to init representor proxy RxQ");
@@ -898,14 +898,14 @@ sfc_repr_proxy_attach(struct sfc_adapter *sa)
if (rc != 0)
goto fail_ports_init;
- cid = sfc_get_service_lcore(sa->socket_id);
- if (cid == RTE_MAX_LCORE && sa->socket_id != SOCKET_ID_ANY) {
+ cid = sfc_get_service_lcore(sa->numa_id);
+ if (cid == RTE_MAX_LCORE && sa->numa_id != RTE_NUMA_ID_ANY) {
/* Warn and try to allocate on any NUMA node */
sfc_warn(sa,
"repr proxy: unable to get service lcore at socket %d",
- sa->socket_id);
+ sa->numa_id);
- cid = sfc_get_service_lcore(SOCKET_ID_ANY);
+ cid = sfc_get_service_lcore(RTE_NUMA_ID_ANY);
}
if (cid == RTE_MAX_LCORE) {
rc = ENOTSUP;
@@ -916,7 +916,7 @@ sfc_repr_proxy_attach(struct sfc_adapter *sa)
memset(&service, 0, sizeof(service));
snprintf(service.name, sizeof(service.name),
"net_sfc_%hu_repr_proxy", sfc_sa2shared(sa)->port_id);
- service.socket_id = rte_lcore_to_socket_id(cid);
+ service.socket_id = rte_lcore_to_numa_id(cid);
service.callback = sfc_repr_proxy_routine;
service.callback_userdata = rp;
@@ -947,7 +947,7 @@ sfc_repr_proxy_attach(struct sfc_adapter *sa)
fail_register:
/*
* No need to rollback service lcore get since
- * it just makes socket_id based search and remembers it.
+ * it just makes numa_id based search and remembers it.
*/
fail_get_service_lcore:
@@ -1270,7 +1270,7 @@ sfc_repr_proxy_add_port(uint16_t pf_port_id, uint16_t repr_id,
}
port = rte_zmalloc("sfc-repr-proxy-port", sizeof(*port),
- sa->socket_id);
+ sa->numa_id);
if (port == NULL) {
rc = ENOMEM;
sfc_err(sa, "failed to alloc memory for proxy port");
diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c
index 70ad3bf00c..77f29da23f 100644
--- a/drivers/net/sfc/sfc_rx.c
+++ b/drivers/net/sfc/sfc_rx.c
@@ -477,7 +477,7 @@ sfc_efx_rx_qsize_up_rings(uint16_t nb_rx_desc,
static sfc_dp_rx_qcreate_t sfc_efx_rx_qcreate;
static int
sfc_efx_rx_qcreate(uint16_t port_id, uint16_t queue_id,
- const struct rte_pci_addr *pci_addr, int socket_id,
+ const struct rte_pci_addr *pci_addr, int numa_id,
const struct sfc_dp_rx_qcreate_info *info,
struct sfc_dp_rxq **dp_rxqp)
{
@@ -489,18 +489,18 @@ sfc_efx_rx_qcreate(uint16_t port_id, uint16_t queue_id,
goto fail_nic_dma;
rc = ENOMEM;
- rxq = rte_zmalloc_socket("sfc-efx-rxq", sizeof(*rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("sfc-efx-rxq", sizeof(*rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL)
goto fail_rxq_alloc;
sfc_dp_queue_init(&rxq->dp.dpq, port_id, queue_id, pci_addr);
rc = ENOMEM;
- rxq->sw_desc = rte_calloc_socket("sfc-efx-rxq-sw_desc",
+ rxq->sw_desc = rte_calloc_numa("sfc-efx-rxq-sw_desc",
info->rxq_entries,
sizeof(*rxq->sw_desc),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq->sw_desc == NULL)
goto fail_desc_alloc;
@@ -1098,7 +1098,7 @@ sfc_rx_mb_pool_buf_size(struct sfc_adapter *sa, struct rte_mempool *mb_pool)
int
sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
@@ -1206,7 +1206,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
rxq_info->type_flags |= EFX_RXQ_FLAG_VLAN_STRIPPED_TCI;
rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_RX, sw_index,
- evq_entries, socket_id, &evq);
+ evq_entries, numa_id, &evq);
if (rc != 0)
goto fail_ev_qinit;
@@ -1247,7 +1247,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
rc = sfc_dma_alloc(sa, "rxq", sw_index, EFX_NIC_DMA_ADDR_RX_RING,
efx_rxq_size(sa->nic, rxq_info->entries),
- socket_id, &rxq->mem);
+ numa_id, &rxq->mem);
if (rc != 0)
goto fail_dma_alloc;
@@ -1280,7 +1280,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
struct rte_pci_device *pci_dev = RTE_CLASS_TO_BUS_DEVICE(sa->eth_dev, *pci_dev);
rc = sa->priv.dp_rx->qcreate(sa->eth_dev->data->port_id, sw_index,
&pci_dev->addr,
- socket_id, &info, &rxq_info->dp);
+ numa_id, &info, &rxq_info->dp);
if (rc != 0)
goto fail_dp_rx_qcreate;
@@ -1420,9 +1420,9 @@ sfc_rx_hash_init(struct sfc_adapter *sa)
if (rc != 0)
return rc;
- hf_map = rte_calloc_socket("sfc-rss-hf-map",
+ hf_map = rte_calloc_numa("sfc-rss-hf-map",
RTE_DIM(sfc_rss_hf_map),
- sizeof(*hf_map), 0, sa->socket_id);
+ sizeof(*hf_map), 0, sa->numa_id);
if (hf_map == NULL)
return ENOMEM;
@@ -1755,9 +1755,9 @@ sfc_rx_configure(struct sfc_adapter *sa)
if (sas->rxq_info == NULL) {
reconfigure = false;
rc = ENOMEM;
- sas->rxq_info = rte_calloc_socket("sfc-rxqs", nb_rxq_total,
+ sas->rxq_info = rte_calloc_numa("sfc-rxqs", nb_rxq_total,
sizeof(sas->rxq_info[0]), 0,
- sa->socket_id);
+ sa->numa_id);
if (sas->rxq_info == NULL)
goto fail_rxqs_alloc;
diff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h
index bd189e6a56..8f8948fa53 100644
--- a/drivers/net/sfc/sfc_rx.h
+++ b/drivers/net/sfc/sfc_rx.h
@@ -133,7 +133,7 @@ void sfc_rx_stop(struct sfc_adapter *sa);
int sfc_rx_qinit_info(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
unsigned int extra_efx_type_flags);
int sfc_rx_qinit(struct sfc_adapter *sa, unsigned int rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
void sfc_rx_qfini(struct sfc_adapter *sa, sfc_sw_index_t sw_index);
diff --git a/drivers/net/sfc/sfc_service.c b/drivers/net/sfc/sfc_service.c
index 9c89484406..50272666b8 100644
--- a/drivers/net/sfc/sfc_service.c
+++ b/drivers/net/sfc/sfc_service.c
@@ -27,7 +27,7 @@ RTE_INIT(sfc_service_lcore_init)
}
static uint32_t
-sfc_find_service_lcore(int *socket_id)
+sfc_find_service_lcore(int *numa_id)
{
uint32_t service_core_list[RTE_MAX_LCORE];
uint32_t lcore_id;
@@ -50,18 +50,18 @@ sfc_find_service_lcore(int *socket_id)
for (i = 0; i < num; ++i) {
lcore_id = service_core_list[i];
- if (*socket_id == SOCKET_ID_ANY) {
- *socket_id = rte_lcore_to_socket_id(lcore_id);
+ if (*numa_id == RTE_NUMA_ID_ANY) {
+ *numa_id = rte_lcore_to_numa_id(lcore_id);
break;
- } else if (rte_lcore_to_socket_id(lcore_id) ==
- (unsigned int)*socket_id) {
+ } else if (rte_lcore_to_numa_id(lcore_id) ==
+ (unsigned int)*numa_id) {
break;
}
}
if (i == num) {
SFC_GENERIC_LOG(WARNING,
- "No service cores reserved at socket %d", *socket_id);
+ "No service cores reserved at socket %d", *numa_id);
return RTE_MAX_LCORE;
}
@@ -69,14 +69,14 @@ sfc_find_service_lcore(int *socket_id)
}
uint32_t
-sfc_get_service_lcore(int socket_id)
+sfc_get_service_lcore(int numa_id)
{
uint32_t lcore_id = RTE_MAX_LCORE;
rte_spinlock_lock(&sfc_service_lcore_lock);
- if (socket_id != SOCKET_ID_ANY) {
- lcore_id = sfc_service_lcore[socket_id];
+ if (numa_id != RTE_NUMA_ID_ANY) {
+ lcore_id = sfc_service_lcore[numa_id];
} else {
size_t i;
@@ -89,9 +89,9 @@ sfc_get_service_lcore(int socket_id)
}
if (lcore_id == RTE_MAX_LCORE) {
- lcore_id = sfc_find_service_lcore(&socket_id);
+ lcore_id = sfc_find_service_lcore(&numa_id);
if (lcore_id != RTE_MAX_LCORE)
- sfc_service_lcore[socket_id] = lcore_id;
+ sfc_service_lcore[numa_id] = lcore_id;
}
rte_spinlock_unlock(&sfc_service_lcore_lock);
diff --git a/drivers/net/sfc/sfc_service.h b/drivers/net/sfc/sfc_service.h
index bbcce28479..16ff71bca8 100644
--- a/drivers/net/sfc/sfc_service.h
+++ b/drivers/net/sfc/sfc_service.h
@@ -12,7 +12,7 @@
extern "C" {
#endif
-uint32_t sfc_get_service_lcore(int socket_id);
+uint32_t sfc_get_service_lcore(int numa_id);
#ifdef __cplusplus
}
diff --git a/drivers/net/sfc/sfc_sw_stats.c b/drivers/net/sfc/sfc_sw_stats.c
index 3ae5023b6f..3ec5fda291 100644
--- a/drivers/net/sfc/sfc_sw_stats.c
+++ b/drivers/net/sfc/sfc_sw_stats.c
@@ -831,8 +831,8 @@ sfc_sw_xstats_alloc_queues_bitmap(struct sfc_adapter *sa)
*queues_bitmap_mem = NULL;
*queues_bitmap = NULL;
- *queues_bitmap_mem = rte_calloc_socket("bitmap_mem", bmp_size, 1, 0,
- sa->socket_id);
+ *queues_bitmap_mem = rte_calloc_numa("bitmap_mem", bmp_size, 1, 0,
+ sa->numa_id);
if (*queues_bitmap_mem == NULL)
return ENOMEM;
diff --git a/drivers/net/sfc/sfc_tso.c b/drivers/net/sfc/sfc_tso.c
index a0827d1c0d..dfeb283cc8 100644
--- a/drivers/net/sfc/sfc_tso.c
+++ b/drivers/net/sfc/sfc_tso.c
@@ -18,15 +18,15 @@
int
sfc_efx_tso_alloc_tsoh_objs(struct sfc_efx_tx_sw_desc *sw_ring,
- unsigned int txq_entries, unsigned int socket_id)
+ unsigned int txq_entries, unsigned int numa_id)
{
unsigned int i;
for (i = 0; i < txq_entries; ++i) {
- sw_ring[i].tsoh = rte_malloc_socket("sfc-efx-txq-tsoh-obj",
+ sw_ring[i].tsoh = rte_malloc_numa("sfc-efx-txq-tsoh-obj",
SFC_TSOH_STD_LEN,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (sw_ring[i].tsoh == NULL)
goto fail_alloc_tsoh_objs;
}
diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index a860265c6a..b525793c9e 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -132,7 +132,7 @@ sfc_tx_qflush_done(struct sfc_txq_info *txq_info)
int
sfc_tx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct sfc_adapter_shared * const sas = sfc_sa2shared(sa);
@@ -182,7 +182,7 @@ sfc_tx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
txq_info->entries = txq_entries;
rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_TX, sw_index,
- evq_entries, socket_id, &evq);
+ evq_entries, numa_id, &evq);
if (rc != 0)
goto fail_ev_qinit;
@@ -196,7 +196,7 @@ sfc_tx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
rc = sfc_dma_alloc(sa, "txq", sw_index, EFX_NIC_DMA_ADDR_TX_RING,
efx_txq_size(sa->nic, txq_info->entries),
- socket_id, &txq->mem);
+ numa_id, &txq->mem);
if (rc != 0)
goto fail_dma_alloc;
@@ -233,7 +233,7 @@ sfc_tx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
struct rte_pci_device *pci_dev = RTE_CLASS_TO_BUS_DEVICE(sa->eth_dev, *pci_dev);
rc = sa->priv.dp_tx->qcreate(sa->eth_dev->data->port_id, sw_index,
&pci_dev->addr,
- socket_id, &info, &txq_info->dp);
+ numa_id, &info, &txq_info->dp);
if (rc != 0)
goto fail_dp_tx_qinit;
@@ -407,9 +407,9 @@ sfc_tx_configure(struct sfc_adapter *sa)
if (sas->txq_info == NULL) {
reconfigure = false;
- sas->txq_info = rte_calloc_socket("sfc-txqs", nb_txq_total,
+ sas->txq_info = rte_calloc_numa("sfc-txqs", nb_txq_total,
sizeof(sas->txq_info[0]), 0,
- sa->socket_id);
+ sa->numa_id);
if (sas->txq_info == NULL)
goto fail_txqs_alloc;
@@ -1078,7 +1078,7 @@ static sfc_dp_tx_qcreate_t sfc_efx_tx_qcreate;
static int
sfc_efx_tx_qcreate(uint16_t port_id, uint16_t queue_id,
const struct rte_pci_addr *pci_addr,
- int socket_id,
+ int numa_id,
const struct sfc_dp_tx_qcreate_info *info,
struct sfc_dp_txq **dp_txqp)
{
@@ -1091,33 +1091,33 @@ sfc_efx_tx_qcreate(uint16_t port_id, uint16_t queue_id,
goto fail_nic_dma;
rc = ENOMEM;
- txq = rte_zmalloc_socket("sfc-efx-txq", sizeof(*txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("sfc-efx-txq", sizeof(*txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL)
goto fail_txq_alloc;
sfc_dp_queue_init(&txq->dp.dpq, port_id, queue_id, pci_addr);
rc = ENOMEM;
- txq->pend_desc = rte_calloc_socket("sfc-efx-txq-pend-desc",
+ txq->pend_desc = rte_calloc_numa("sfc-efx-txq-pend-desc",
EFX_TXQ_LIMIT(info->txq_entries),
sizeof(*txq->pend_desc), 0,
- socket_id);
+ numa_id);
if (txq->pend_desc == NULL)
goto fail_pend_desc_alloc;
rc = ENOMEM;
- txq->sw_ring = rte_calloc_socket("sfc-efx-txq-sw_ring",
+ txq->sw_ring = rte_calloc_numa("sfc-efx-txq-sw_ring",
info->txq_entries,
sizeof(*txq->sw_ring),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL)
goto fail_sw_ring_alloc;
ctrl_txq = sfc_txq_by_dp_txq(&txq->dp);
if (ctrl_txq->evq->sa->tso) {
rc = sfc_efx_tso_alloc_tsoh_objs(txq->sw_ring,
- info->txq_entries, socket_id);
+ info->txq_entries, numa_id);
if (rc != 0)
goto fail_alloc_tsoh_objs;
}
diff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h
index 1a33199fdc..c29e00f3c3 100644
--- a/drivers/net/sfc/sfc_tx.h
+++ b/drivers/net/sfc/sfc_tx.h
@@ -110,7 +110,7 @@ void sfc_tx_close(struct sfc_adapter *sa);
int sfc_tx_qinit_info(struct sfc_adapter *sa, sfc_sw_index_t sw_index);
int sfc_tx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
void sfc_tx_qfini(struct sfc_adapter *sa, sfc_sw_index_t sw_index);
@@ -126,7 +126,7 @@ uint64_t sfc_tx_get_queue_offload_caps(struct sfc_adapter *sa);
/* From 'sfc_tso.c' */
int sfc_efx_tso_alloc_tsoh_objs(struct sfc_efx_tx_sw_desc *sw_ring,
unsigned int txq_entries,
- unsigned int socket_id);
+ unsigned int numa_id);
void sfc_efx_tso_free_tsoh_objs(struct sfc_efx_tx_sw_desc *sw_ring,
unsigned int txq_entries);
int sfc_efx_tso_do(struct sfc_efx_txq *txq, unsigned int idx,
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 147/227] net/softnic: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (145 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 146/227] net/sfc: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 148/227] net/sxe2: " Chengwen Feng
` (80 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/softnic/rte_eth_softnic.c | 6 +++---
drivers/net/softnic/rte_eth_softnic_thread.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c
index 868e194509..857c70da4a 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -79,7 +79,7 @@ static int
pmd_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool __rte_unused)
{
@@ -107,7 +107,7 @@ static int
pmd_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
char name[NAME_SIZE];
@@ -254,7 +254,7 @@ pmd_init(struct pmd_params *params)
struct pmd_internals *p;
int status;
- p = rte_zmalloc_socket(params->name,
+ p = rte_zmalloc_numa(params->name,
sizeof(struct pmd_internals),
0,
params->cpu_id);
diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c
index a6d47c8b33..f45b63f481 100644
--- a/drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/drivers/net/softnic/rte_eth_softnic_thread.c
@@ -41,7 +41,7 @@ softnic_thread_init(struct pmd_internals *softnic)
struct rte_ring *msgq_req, *msgq_rsp;
struct softnic_thread *t = &softnic->thread[i];
struct softnic_thread_data *t_data = &softnic->thread_data[i];
- uint32_t cpu_id = rte_lcore_to_socket_id(i);
+ uint32_t cpu_id = rte_lcore_to_numa_id(i);
/* MSGQs */
snprintf(ring_name, sizeof(ring_name), "%s-TH%u-REQ",
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 148/227] net/sxe2: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (146 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 147/227] net/softnic: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 149/227] net/tap: " Chengwen Feng
` (79 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/sxe2/sxe2_ethdev_repr.c | 2 +-
drivers/net/sxe2/sxe2_mp.c | 2 +-
drivers/net/sxe2/sxe2_rx.c | 16 ++++++++--------
drivers/net/sxe2/sxe2_rx.h | 2 +-
drivers/net/sxe2/sxe2_tx.c | 16 ++++++++--------
drivers/net/sxe2/sxe2_tx.h | 2 +-
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/net/sxe2/sxe2_ethdev_repr.c b/drivers/net/sxe2/sxe2_ethdev_repr.c
index cee37d5d8e..5be8d45301 100644
--- a/drivers/net/sxe2/sxe2_ethdev_repr.c
+++ b/drivers/net/sxe2/sxe2_ethdev_repr.c
@@ -560,7 +560,7 @@ int32_t sxe2_switchdev_repr_devs_init(struct sxe2_adapter *adapter,
goto l_release_port;
}
eth_dev->data->numa_node = adapter->dev_info.dev_data->numa_node;
- eth_dev->data->dev_private = rte_zmalloc_socket(name,
+ eth_dev->data->dev_private = rte_zmalloc_numa(name,
sizeof(struct sxe2_adapter),
RTE_CACHE_LINE_SIZE,
eth_dev->data->numa_node);
diff --git a/drivers/net/sxe2/sxe2_mp.c b/drivers/net/sxe2/sxe2_mp.c
index be103322ad..715c86d8db 100644
--- a/drivers/net/sxe2/sxe2_mp.c
+++ b/drivers/net/sxe2/sxe2_mp.c
@@ -135,7 +135,7 @@ sxe2_mp_init_primary(__rte_unused struct rte_eth_dev *dev)
if (sxe2_mp_mz == NULL) {
sxe2_mp_mz = rte_memzone_reserve(SXE2_MP_MZ_NAME,
sizeof(struct sxe2_mp_shared_data),
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (sxe2_mp_mz == NULL && rte_errno != EEXIST) {
PMD_LOG_ERR(DRV, "Failed to reserve memzone %s, error: %d",
SXE2_MP_MZ_NAME, -rte_errno);
diff --git a/drivers/net/sxe2/sxe2_rx.c b/drivers/net/sxe2/sxe2_rx.c
index 3830c676d7..f17e446c23 100644
--- a/drivers/net/sxe2/sxe2_rx.c
+++ b/drivers/net/sxe2/sxe2_rx.c
@@ -189,7 +189,7 @@ void __rte_cold sxe2_all_rxqs_release(struct rte_eth_dev *dev)
}
static struct sxe2_rx_queue *sxe2_rx_queue_alloc(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t ring_depth, uint32_t socket_id)
+ uint16_t ring_depth, uint32_t numa_id)
{
struct sxe2_rx_queue *rxq;
const struct rte_memzone *tz;
@@ -200,8 +200,8 @@ static struct sxe2_rx_queue *sxe2_rx_queue_alloc(struct rte_eth_dev *dev, uint16
dev->data->rx_queues[queue_idx] = NULL;
}
- rxq = rte_zmalloc_socket("rx_queue", sizeof(*rxq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ rxq = rte_zmalloc_numa("rx_queue", sizeof(*rxq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL) {
PMD_LOG_ERR(RX, "rx queue[%d] alloc failed", queue_idx);
@@ -211,9 +211,9 @@ static struct sxe2_rx_queue *sxe2_rx_queue_alloc(struct rte_eth_dev *dev, uint16
rxq->ring_depth = ring_depth;
len = rxq->ring_depth + SXE2_RX_PKTS_BURST_BATCH_NUM;
- rxq->buffer_ring = rte_zmalloc_socket("rx_buffer_ring",
+ rxq->buffer_ring = rte_zmalloc_numa("rx_buffer_ring",
sizeof(struct rte_mbuf *) * len,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->buffer_ring) {
PMD_LOG_ERR(RX, "Rxq malloc mbuf mem failed");
@@ -223,7 +223,7 @@ static struct sxe2_rx_queue *sxe2_rx_queue_alloc(struct rte_eth_dev *dev, uint16
}
tz = rte_eth_dma_zone_reserve(dev, "rx_dma", queue_idx,
- SXE2_RX_RING_SIZE, SXE2_DESC_ADDR_ALIGN, socket_id);
+ SXE2_RX_RING_SIZE, SXE2_DESC_ADDR_ALIGN, numa_id);
if (tz == NULL) {
PMD_LOG_ERR(RX, "Rxq malloc desc mem failed");
rte_free(rxq->buffer_ring);
@@ -243,7 +243,7 @@ static struct sxe2_rx_queue *sxe2_rx_queue_alloc(struct rte_eth_dev *dev, uint16
}
int32_t __rte_cold sxe2_rx_queue_setup(struct rte_eth_dev *dev,
- uint16_t queue_idx, uint16_t nb_desc, uint32_t socket_id,
+ uint16_t queue_idx, uint16_t nb_desc, uint32_t numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -299,7 +299,7 @@ int32_t __rte_cold sxe2_rx_queue_setup(struct rte_eth_dev *dev,
goto l_end;
}
- rxq = sxe2_rx_queue_alloc(dev, queue_idx, nb_desc, socket_id);
+ rxq = sxe2_rx_queue_alloc(dev, queue_idx, nb_desc, numa_id);
if (rxq == NULL) {
PMD_LOG_ERR(RX, "rx queue[%d] resource alloc failed", queue_idx);
ret = -ENOMEM;
diff --git a/drivers/net/sxe2/sxe2_rx.h b/drivers/net/sxe2/sxe2_rx.h
index c2582bc571..2fa7d189a1 100644
--- a/drivers/net/sxe2/sxe2_rx.h
+++ b/drivers/net/sxe2/sxe2_rx.h
@@ -8,7 +8,7 @@
#include "sxe2_queue.h"
int32_t __rte_cold sxe2_rx_queue_setup(struct rte_eth_dev *dev,
- uint16_t queue_idx, uint16_t nb_desc, uint32_t socket_id,
+ uint16_t queue_idx, uint16_t nb_desc, uint32_t numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
diff --git a/drivers/net/sxe2/sxe2_tx.c b/drivers/net/sxe2/sxe2_tx.c
index 94a6e9afc7..a05e94effe 100644
--- a/drivers/net/sxe2/sxe2_tx.c
+++ b/drivers/net/sxe2/sxe2_tx.c
@@ -258,7 +258,7 @@ void __rte_cold sxe2_all_txqs_release(struct rte_eth_dev *dev)
static struct sxe2_tx_queue
*sxe2_tx_queue_alloc(struct rte_eth_dev *dev, uint16_t queue_idx,
- uint16_t ring_depth, uint32_t socket_id)
+ uint16_t ring_depth, uint32_t numa_id)
{
struct sxe2_tx_queue *txq;
const struct rte_memzone *tz;
@@ -268,8 +268,8 @@ static struct sxe2_tx_queue
dev->data->tx_queues[queue_idx] = NULL;
}
- txq = rte_zmalloc_socket("tx_queue", sizeof(struct sxe2_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa("tx_queue", sizeof(struct sxe2_tx_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL) {
PMD_LOG_ERR(TX, "tx queue:%d alloc failed", queue_idx);
goto l_end;
@@ -277,7 +277,7 @@ static struct sxe2_tx_queue
tz = rte_eth_dma_zone_reserve(dev, "tx_dma", queue_idx,
sizeof(union sxe2_tx_data_desc) * SXE2_MAX_RING_DESC,
- SXE2_DESC_ADDR_ALIGN, socket_id);
+ SXE2_DESC_ADDR_ALIGN, numa_id);
if (tz == NULL) {
PMD_LOG_ERR(TX, "tx desc ring alloc failed, queue_id:%d", queue_idx);
rte_free(txq);
@@ -285,9 +285,9 @@ static struct sxe2_tx_queue
goto l_end;
}
- txq->buffer_ring = rte_zmalloc_socket("tx_buffer_ring",
+ txq->buffer_ring = rte_zmalloc_numa("tx_buffer_ring",
sizeof(struct sxe2_tx_buffer) * ring_depth,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->buffer_ring == NULL) {
PMD_LOG_ERR(TX, "tx buffer alloc failed, queue_id:%d", queue_idx);
rte_memzone_free(tz);
@@ -305,7 +305,7 @@ static struct sxe2_tx_queue
}
int32_t __rte_cold sxe2_tx_queue_setup(struct rte_eth_dev *dev,
- uint16_t queue_idx, uint16_t nb_desc, uint32_t socket_id,
+ uint16_t queue_idx, uint16_t nb_desc, uint32_t numa_id,
const struct rte_eth_txconf *tx_conf)
{
int32_t ret = 0;
@@ -329,7 +329,7 @@ int32_t __rte_cold sxe2_tx_queue_setup(struct rte_eth_dev *dev,
goto end;
}
- txq = sxe2_tx_queue_alloc(dev, queue_idx, nb_desc, socket_id);
+ txq = sxe2_tx_queue_alloc(dev, queue_idx, nb_desc, numa_id);
if (txq == NULL) {
PMD_LOG_ERR(TX, "failed to alloc sxe2vf tx queue:%u resource", queue_idx);
ret = -ENOMEM;
diff --git a/drivers/net/sxe2/sxe2_tx.h b/drivers/net/sxe2/sxe2_tx.h
index bc5ff1c2bc..37e3a00d6f 100644
--- a/drivers/net/sxe2/sxe2_tx.h
+++ b/drivers/net/sxe2/sxe2_tx.h
@@ -20,7 +20,7 @@ void sxe2_tx_queue_mbufs_release(struct sxe2_tx_queue *txq);
int32_t __rte_cold sxe2_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id);
int32_t __rte_cold sxe2_tx_queue_setup(struct rte_eth_dev *dev,
- uint16_t queue_idx, uint16_t nb_desc, uint32_t socket_id,
+ uint16_t queue_idx, uint16_t nb_desc, uint32_t numa_id,
const struct rte_eth_txconf *tx_conf);
void __rte_cold sxe2_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 149/227] net/tap: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (147 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 148/227] net/sxe2: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 150/227] net/thunderx: " Chengwen Feng
` (78 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/tap/rte_eth_tap.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 1d2b71675a..c6a998cbd5 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -1155,7 +1155,7 @@ tap_dev_close(struct rte_eth_dev *dev)
internals = dev->data->dev_private;
TAP_LOG(DEBUG, "Closing %s Ethernet device on numa %u",
- tuntap_types[internals->type], rte_socket_id());
+ tuntap_types[internals->type], rte_numa_id());
rte_intr_instance_free(internals->intr_handle);
@@ -1503,7 +1503,7 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev)
pmd->gso_ctx_mp = rte_pktmbuf_pool_create(pool_name,
TAP_GSO_MBUFS_NUM, TAP_GSO_MBUF_CACHE_SIZE, 0,
RTE_PKTMBUF_HEADROOM + TAP_GSO_MBUF_SEG_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!pmd->gso_ctx_mp) {
TAP_LOG(ERR,
"%s: failed to create mbuf pool for device %s",
@@ -1569,7 +1569,7 @@ static int
tap_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mp)
{
@@ -1619,9 +1619,9 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,
dev->device->name, dev->data->mtu, max_rx_segs);
}
- rxq = rte_zmalloc_socket(dev->device->name,
+ rxq = rte_zmalloc_numa(dev->device->name,
sizeof(*rxq) + (max_rx_segs + 1) * sizeof(struct iovec),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq) {
TAP_LOG(ERR,
"%s: Couldn't allocate rx queue structure",
@@ -1687,7 +1687,7 @@ static int
tap_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
struct pmd_internals *internals = dev->data->dev_private;
@@ -1699,8 +1699,8 @@ tap_tx_queue_setup(struct rte_eth_dev *dev,
if (tx_queue_id >= dev->data->nb_tx_queues)
return -1;
- txq = rte_zmalloc_socket(dev->device->name, sizeof(*txq),
- RTE_CACHE_LINE_SIZE, socket_id);
+ txq = rte_zmalloc_numa(dev->device->name, sizeof(*txq),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!txq) {
TAP_LOG(ERR,
"%s: Couldn't allocate tx queue structure",
@@ -2150,7 +2150,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,
const char *remote_iface, struct rte_ether_addr *mac_addr,
enum rte_tuntap_type type, bool persist)
{
- int numa_node = rte_socket_id();
+ int numa_node = rte_numa_id();
struct rte_eth_dev *dev;
struct pmd_internals *pmd;
struct pmd_process_private *process_private;
@@ -2158,7 +2158,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,
struct rte_eth_dev_data *data;
int i;
- TAP_LOG(DEBUG, "%s device on numa %u", tuntap_name, rte_socket_id());
+ TAP_LOG(DEBUG, "%s device on numa %u", tuntap_name, rte_numa_id());
dev = rte_eth_vdev_allocate(vdev, sizeof(*pmd));
if (!dev) {
@@ -2198,7 +2198,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,
data->numa_node = numa_node;
data->dev_link = pmd_link;
- data->mac_addrs = rte_calloc_socket(rte_vdev_device_name(vdev),
+ data->mac_addrs = rte_calloc_numa(rte_vdev_device_name(vdev),
TAP_MAX_MAC_ADDRS,
sizeof(*data->mac_addrs),
0, numa_node);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 150/227] net/thunderx: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (148 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 149/227] net/tap: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 151/227] net/txgbe: " Chengwen Feng
` (77 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/thunderx/nicvf_ethdev.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c
index 2ed4390522..0671de6691 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -705,7 +705,7 @@ nicvf_qset_rbdr_alloc(struct rte_eth_dev *dev, struct nicvf *nic,
uint32_t ring_size;
assert(nic->rbdr == NULL);
- rbdr = rte_zmalloc_socket("rbdr", sizeof(struct nicvf_rbdr),
+ rbdr = rte_zmalloc_numa("rbdr", sizeof(struct nicvf_rbdr),
RTE_CACHE_LINE_SIZE, nic->node);
if (rbdr == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate mem for rbdr");
@@ -1012,7 +1012,7 @@ nicvf_set_rx_function(struct rte_eth_dev *dev)
static int
nicvf_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
uint16_t tx_free_thresh;
@@ -1029,9 +1029,9 @@ nicvf_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
qidx = qidx % MAX_SND_QUEUES_PER_QS;
/* Socket id check */
- if (socket_id != (unsigned int)SOCKET_ID_ANY && socket_id != nic->node)
- PMD_DRV_LOG(WARNING, "socket_id expected %d, configured %d",
- socket_id, nic->node);
+ if (numa_id != (unsigned int)RTE_NUMA_ID_ANY && numa_id != nic->node)
+ PMD_DRV_LOG(WARNING, "numa_id expected %d, configured %d",
+ numa_id, nic->node);
/* Tx deferred start is not supported */
if (tx_conf->tx_deferred_start) {
@@ -1070,7 +1070,7 @@ nicvf_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
}
/* Allocating tx queue data structure */
- txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct nicvf_txq),
+ txq = rte_zmalloc_numa("ethdev TX queue", sizeof(struct nicvf_txq),
RTE_CACHE_LINE_SIZE, nic->node);
if (txq == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate txq=%d",
@@ -1102,7 +1102,7 @@ nicvf_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
dev->data->tx_queues[nicvf_netdev_qidx(nic, qidx)] = txq;
/* Allocate software ring */
- txq->txbuffs = rte_zmalloc_socket("txq->txbuffs",
+ txq->txbuffs = rte_zmalloc_numa("txq->txbuffs",
nb_desc * sizeof(struct rte_mbuf *),
RTE_CACHE_LINE_SIZE, nic->node);
@@ -1343,7 +1343,7 @@ nicvf_rxq_mbuf_setup(struct nicvf_rxq *rxq)
static int
nicvf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
- uint16_t nb_desc, unsigned int socket_id,
+ uint16_t nb_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -1370,9 +1370,9 @@ nicvf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
qidx = qidx % MAX_RCV_QUEUES_PER_QS;
/* Socket id check */
- if (socket_id != (unsigned int)SOCKET_ID_ANY && socket_id != nic->node)
- PMD_DRV_LOG(WARNING, "socket_id expected %d, configured %d",
- socket_id, nic->node);
+ if (numa_id != (unsigned int)RTE_NUMA_ID_ANY && numa_id != nic->node)
+ PMD_DRV_LOG(WARNING, "numa_id expected %d, configured %d",
+ numa_id, nic->node);
/* Mempool memory must be contiguous, so must be one memory segment*/
if (mp->nb_mem_chunks != 1) {
@@ -1420,7 +1420,7 @@ nicvf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
}
/* Allocate rxq memory */
- rxq = rte_zmalloc_socket("ethdev rx queue", sizeof(struct nicvf_rxq),
+ rxq = rte_zmalloc_numa("ethdev rx queue", sizeof(struct nicvf_rxq),
RTE_CACHE_LINE_SIZE, nic->node);
if (rxq == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate rxq=%d",
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 151/227] net/txgbe: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (149 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 150/227] net/thunderx: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 152/227] net/vhost: " Chengwen Feng
` (76 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/txgbe/txgbe_ethdev.c | 2 +-
drivers/net/txgbe/txgbe_ethdev.h | 4 ++--
drivers/net/txgbe/txgbe_rxtx.c | 34 ++++++++++++++++----------------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index fe7fed704f..da562bda15 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -719,7 +719,7 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
/* Reserve memory for interrupt status block */
mz = rte_eth_dma_zone_reserve(eth_dev, "txgbe_driver", -1,
- 16, TXGBE_ALIGN, SOCKET_ID_ANY);
+ 16, TXGBE_ALIGN, RTE_NUMA_ID_ANY);
if (mz == NULL)
return -ENOMEM;
diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h
index 28dfa1bc5e..3dfc751572 100644
--- a/drivers/net/txgbe/txgbe_ethdev.h
+++ b/drivers/net/txgbe/txgbe_ethdev.h
@@ -435,12 +435,12 @@ void txgbe_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
void txgbe_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
int txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
int txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int txgbe_dev_rx_queue_count(void *rx_queue);
diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c
index a295666f9d..e2e8a02df4 100644
--- a/drivers/net/txgbe/txgbe_rxtx.c
+++ b/drivers/net/txgbe/txgbe_rxtx.c
@@ -2423,7 +2423,7 @@ txgbe_get_tx_port_offloads(struct rte_eth_dev *dev)
static void
txgbe_setup_headwb_resources(struct rte_eth_dev *dev,
void *tx_queue,
- unsigned int socket_id)
+ unsigned int numa_id)
{
struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
const struct rte_memzone *headwb;
@@ -2439,7 +2439,7 @@ txgbe_setup_headwb_resources(struct rte_eth_dev *dev,
headwb_size = txq->headwb_size;
headwb = rte_eth_dma_zone_reserve(dev, "tx_headwb_mem", txq->queue_id,
sizeof(u32) * headwb_size,
- TXGBE_ALIGN, socket_id);
+ TXGBE_ALIGN, numa_id);
if (headwb == NULL) {
PMD_DRV_LOG(INFO,
@@ -2461,7 +2461,7 @@ int __rte_cold
txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf)
{
const struct rte_memzone *tz;
@@ -2522,16 +2522,16 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
}
/* First allocate the tx queue data structure */
- txq = rte_zmalloc_socket("ethdev TX queue",
+ txq = rte_zmalloc_numa("ethdev TX queue",
sizeof(struct txgbe_tx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq == NULL)
return -ENOMEM;
/* Allocate TX ring hardware descriptors. */
tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx,
sizeof(struct txgbe_tx_desc) * nb_desc,
- TXGBE_ALIGN, socket_id);
+ TXGBE_ALIGN, numa_id);
if (tz == NULL) {
txgbe_tx_queue_release(txq);
return -ENOMEM;
@@ -2573,9 +2573,9 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
txq->tx_ring = (struct txgbe_tx_desc *)TMZ_VADDR(tz);
/* Allocate software ring */
- txq->sw_ring = rte_zmalloc_socket("txq->sw_ring",
+ txq->sw_ring = rte_zmalloc_numa("txq->sw_ring",
sizeof(struct txgbe_tx_entry) * nb_desc,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (txq->sw_ring == NULL) {
txgbe_tx_queue_release(txq);
return -ENOMEM;
@@ -2586,7 +2586,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
/* set up scalar TX function as appropriate */
txgbe_set_tx_function(dev, txq);
- txgbe_setup_headwb_resources(dev, txq, socket_id);
+ txgbe_setup_headwb_resources(dev, txq, numa_id);
txq->ops->reset(txq);
txq->desc_error = 0;
@@ -2774,7 +2774,7 @@ int __rte_cold
txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -2809,9 +2809,9 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
}
/* First allocate the rx queue data structure */
- rxq = rte_zmalloc_socket("ethdev RX queue",
+ rxq = rte_zmalloc_numa("ethdev RX queue",
sizeof(struct txgbe_rx_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (rxq == NULL)
return -ENOMEM;
rxq->mb_pool = mp;
@@ -2838,7 +2838,7 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
/* Allocate RX ring hardware descriptors. */
size = (nb_desc + RTE_PMD_TXGBE_RX_MAX_BURST) * sizeof(struct txgbe_rx_desc);
rz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx,
- size, TXGBE_ALIGN, socket_id);
+ size, TXGBE_ALIGN, numa_id);
if (rz == NULL) {
txgbe_rx_queue_release(rxq);
return -ENOMEM;
@@ -2890,9 +2890,9 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
if (adapter->rx_bulk_alloc_allowed)
len += RTE_PMD_TXGBE_RX_MAX_BURST;
- rxq->sw_ring = rte_zmalloc_socket("rxq->sw_ring",
+ rxq->sw_ring = rte_zmalloc_numa("rxq->sw_ring",
sizeof(struct txgbe_rx_entry) * len,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->sw_ring) {
txgbe_rx_queue_release(rxq);
return -ENOMEM;
@@ -2907,9 +2907,9 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
* dev_start() flow.
*/
rxq->sw_sc_ring =
- rte_zmalloc_socket("rxq->sw_sc_ring",
+ rte_zmalloc_numa("rxq->sw_sc_ring",
sizeof(struct txgbe_scattered_rx_entry) * len,
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (!rxq->sw_sc_ring) {
txgbe_rx_queue_release(rxq);
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 152/227] net/vhost: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (150 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 151/227] net/txgbe: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 153/227] net/virtio: " Chengwen Feng
` (75 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/vhost/rte_eth_vhost.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index 41b77d8533..4f8f39f683 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1010,11 +1010,11 @@ vhost_driver_setup(struct rte_eth_dev *eth_dev)
if (list)
return 0;
- list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
+ list = rte_zmalloc_numa(name, sizeof(*list), 0, numa_node);
if (list == NULL)
return -1;
- vring_state = rte_zmalloc_socket(name, sizeof(*vring_state),
+ vring_state = rte_zmalloc_numa(name, sizeof(*vring_state),
0, numa_node);
if (vring_state == NULL)
goto free_list;
@@ -1251,14 +1251,14 @@ eth_dev_close(struct rte_eth_dev *dev)
static int
eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool)
{
struct vhost_queue *vq;
- vq = rte_zmalloc_socket(NULL, sizeof(struct vhost_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ vq = rte_zmalloc_numa(NULL, sizeof(struct vhost_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (vq == NULL) {
VHOST_LOG_LINE(ERR, "Failed to allocate memory for rx queue");
return -ENOMEM;
@@ -1276,13 +1276,13 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
static int
eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct vhost_queue *vq;
- vq = rte_zmalloc_socket(NULL, sizeof(struct vhost_queue),
- RTE_CACHE_LINE_SIZE, socket_id);
+ vq = rte_zmalloc_numa(NULL, sizeof(struct vhost_queue),
+ RTE_CACHE_LINE_SIZE, numa_id);
if (vq == NULL) {
VHOST_LOG_LINE(ERR, "Failed to allocate memory for tx queue");
return -ENOMEM;
@@ -1582,7 +1582,7 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
goto error;
data = eth_dev->data;
- eth_addr = rte_zmalloc_socket(name, sizeof(*eth_addr), 0, numa_node);
+ eth_addr = rte_zmalloc_numa(name, sizeof(*eth_addr), 0, numa_node);
if (eth_addr == NULL)
goto error;
data->mac_addrs = eth_addr;
@@ -1595,7 +1595,7 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
* - and point eth_dev structure to new eth_dev_data structure
*/
internal = eth_dev->data->dev_private;
- internal->iface_name = rte_malloc_socket(name, strlen(iface_name) + 1,
+ internal->iface_name = rte_malloc_numa(name, strlen(iface_name) + 1,
0, numa_node);
if (internal->iface_name == NULL)
goto error;
@@ -1689,8 +1689,8 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
eth_dev->rx_pkt_burst = eth_vhost_rx;
eth_dev->tx_pkt_burst = eth_vhost_tx;
eth_dev->dev_ops = &ops;
- if (dev->device.numa_node == SOCKET_ID_ANY)
- dev->device.numa_node = rte_socket_id();
+ if (dev->device.numa_node == RTE_NUMA_ID_ANY)
+ dev->device.numa_node = rte_numa_id();
eth_dev->device = &dev->device;
rte_eth_dev_probing_finish(eth_dev);
return 0;
@@ -1795,8 +1795,8 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
if (legacy_ol_flags == 0)
flags |= RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS;
- if (dev->device.numa_node == SOCKET_ID_ANY)
- dev->device.numa_node = rte_socket_id();
+ if (dev->device.numa_node == RTE_NUMA_ID_ANY)
+ dev->device.numa_node = rte_numa_id();
ret = eth_dev_vhost_create(dev, iface_name, queues,
dev->device.numa_node, flags, disable_flags);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 153/227] net/virtio: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (151 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 152/227] net/vhost: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 154/227] net/vmxnet3: " Chengwen Feng
` (74 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/virtio/virtio_ethdev.c | 4 ++--
drivers/net/virtio/virtio_ethdev.h | 4 ++--
drivers/net/virtio/virtio_rxtx.c | 6 +++---
drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +-
drivers/net/virtio/virtqueue.c | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index e6ad2de4ba..ad209107f8 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1811,7 +1811,7 @@ virtio_dev_rss_init(struct rte_eth_dev *eth_dev)
if (!hw->rss_key) {
/* Setup default RSS key if not already setup by the user */
- hw->rss_key = rte_malloc_socket("rss_key",
+ hw->rss_key = rte_malloc_numa("rss_key",
VIRTIO_NET_RSS_KEY_SIZE, 0,
eth_dev->device->numa_node);
if (!hw->rss_key) {
@@ -1833,7 +1833,7 @@ virtio_dev_rss_init(struct rte_eth_dev *eth_dev)
if (!hw->rss_reta) {
/* Setup default RSS reta if not already setup by the user */
- hw->rss_reta = rte_zmalloc_socket("rss_reta",
+ hw->rss_reta = rte_zmalloc_numa("rss_reta",
VIRTIO_NET_RSS_RETA_SIZE * sizeof(uint16_t), 0,
eth_dev->device->numa_node);
if (!hw->rss_reta) {
diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
index 7aa771fd2b..765f9c8979 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -61,7 +61,7 @@ void virtio_dev_cq_start(struct rte_eth_dev *dev);
*/
int virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
@@ -69,7 +69,7 @@ int virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev,
uint16_t rx_queue_id);
int virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int virtio_dev_tx_queue_setup_finish(struct rte_eth_dev *dev,
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 1afb68bc69..72116b218b 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -653,7 +653,7 @@ int
virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -808,7 +808,7 @@ virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev, uint16_t queue_idx)
/*
* struct rte_eth_dev *dev: Used to update dev
* uint16_t nb_desc: Defaults to values read from config space
- * unsigned int socket_id: Used to allocate memzone
+ * unsigned int numa_id: Used to allocate memzone
* const struct rte_eth_txconf *tx_conf: Used to setup tx engine
* uint16_t queue_idx: Just used as an index in dev txq list
*/
@@ -816,7 +816,7 @@ int
virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf)
{
uint16_t vq_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index c38ac059df..b7e1b617c5 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -1201,7 +1201,7 @@ virtio_user_dev_create_shadow_cvq(struct virtio_user_dev *dev, struct virtqueue
snprintf(name, sizeof(name), "port%d_shadow_cvq", vq->hw->port_id);
scvq = virtqueue_alloc(&dev->hw, vq->vq_queue_index, vq->vq_nentries,
- VTNET_CQ, SOCKET_ID_ANY, name);
+ VTNET_CQ, RTE_NUMA_ID_ANY, name);
if (!scvq) {
PMD_INIT_LOG(ERR, "(%s) Failed to alloc shadow control vq", dev->path);
return -ENOMEM;
diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c
index cf46abfd06..b4d4c49f42 100644
--- a/drivers/net/virtio/virtqueue.c
+++ b/drivers/net/virtio/virtqueue.c
@@ -390,13 +390,13 @@ virtio_rxq_sw_ring_alloc(struct virtqueue *vq, int numa_node)
size = (RTE_PMD_VIRTIO_RX_MAX_BURST + vq->vq_nentries) * sizeof(vq->rxq.sw_ring[0]);
- sw_ring = rte_zmalloc_socket("sw_ring", size, RTE_CACHE_LINE_SIZE, numa_node);
+ sw_ring = rte_zmalloc_numa("sw_ring", size, RTE_CACHE_LINE_SIZE, numa_node);
if (!sw_ring) {
PMD_INIT_LOG(ERR, "can not allocate RX soft ring");
return -ENOMEM;
}
- mbuf = rte_zmalloc_socket("sw_ring", sizeof(*mbuf), RTE_CACHE_LINE_SIZE, numa_node);
+ mbuf = rte_zmalloc_numa("sw_ring", sizeof(*mbuf), RTE_CACHE_LINE_SIZE, numa_node);
if (!mbuf) {
PMD_INIT_LOG(ERR, "can not allocate fake mbuf");
rte_free(sw_ring);
@@ -429,7 +429,7 @@ virtqueue_alloc(struct virtio_hw *hw, uint16_t index, uint16_t num, int type,
size = sizeof(*vq) + num * sizeof(struct vq_desc_extra);
size = RTE_ALIGN_CEIL(size, RTE_CACHE_LINE_SIZE);
- vq = rte_zmalloc_socket(name, size, RTE_CACHE_LINE_SIZE, node);
+ vq = rte_zmalloc_numa(name, size, RTE_CACHE_LINE_SIZE, node);
if (vq == NULL) {
PMD_INIT_LOG(ERR, "can not allocate vq");
return NULL;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 154/227] net/vmxnet3: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (152 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 153/227] net/virtio: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 155/227] net/xsc: " Chengwen Feng
` (73 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 14 +++++++-------
drivers/net/vmxnet3/vmxnet3_ethdev.h | 4 ++--
drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 ++++----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 4a7c76cfef..5f18e26c4c 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -179,7 +179,7 @@ static const struct vmxnet3_xstats_name_off vmxnet3_rxq_stat_strings[] = {
static const struct rte_memzone *
gpa_zone_reserve(struct rte_eth_dev *dev, uint32_t size,
- const char *post_string, int socket_id,
+ const char *post_string, int numa_id,
uint16_t align, bool reuse)
{
char z_name[RTE_MEMZONE_NAMESIZE];
@@ -191,14 +191,14 @@ gpa_zone_reserve(struct rte_eth_dev *dev, uint32_t size,
mz = rte_memzone_lookup(z_name);
if (!reuse) {
rte_memzone_free(mz);
- return rte_memzone_reserve_aligned(z_name, size, socket_id,
+ return rte_memzone_reserve_aligned(z_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, align);
}
if (mz)
return mz;
- return rte_memzone_reserve_aligned(z_name, size, socket_id,
+ return rte_memzone_reserve_aligned(z_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, align);
}
@@ -653,7 +653,7 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)
* on current socket
*/
mz = gpa_zone_reserve(dev, sizeof(struct Vmxnet3_DriverShared),
- "shared", rte_socket_id(), 8, 1);
+ "shared", rte_numa_id(), 8, 1);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating shared zone");
@@ -672,7 +672,7 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)
* depends on the number of tx and rx queues, which could be different
* from one config to another.
*/
- mz = gpa_zone_reserve(dev, size, "queuedesc", rte_socket_id(),
+ mz = gpa_zone_reserve(dev, size, "queuedesc", rte_numa_id(),
VMXNET3_QUEUE_DESC_ALIGN, 0);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating queue descriptors zone");
@@ -689,7 +689,7 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)
if (dev->data->dev_conf.rxmode.mq_mode == RTE_ETH_MQ_RX_RSS) {
/* Allocate memory structure for UPT1_RSSConf and configure */
mz = gpa_zone_reserve(dev, sizeof(struct VMXNET3_RSSConf),
- "rss_conf", rte_socket_id(),
+ "rss_conf", rte_numa_id(),
RTE_CACHE_LINE_SIZE, 1);
if (mz == NULL) {
PMD_INIT_LOG(ERR,
@@ -820,7 +820,7 @@ vmxnet3_dev_setup_memreg(struct rte_eth_dev *dev)
(2 * VMXNET3_MAX_MEMREG_QUEUES) *
sizeof(Vmxnet3_MemoryRegion);
- mz = gpa_zone_reserve(dev, size, "memRegs", rte_socket_id(), 8,
+ mz = gpa_zone_reserve(dev, size, "memRegs", rte_numa_id(), 8,
1);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating memRegs zone");
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h
index 75dafa664f..a7830bba40 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.h
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h
@@ -208,14 +208,14 @@ void vmxnet3_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
int vmxnet3_v4_rss_configure(struct rte_eth_dev *dev);
int vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
int vmxnet3_dev_rx_queue_count(void *rx_queue);
int vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev);
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index aaebfc8675..b9b3de90f9 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -1031,7 +1031,7 @@ int
vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct vmxnet3_hw *hw = dev->data->dev_private;
@@ -1092,7 +1092,7 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
size += txq->txdata_desc_size * data_ring->size;
mz = rte_eth_dma_zone_reserve(dev, "txdesc", queue_idx, size,
- VMXNET3_RING_BA_ALIGN, socket_id);
+ VMXNET3_RING_BA_ALIGN, numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating queue descriptors zone");
return -ENOMEM;
@@ -1132,7 +1132,7 @@ int
vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -1208,7 +1208,7 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,
size += rxq->data_desc_size * data_ring->size;
mz = rte_eth_dma_zone_reserve(dev, "rxdesc", queue_idx, size,
- VMXNET3_RING_BA_ALIGN, socket_id);
+ VMXNET3_RING_BA_ALIGN, numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating queue descriptors zone");
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 155/227] net/xsc: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (153 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 154/227] net/vmxnet3: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 156/227] net/zxdh: " Chengwen Feng
` (72 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/xsc/xsc_ethdev.c | 4 ++--
drivers/net/xsc/xsc_rx.c | 2 +-
drivers/net/xsc/xsc_rxtx.h | 6 +++---
drivers/net/xsc/xsc_tx.c | 4 ++--
drivers/net/xsc/xsc_vfio.c | 18 +++++++++---------
drivers/net/xsc/xsc_vfio_mbox.c | 6 +++---
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index 20d6f58f68..5a5c3976b2 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -497,7 +497,7 @@ xsc_ethdev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
if (!rte_is_power_of_2(desc))
desc_n = 1 << rte_log2_u32(desc);
- rxq_data = rte_malloc_socket(NULL, sizeof(*rxq_data) + desc_n * sizeof(struct rte_mbuf *),
+ rxq_data = rte_malloc_numa(NULL, sizeof(*rxq_data) + desc_n * sizeof(struct rte_mbuf *),
RTE_CACHE_LINE_SIZE, socket);
if (rxq_data == NULL) {
PMD_DRV_LOG(ERR, "Port %u create rxq idx %d failure",
@@ -543,7 +543,7 @@ xsc_ethdev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
if (!rte_is_power_of_2(desc))
desc_n = 1 << rte_log2_u32(desc);
- txq = rte_malloc_socket(NULL, sizeof(*txq) + desc_n * sizeof(struct rte_mbuf *),
+ txq = rte_malloc_numa(NULL, sizeof(*txq) + desc_n * sizeof(struct rte_mbuf *),
RTE_CACHE_LINE_SIZE, socket);
txq->offloads = conf->offloads | dev->data->dev_conf.txmode.offloads;
txq->priv = priv;
diff --git a/drivers/net/xsc/xsc_rx.c b/drivers/net/xsc/xsc_rx.c
index 13b2e26908..54329c350c 100644
--- a/drivers/net/xsc/xsc_rx.c
+++ b/drivers/net/xsc/xsc_rx.c
@@ -535,7 +535,7 @@ xsc_rxq_rss_obj_new(struct xsc_ethdev_priv *priv, uint16_t port_id)
cq_params.port_id = rxq_data->port_id;
cq_params.qp_id = rxq_data->idx;
cq_params.wqe_s = rxq_data->wqe_s;
- cq_params.socket_id = rxq_data->socket;
+ cq_params.numa_id = rxq_data->socket;
ret = xsc_dev_rx_cq_create(xdev, &cq_params, &cq_info);
if (ret) {
diff --git a/drivers/net/xsc/xsc_rxtx.h b/drivers/net/xsc/xsc_rxtx.h
index 129bbd2fa4..de282b3a2f 100644
--- a/drivers/net/xsc/xsc_rxtx.h
+++ b/drivers/net/xsc/xsc_rxtx.h
@@ -124,7 +124,7 @@ struct xsc_tx_cq_params {
uint16_t port_id;
uint16_t qp_id;
uint16_t elts_n;
- int socket_id;
+ int numa_id;
};
struct xsc_tx_cq_info {
@@ -142,7 +142,7 @@ struct xsc_tx_qp_params {
uint16_t port_id;
uint16_t qp_id;
uint16_t elts_n;
- int socket_id;
+ int numa_id;
};
struct xsc_tx_qp_info {
@@ -167,7 +167,7 @@ struct xsc_rx_cq_params {
uint16_t port_id;
uint16_t qp_id;
uint16_t wqe_s;
- int socket_id;
+ int numa_id;
};
struct xsc_rx_cq_info {
diff --git a/drivers/net/xsc/xsc_tx.c b/drivers/net/xsc/xsc_tx.c
index 265439fec0..d94aa75167 100644
--- a/drivers/net/xsc/xsc_tx.c
+++ b/drivers/net/xsc/xsc_tx.c
@@ -37,7 +37,7 @@ xsc_txq_obj_new(struct xsc_dev *xdev, struct xsc_txq_data *txq_data, uint16_t id
cq_params.port_id = txq_data->port_id;
cq_params.qp_id = txq_data->idx;
cq_params.elts_n = txq_data->elts_n;
- cq_params.socket_id = txq_data->socket;
+ cq_params.numa_id = txq_data->socket;
ret = xsc_dev_tx_cq_create(xdev, &cq_params, &cq_info);
if (ret) {
rte_errno = errno;
@@ -61,7 +61,7 @@ xsc_txq_obj_new(struct xsc_dev *xdev, struct xsc_txq_data *txq_data, uint16_t id
qp_params.port_id = txq_data->port_id;
qp_params.qp_id = idx;
qp_params.elts_n = txq_data->elts_n;
- qp_params.socket_id = txq_data->socket;
+ qp_params.numa_id = txq_data->socket;
ret = xsc_dev_tx_qp_create(xdev, &qp_params, &qp_info);
if (ret != 0) {
diff --git a/drivers/net/xsc/xsc_vfio.c b/drivers/net/xsc/xsc_vfio.c
index 0a1e507f7d..520c28722e 100644
--- a/drivers/net/xsc/xsc_vfio.c
+++ b/drivers/net/xsc/xsc_vfio.c
@@ -559,9 +559,9 @@ xsc_vfio_rx_cq_create(struct xsc_dev *xdev, struct xsc_rx_cq_params *cq_params,
void *cmd_buf;
int numa_node = xdev->pci_dev->device.numa_node;
- if (numa_node != cq_params->socket_id)
+ if (numa_node != cq_params->numa_id)
PMD_DRV_LOG(WARNING, "Port %u rxq %u: cq numa_node=%u, device numa_node=%u",
- port_id, idx, cq_params->socket_id, numa_node);
+ port_id, idx, cq_params->numa_id, numa_node);
cqe_n = cq_params->wqe_s * 2;
log_cq_sz = rte_log2_u32(cqe_n);
@@ -598,7 +598,7 @@ xsc_vfio_rx_cq_create(struct xsc_dev *xdev, struct xsc_rx_cq_params *cq_params,
snprintf(name, sizeof(name), "mz_cqe_mem_rx_%u_%u", port_id, idx);
cq_pas = rte_memzone_reserve_aligned(name,
(XSC_PAGE_SIZE * pa_num),
- cq_params->socket_id,
+ cq_params->numa_id,
RTE_MEMZONE_IOVA_CONTIG,
XSC_PAGE_SIZE);
if (cq_pas == NULL) {
@@ -664,10 +664,10 @@ xsc_vfio_tx_cq_create(struct xsc_dev *xdev, struct xsc_tx_cq_params *cq_params,
void *cmd_buf = NULL;
int numa_node = xdev->pci_dev->device.numa_node;
- if (numa_node != cq_params->socket_id)
+ if (numa_node != cq_params->numa_id)
PMD_DRV_LOG(WARNING, "Port %u txq %u: cq numa_node=%u, device numa_node=%u",
cq_params->port_id, cq_params->qp_id,
- cq_params->socket_id, numa_node);
+ cq_params->numa_id, numa_node);
cq = rte_zmalloc(NULL, sizeof(struct xsc_vfio_cq), 0);
if (cq == NULL) {
@@ -682,7 +682,7 @@ xsc_vfio_tx_cq_create(struct xsc_dev *xdev, struct xsc_tx_cq_params *cq_params,
snprintf(name, sizeof(name), "mz_cqe_mem_tx_%u_%u", cq_params->port_id, cq_params->qp_id);
cq_pas = rte_memzone_reserve_aligned(name,
(XSC_PAGE_SIZE * pa_num),
- cq_params->socket_id,
+ cq_params->numa_id,
RTE_MEMZONE_IOVA_CONTIG,
XSC_PAGE_SIZE);
if (cq_pas == NULL) {
@@ -772,10 +772,10 @@ xsc_vfio_tx_qp_create(struct xsc_dev *xdev, struct xsc_tx_qp_params *qp_params,
bool tso_en = !!(qp_params->tx_offloads & RTE_ETH_TX_OFFLOAD_TCP_TSO);
int numa_node = xdev->pci_dev->device.numa_node;
- if (numa_node != qp_params->socket_id)
+ if (numa_node != qp_params->numa_id)
PMD_DRV_LOG(WARNING, "Port %u: txq %u numa_node=%u, device numa_node=%u",
qp_params->port_id, qp_params->qp_id,
- qp_params->socket_id, numa_node);
+ qp_params->numa_id, numa_node);
qp = rte_zmalloc(NULL, sizeof(struct xsc_vfio_qp), 0);
if (qp == NULL) {
@@ -791,7 +791,7 @@ xsc_vfio_tx_qp_create(struct xsc_dev *xdev, struct xsc_tx_qp_params *qp_params,
snprintf(name, sizeof(name), "mz_wqe_mem_tx_%u_%u", qp_params->port_id, qp_params->qp_id);
qp_pas = rte_memzone_reserve_aligned(name,
(XSC_PAGE_SIZE * pa_num),
- qp_params->socket_id,
+ qp_params->numa_id,
RTE_MEMZONE_IOVA_CONTIG,
XSC_PAGE_SIZE);
if (qp_pas == NULL) {
diff --git a/drivers/net/xsc/xsc_vfio_mbox.c b/drivers/net/xsc/xsc_vfio_mbox.c
index 6d6cc677a7..da063249c4 100644
--- a/drivers/net/xsc/xsc_vfio_mbox.c
+++ b/drivers/net/xsc/xsc_vfio_mbox.c
@@ -562,7 +562,7 @@ xsc_vfio_mbox_init(struct xsc_dev *xdev)
snprintf(name, RTE_MEMZONE_NAMESIZE, "%s_cmdq", xdev->pci_dev->device.name);
size = (1 << XSC_CMDQ_DEPTH_LOG) * sizeof(struct xsc_cmdq_req_layout);
cmdq->req_mz = rte_memzone_reserve_aligned(name,
- size, SOCKET_ID_ANY,
+ size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG,
XSC_PAGE_SIZE);
if (cmdq->req_mz == NULL) {
@@ -574,7 +574,7 @@ xsc_vfio_mbox_init(struct xsc_dev *xdev)
snprintf(name, RTE_MEMZONE_NAMESIZE, "%s_cmd_cq", xdev->pci_dev->device.name);
size = (1 << XSC_CMDQ_DEPTH_LOG) * sizeof(struct xsc_cmdq_rsp_layout); /* -V1048 */
cmdq->rsp_mz = rte_memzone_reserve_aligned(name,
- size, SOCKET_ID_ANY,
+ size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG,
XSC_PAGE_SIZE);
if (cmdq->rsp_mz == NULL) {
@@ -588,7 +588,7 @@ xsc_vfio_mbox_init(struct xsc_dev *xdev)
sizeof(struct xsc_cmdq_mbox_buf),
XSC_MBOX_BUF_CACHE_SIZE, 0,
NULL, NULL, NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (cmdq->mbox_buf_pool == NULL) {
PMD_DRV_LOG(ERR, "Failed to create mailbox buf pool");
goto error;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 156/227] net/zxdh: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (154 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 155/227] net/xsc: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 157/227] raw/cnxk_bphy: " Chengwen Feng
` (71 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/net/zxdh/zxdh_ethdev.c | 18 +++++++++---------
drivers/net/zxdh/zxdh_queue.c | 4 ++--
drivers/net/zxdh/zxdh_queue.h | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c
index f3efc927b2..616ed6f610 100644
--- a/drivers/net/zxdh/zxdh_ethdev.c
+++ b/drivers/net/zxdh/zxdh_ethdev.c
@@ -679,7 +679,7 @@ zxdh_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_logic_qidx)
sz_hdr_mz = vq_size * sizeof(struct zxdh_tx_region);
}
- vq = rte_zmalloc_socket(vq_name, size, RTE_CACHE_LINE_SIZE, numa_node);
+ vq = rte_zmalloc_numa(vq_name, size, RTE_CACHE_LINE_SIZE, numa_node);
if (vq == NULL) {
PMD_DRV_LOG(ERR, "can not allocate vq");
return -ENOMEM;
@@ -1665,7 +1665,7 @@ zxdh_dtb_dump_res_init(struct zxdh_hw *hw, ZXDH_DEV_INIT_CTRL_T *dpp_ctrl)
const struct rte_memzone *generic_dump_mz =
rte_memzone_reserve_aligned(p->mz_name, p->mz_size,
- SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
+ RTE_NUMA_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
if (generic_dump_mz == NULL) {
PMD_DRV_LOG(ERR, "Cannot alloc mem for dtb table bulk dump, mz_name is %s, mz_size is %u",
p->mz_name, p->mz_size);
@@ -1732,7 +1732,7 @@ zxdh_np_dtb_res_init(struct rte_eth_dev *dev)
if (!dtb_data->dtb_table_conf_mz) {
snprintf(buf, sizeof(buf), "%s_%x", "zxdh_dtb_table_conf_mz", hw->dev_id);
const struct rte_memzone *conf_mz = rte_memzone_reserve_aligned(buf,
- ZXDH_DTB_TABLE_CONF_SIZE, SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
+ ZXDH_DTB_TABLE_CONF_SIZE, RTE_NUMA_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
if (conf_mz == NULL) {
PMD_DRV_LOG(ERR,
@@ -1750,7 +1750,7 @@ zxdh_np_dtb_res_init(struct rte_eth_dev *dev)
memset(buf, '\0', sizeof(buf));
snprintf(buf, sizeof(buf), "%s_%x", "zxdh_dtb_table_dump_mz", hw->dev_id);
const struct rte_memzone *dump_mz = rte_memzone_reserve_aligned(buf,
- ZXDH_DTB_TABLE_DUMP_SIZE, SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
+ ZXDH_DTB_TABLE_DUMP_SIZE, RTE_NUMA_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
if (dump_mz == NULL) {
PMD_DRV_LOG(ERR,
@@ -1842,7 +1842,7 @@ zxdh_init_shared_data(void)
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
/* Allocate shared memory. */
mz = rte_memzone_reserve("zxdh_pmd_shared_data",
- sizeof(*zxdh_shared_data), SOCKET_ID_ANY, 0);
+ sizeof(*zxdh_shared_data), RTE_NUMA_ID_ANY, 0);
if (mz == NULL) {
PMD_DRV_LOG(ERR, "Cannot allocate zxdh shared data");
ret = -rte_errno;
@@ -1898,14 +1898,14 @@ zxdh_init_sh_res(struct zxdh_shared_data *sd)
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
flow_mp = rte_mempool_create(MZ_ZXDH_FLOW_MP, ZXDH_MAX_FLOW_NUM,
sizeof(struct zxdh_flow), 64, 0,
- NULL, NULL, NULL, NULL, SOCKET_ID_ANY, 0);
+ NULL, NULL, NULL, NULL, RTE_NUMA_ID_ANY, 0);
if (flow_mp == NULL) {
PMD_DRV_LOG(ERR, "Cannot allocate zxdh flow mempool");
goto error;
}
mtr_mp = rte_mempool_create(MZ_ZXDH_MTR_MP, ZXDH_MAX_MTR_NUM,
sizeof(struct zxdh_mtr_object), 64, 0,
- NULL, NULL, NULL, NULL, SOCKET_ID_ANY, 0);
+ NULL, NULL, NULL, NULL, RTE_NUMA_ID_ANY, 0);
if (mtr_mp == NULL) {
PMD_DRV_LOG(ERR, "Cannot allocate zxdh mtr mempool");
goto error;
@@ -1913,14 +1913,14 @@ zxdh_init_sh_res(struct zxdh_shared_data *sd)
mtr_profile_mp = rte_mempool_create(MZ_ZXDH_MTR_PROFILE_MP,
MAX_MTR_PROFILE_NUM, sizeof(struct zxdh_meter_profile),
64, 0, NULL, NULL, NULL,
- NULL, SOCKET_ID_ANY, 0);
+ NULL, RTE_NUMA_ID_ANY, 0);
if (mtr_profile_mp == NULL) {
PMD_DRV_LOG(ERR, "Cannot allocate zxdh mtr profile mempool");
goto error;
}
mtr_policy_mp = rte_mempool_create(MZ_ZXDH_MTR_POLICY_MP,
ZXDH_MAX_POLICY_NUM, sizeof(struct zxdh_meter_policy),
- 64, 0, NULL, NULL, NULL, NULL, SOCKET_ID_ANY, 0);
+ 64, 0, NULL, NULL, NULL, NULL, RTE_NUMA_ID_ANY, 0);
if (mtr_policy_mp == NULL) {
PMD_DRV_LOG(ERR, "Cannot allocate zxdh mtr profile mempool");
goto error;
diff --git a/drivers/net/zxdh/zxdh_queue.c b/drivers/net/zxdh/zxdh_queue.c
index 4668cb5d13..b2b7c30fab 100644
--- a/drivers/net/zxdh/zxdh_queue.c
+++ b/drivers/net/zxdh/zxdh_queue.c
@@ -223,7 +223,7 @@ int32_t
zxdh_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- uint32_t socket_id __rte_unused,
+ uint32_t numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -316,7 +316,7 @@ int32_t
zxdh_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- uint32_t socket_id __rte_unused,
+ uint32_t numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf)
{
struct zxdh_hw *hw = dev->data->dev_private;
diff --git a/drivers/net/zxdh/zxdh_queue.h b/drivers/net/zxdh/zxdh_queue.h
index 006b02c425..a254d3781e 100644
--- a/drivers/net/zxdh/zxdh_queue.h
+++ b/drivers/net/zxdh/zxdh_queue.h
@@ -376,12 +376,12 @@ int32_t zxdh_get_queue_type(uint16_t vtpci_queue_idx);
int32_t zxdh_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- uint32_t socket_id,
+ uint32_t numa_id,
const struct rte_eth_txconf *tx_conf);
int32_t zxdh_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- uint32_t socket_id,
+ uint32_t numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp);
int32_t zxdh_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 157/227] raw/cnxk_bphy: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (155 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 156/227] net/zxdh: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 158/227] raw/cnxk_gpio: " Chengwen Feng
` (70 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/raw/cnxk_bphy/cnxk_bphy.c | 2 +-
drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy.c b/drivers/raw/cnxk_bphy/cnxk_bphy.c
index ea30a7100c..3e5e3e0154 100644
--- a/drivers/raw/cnxk_bphy/cnxk_bphy.c
+++ b/drivers/raw/cnxk_bphy/cnxk_bphy.c
@@ -343,7 +343,7 @@ bphy_rawdev_probe(struct rte_pci_driver *pci_drv,
bphy_rawdev_get_name(name, pci_dev);
bphy_rawdev = rte_rawdev_pmd_allocate(name, sizeof(*bphy_dev),
- rte_socket_id());
+ rte_numa_id());
if (bphy_rawdev == NULL) {
CNXK_BPHY_LOG(ERR, "Failed to allocate rawdev");
return -ENOMEM;
diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c
index e0c7257027..d4712ed4ca 100644
--- a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c
+++ b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c
@@ -313,7 +313,7 @@ cnxk_bphy_cgx_rawdev_probe(struct rte_pci_driver *pci_drv,
return ret;
cnxk_bphy_cgx_format_name(name, sizeof(name), pci_dev);
- rawdev = rte_rawdev_pmd_allocate(name, sizeof(*cgx), rte_socket_id());
+ rawdev = rte_rawdev_pmd_allocate(name, sizeof(*cgx), rte_numa_id());
if (!rawdev)
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 158/227] raw/cnxk_gpio: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (156 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 157/227] raw/cnxk_bphy: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 159/227] raw/cnxk_rvu_lf: " Chengwen Feng
` (69 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/raw/cnxk_gpio/cnxk_gpio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio.c b/drivers/raw/cnxk_gpio/cnxk_gpio.c
index 8a5dda68dc..ed4e533740 100644
--- a/drivers/raw/cnxk_gpio/cnxk_gpio.c
+++ b/drivers/raw/cnxk_gpio/cnxk_gpio.c
@@ -147,7 +147,7 @@ cnxk_gpio_params_reserve(size_t len)
{
const struct rte_memzone *mz;
- mz = rte_memzone_reserve(CNXK_GPIO_PARAMS_MZ_NAME, len, rte_socket_id(), 0);
+ mz = rte_memzone_reserve(CNXK_GPIO_PARAMS_MZ_NAME, len, rte_numa_id(), 0);
if (!mz)
return NULL;
@@ -879,7 +879,7 @@ cnxk_gpio_probe(struct rte_vdev_device *dev)
int ret;
cnxk_gpio_format_name(name, sizeof(name));
- rawdev = rte_rawdev_pmd_allocate(name, sizeof(*gpiochip), rte_socket_id());
+ rawdev = rte_rawdev_pmd_allocate(name, sizeof(*gpiochip), rte_numa_id());
if (!rawdev) {
CNXK_GPIO_LOG(ERR, "failed to allocate %s rawdev", name);
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 159/227] raw/cnxk_rvu_lf: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (157 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 158/227] raw/cnxk_gpio: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 160/227] raw/dpaa2_cmdif: " Chengwen Feng
` (68 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c b/drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c
index 57c7cc85f3..69c36103b3 100644
--- a/drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c
+++ b/drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c
@@ -202,7 +202,7 @@ rvu_lf_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
rvu_lf_rawdev_get_name(name, pci_dev);
rvu_lf_rawdev = rte_rawdev_pmd_allocate(name, sizeof(*roc_rvu_lf),
- rte_socket_id());
+ rte_numa_id());
if (rvu_lf_rawdev == NULL) {
CNXK_RVU_LF_LOG(ERR, "Failed to allocate rawdev");
return -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 160/227] raw/dpaa2_cmdif: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (158 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 159/227] raw/cnxk_rvu_lf: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:51 ` [PATCH 161/227] raw/gdtc: " Chengwen Feng
` (67 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c
index 34a3c4f6af..fd3b3145c2 100644
--- a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c
+++ b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c
@@ -195,14 +195,14 @@ static const struct rte_rawdev_ops dpaa2_cmdif_ops = {
static int
dpaa2_cmdif_create(const char *name,
struct rte_vdev_device *vdev,
- int socket_id)
+ int numa_id)
{
struct rte_rawdev *rawdev;
struct dpaa2_dpci_dev *cidev;
/* Allocate device structure */
rawdev = rte_rawdev_pmd_allocate(name, sizeof(struct dpaa2_dpci_dev),
- socket_id);
+ numa_id);
if (!rawdev) {
DPAA2_CMDIF_ERR("Unable to allocate rawdevice");
return -EINVAL;
@@ -258,9 +258,9 @@ dpaa2_cmdif_probe(struct rte_vdev_device *vdev)
name = rte_vdev_device_name(vdev);
- DPAA2_CMDIF_INFO("Init %s on NUMA node %d", name, rte_socket_id());
+ DPAA2_CMDIF_INFO("Init %s on NUMA node %d", name, rte_numa_id());
- ret = dpaa2_cmdif_create(name, vdev, rte_socket_id());
+ ret = dpaa2_cmdif_create(name, vdev, rte_numa_id());
return ret;
}
@@ -275,7 +275,7 @@ dpaa2_cmdif_remove(struct rte_vdev_device *vdev)
if (name == NULL)
return -1;
- DPAA2_CMDIF_INFO("Closing %s on NUMA node %d", name, rte_socket_id());
+ DPAA2_CMDIF_INFO("Closing %s on NUMA node %d", name, rte_numa_id());
ret = dpaa2_cmdif_destroy(name);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 161/227] raw/gdtc: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (159 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 160/227] raw/dpaa2_cmdif: " Chengwen Feng
@ 2026-11-03 14:51 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 162/227] raw/ifpga: " Chengwen Feng
` (66 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:51 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/raw/gdtc/gdtc_rawdev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/raw/gdtc/gdtc_rawdev.c b/drivers/raw/gdtc/gdtc_rawdev.c
index ee83a67bad..83ffa024ae 100644
--- a/drivers/raw/gdtc/gdtc_rawdev.c
+++ b/drivers/raw/gdtc/gdtc_rawdev.c
@@ -697,7 +697,7 @@ zxdh_gdma_queue_init(struct rte_rawdev *dev, uint16_t queue_id)
/* Init ring */
snprintf(name, RTE_MEMZONE_NAMESIZE, "gdma_vq%d_ring", queue_id);
size = ZXDH_GDMA_RING_SIZE * sizeof(struct zxdh_gdma_buff_desc);
- mz = rte_memzone_reserve_aligned(name, size, rte_socket_id(),
+ mz = rte_memzone_reserve_aligned(name, size, rte_numa_id(),
RTE_MEMZONE_IOVA_CONTIG, size);
if (mz == NULL) {
if (rte_errno == EEXIST)
@@ -843,13 +843,13 @@ zxdh_gdma_rawdev_probe(struct rte_pci_driver *pci_drv __rte_unused,
pci_dev->name, pci_dev->mem_resource[0].phys_addr,
pci_dev->mem_resource[0].addr);
- dev = rte_rawdev_pmd_allocate(dev_name, sizeof(struct zxdh_gdma_rawdev), rte_socket_id());
+ dev = rte_rawdev_pmd_allocate(dev_name, sizeof(struct zxdh_gdma_rawdev), rte_numa_id());
if (dev == NULL) {
ZXDH_PMD_LOG(ERR, "Unable to allocate gdma rawdev");
goto err_out;
}
ZXDH_PMD_LOG(INFO, "Init %s on NUMA node %d, dev_id is %d",
- dev_name, rte_socket_id(), dev->dev_id);
+ dev_name, rte_numa_id(), dev->dev_id);
dev->dev_ops = &zxdh_gdma_rawdev_ops;
dev->device = &pci_dev->device;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 162/227] raw/ifpga: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (160 preceding siblings ...)
2026-11-03 14:51 ` [PATCH 161/227] raw/gdtc: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 163/227] raw/ntb: " Chengwen Feng
` (65 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/raw/ifpga/afu_pmd_core.c | 14 +++++++-------
drivers/raw/ifpga/base/ifpga_defines.h | 2 +-
drivers/raw/ifpga/base/ifpga_fme.c | 4 ++--
drivers/raw/ifpga/base/ifpga_hw.h | 2 +-
drivers/raw/ifpga/ifpga_rawdev.c | 10 +++++-----
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/raw/ifpga/afu_pmd_core.c b/drivers/raw/ifpga/afu_pmd_core.c
index ca14ebf52f..62c2beefe6 100644
--- a/drivers/raw/ifpga/afu_pmd_core.c
+++ b/drivers/raw/ifpga/afu_pmd_core.c
@@ -214,7 +214,7 @@ static const struct rte_rawdev_ops afu_rawdev_ops = {
};
static int afu_shared_data_alloc(const char *name,
- struct afu_shared_data **data, int socket_id)
+ struct afu_shared_data **data, int numa_id)
{
const struct rte_memzone *mz;
char mz_name[RTE_MEMZONE_NAMESIZE];
@@ -230,7 +230,7 @@ static int afu_shared_data_alloc(const char *name,
mz = rte_memzone_lookup(mz_name);
if (!mz) {
mz = rte_memzone_reserve(mz_name, sizeof(struct afu_shared_data),
- socket_id, 0);
+ numa_id, 0);
init_mz = 1;
}
@@ -283,7 +283,7 @@ static struct afu_ops *afu_ops_get(struct rte_afu_uuid *afu_id)
return drv ? drv->ops : NULL;
}
-static int afu_rawdev_create(struct rte_afu_device *afu_dev, int socket_id)
+static int afu_rawdev_create(struct rte_afu_device *afu_dev, int numa_id)
{
struct rte_rawdev *rawdev = NULL;
struct afu_rawdev *dev = NULL;
@@ -298,11 +298,11 @@ static int afu_rawdev_create(struct rte_afu_device *afu_dev, int socket_id)
return ret;
IFPGA_RAWDEV_PMD_INFO("Create raw device %s on NUMA node %d",
- name, socket_id);
+ name, numa_id);
/* Allocate device structure */
rawdev = rte_rawdev_pmd_allocate(name, sizeof(struct afu_rawdev),
- socket_id);
+ numa_id);
if (!rawdev) {
IFPGA_RAWDEV_PMD_ERR("Unable to allocate raw device");
return -ENOMEM;
@@ -333,7 +333,7 @@ static int afu_rawdev_create(struct rte_afu_device *afu_dev, int socket_id)
}
}
- ret = afu_shared_data_alloc(name, &dev->sd, socket_id);
+ ret = afu_shared_data_alloc(name, &dev->sd, numa_id);
if (ret)
goto cleanup;
@@ -376,7 +376,7 @@ static int afu_rawdev_destroy(struct rte_afu_device *afu_dev)
static int afu_rawdev_probe(struct rte_afu_device *afu_dev)
{
IFPGA_RAWDEV_PMD_FUNC_TRACE();
- return afu_rawdev_create(afu_dev, rte_socket_id());
+ return afu_rawdev_create(afu_dev, rte_numa_id());
}
static int afu_rawdev_remove(struct rte_afu_device *afu_dev)
diff --git a/drivers/raw/ifpga/base/ifpga_defines.h b/drivers/raw/ifpga/base/ifpga_defines.h
index 7c8fa89aeb..5d7da761de 100644
--- a/drivers/raw/ifpga/base/ifpga_defines.h
+++ b/drivers/raw/ifpga/base/ifpga_defines.h
@@ -151,7 +151,7 @@ struct feature_fme_capability {
u64 csr;
struct {
u8 fabric_verid; /* Fabric version ID */
- u8 socket_id:1; /* Socket id */
+ u8 numa_id:1; /* Socket id */
u8 rsvd1:3; /* Reserved */
/* pci0 link available yes /no */
u8 pci0_link_avile:1;
diff --git a/drivers/raw/ifpga/base/ifpga_fme.c b/drivers/raw/ifpga/base/ifpga_fme.c
index b6dd4ce58c..587d47661b 100644
--- a/drivers/raw/ifpga/base/ifpga_fme.c
+++ b/drivers/raw/ifpga/base/ifpga_fme.c
@@ -143,14 +143,14 @@ static int fme_hdr_get_version(struct ifpga_fme_hw *fme, u64 *version)
return 0;
}
-static int fme_hdr_get_socket_id(struct ifpga_fme_hw *fme, u64 *socket_id)
+static int fme_hdr_get_socket_id(struct ifpga_fme_hw *fme, u64 *numa_id)
{
struct feature_fme_header *fme_hdr
= get_fme_feature_ioaddr_by_index(fme, FME_FEATURE_ID_HEADER);
struct feature_fme_capability fme_capability;
fme_capability.csr = readq(&fme_hdr->capability);
- *socket_id = fme_capability.socket_id;
+ *numa_id = fme_capability.numa_id;
return 0;
}
diff --git a/drivers/raw/ifpga/base/ifpga_hw.h b/drivers/raw/ifpga/base/ifpga_hw.h
index 4d56deb1b9..06f4e7331b 100644
--- a/drivers/raw/ifpga/base/ifpga_hw.h
+++ b/drivers/raw/ifpga/base/ifpga_hw.h
@@ -78,7 +78,7 @@ struct ifpga_fme_hw {
struct uuid bitstream_id;
u64 bitstream_md;
size_t pr_bandwidth;
- u32 socket_id;
+ u32 numa_id;
u32 fabric_version_id;
u32 cache_size;
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index d44141824f..ae10e8afdb 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -1531,7 +1531,7 @@ ifpga_register_msix_irq(struct ifpga_rawdev *dev, int port_id,
static int
ifpga_rawdev_create(struct rte_pci_device *pci_dev,
- int socket_id)
+ int numa_id)
{
int ret = 0;
struct rte_rawdev *rawdev = NULL;
@@ -1552,11 +1552,11 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev,
snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, IFPGA_RAWDEV_NAME_FMT,
pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function);
- IFPGA_RAWDEV_PMD_INFO("Init %s on NUMA node %d", name, rte_socket_id());
+ IFPGA_RAWDEV_PMD_INFO("Init %s on NUMA node %d", name, rte_numa_id());
/* Allocate device structure */
rawdev = rte_rawdev_pmd_allocate(name, sizeof(struct opae_adapter),
- socket_id);
+ numa_id);
if (rawdev == NULL) {
IFPGA_RAWDEV_PMD_ERR("Unable to allocate rawdevice");
ret = -EINVAL;
@@ -1651,7 +1651,7 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev)
pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function);
IFPGA_RAWDEV_PMD_INFO("Closing %s on NUMA node %d",
- name, rte_socket_id());
+ name, rte_numa_id());
rawdev = rte_rawdev_pmd_get_named_dev(name);
if (!rawdev) {
@@ -1672,7 +1672,7 @@ ifpga_rawdev_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct rte_pci_device *pci_dev)
{
IFPGA_RAWDEV_PMD_FUNC_TRACE();
- return ifpga_rawdev_create(pci_dev, rte_socket_id());
+ return ifpga_rawdev_create(pci_dev, rte_numa_id());
}
static int
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 163/227] raw/ntb: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (161 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 162/227] raw/ifpga: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 164/227] raw/skeleton: " Chengwen Feng
` (64 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/raw/ntb/ntb.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c
index 9f29d409e4..6167f69402 100644
--- a/drivers/raw/ntb/ntb.c
+++ b/drivers/raw/ntb/ntb.c
@@ -187,7 +187,7 @@ ntb_rxq_setup(struct rte_rawdev *dev,
return -EINVAL;
/* Allocate the rx queue data structure */
- rxq = rte_zmalloc_socket("ntb rx queue",
+ rxq = rte_zmalloc_numa("ntb rx queue",
sizeof(struct ntb_rx_queue),
RTE_CACHE_LINE_SIZE,
dev->numa_id);
@@ -209,7 +209,7 @@ ntb_rxq_setup(struct rte_rawdev *dev,
/* Allocate the software ring. */
rxq->sw_ring =
- rte_zmalloc_socket("ntb rx sw ring",
+ rte_zmalloc_numa("ntb rx sw ring",
sizeof(struct ntb_rx_entry) *
rxq->nb_rx_desc,
RTE_CACHE_LINE_SIZE,
@@ -273,7 +273,7 @@ ntb_txq_setup(struct rte_rawdev *dev,
return -EINVAL;
/* Allocate the TX queue data structure. */
- txq = rte_zmalloc_socket("ntb tx queue",
+ txq = rte_zmalloc_numa("ntb tx queue",
sizeof(struct ntb_tx_queue),
RTE_CACHE_LINE_SIZE,
dev->numa_id);
@@ -290,7 +290,7 @@ ntb_txq_setup(struct rte_rawdev *dev,
/* Allocate software ring */
txq->sw_ring =
- rte_zmalloc_socket("ntb tx sw ring",
+ rte_zmalloc_numa("ntb tx sw ring",
sizeof(struct ntb_tx_entry) *
txq->nb_tx_desc,
RTE_CACHE_LINE_SIZE,
@@ -1319,7 +1319,7 @@ ntb_init_hw(struct rte_rawdev *dev, struct rte_pci_device *pci_dev)
}
static int
-ntb_create(struct rte_pci_device *pci_dev, int socket_id)
+ntb_create(struct rte_pci_device *pci_dev, int numa_id)
{
char name[RTE_RAWDEV_NAME_MAX_LEN];
struct rte_rawdev *rawdev = NULL;
@@ -1335,11 +1335,11 @@ ntb_create(struct rte_pci_device *pci_dev, int socket_id)
pci_dev->addr.bus, pci_dev->addr.devid,
pci_dev->addr.function);
- NTB_LOG(INFO, "Init %s on NUMA node %d", name, socket_id);
+ NTB_LOG(INFO, "Init %s on NUMA node %d", name, numa_id);
/* Allocate device structure. */
rawdev = rte_rawdev_pmd_allocate(name, sizeof(struct ntb_hw),
- socket_id);
+ numa_id);
if (rawdev == NULL) {
NTB_LOG(ERR, "Unable to allocate rawdev.");
return -EINVAL;
@@ -1382,7 +1382,7 @@ ntb_destroy(struct rte_pci_device *pci_dev)
pci_dev->addr.bus, pci_dev->addr.devid,
pci_dev->addr.function);
- NTB_LOG(INFO, "Closing %s on NUMA node %d", name, rte_socket_id());
+ NTB_LOG(INFO, "Closing %s on NUMA node %d", name, rte_numa_id());
rawdev = rte_rawdev_pmd_get_named_dev(name);
if (rawdev == NULL) {
@@ -1402,7 +1402,7 @@ static int
ntb_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct rte_pci_device *pci_dev)
{
- return ntb_create(pci_dev, rte_socket_id());
+ return ntb_create(pci_dev, rte_numa_id());
}
static int
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 164/227] raw/skeleton: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (162 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 163/227] raw/ntb: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 165/227] regex/cn9k: " Chengwen Feng
` (63 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/raw/skeleton/skeleton_rawdev.c | 10 +++++-----
drivers/raw/skeleton/skeleton_rawdev_test.c | 14 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/raw/skeleton/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c
index 6e99d35536..b307d8aab3 100644
--- a/drivers/raw/skeleton/skeleton_rawdev.c
+++ b/drivers/raw/skeleton/skeleton_rawdev.c
@@ -573,7 +573,7 @@ static const struct rte_rawdev_ops skeleton_rawdev_ops = {
static int
skeleton_rawdev_create(const char *name,
struct rte_vdev_device *vdev,
- int socket_id)
+ int numa_id)
{
int ret = 0, i;
struct rte_rawdev *rawdev = NULL;
@@ -587,7 +587,7 @@ skeleton_rawdev_create(const char *name,
/* Allocate device structure */
rawdev = rte_rawdev_pmd_allocate(name, sizeof(struct skeleton_rawdev),
- socket_id);
+ numa_id);
if (rawdev == NULL) {
SKELETON_PMD_ERR("Unable to allocate rawdevice");
ret = -EINVAL;
@@ -729,12 +729,12 @@ skeleton_rawdev_probe(struct rte_vdev_device *vdev)
return -EINVAL;
}
- SKELETON_PMD_INFO("Init %s on NUMA node %d", name, rte_socket_id());
+ SKELETON_PMD_INFO("Init %s on NUMA node %d", name, rte_numa_id());
selftest = skeldev_parse_vdev_args(vdev);
/* In case of invalid argument, selftest != 1; ignore other values */
- ret = skeleton_rawdev_create(name, vdev, rte_socket_id());
+ ret = skeleton_rawdev_create(name, vdev, rte_numa_id());
if (ret >= 0) {
/* In case command line argument for 'selftest' was passed;
* if invalid arguments were passed, execution continues but
@@ -760,7 +760,7 @@ skeleton_rawdev_remove(struct rte_vdev_device *vdev)
if (name == NULL)
return -1;
- SKELETON_PMD_INFO("Closing %s on NUMA node %d", name, rte_socket_id());
+ SKELETON_PMD_INFO("Closing %s on NUMA node %d", name, rte_numa_id());
ret = skeleton_rawdev_destroy(name);
if (!ret)
diff --git a/drivers/raw/skeleton/skeleton_rawdev_test.c b/drivers/raw/skeleton/skeleton_rawdev_test.c
index 99765feb41..9bc808faaa 100644
--- a/drivers/raw/skeleton/skeleton_rawdev_test.c
+++ b/drivers/raw/skeleton/skeleton_rawdev_test.c
@@ -95,13 +95,13 @@ test_rawdev_get_dev_id(void)
static int
test_rawdev_socket_id(void)
{
- int socket_id;
- socket_id = rte_rawdev_socket_id(test_dev_id);
- RTE_TEST_ASSERT(socket_id != -EINVAL,
- "Failed to get socket_id %d", socket_id);
- socket_id = rte_rawdev_socket_id(RTE_RAWDEV_MAX_DEVS);
- RTE_TEST_ASSERT(socket_id == -EINVAL,
- "Expected -EINVAL %d", socket_id);
+ int numa_id;
+ numa_id = rte_rawdev_numa_id(test_dev_id);
+ RTE_TEST_ASSERT(numa_id != -EINVAL,
+ "Failed to get numa_id %d", numa_id);
+ numa_id = rte_rawdev_numa_id(RTE_RAWDEV_MAX_DEVS);
+ RTE_TEST_ASSERT(numa_id == -EINVAL,
+ "Expected -EINVAL %d", numa_id);
return TEST_SUCCESS;
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 165/227] regex/cn9k: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (163 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 164/227] raw/skeleton: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 166/227] regex/mlx5: " Chengwen Feng
` (62 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/regex/cn9k/cn9k_regexdev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/regex/cn9k/cn9k_regexdev.c b/drivers/regex/cn9k/cn9k_regexdev.c
index 5abc7e22bc..74a2aa6421 100644
--- a/drivers/regex/cn9k/cn9k_regexdev.c
+++ b/drivers/regex/cn9k/cn9k_regexdev.c
@@ -99,7 +99,7 @@ ree_qp_create(const struct rte_regexdev *dev, uint16_t qp_id)
qp_memzone_name_get(name, RTE_MEMZONE_NAMESIZE, dev->data->dev_id,
qp_id);
- lf_mem = rte_memzone_reserve_aligned(name, len, rte_socket_id(),
+ lf_mem = rte_memzone_reserve_aligned(name, len, rte_numa_id(),
RTE_MEMZONE_SIZE_HINT_ONLY | RTE_MEMZONE_256MB,
RTE_CACHE_LINE_SIZE);
if (lf_mem == NULL) {
@@ -204,10 +204,10 @@ ree_dev_register(const char *name)
/* allocate private device structure */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
dev->data->dev_private =
- rte_zmalloc_socket("regexdev device private",
+ rte_zmalloc_numa("regexdev device private",
sizeof(struct cn9k_ree_data),
RTE_CACHE_LINE_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (dev->data->dev_private == NULL) {
cn9k_err("Cannot allocate memory for dev %s private data",
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 166/227] regex/mlx5: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (164 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 165/227] regex/cn9k: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 167/227] vdpa/mlx5: " Chengwen Feng
` (61 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/regex/mlx5/mlx5_regex_control.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/regex/mlx5/mlx5_regex_control.c b/drivers/regex/mlx5/mlx5_regex_control.c
index 92cf5f495e..f837a24c74 100644
--- a/drivers/regex/mlx5/mlx5_regex_control.c
+++ b/drivers/regex/mlx5/mlx5_regex_control.c
@@ -83,7 +83,7 @@ regex_ctrl_create_cq(struct mlx5_regex_priv *priv, struct mlx5_regex_cq *cq)
cq->ci = 0;
ret = mlx5_devx_cq_create(priv->cdev->ctx, &cq->cq_obj, cq->log_nb_desc,
- &attr, SOCKET_ID_ANY);
+ &attr, RTE_NUMA_ID_ANY);
if (ret) {
DRV_LOG(ERR, "Can't create CQ object.");
memset(cq, 0, sizeof(*cq));
@@ -155,7 +155,7 @@ regex_ctrl_create_hw_qp(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *qp,
attr.mmo = priv->mmo_regex_qp_cap;
ret = mlx5_devx_qp_create(priv->cdev->ctx, &qp_obj->qp_obj,
attr.num_of_send_wqbbs * MLX5_WQE_SIZE, &attr,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (ret) {
DRV_LOG(ERR, "Can't create QP object.");
rte_errno = ENOMEM;
@@ -248,7 +248,7 @@ mlx5_regex_qp_setup(struct rte_regexdev *dev, uint16_t qp_ind,
}
ret = mlx5_mr_ctrl_init(&qp->mr_ctrl, &priv->cdev->mr_scache.dev_gen,
- rte_socket_id());
+ rte_numa_id());
if (ret) {
DRV_LOG(ERR, "Error setting up mr btree");
goto err_btree;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 167/227] vdpa/mlx5: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (165 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 166/227] regex/mlx5: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 168/227] drivers: " Chengwen Feng
` (60 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/vdpa/mlx5/mlx5_vdpa_cthread.c | 2 +-
drivers/vdpa/mlx5/mlx5_vdpa_event.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c b/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c
index 84f611c1ab..6b173957e8 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_cthread.c
@@ -265,7 +265,7 @@ mlx5_vdpa_c_thread_create(void)
thrd_idx);
conf_thread_mng.cthrd[thrd_idx].rng = rte_ring_create_elem(name,
sizeof(struct mlx5_vdpa_task), ring_num,
- rte_socket_id(),
+ rte_numa_id(),
RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ |
RING_F_EXACT_SZ);
if (!conf_thread_mng.cthrd[thrd_idx].rng) {
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_event.c b/drivers/vdpa/mlx5/mlx5_vdpa_event.c
index d18cf7d7e5..fc7eabf9d0 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa_event.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_event.c
@@ -96,7 +96,7 @@ mlx5_vdpa_cq_create(struct mlx5_vdpa_priv *priv, uint16_t log_desc_n,
int ret;
ret = mlx5_devx_cq_create(priv->cdev->ctx, &cq->cq_obj, log_desc_n,
- &attr, SOCKET_ID_ANY);
+ &attr, RTE_NUMA_ID_ANY);
if (ret)
goto error;
cq->cq_ci = 0;
@@ -671,7 +671,7 @@ mlx5_vdpa_event_qp_prepare(struct mlx5_vdpa_priv *priv, uint16_t desc_n,
mlx5_ts_format_conv(priv->cdev->config.hca_attr.qp_ts_format);
ret = mlx5_devx_qp_create(priv->cdev->ctx, &(eqp->sw_qp),
attr.num_of_receive_wqes * MLX5_WSEG_SIZE,
- &attr, SOCKET_ID_ANY);
+ &attr, RTE_NUMA_ID_ANY);
if (ret) {
DRV_LOG(ERR, "Failed to create SW QP(%u).", rte_errno);
goto error;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 168/227] drivers: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (166 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 167/227] vdpa/mlx5: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 169/227] " Chengwen Feng
` (59 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology across the qat common,
crypto and compress drivers, and switch calls to the NUMA-named
APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/common/qat/qat_device.c | 2 +-
drivers/common/qat/qat_qp.c | 22 +++++++-------
drivers/common/qat/qat_qp.h | 2 +-
drivers/compress/qat/qat_comp.c | 14 ++++-----
drivers/compress/qat/qat_comp.h | 2 +-
drivers/compress/qat/qat_comp_pmd.c | 22 +++++++-------
drivers/compress/qat/qat_comp_pmd.h | 2 +-
drivers/crypto/qat/asym/qat_asym.c | 2 +-
drivers/crypto/qat/dev/qat_asym_pmd_gen1.c | 2 +-
drivers/crypto/qat/dev/qat_crypto_pmd_gen2.c | 6 ++--
drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c | 2 +-
drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c | 4 +--
drivers/crypto/qat/dev/qat_crypto_pmd_gen5.c | 2 +-
drivers/crypto/qat/dev/qat_crypto_pmd_gen6.c | 2 +-
.../crypto/qat/dev/qat_crypto_pmd_gen_lce.c | 2 +-
drivers/crypto/qat/dev/qat_sym_pmd_gen1.c | 2 +-
drivers/crypto/qat/qat_crypto.c | 4 +--
drivers/crypto/qat/qat_crypto.h | 2 +-
drivers/crypto/qat/qat_sym.c | 2 +-
drivers/net/mlx5/mlx5_flow.c | 29 ++++++++++---------
drivers/net/mlx5/mlx5_rxq.c | 24 ++++++++-------
drivers/net/mlx5/mlx5_txq.c | 13 +++++----
22 files changed, 84 insertions(+), 80 deletions(-)
diff --git a/drivers/common/qat/qat_device.c b/drivers/common/qat/qat_device.c
index f0ed115b30..041f4cf880 100644
--- a/drivers/common/qat/qat_device.c
+++ b/drivers/common/qat/qat_device.c
@@ -320,7 +320,7 @@ qat_pci_device_allocate(struct rte_pci_device *pci_dev)
qat_dev_size = sizeof(struct qat_pci_device) + sizeof(void *) *
QAT_MAX_SERVICES + extra_size;
qat_dev_mz = rte_memzone_reserve(name, qat_dev_size,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (qat_dev_mz == NULL) {
QAT_LOG(ERR, "Error when allocating memzone for QAT_%d",
diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
index fe28cb160d..0d4d2dda52 100644
--- a/drivers/common/qat/qat_qp.c
+++ b/drivers/common/qat/qat_qp.c
@@ -84,7 +84,7 @@ static int adf_queue_arb_disable(enum qat_device_gen qat_dev_gen,
static int qat_qp_build_ring_base(struct qat_pci_device *qat_dev,
void *io_addr, struct qat_queue *queue);
static const struct rte_memzone *queue_dma_zone_reserve(const char *queue_name,
- uint32_t queue_size, int socket_id);
+ uint32_t queue_size, int numa_id);
static int qat_qp_csr_setup(struct qat_pci_device *qat_dev, void *io_addr,
struct qat_qp *qp);
@@ -128,17 +128,17 @@ qat_qp_setup(struct qat_pci_device *qat_dev,
}
/* Allocate the queue pair data structure. */
- qp = rte_zmalloc_socket("qat PMD qp metadata",
+ qp = rte_zmalloc_numa("qat PMD qp metadata",
sizeof(*qp), RTE_CACHE_LINE_SIZE,
- qat_qp_conf->socket_id);
+ qat_qp_conf->numa_id);
if (qp == NULL) {
QAT_LOG(ERR, "Failed to alloc mem for qp struct");
return -ENOMEM;
}
qp->nb_descriptors = qat_qp_conf->nb_descriptors;
- qp->op_cookies = rte_zmalloc_socket("qat PMD op cookie pointer",
+ qp->op_cookies = rte_zmalloc_numa("qat PMD op cookie pointer",
qat_qp_conf->nb_descriptors * sizeof(*qp->op_cookies),
- RTE_CACHE_LINE_SIZE, qat_qp_conf->socket_id);
+ RTE_CACHE_LINE_SIZE, qat_qp_conf->numa_id);
if (qp->op_cookies == NULL) {
QAT_LOG(ERR, "Failed to alloc mem for cookie");
rte_free(qp);
@@ -309,15 +309,15 @@ qat_queue_create(struct qat_pci_device *qat_dev, struct qat_queue *queue,
static const struct rte_memzone *
queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size,
- int socket_id)
+ int numa_id)
{
const struct rte_memzone *mz;
mz = rte_memzone_lookup(queue_name);
if (mz != 0) {
if (((size_t)queue_size <= mz->len) &&
- ((socket_id == SOCKET_ID_ANY) ||
- (socket_id == mz->socket_id))) {
+ ((numa_id == RTE_NUMA_ID_ANY) ||
+ (numa_id == mz->socket_id))) {
QAT_LOG(DEBUG, "re-use memzone already "
"allocated for %s", queue_name);
return mz;
@@ -327,14 +327,14 @@ queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size,
"allocated %s, size %u, socket %d. "
"Requested size %u, socket %u",
queue_name, (uint32_t)mz->len,
- mz->socket_id, queue_size, socket_id);
+ mz->socket_id, queue_size, numa_id);
return NULL;
}
QAT_LOG(DEBUG, "Allocate memzone for %s, size %u on socket %u",
- queue_name, queue_size, socket_id);
+ queue_name, queue_size, numa_id);
return rte_memzone_reserve_aligned(queue_name, queue_size,
- socket_id, RTE_MEMZONE_IOVA_CONTIG, queue_size);
+ numa_id, RTE_MEMZONE_IOVA_CONTIG, queue_size);
}
int
diff --git a/drivers/common/qat/qat_qp.h b/drivers/common/qat/qat_qp.h
index 5ccaedefa7..be57e00dd4 100644
--- a/drivers/common/qat/qat_qp.h
+++ b/drivers/common/qat/qat_qp.h
@@ -120,7 +120,7 @@ struct qat_qp_config {
const struct qat_qp_hw_data *hw;
uint32_t nb_descriptors;
uint32_t cookie_size;
- int socket_id;
+ int numa_id;
const char *service_str;
};
diff --git a/drivers/compress/qat/qat_comp.c b/drivers/compress/qat/qat_comp.c
index 559948a46a..1f4973f614 100644
--- a/drivers/compress/qat/qat_comp.c
+++ b/drivers/compress/qat/qat_comp.c
@@ -63,10 +63,10 @@ qat_comp_allocate_split_op_memzones(struct qat_comp_op_cookie *cookie,
unsigned int i;
/* allocate the array of memzone pointers */
- cookie->dst_memzones = rte_zmalloc_socket("qat PMD im buf mz pointers",
+ cookie->dst_memzones = rte_zmalloc_numa("qat PMD im buf mz pointers",
(nb_descriptors_needed - 1) *
sizeof(const struct rte_memzone *),
- RTE_CACHE_LINE_SIZE, cookie->socket_id);
+ RTE_CACHE_LINE_SIZE, cookie->numa_id);
if (cookie->dst_memzones == NULL) {
QAT_DP_LOG(ERR,
@@ -84,7 +84,7 @@ qat_comp_allocate_split_op_memzones(struct qat_comp_op_cookie *cookie,
cookie->dst_memzones[i] = rte_memzone_reserve_aligned(
dst_memz_name, RTE_PMD_QAT_COMP_IM_BUFFER_SIZE,
- cookie->socket_id, RTE_MEMZONE_IOVA_CONTIG,
+ cookie->numa_id, RTE_MEMZONE_IOVA_CONTIG,
RTE_CACHE_LINE_SIZE);
if (cookie->dst_memzones[i] == NULL) {
@@ -211,11 +211,11 @@ qat_comp_build_request(void *in_op, uint8_t *out_msg,
/* we need to allocate more elements in SGL*/
void *tmp;
- tmp = rte_realloc_socket(cookie->qat_sgl_src_d,
+ tmp = rte_realloc_numa(cookie->qat_sgl_src_d,
sizeof(struct qat_sgl) +
sizeof(struct qat_flat_buf) *
op->m_src->nb_segs, 64,
- cookie->socket_id);
+ cookie->numa_id);
if (unlikely(tmp == NULL)) {
QAT_DP_LOG(ERR, "QAT PMD can't allocate memory"
@@ -252,11 +252,11 @@ qat_comp_build_request(void *in_op, uint8_t *out_msg,
/* we need to allocate more elements in SGL*/
struct qat_sgl *tmp;
- tmp = rte_realloc_socket(cookie->qat_sgl_dst_d,
+ tmp = rte_realloc_numa(cookie->qat_sgl_dst_d,
sizeof(struct qat_sgl) +
sizeof(struct qat_flat_buf) *
op->m_dst->nb_segs, 64,
- cookie->socket_id);
+ cookie->numa_id);
if (unlikely(tmp == NULL)) {
QAT_DP_LOG(ERR, "QAT PMD can't allocate memory"
diff --git a/drivers/compress/qat/qat_comp.h b/drivers/compress/qat/qat_comp.h
index 18d5fd4b02..016459f311 100644
--- a/drivers/compress/qat/qat_comp.h
+++ b/drivers/compress/qat/qat_comp.h
@@ -61,7 +61,7 @@ struct qat_comp_op_cookie {
phys_addr_t qat_sgl_dst_phys_addr;
/* dynamically created SGLs */
uint8_t error;
- uint8_t socket_id;
+ uint8_t numa_id;
uint16_t src_nb_elems;
uint16_t dst_nb_elems;
struct qat_sgl *qat_sgl_src_d;
diff --git a/drivers/compress/qat/qat_comp_pmd.c b/drivers/compress/qat/qat_comp_pmd.c
index 5ac49318da..4a699e63b6 100644
--- a/drivers/compress/qat/qat_comp_pmd.c
+++ b/drivers/compress/qat/qat_comp_pmd.c
@@ -20,7 +20,7 @@ struct qat_comp_gen_dev_ops qat_comp_gen_dev_ops[QAT_N_GENS];
struct stream_create_info {
struct qat_comp_dev_private *comp_dev;
- int socket_id;
+ int numa_id;
int error;
};
@@ -103,7 +103,7 @@ qat_comp_qp_release(struct rte_compressdev *dev, uint16_t queue_pair_id)
int
qat_comp_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
- uint32_t max_inflight_ops, int socket_id)
+ uint32_t max_inflight_ops, int numa_id)
{
struct qat_qp_config qat_qp_conf = {0};
struct qat_qp **qp_addr =
@@ -135,7 +135,7 @@ qat_comp_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
}
qat_qp_conf.cookie_size = sizeof(struct qat_comp_op_cookie);
qat_qp_conf.nb_descriptors = max_inflight_ops;
- qat_qp_conf.socket_id = socket_id;
+ qat_qp_conf.numa_id = numa_id;
qat_qp_conf.service_str = "comp";
ret = qat_qp_setup(qat_private->qat_dev, qp_addr, qp_id, &qat_qp_conf);
@@ -156,13 +156,13 @@ qat_comp_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
cookie->qp = qp;
cookie->cookie_index = i;
- cookie->qat_sgl_src_d = rte_zmalloc_socket(NULL,
+ cookie->qat_sgl_src_d = rte_zmalloc_numa(NULL,
sizeof(struct qat_sgl) +
sizeof(struct qat_flat_buf) *
QAT_PMD_COMP_SGL_DEF_SEGMENTS,
64, dev->data->numa_id);
- cookie->qat_sgl_dst_d = rte_zmalloc_socket(NULL,
+ cookie->qat_sgl_dst_d = rte_zmalloc_numa(NULL,
sizeof(struct qat_sgl) +
sizeof(struct qat_flat_buf) *
QAT_PMD_COMP_SGL_DEF_SEGMENTS,
@@ -185,7 +185,7 @@ qat_comp_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
cookie->dst_nb_elems = cookie->src_nb_elems =
QAT_PMD_COMP_SGL_DEF_SEGMENTS;
- cookie->socket_id = dev->data->numa_id;
+ cookie->numa_id = dev->data->numa_id;
cookie->error = 0;
}
@@ -386,7 +386,7 @@ qat_comp_stream_init(struct rte_mempool *mp __rte_unused, void *opaque,
QAT_STATE_REGISTERS_MAX_SIZE
+ sizeof(struct qat_inter_sgl)
+ QAT_INFLATE_CONTEXT_SIZE,
- info->socket_id,
+ info->numa_id,
RTE_MEMZONE_IOVA_CONTIG, QAT_64_BYTE_ALIGN);
if (memzone == NULL) {
QAT_LOG(ERR,
@@ -428,7 +428,7 @@ qat_comp_stream_destroy(struct rte_mempool *mp __rte_unused,
static struct rte_mempool *
qat_comp_create_stream_pool(struct qat_comp_dev_private *comp_dev,
- int socket_id,
+ int numa_id,
uint32_t num_elements)
{
char stream_pool_name[RTE_MEMPOOL_NAMESIZE];
@@ -454,14 +454,14 @@ qat_comp_create_stream_pool(struct qat_comp_dev_private *comp_dev,
if (mp == NULL) {
struct stream_create_info info = {
.comp_dev = comp_dev,
- .socket_id = socket_id,
+ .numa_id = numa_id,
.error = 0
};
mp = rte_mempool_create(stream_pool_name,
num_elements,
qat_comp_stream_size(), 0, 0,
NULL, NULL, qat_comp_stream_init, &info,
- socket_id, 0);
+ numa_id, 0);
if (mp == NULL) {
QAT_LOG(ERR,
"Err creating mempool %s w %d elements of size %d",
@@ -758,7 +758,7 @@ qat_comp_dev_create(struct qat_pci_device *qat_pci_dev)
if (comp_dev->capa_mz == NULL) {
comp_dev->capa_mz = rte_memzone_reserve(capa_memz_name,
capa_size,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
}
if (comp_dev->capa_mz == NULL) {
QAT_LOG(DEBUG,
diff --git a/drivers/compress/qat/qat_comp_pmd.h b/drivers/compress/qat/qat_comp_pmd.h
index 01a8983287..6506ba0e4e 100644
--- a/drivers/compress/qat/qat_comp_pmd.h
+++ b/drivers/compress/qat/qat_comp_pmd.h
@@ -100,7 +100,7 @@ qat_comp_qp_release(struct rte_compressdev *dev, uint16_t queue_pair_id);
int
qat_comp_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
- uint32_t max_inflight_ops, int socket_id);
+ uint32_t max_inflight_ops, int numa_id);
const struct rte_memzone *
qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
diff --git a/drivers/crypto/qat/asym/qat_asym.c b/drivers/crypto/qat/asym/qat_asym.c
index 9276b86c0e..9630355a57 100644
--- a/drivers/crypto/qat/asym/qat_asym.c
+++ b/drivers/crypto/qat/asym/qat_asym.c
@@ -1700,7 +1700,7 @@ qat_asym_dev_create(struct qat_pci_device *qat_pci_dev)
&qat_pci_devs[qat_pci_dev->qat_dev_id];
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
- .socket_id = qat_dev_instance->pci_dev->device.numa_node,
+ .numa_id = qat_dev_instance->pci_dev->device.numa_node,
.private_data_size = sizeof(struct qat_cryptodev_private)
};
const struct qat_crypto_gen_dev_ops *gen_dev_ops =
diff --git a/drivers/crypto/qat/dev/qat_asym_pmd_gen1.c b/drivers/crypto/qat/dev/qat_asym_pmd_gen1.c
index c96608dd37..d4408a17c4 100644
--- a/drivers/crypto/qat/dev/qat_asym_pmd_gen1.c
+++ b/drivers/crypto/qat/dev/qat_asym_pmd_gen1.c
@@ -65,7 +65,7 @@ qat_asym_crypto_cap_get_gen1(struct qat_cryptodev_private *internals,
internals->capa_mz = rte_memzone_lookup(capa_memz_name);
if (internals->capa_mz == NULL) {
internals->capa_mz = rte_memzone_reserve(capa_memz_name,
- size, rte_socket_id(), 0);
+ size, rte_numa_id(), 0);
if (internals->capa_mz == NULL) {
QAT_LOG(DEBUG,
"Error allocating memzone for capabilities");
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen2.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen2.c
index 89c51c8f80..3982995901 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen2.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen2.c
@@ -139,13 +139,13 @@ static struct rte_cryptodev_capabilities qat_sym_crypto_caps_gen2[] = {
static int
qat_sym_crypto_qp_setup_gen2(struct rte_cryptodev *dev, uint16_t qp_id,
- const struct rte_cryptodev_qp_conf *qp_conf, int socket_id)
+ const struct rte_cryptodev_qp_conf *qp_conf, int numa_id)
{
struct qat_cryptodev_private *qat_sym_private = dev->data->dev_private;
struct qat_qp *qp;
int ret;
- if (qat_cryptodev_qp_setup(dev, qp_id, qp_conf, socket_id)) {
+ if (qat_cryptodev_qp_setup(dev, qp_id, qp_conf, numa_id)) {
QAT_LOG(DEBUG, "QAT qp setup failed");
return -1;
}
@@ -296,7 +296,7 @@ qat_sym_crypto_cap_get_gen2(struct qat_cryptodev_private *internals,
internals->capa_mz = rte_memzone_lookup(capa_memz_name);
if (internals->capa_mz == NULL) {
internals->capa_mz = rte_memzone_reserve(capa_memz_name,
- size, rte_socket_id(), 0);
+ size, rte_numa_id(), 0);
if (internals->capa_mz == NULL) {
QAT_LOG(DEBUG,
"Error allocating memzone for capabilities");
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
index 91546046f1..eaa2cbd809 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
@@ -211,7 +211,7 @@ qat_sym_crypto_cap_get_gen3(struct qat_cryptodev_private *internals,
internals->capa_mz = rte_memzone_lookup(capa_memz_name);
if (internals->capa_mz == NULL) {
internals->capa_mz = rte_memzone_reserve(capa_memz_name,
- size, rte_socket_id(), 0);
+ size, rte_numa_id(), 0);
if (internals->capa_mz == NULL) {
QAT_LOG(DEBUG,
"Error allocating memzone for capabilities");
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c
index 41cad29142..b7cba0c2a0 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c
@@ -178,7 +178,7 @@ qat_sym_crypto_cap_get_gen4(struct qat_cryptodev_private *internals,
internals->capa_mz = rte_memzone_lookup(capa_memz_name);
if (internals->capa_mz == NULL) {
internals->capa_mz = rte_memzone_reserve(capa_memz_name,
- size, rte_socket_id(), 0);
+ size, rte_numa_id(), 0);
if (internals->capa_mz == NULL) {
QAT_LOG(DEBUG,
"Error allocating memzone for capabilities");
@@ -216,7 +216,7 @@ qat_asym_crypto_cap_get_gen4(struct qat_cryptodev_private *internals,
internals->capa_mz = rte_memzone_lookup(capa_memz_name);
if (internals->capa_mz == NULL) {
internals->capa_mz = rte_memzone_reserve(capa_memz_name,
- size, rte_socket_id(), 0);
+ size, rte_numa_id(), 0);
if (internals->capa_mz == NULL) {
QAT_LOG(DEBUG,
"Error allocating memzone for capabilities");
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen5.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen5.c
index 2680116d6e..4a32d17feb 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen5.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen5.c
@@ -147,7 +147,7 @@ qat_sym_crypto_cap_get_gen5(struct qat_cryptodev_private *internals,
internals->capa_mz = rte_memzone_lookup(capa_memz_name);
if (internals->capa_mz == NULL) {
internals->capa_mz = rte_memzone_reserve(capa_memz_name,
- size, rte_socket_id(), 0);
+ size, rte_numa_id(), 0);
if (internals->capa_mz == NULL) {
QAT_LOG(DEBUG,
"Error allocating memzone for capabilities");
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen6.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen6.c
index 7f810cfcc1..ba887fdf47 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen6.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen6.c
@@ -84,7 +84,7 @@ qat_sym_crypto_cap_get_gen6(struct qat_cryptodev_private *internals,
internals->capa_mz = rte_memzone_lookup(capa_memz_name);
if (internals->capa_mz == NULL) {
internals->capa_mz = rte_memzone_reserve(capa_memz_name,
- size, rte_socket_id(), 0);
+ size, rte_numa_id(), 0);
if (internals->capa_mz == NULL) {
QAT_LOG(DEBUG,
"Error allocating memzone for capabilities");
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen_lce.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen_lce.c
index ec075bbf68..410d566389 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen_lce.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen_lce.c
@@ -267,7 +267,7 @@ qat_sym_crypto_cap_get_gen_lce(struct qat_cryptodev_private *internals,
internals->capa_mz = rte_memzone_lookup(capa_memz_name);
if (internals->capa_mz == NULL) {
- internals->capa_mz = rte_memzone_reserve(capa_memz_name, size, rte_socket_id(), 0);
+ internals->capa_mz = rte_memzone_reserve(capa_memz_name, size, rte_numa_id(), 0);
if (internals->capa_mz == NULL) {
QAT_LOG(DEBUG, "Error allocating memzone for capabilities");
return -1;
diff --git a/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c b/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
index 6da0f6c645..d96eeab734 100644
--- a/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
+++ b/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
@@ -170,7 +170,7 @@ qat_sym_crypto_cap_get_gen1(struct qat_cryptodev_private *internals,
internals->capa_mz = rte_memzone_lookup(capa_memz_name);
if (internals->capa_mz == NULL) {
internals->capa_mz = rte_memzone_reserve(capa_memz_name,
- size, rte_socket_id(), 0);
+ size, rte_numa_id(), 0);
if (internals->capa_mz == NULL) {
QAT_LOG(DEBUG,
"Error allocating memzone for capabilities");
diff --git a/drivers/crypto/qat/qat_crypto.c b/drivers/crypto/qat/qat_crypto.c
index daa36c5eed..88e73efd96 100644
--- a/drivers/crypto/qat/qat_crypto.c
+++ b/drivers/crypto/qat/qat_crypto.c
@@ -120,7 +120,7 @@ qat_cryptodev_qp_release(struct rte_cryptodev *dev, uint16_t queue_pair_id)
int
qat_cryptodev_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
- const struct rte_cryptodev_qp_conf *qp_conf, int socket_id)
+ const struct rte_cryptodev_qp_conf *qp_conf, int numa_id)
{
struct qat_qp **qp_addr =
(struct qat_qp **)&(dev->data->queue_pairs[qp_id]);
@@ -154,7 +154,7 @@ qat_cryptodev_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
sizeof(struct qat_sym_op_cookie) :
sizeof(struct qat_asym_op_cookie);
qat_qp_conf.nb_descriptors = qp_conf->nb_descriptors;
- qat_qp_conf.socket_id = socket_id;
+ qat_qp_conf.numa_id = numa_id;
qat_qp_conf.service_str = qat_service_get_str(service_type);
ret = qat_qp_setup(qat_dev, qp_addr, qp_id, &qat_qp_conf);
diff --git a/drivers/crypto/qat/qat_crypto.h b/drivers/crypto/qat/qat_crypto.h
index fcd62eda27..1b390047d0 100644
--- a/drivers/crypto/qat/qat_crypto.h
+++ b/drivers/crypto/qat/qat_crypto.h
@@ -94,7 +94,7 @@ qat_cryptodev_stats_reset(struct rte_cryptodev *dev);
int
qat_cryptodev_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
- const struct rte_cryptodev_qp_conf *qp_conf, int socket_id);
+ const struct rte_cryptodev_qp_conf *qp_conf, int numa_id);
int
qat_cryptodev_qp_release(struct rte_cryptodev *dev, uint16_t queue_pair_id);
diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index 83f1084030..21fdf7c44c 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -206,7 +206,7 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev)
&qat_pci_devs[qat_pci_dev->qat_dev_id];
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
- .socket_id = qat_dev_instance->pci_dev->device.numa_node,
+ .numa_id = qat_dev_instance->pci_dev->device.numa_node,
.private_data_size = sizeof(struct qat_cryptodev_private)
};
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 37654918b5..bba466562c 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -4642,7 +4642,7 @@ flow_action_handles_translate(struct rte_eth_dev *dev,
if (!copied_n)
return 0;
actions_size = sizeof(struct rte_flow_action) * n;
- translated = mlx5_malloc(MLX5_MEM_ZERO, actions_size, 0, SOCKET_ID_ANY);
+ translated = mlx5_malloc(MLX5_MEM_ZERO, actions_size, 0, RTE_NUMA_ID_ANY);
if (!translated) {
rte_errno = ENOMEM;
return -ENOMEM;
@@ -6683,7 +6683,7 @@ flow_create_split_metadata(struct rte_eth_dev *dev,
sizeof(struct rte_flow_action_set_tag) +
sizeof(struct rte_flow_action_jump);
ext_actions = mlx5_malloc(MLX5_MEM_ZERO, act_size, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!ext_actions)
return rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_ACTION,
@@ -6710,7 +6710,7 @@ flow_create_split_metadata(struct rte_eth_dev *dev,
act_size = sizeof(struct rte_flow_action) * (actions_n + 1) +
sizeof(struct mlx5_flow_action_copy_mreg);
ext_actions = mlx5_malloc(MLX5_MEM_ZERO, act_size, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!ext_actions)
return rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_ACTION,
@@ -6998,7 +6998,7 @@ flow_create_split_meter(struct rte_eth_dev *dev,
item_size = sizeof(struct rte_flow_item) * (METER_SUFFIX_ITEM + vlan_items_n) +
sizeof(struct mlx5_rte_flow_item_tag) * 2;
sfx_actions = mlx5_malloc(MLX5_MEM_ZERO, (act_size + item_size),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!sfx_actions)
return rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_ACTION,
@@ -7148,7 +7148,7 @@ flow_create_split_sample(struct rte_eth_dev *dev,
item_size = sizeof(struct rte_flow_item) * SAMPLE_SUFFIX_ITEM +
sizeof(struct mlx5_rte_flow_item_tag) * 2;
sfx_actions = mlx5_malloc(MLX5_MEM_ZERO, (act_size +
- item_size), 0, SOCKET_ID_ANY);
+ item_size), 0, RTE_NUMA_ID_ANY);
if (!sfx_actions)
return rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_ACTION,
@@ -7767,7 +7767,7 @@ mlx5_flow_cache_flow_info(struct rte_eth_dev *dev,
struct rte_flow_error error;
int len, ret;
- flow_info = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*flow_info), 0, SOCKET_ID_ANY);
+ flow_info = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*flow_info), 0, RTE_NUMA_ID_ANY);
if (!flow_info) {
DRV_LOG(ERR, "No enough memory for flow_info caching.");
return -1;
@@ -7784,7 +7784,7 @@ mlx5_flow_cache_flow_info(struct rte_eth_dev *dev,
goto end;
}
len = RTE_ALIGN(ret, 16);
- flow_info->items = mlx5_malloc(MLX5_MEM_ZERO, len, 0, SOCKET_ID_ANY);
+ flow_info->items = mlx5_malloc(MLX5_MEM_ZERO, len, 0, RTE_NUMA_ID_ANY);
if (!flow_info->items) {
DRV_LOG(ERR, "No enough memory for items caching.");
goto end;
@@ -7802,7 +7802,7 @@ mlx5_flow_cache_flow_info(struct rte_eth_dev *dev,
goto end;
}
len = RTE_ALIGN(ret, 16);
- flow_info->actions = mlx5_malloc(MLX5_MEM_ZERO, len, 0, SOCKET_ID_ANY);
+ flow_info->actions = mlx5_malloc(MLX5_MEM_ZERO, len, 0, RTE_NUMA_ID_ANY);
if (!flow_info->actions) {
DRV_LOG(ERR, "No enough memory for actions caching.");
goto end;
@@ -8557,7 +8557,8 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
for (i = 0; i != priv->reta_idx_n; ++i)
queue[i] = (*priv->reta_idx)[i];
- entry = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*entry), alignof(typeof(*entry)), SOCKET_ID_ANY);
+ entry = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*entry), alignof(typeof(*entry)),
+ RTE_NUMA_ID_ANY);
if (entry == NULL) {
rte_errno = ENOMEM;
goto err;
@@ -9670,7 +9671,7 @@ mlx5_flow_create_counter_stat_mem_mng(struct mlx5_dev_ctx_shared *sh)
rte_errno = ENOMEM;
return -ENOMEM;
}
- mem = mlx5_malloc(MLX5_MEM_ZERO, size, pgsize, SOCKET_ID_ANY);
+ mem = mlx5_malloc(MLX5_MEM_ZERO, size, pgsize, RTE_NUMA_ID_ANY);
if (!mem) {
rte_errno = ENOMEM;
return -ENOMEM;
@@ -11175,7 +11176,7 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev,
miss_actions[1].type = RTE_FLOW_ACTION_TYPE_RSS;
q_size = priv->reta_idx_n * sizeof(ctx->queue[0]);
ctx->queue = mlx5_malloc(MLX5_MEM_SYS | MLX5_MEM_ZERO, q_size,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!ctx->queue)
return rte_flow_error_set
(error, ENOMEM,
@@ -11304,7 +11305,7 @@ mlx5_flow_tunnel_grp2tbl_create_cb(void *tool_ctx, void *cb_ctx)
tte = mlx5_malloc(MLX5_MEM_SYS | MLX5_MEM_ZERO,
sizeof(*tte), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!tte)
goto err;
mlx5_ipool_malloc(sh->ipool[MLX5_IPOOL_TNL_TBL_ID],
@@ -11334,7 +11335,7 @@ mlx5_flow_tunnel_grp2tbl_clone_cb(void *tool_ctx __rte_unused,
void *cb_ctx __rte_unused)
{
struct tunnel_tbl_entry *tte = mlx5_malloc(MLX5_MEM_SYS, sizeof(*tte),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!tte)
return NULL;
@@ -11588,7 +11589,7 @@ int mlx5_alloc_tunnel_hub(struct mlx5_dev_ctx_shared *sh)
struct mlx5_flow_tunnel_hub *thub;
thub = mlx5_malloc(MLX5_MEM_SYS | MLX5_MEM_ZERO, sizeof(*thub),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!thub)
return -ENOMEM;
LIST_INIT(&thub->tunnels);
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 25dba7f4d9..e525cc853d 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -994,7 +994,7 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
}
/* Allocate RXQ. */
rxq = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO, sizeof(*rxq), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!rxq) {
DRV_LOG(ERR, "port %u unable to allocate rx queue index %u private data",
dev->data->port_id, idx);
@@ -1083,7 +1083,7 @@ mlx5_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t idx,
}
}
rxq = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO, sizeof(*rxq), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!rxq) {
DRV_LOG(ERR, "port %u unable to allocate hairpin rx queue index %u private data",
dev->data->port_id, idx);
@@ -1875,7 +1875,7 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
desc >>= mprq_log_actual_stride_num;
alloc_size += desc * sizeof(struct mlx5_mprq_buf *);
}
- if (socket != (unsigned int)SOCKET_ID_ANY) {
+ if (socket != (unsigned int)RTE_NUMA_ID_ANY) {
tmpl = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO, alloc_size, 0, socket);
} else {
tmpl = mlx5_malloc_numa_tolerant(MLX5_MEM_RTE | MLX5_MEM_ZERO, alloc_size, 0,
@@ -1983,7 +1983,7 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
goto error;
}
tmpl->is_hairpin = false;
- if (socket != (unsigned int)SOCKET_ID_ANY) {
+ if (socket != (unsigned int)RTE_NUMA_ID_ANY) {
if (mlx5_mr_ctrl_init(&tmpl->rxq.mr_ctrl,
&priv->sh->cdev->mr_scache.dev_gen, socket))
/* rte_errno is already set. */
@@ -1993,13 +1993,14 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
&priv->sh->cdev->mr_scache.dev_gen, dev->device->numa_node);
if (ret == -ENOMEM) {
ret = mlx5_mr_ctrl_init(&tmpl->rxq.mr_ctrl,
- &priv->sh->cdev->mr_scache.dev_gen, SOCKET_ID_ANY);
+ &priv->sh->cdev->mr_scache.dev_gen,
+ RTE_NUMA_ID_ANY);
}
if (ret)
/* rte_errno is already set. */
goto error;
}
- tmpl->socket = (socket == (unsigned int)SOCKET_ID_ANY ?
+ tmpl->socket = (socket == (unsigned int)RTE_NUMA_ID_ANY ?
(unsigned int)dev->device->numa_node : socket);
if (dev->data->dev_conf.intr_conf.rxq)
tmpl->irq = 1;
@@ -2159,7 +2160,7 @@ mlx5_rxq_hairpin_new(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq,
struct mlx5_rxq_ctrl *tmpl;
tmpl = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO, sizeof(*tmpl), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!tmpl) {
rte_errno = ENOMEM;
return NULL;
@@ -2168,7 +2169,7 @@ mlx5_rxq_hairpin_new(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq,
rxq->ctrl = tmpl;
LIST_INSERT_HEAD(&tmpl->owners, rxq, owner_entry);
tmpl->is_hairpin = true;
- tmpl->socket = SOCKET_ID_ANY;
+ tmpl->socket = RTE_NUMA_ID_ANY;
tmpl->rxq.rss_hash = 0;
tmpl->rxq.port_id = dev->data->port_id;
tmpl->sh = priv->sh;
@@ -2769,7 +2770,7 @@ mlx5_ind_table_obj_new(struct rte_eth_dev *dev, const uint16_t *queues,
*/
ind_tbl = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*ind_tbl) +
(standalone ? max_queues_n : queues_n) *
- sizeof(uint16_t), 0, SOCKET_ID_ANY);
+ sizeof(uint16_t), 0, RTE_NUMA_ID_ANY);
if (!ind_tbl) {
rte_errno = ENOMEM;
return NULL;
@@ -3276,7 +3277,8 @@ mlx5_drop_action_create(struct rte_eth_dev *dev)
if (priv->drop_queue.hrxq)
return priv->drop_queue.hrxq;
- hrxq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hrxq) + MLX5_RSS_HASH_KEY_LEN, 0, SOCKET_ID_ANY);
+ hrxq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hrxq) + MLX5_RSS_HASH_KEY_LEN,
+ 0, RTE_NUMA_ID_ANY);
if (!hrxq) {
DRV_LOG(WARNING,
"Port %u cannot allocate memory for drop queue.",
@@ -3286,7 +3288,7 @@ mlx5_drop_action_create(struct rte_eth_dev *dev)
}
priv->drop_queue.hrxq = hrxq;
hrxq->ind_table = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hrxq->ind_table),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!hrxq->ind_table) {
rte_errno = ENOMEM;
goto error;
diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index aa43cb1612..e2c85f389c 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -1128,7 +1128,7 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
uint16_t max_wqe;
uint32_t wqebb_cnt, log_desc_n;
- if (socket != (unsigned int)SOCKET_ID_ANY) {
+ if (socket != (unsigned int)RTE_NUMA_ID_ANY) {
tmpl = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO, sizeof(*tmpl) +
desc * sizeof(struct rte_mbuf *), 0, socket);
} else {
@@ -1140,7 +1140,7 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
rte_errno = ENOMEM;
return NULL;
}
- if (socket != (unsigned int)SOCKET_ID_ANY) {
+ if (socket != (unsigned int)RTE_NUMA_ID_ANY) {
if (mlx5_mr_ctrl_init(&tmpl->txq.mr_ctrl,
&priv->sh->cdev->mr_scache.dev_gen, socket))
/* rte_errno is already set. */
@@ -1150,7 +1150,8 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
&priv->sh->cdev->mr_scache.dev_gen, dev->device->numa_node);
if (ret == -ENOMEM) {
ret = mlx5_mr_ctrl_init(&tmpl->txq.mr_ctrl,
- &priv->sh->cdev->mr_scache.dev_gen, SOCKET_ID_ANY);
+ &priv->sh->cdev->mr_scache.dev_gen,
+ RTE_NUMA_ID_ANY);
}
if (ret)
/* rte_errno is already set. */
@@ -1160,7 +1161,7 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
tmpl->txq.offloads = conf->offloads |
dev->data->dev_conf.txmode.offloads;
tmpl->priv = priv;
- tmpl->socket = (socket == (unsigned int)SOCKET_ID_ANY ?
+ tmpl->socket = (socket == (unsigned int)RTE_NUMA_ID_ANY ?
(unsigned int)dev->device->numa_node : socket);
tmpl->txq.elts_n = log2above(desc);
tmpl->txq.elts_s = desc;
@@ -1221,13 +1222,13 @@ mlx5_txq_hairpin_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
struct mlx5_txq_ctrl *tmpl;
tmpl = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO, sizeof(*tmpl), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!tmpl) {
rte_errno = ENOMEM;
return NULL;
}
tmpl->priv = priv;
- tmpl->socket = SOCKET_ID_ANY;
+ tmpl->socket = RTE_NUMA_ID_ANY;
tmpl->txq.elts_n = log2above(desc);
tmpl->txq.port_id = dev->data->port_id;
tmpl->txq.idx = idx;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 169/227] drivers: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (167 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 168/227] drivers: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 170/227] test: " Chengwen Feng
` (58 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology across the mlx5 common
and net drivers, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
.../common/mlx5/linux/mlx5_common_auxiliary.c | 6 +--
drivers/common/mlx5/linux/mlx5_nl.c | 4 +-
drivers/common/mlx5/mlx5_common.c | 4 +-
drivers/common/mlx5/mlx5_common_mr.c | 16 +++---
drivers/common/mlx5/mlx5_common_mr.h | 2 +-
drivers/common/mlx5/mlx5_common_utils.c | 6 +--
drivers/common/mlx5/mlx5_devx_cmds.c | 50 +++++++++----------
drivers/common/mlx5/mlx5_malloc.c | 10 ++--
drivers/common/mlx5/mlx5_malloc.h | 4 +-
drivers/common/mlx5/windows/mlx5_common_os.c | 4 +-
drivers/net/mlx5/hws/mlx5dr_internal.h | 4 +-
drivers/net/mlx5/linux/mlx5_ethdev_os.c | 8 +--
drivers/net/mlx5/linux/mlx5_os.c | 14 +++---
drivers/net/mlx5/linux/mlx5_verbs.c | 6 +--
drivers/net/mlx5/linux/mlx5_vlan_os.c | 2 +-
drivers/net/mlx5/mlx5.c | 16 +++---
drivers/net/mlx5/mlx5_devx.c | 12 ++---
drivers/net/mlx5/mlx5_ethdev.c | 6 +--
drivers/net/mlx5/mlx5_flow.c | 2 +-
drivers/net/mlx5/mlx5_flow_aso.c | 8 +--
drivers/net/mlx5/mlx5_flow_dv.c | 32 ++++++------
drivers/net/mlx5/mlx5_flow_flex.c | 4 +-
drivers/net/mlx5/mlx5_flow_geneve.c | 2 +-
drivers/net/mlx5/mlx5_flow_hw.c | 48 +++++++++---------
drivers/net/mlx5/mlx5_flow_meter.c | 14 +++---
drivers/net/mlx5/mlx5_flow_quota.c | 6 +--
drivers/net/mlx5/mlx5_flow_verbs.c | 2 +-
drivers/net/mlx5/mlx5_hws_cnt.c | 30 +++++------
drivers/net/mlx5/mlx5_nta_sample.c | 16 +++---
drivers/net/mlx5/mlx5_nta_split.c | 2 +-
| 4 +-
drivers/net/mlx5/mlx5_rxq.c | 4 +-
drivers/net/mlx5/mlx5_stats.c | 2 +-
drivers/net/mlx5/mlx5_trigger.c | 2 +-
drivers/net/mlx5/mlx5_tx.c | 2 +-
drivers/net/mlx5/mlx5_utils.c | 30 +++++------
drivers/net/mlx5/windows/mlx5_flow_os.c | 4 +-
drivers/net/mlx5/windows/mlx5_os.c | 8 +--
38 files changed, 198 insertions(+), 198 deletions(-)
diff --git a/drivers/common/mlx5/linux/mlx5_common_auxiliary.c b/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
index 3ee2f4638a..d54e681b42 100644
--- a/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
+++ b/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
@@ -97,14 +97,14 @@ mlx5_auxiliary_get_numa(const struct rte_auxiliary_device *dev)
char numa_path[PATH_MAX];
if (mlx5_auxiliary_get_pci_path(dev, numa_path, sizeof(numa_path)) != 0)
- return SOCKET_ID_ANY;
+ return RTE_NUMA_ID_ANY;
if (strcat(numa_path, "/numa_node") == NULL) {
rte_errno = ENAMETOOLONG;
- return SOCKET_ID_ANY;
+ return RTE_NUMA_ID_ANY;
}
if (eal_parse_sysfs_value(numa_path, &numa) != 0) {
rte_errno = EINVAL;
- return SOCKET_ID_ANY;
+ return RTE_NUMA_ID_ANY;
}
return (int)numa;
}
diff --git a/drivers/common/mlx5/linux/mlx5_nl.c b/drivers/common/mlx5/linux/mlx5_nl.c
index 3fabcfaee0..d2e762ad73 100644
--- a/drivers/common/mlx5/linux/mlx5_nl.c
+++ b/drivers/common/mlx5/linux/mlx5_nl.c
@@ -400,7 +400,7 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
if (recv_bytes < MLX5_RECV_BUF_SIZE)
recv_bytes = MLX5_RECV_BUF_SIZE;
mlx5_free(buf);
- buf = mlx5_malloc(0, recv_bytes, 0, SOCKET_ID_ANY);
+ buf = mlx5_malloc(0, recv_bytes, 0, RTE_NUMA_ID_ANY);
if (!buf) {
rte_errno = ENOMEM;
ret = -rte_errno;
@@ -1338,7 +1338,7 @@ mlx5_nl_portnum(int nl, const char *name, struct mlx5_dev_info *dev_info)
size = (data.portnum + 1) * sizeof(struct mlx5_port_nl_info);
dev_info->port_info = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE, size,
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (dev_info->port_info == NULL) {
memset(dev_info, 0, sizeof(*dev_info));
rte_errno = ENOMEM;
diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c
index f4b8904366..de20f97ef3 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -854,7 +854,7 @@ mlx5_common_probe_again_args_validate(struct mlx5_common_device *cdev,
return 0;
config = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(struct mlx5_common_dev_config),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (config == NULL) {
rte_errno = -ENOMEM;
return -rte_errno;
@@ -1135,7 +1135,7 @@ mlx5_common_dev_dma_map(struct rte_device *rte_dev, void *addr,
return -1;
}
mr = mlx5_create_mr_ext(dev->pd, (uintptr_t)addr, len,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!mr) {
DRV_LOG(WARNING, "Device %s unable to DMA map", rte_dev->name);
rte_errno = EINVAL;
diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c
index cf39aa93e7..ff0c41ecec 100644
--- a/drivers/common/mlx5/mlx5_common_mr.c
+++ b/drivers/common/mlx5/mlx5_common_mr.c
@@ -88,14 +88,14 @@ mr_btree_expand(struct mlx5_mr_btree *bt, uint32_t n)
if (n <= bt->size)
return ret;
/*
- * Downside of directly using rte_realloc() is that SOCKET_ID_ANY is
+ * Downside of directly using rte_realloc() is that RTE_NUMA_ID_ANY is
* used inside if there's no room to expand. Because this is a quite
* rare case and a part of very slow path, it is very acceptable.
* Initially cache_bh[] will be given practically enough space and once
* it is expanded, expansion wouldn't be needed again ever.
*/
mem = mlx5_realloc(bt->table, MLX5_MEM_RTE | MLX5_MEM_ZERO,
- n * sizeof(struct mr_cache_entry), 0, SOCKET_ID_ANY);
+ n * sizeof(struct mr_cache_entry), 0, RTE_NUMA_ID_ANY);
if (mem == NULL) {
/* Not an error, B-tree search will be skipped. */
DRV_LOG(WARNING, "failed to expand MR B-tree (%p) table",
@@ -773,7 +773,7 @@ mlx5_mr_create_primary(void *pd,
bmp_size = rte_bitmap_get_memory_footprint(ms_n);
mr = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
RTE_ALIGN_CEIL(sizeof(*mr), RTE_CACHE_LINE_SIZE) +
- bmp_size, RTE_CACHE_LINE_SIZE, msl->socket_id);
+ bmp_size, RTE_CACHE_LINE_SIZE, msl->numa_id);
if (mr == NULL) {
DRV_LOG(DEBUG, "Unable to allocate memory for a new MR of"
" address (%p).", (void *)addr);
@@ -909,7 +909,7 @@ mlx5_mr_create_primary(void *pd,
/*
* Finally create an MR for the memory chunk. Verbs: ibv_reg_mr() can
* be called with holding the memory lock because it doesn't use
- * mlx5_alloc_buf_extern() which eventually calls rte_malloc_socket()
+ * mlx5_alloc_buf_extern() which eventually calls rte_malloc_numa()
* through mlx5_alloc_verbs_buf().
*/
mlx5_os_reg_mr(pd, (void *)data.start, len, &mr->pmd_mr);
@@ -1186,13 +1186,13 @@ mlx5_mr_flush_local_cache(struct mlx5_mr_ctrl *mr_ctrl)
* Pointer to MR structure on success, NULL otherwise.
*/
struct mlx5_mr *
-mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int socket_id)
+mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int numa_id)
{
struct mlx5_mr *mr = NULL;
mr = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
RTE_ALIGN_CEIL(sizeof(*mr), RTE_CACHE_LINE_SIZE),
- RTE_CACHE_LINE_SIZE, socket_id);
+ RTE_CACHE_LINE_SIZE, numa_id);
if (mr == NULL)
return NULL;
mlx5_os_reg_mr(pd, (void *)addr, len, &mr->pmd_mr);
@@ -1592,7 +1592,7 @@ mlx5_mempool_reg_create(struct rte_mempool *mp, unsigned int mrs_n,
mpr = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
sizeof(struct mlx5_mempool_reg),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (mpr == NULL) {
DRV_LOG(ERR, "Cannot allocate mempool %s registration object",
mp->name);
@@ -1600,7 +1600,7 @@ mlx5_mempool_reg_create(struct rte_mempool *mp, unsigned int mrs_n,
}
mpr->mrs = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
mrs_n * sizeof(struct mlx5_mempool_mr),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!mpr->mrs) {
DRV_LOG(ERR, "Cannot allocate mempool %s registration MRs",
mp->name);
diff --git a/drivers/common/mlx5/mlx5_common_mr.h b/drivers/common/mlx5/mlx5_common_mr.h
index 5fb931a1b5..5d1e601fa2 100644
--- a/drivers/common/mlx5/mlx5_common_mr.h
+++ b/drivers/common/mlx5/mlx5_common_mr.h
@@ -224,7 +224,7 @@ struct mlx5_mr *
mlx5_mr_lookup_list(struct mlx5_mr_share_cache *share_cache,
struct mr_cache_entry *entry, uintptr_t addr);
struct mlx5_mr *
-mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int socket_id);
+mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int numa_id);
void mlx5_mr_free(struct mlx5_mr *mr);
__rte_internal
uint32_t
diff --git a/drivers/common/mlx5/mlx5_common_utils.c b/drivers/common/mlx5/mlx5_common_utils.c
index 14056cebcb..d6989cbaec 100644
--- a/drivers/common/mlx5/mlx5_common_utils.c
+++ b/drivers/common/mlx5/mlx5_common_utils.c
@@ -46,7 +46,7 @@ mlx5_list_create(const char *name, void *ctx, bool lcores_share,
}
list = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*list) + (lcores_share ? sizeof(*gc) : 0),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!list)
return NULL;
@@ -183,7 +183,7 @@ _mlx5_list_register(struct mlx5_list_inconst *l_inconst,
if (unlikely(!l_inconst->cache[lcore_index])) {
l_inconst->cache[lcore_index] = mlx5_malloc(0,
sizeof(struct mlx5_list_cache),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!l_inconst->cache[lcore_index]) {
rte_errno = ENOMEM;
return NULL;
@@ -423,7 +423,7 @@ mlx5_hlist_create(const char *name, uint32_t size, bool direct_key,
alloc_size += sizeof(struct mlx5_list_cache) * act_size;
/* Using zmalloc, then no need to initialize the heads. */
h = mlx5_malloc(MLX5_MEM_ZERO, alloc_size, RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!h) {
DRV_LOG(ERR, "No memory for hash list %s creation",
name ? name : "None");
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c
index e5d9c92779..f7ab1f3f1d 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -185,7 +185,7 @@ mlx5_devx_cmd_flow_counter_alloc_general(void *ctx,
struct mlx5_devx_counter_attr *attr)
{
struct mlx5_devx_obj *dcs = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*dcs),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
uint32_t in[MLX5_ST_SZ_DW(alloc_flow_counter_in)] = {0};
uint32_t out[MLX5_ST_SZ_DW(alloc_flow_counter_out)] = {0};
@@ -234,7 +234,7 @@ struct mlx5_devx_obj *
mlx5_devx_cmd_flow_counter_alloc(void *ctx, uint32_t bulk_n_128)
{
struct mlx5_devx_obj *dcs = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*dcs),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
uint32_t in[MLX5_ST_SZ_DW(alloc_flow_counter_in)] = {0};
uint32_t out[MLX5_ST_SZ_DW(alloc_flow_counter_out)] = {0};
@@ -379,7 +379,7 @@ mlx5_devx_cmd_mkey_create(void *ctx,
uint32_t out[MLX5_ST_SZ_DW(create_mkey_out)] = {0};
void *mkc;
struct mlx5_devx_obj *mkey = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*mkey),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
size_t pgsize;
uint32_t translation_size;
@@ -795,7 +795,7 @@ mlx5_devx_cmd_create_flex_parser(void *ctx,
void *in_arc = MLX5_ADDR_OF(parse_graph_flex, flex, input_arc);
void *out_arc = MLX5_ADDR_OF(parse_graph_flex, flex, output_arc);
struct mlx5_devx_obj *parse_flex_obj = mlx5_malloc
- (MLX5_MEM_ZERO, sizeof(*parse_flex_obj), 0, SOCKET_ID_ANY);
+ (MLX5_MEM_ZERO, sizeof(*parse_flex_obj), 0, RTE_NUMA_ID_ANY);
uint32_t i;
if (!parse_flex_obj) {
@@ -1830,7 +1830,7 @@ mlx5_devx_cmd_create_tir(void *ctx,
void *tir_ctx, *outer, *inner, *rss_key;
struct mlx5_devx_obj *tir = NULL;
- tir = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*tir), 0, SOCKET_ID_ANY);
+ tir = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*tir), 0, RTE_NUMA_ID_ANY);
if (!tir) {
DRV_LOG(ERR, "Failed to allocate TIR data");
rte_errno = ENOMEM;
@@ -1987,13 +1987,13 @@ mlx5_devx_cmd_create_rqt(void *ctx,
struct mlx5_devx_obj *rqt = NULL;
unsigned int i;
- in = mlx5_malloc(MLX5_MEM_ZERO, inlen, 0, SOCKET_ID_ANY);
+ in = mlx5_malloc(MLX5_MEM_ZERO, inlen, 0, RTE_NUMA_ID_ANY);
if (!in) {
DRV_LOG(ERR, "Failed to allocate RQT IN data");
rte_errno = ENOMEM;
return NULL;
}
- rqt = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rqt), 0, SOCKET_ID_ANY);
+ rqt = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rqt), 0, RTE_NUMA_ID_ANY);
if (!rqt) {
DRV_LOG(ERR, "Failed to allocate RQT data");
rte_errno = ENOMEM;
@@ -2037,7 +2037,7 @@ mlx5_devx_cmd_modify_rqt(struct mlx5_devx_obj *rqt,
uint32_t inlen = MLX5_ST_SZ_BYTES(modify_rqt_in) +
rqt_attr->rqt_actual_size * sizeof(uint32_t);
uint32_t out[MLX5_ST_SZ_DW(modify_rqt_out)] = {0};
- uint32_t *in = mlx5_malloc(MLX5_MEM_ZERO, inlen, 0, SOCKET_ID_ANY);
+ uint32_t *in = mlx5_malloc(MLX5_MEM_ZERO, inlen, 0, RTE_NUMA_ID_ANY);
void *rqt_ctx;
unsigned int i;
int ret;
@@ -2090,7 +2090,7 @@ mlx5_devx_cmd_create_sq(void *ctx,
struct mlx5_devx_wq_attr *wq_attr;
struct mlx5_devx_obj *sq = NULL;
- sq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*sq), 0, SOCKET_ID_ANY);
+ sq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*sq), 0, RTE_NUMA_ID_ANY);
if (!sq) {
DRV_LOG(ERR, "Failed to allocate SQ data");
rte_errno = ENOMEM;
@@ -2230,7 +2230,7 @@ mlx5_devx_cmd_create_tis(void *ctx,
struct mlx5_devx_obj *tis = NULL;
void *tis_ctx;
- tis = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*tis), 0, SOCKET_ID_ANY);
+ tis = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*tis), 0, RTE_NUMA_ID_ANY);
if (!tis) {
DRV_LOG(ERR, "Failed to allocate TIS object");
rte_errno = ENOMEM;
@@ -2272,7 +2272,7 @@ mlx5_devx_cmd_create_td(void *ctx)
uint32_t out[MLX5_ST_SZ_DW(alloc_transport_domain_out)] = {0};
struct mlx5_devx_obj *td = NULL;
- td = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*td), 0, SOCKET_ID_ANY);
+ td = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*td), 0, RTE_NUMA_ID_ANY);
if (!td) {
DRV_LOG(ERR, "Failed to allocate TD object");
rte_errno = ENOMEM;
@@ -2367,7 +2367,7 @@ mlx5_devx_cmd_create_cq(void *ctx, struct mlx5_devx_cq_attr *attr)
uint32_t out[MLX5_ST_SZ_DW(create_cq_out)] = {0};
struct mlx5_devx_obj *cq_obj = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*cq_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
void *cqctx = MLX5_ADDR_OF(create_cq_in, in, cq_context);
if (!cq_obj) {
@@ -2465,7 +2465,7 @@ mlx5_devx_cmd_create_virtq(void *ctx,
uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0};
struct mlx5_devx_obj *virtq_obj = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*virtq_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
void *virtq = MLX5_ADDR_OF(create_virtq_in, in, virtq);
void *hdr = MLX5_ADDR_OF(create_virtq_in, in, hdr);
void *virtctx = MLX5_ADDR_OF(virtio_net_q, virtq, virtio_q_context);
@@ -2684,7 +2684,7 @@ mlx5_devx_cmd_create_qp(void *ctx,
uint32_t out[MLX5_ST_SZ_DW(create_qp_out)] = {0};
struct mlx5_devx_obj *qp_obj = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*qp_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
void *qpc = MLX5_ADDR_OF(create_qp_in, in, qpc);
if (!qp_obj) {
@@ -2864,7 +2864,7 @@ mlx5_devx_cmd_create_virtio_q_counters(void *ctx)
uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0};
struct mlx5_devx_obj *couners_obj = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*couners_obj), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
void *hdr = MLX5_ADDR_OF(create_virtio_q_counters_in, in, hdr);
if (!couners_obj) {
@@ -2948,7 +2948,7 @@ mlx5_devx_cmd_create_flow_hit_aso_obj(void *ctx, uint32_t pd)
void *ptr = NULL;
flow_hit_aso_obj = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*flow_hit_aso_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!flow_hit_aso_obj) {
DRV_LOG(ERR, "Failed to allocate FLOW_HIT_ASO object data");
rte_errno = ENOMEM;
@@ -2986,7 +2986,7 @@ struct mlx5_devx_obj *
mlx5_devx_cmd_alloc_pd(void *ctx)
{
struct mlx5_devx_obj *ppd =
- mlx5_malloc(MLX5_MEM_ZERO, sizeof(*ppd), 0, SOCKET_ID_ANY);
+ mlx5_malloc(MLX5_MEM_ZERO, sizeof(*ppd), 0, RTE_NUMA_ID_ANY);
u32 in[MLX5_ST_SZ_DW(alloc_pd_in)] = {0};
u32 out[MLX5_ST_SZ_DW(alloc_pd_out)] = {0};
@@ -3034,7 +3034,7 @@ mlx5_devx_cmd_create_flow_meter_aso_obj(void *ctx, uint32_t pd,
flow_meter_aso_obj = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*flow_meter_aso_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!flow_meter_aso_obj) {
DRV_LOG(ERR, "Failed to allocate FLOW_METER_ASO object data");
rte_errno = ENOMEM;
@@ -3087,7 +3087,7 @@ mlx5_devx_cmd_create_conn_track_offload_obj(void *ctx, uint32_t pd,
void *ptr;
ct_aso_obj = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*ct_aso_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!ct_aso_obj) {
DRV_LOG(ERR, "Failed to allocate CONN_TRACK_OFFLOAD object.");
rte_errno = ENOMEM;
@@ -3132,7 +3132,7 @@ mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0};
struct mlx5_devx_obj *geneve_tlv_opt_obj = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*geneve_tlv_opt_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!geneve_tlv_opt_obj) {
DRV_LOG(ERR, "Failed to allocate GENEVE TLV option object.");
@@ -3271,7 +3271,7 @@ mlx5_devx_cmd_queue_counter_alloc(void *ctx, int *syndrome)
{
int status;
struct mlx5_devx_obj *dcs = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*dcs), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
uint32_t in[MLX5_ST_SZ_DW(alloc_q_counter_in)] = {0};
uint32_t out[MLX5_ST_SZ_DW(alloc_q_counter_out)] = {0};
@@ -3353,7 +3353,7 @@ mlx5_devx_cmd_create_dek_obj(void *ctx, struct mlx5_devx_dek_attr *attr)
void *ptr = NULL, *key_addr = NULL;
dek_obj = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*dek_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (dek_obj == NULL) {
DRV_LOG(ERR, "Failed to allocate DEK object data");
rte_errno = ENOMEM;
@@ -3405,7 +3405,7 @@ mlx5_devx_cmd_create_import_kek_obj(void *ctx,
void *ptr = NULL, *key_addr = NULL;
import_kek_obj = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*import_kek_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (import_kek_obj == NULL) {
DRV_LOG(ERR, "Failed to allocate IMPORT_KEK object data");
rte_errno = ENOMEM;
@@ -3453,7 +3453,7 @@ mlx5_devx_cmd_create_credential_obj(void *ctx,
void *ptr = NULL, *credential_addr = NULL;
credential_obj = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*credential_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (credential_obj == NULL) {
DRV_LOG(ERR, "Failed to allocate CREDENTIAL object data");
rte_errno = ENOMEM;
@@ -3502,7 +3502,7 @@ mlx5_devx_cmd_create_crypto_login_obj(void *ctx,
void *ptr = NULL, *credential_addr = NULL;
crypto_login_obj = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*crypto_login_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (crypto_login_obj == NULL) {
DRV_LOG(ERR, "Failed to allocate CRYPTO_LOGIN object data");
rte_errno = ENOMEM;
diff --git a/drivers/common/mlx5/mlx5_malloc.c b/drivers/common/mlx5/mlx5_malloc.c
index 86e2b8881e..3538542221 100644
--- a/drivers/common/mlx5/mlx5_malloc.c
+++ b/drivers/common/mlx5/mlx5_malloc.c
@@ -165,8 +165,8 @@ mlx5_alloc_align(size_t size, unsigned int align, unsigned int zero)
static void *
mlx5_malloc_socket_internal(size_t size, unsigned int align, int socket, bool zero)
{
- return zero ? rte_zmalloc_socket(NULL, size, align, socket) :
- rte_malloc_socket(NULL, size, align, socket);
+ return zero ? rte_zmalloc_numa(NULL, size, align, socket) :
+ rte_malloc_numa(NULL, size, align, socket);
}
RTE_EXPORT_INTERNAL_SYMBOL(mlx5_malloc)
@@ -188,9 +188,9 @@ mlx5_malloc(uint32_t flags, size_t size, unsigned int align, int socket)
rte_mem = mlx5_sys_mem.enable ? false : true;
if (rte_mem) {
addr = mlx5_malloc_socket_internal(size, align, socket, !!(flags & MLX5_MEM_ZERO));
- if (addr == NULL && socket != SOCKET_ID_ANY && (flags & MLX5_NUMA_TOLERANT)) {
+ if (addr == NULL && socket != RTE_NUMA_ID_ANY && (flags & MLX5_NUMA_TOLERANT)) {
size_t alloc_size = size;
- addr = mlx5_malloc_socket_internal(size, align, SOCKET_ID_ANY,
+ addr = mlx5_malloc_socket_internal(size, align, RTE_NUMA_ID_ANY,
!!(flags & MLX5_MEM_ZERO));
if (addr) {
DRV_LOG(WARNING, "Allocated %p (size %zu socket %d) through NUMA tolerant fallback",
@@ -245,7 +245,7 @@ mlx5_realloc(void *addr, uint32_t flags, size_t size, unsigned int align,
}
/* Allocate memory from rte memory. */
if (rte_mem) {
- new_addr = rte_realloc_socket(addr, size, align, socket);
+ new_addr = rte_realloc_numa(addr, size, align, socket);
mlx5_mem_update_msl(new_addr);
#ifdef RTE_PMD_MLX5_DEBUG
if (new_addr)
diff --git a/drivers/common/mlx5/mlx5_malloc.h b/drivers/common/mlx5/mlx5_malloc.h
index 46ea5bc8f0..705396ef4d 100644
--- a/drivers/common/mlx5/mlx5_malloc.h
+++ b/drivers/common/mlx5/mlx5_malloc.h
@@ -106,9 +106,9 @@ void mlx5_free(void *addr);
#if defined(RTE_TOOLCHAIN_GCC) || defined(RTE_TOOLCHAIN_CLANG)
#define mlx5_malloc_numa_tolerant(flags, size, align, socket) (__extension__ ({ \
void *mem = mlx5_malloc((uint32_t)(flags), (size_t)(size), (align), (socket)); \
- if ((mem == NULL) && ((int)(socket) != SOCKET_ID_ANY)) { \
+ if ((mem == NULL) && ((int)(socket) != RTE_NUMA_ID_ANY)) { \
mem = mlx5_malloc((uint32_t)(flags), (size_t)(size), \
- (align), SOCKET_ID_ANY); \
+ (align), RTE_NUMA_ID_ANY); \
if (mem) { \
DRV_LOG(WARNING, \
"Allocated %p (size %zu socket %d) through NUMA tolerant fallback", \
diff --git a/drivers/common/mlx5/windows/mlx5_common_os.c b/drivers/common/mlx5/windows/mlx5_common_os.c
index bdafb95df9..9ffc80e0f5 100644
--- a/drivers/common/mlx5/windows/mlx5_common_os.c
+++ b/drivers/common/mlx5/windows/mlx5_common_os.c
@@ -84,7 +84,7 @@ mlx5_os_pd_prepare(struct mlx5_common_device *cdev)
{
struct mlx5_pd *pd;
- pd = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*pd), 0, SOCKET_ID_ANY);
+ pd = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*pd), 0, RTE_NUMA_ID_ANY);
if (!pd)
return -1;
struct mlx5_devx_obj *obj = mlx5_devx_cmd_alloc_pd(cdev->ctx);
@@ -321,7 +321,7 @@ mlx5_os_umem_reg(void *ctx, void *addr, size_t size, uint32_t access)
struct mlx5_devx_umem *umem;
umem = mlx5_malloc(MLX5_MEM_ZERO,
- (sizeof(*umem)), 0, SOCKET_ID_ANY);
+ (sizeof(*umem)), 0, RTE_NUMA_ID_ANY);
if (!umem) {
errno = ENOMEM;
return NULL;
diff --git a/drivers/net/mlx5/hws/mlx5dr_internal.h b/drivers/net/mlx5/hws/mlx5dr_internal.h
index 3c27206043..a75f38a4ab 100644
--- a/drivers/net/mlx5/hws/mlx5dr_internal.h
+++ b/drivers/net/mlx5/hws/mlx5dr_internal.h
@@ -74,7 +74,7 @@ static inline void *simple_malloc(size_t size)
return mlx5_malloc(MLX5_MEM_SYS,
size,
MLX5_MALLOC_ALIGNMENT,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
}
static inline void *simple_calloc(size_t nmemb, size_t size)
@@ -82,7 +82,7 @@ static inline void *simple_calloc(size_t nmemb, size_t size)
return mlx5_malloc(MLX5_MEM_SYS | MLX5_MEM_ZERO,
nmemb * size,
MLX5_MALLOC_ALIGNMENT,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
}
static inline void simple_free(void *addr)
diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
index f6394ebd19..0536432af1 100644
--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c
+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
@@ -1305,7 +1305,7 @@ int mlx5_get_module_eeprom(struct rte_eth_dev *dev,
}
eeprom = mlx5_malloc(MLX5_MEM_ZERO,
(sizeof(struct ethtool_eeprom) + info->length), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!eeprom) {
DRV_LOG(WARNING, "port %u cannot allocate memory for "
"eeprom data", dev->data->port_id);
@@ -1879,7 +1879,7 @@ mlx5_os_stats_init(struct rte_eth_dev *dev)
str_sz = max_stats_n * ETH_GSTRING_LEN;
strings = (struct ethtool_gstrings *)
mlx5_malloc(0, str_sz + sizeof(struct ethtool_gstrings), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!strings) {
DRV_LOG(WARNING, "port %u unable to allocate memory for xstats",
dev->data->port_id);
@@ -1954,7 +1954,7 @@ int mlx5_get_flag_dropless_rq(struct rte_eth_dev *dev)
int ret;
sset_info = mlx5_malloc(0, sizeof(struct ethtool_sset_info) +
- sizeof(uint32_t), 0, SOCKET_ID_ANY);
+ sizeof(uint32_t), 0, RTE_NUMA_ID_ANY);
if (sset_info == NULL) {
rte_errno = ENOMEM;
return -rte_errno;
@@ -1998,7 +1998,7 @@ int mlx5_get_flag_dropless_rq(struct rte_eth_dev *dev)
str_sz = ETH_GSTRING_LEN * len;
strings = (struct ethtool_gstrings *)
mlx5_malloc(0, str_sz + sizeof(struct ethtool_gstrings), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!strings) {
DRV_LOG(WARNING, "port %u unable to allocate memory for"
" private flags", dev->data->port_id);
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 4c35737292..351314401d 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -903,7 +903,7 @@ mlx5_init_shared_data(void)
/* Allocate shared memory. */
mz = rte_memzone_reserve(MZ_MLX5_PMD_SHARED_DATA,
sizeof(*mlx5_shared_data),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mz == NULL) {
DRV_LOG(ERR,
"Cannot allocate mlx5 shared data");
@@ -1440,7 +1440,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
/* Allocate private eth device data. */
priv = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(*priv),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (priv == NULL) {
DRV_LOG(ERR, "priv allocation failure");
err = ENOMEM;
@@ -1451,7 +1451,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
priv->pci_dev = spawn->pci_dev;
priv->mac = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(*priv->mac) * sh->dev_cap.max_mac_addrs,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (priv->mac == NULL) {
DRV_LOG(ERR, "Failed to allocate MAC address array.");
err = ENOMEM;
@@ -1459,7 +1459,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
}
priv->mac_own = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
RTE_BITSET_SIZE(sh->dev_cap.max_mac_addrs),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (priv->mac_own == NULL) {
DRV_LOG(ERR, "Failed to allocate MAC ownership bitmap.");
err = ENOMEM;
@@ -1821,7 +1821,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
priv->ext_rxqs = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(struct mlx5_external_q) *
MLX5_MAX_EXT_RX_QUEUES, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (priv->ext_rxqs == NULL) {
DRV_LOG(ERR, "Fail to allocate external RxQ array.");
err = ENOMEM;
@@ -1830,7 +1830,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
priv->ext_txqs = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(struct mlx5_external_q) *
MLX5_MAX_EXT_TX_QUEUES, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (priv->ext_txqs == NULL) {
DRV_LOG(ERR, "Fail to allocate external TxQ array.");
err = ENOMEM;
@@ -2684,7 +2684,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
/* Now we can determine the maximal amount of devices to be spawned. */
list = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_dev_spawn_data) * (np ? np : nd),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!list) {
DRV_LOG(ERR, "Spawn data array allocation failure.");
rte_errno = ENOMEM;
diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c
index ce0a26c62b..08bd1f640a 100644
--- a/drivers/net/mlx5/linux/mlx5_verbs.c
+++ b/drivers/net/mlx5/linux/mlx5_verbs.c
@@ -697,7 +697,7 @@ mlx5_rxq_ibv_obj_drop_create(struct rte_eth_dev *dev)
if (rxq != NULL)
return 0;
- rxq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rxq), 0, SOCKET_ID_ANY);
+ rxq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rxq), 0, RTE_NUMA_ID_ANY);
if (rxq == NULL) {
DRV_LOG(DEBUG, "Port %u cannot allocate drop Rx queue memory.",
dev->data->port_id);
@@ -706,7 +706,7 @@ mlx5_rxq_ibv_obj_drop_create(struct rte_eth_dev *dev)
}
priv->drop_queue.rxq = rxq;
rxq_ctrl = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rxq_ctrl), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (rxq_ctrl == NULL) {
DRV_LOG(DEBUG, "Port %u cannot allocate drop Rx queue control memory.",
dev->data->port_id);
@@ -715,7 +715,7 @@ mlx5_rxq_ibv_obj_drop_create(struct rte_eth_dev *dev)
}
rxq->ctrl = rxq_ctrl;
rxq_obj = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rxq_obj), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (rxq_obj == NULL) {
DRV_LOG(DEBUG, "Port %u cannot allocate drop Rx queue memory.",
dev->data->port_id);
diff --git a/drivers/net/mlx5/linux/mlx5_vlan_os.c b/drivers/net/mlx5/linux/mlx5_vlan_os.c
index 353484de3f..c04671f453 100644
--- a/drivers/net/mlx5/linux/mlx5_vlan_os.c
+++ b/drivers/net/mlx5/linux/mlx5_vlan_os.c
@@ -127,7 +127,7 @@ mlx5_vlan_vmwa_init(struct rte_eth_dev *dev, uint32_t ifindex)
return NULL;
}
vmwa = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*vmwa), sizeof(uint32_t),
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!vmwa) {
DRV_LOG(WARNING,
"Can not allocate memory"
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index e2dbd2977b..91d4bc6a58 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -462,7 +462,7 @@ mlx5_flow_aso_age_mng_init(struct mlx5_dev_ctx_shared *sh)
if (sh->aso_age_mng)
return 0;
sh->aso_age_mng = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*sh->aso_age_mng),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!sh->aso_age_mng) {
DRV_LOG(ERR, "aso_age_mng allocation was failed.");
rte_errno = ENOMEM;
@@ -600,7 +600,7 @@ mlx5_flow_counters_mng_init(struct mlx5_dev_ctx_shared *sh)
pools = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_flow_counter_pool *) *
MLX5_COUNTER_POOLS_MAX_NUM,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!pools) {
DRV_LOG(ERR,
"Counter management allocation was failed.");
@@ -724,7 +724,7 @@ mlx5_aso_flow_mtrs_mng_init(struct mlx5_dev_ctx_shared *sh)
if (!sh->mtrmng) {
sh->mtrmng = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*sh->mtrmng),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!sh->mtrmng) {
DRV_LOG(ERR,
"meter management allocation was failed.");
@@ -827,7 +827,7 @@ mlx5_flow_aso_ct_mng_init(struct mlx5_dev_ctx_shared *sh)
return 0;
sh->ct_mng = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*sh->ct_mng) +
sizeof(struct mlx5_aso_sq) * MLX5_ASO_CT_SQ_NUM,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!sh->ct_mng) {
DRV_LOG(ERR, "ASO CT management allocation failed.");
rte_errno = ENOMEM;
@@ -1094,7 +1094,7 @@ mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev)
rte_memory_order_relaxed) > 0)
goto end;
priv->sh->srh_flex_parser.flex.devx_fp = mlx5_malloc(MLX5_MEM_ZERO,
- sizeof(struct mlx5_flex_parser_devx), 0, SOCKET_ID_ANY);
+ sizeof(struct mlx5_flex_parser_devx), 0, RTE_NUMA_ID_ANY);
if (!priv->sh->srh_flex_parser.flex.devx_fp) {
rte_errno = ENOMEM;
goto error;
@@ -1781,7 +1781,7 @@ mlx5_get_physical_device(struct mlx5_common_device *cdev)
}
phdev = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(struct mlx5_physical_device),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!phdev) {
DRV_LOG(ERR, "Physical device allocation failure.");
rte_errno = ENOMEM;
@@ -1889,7 +1889,7 @@ mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data *spawn,
sh = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(struct mlx5_dev_ctx_shared) +
spawn->max_port * sizeof(struct mlx5_dev_shared_port),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!sh) {
DRV_LOG(ERR, "Shared context allocation failure.");
rte_errno = ENOMEM;
@@ -3158,7 +3158,7 @@ mlx5_probe_again_args_validate(struct mlx5_common_device *cdev,
return 0;
config = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(struct mlx5_sh_config),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (config == NULL) {
rte_errno = -ENOMEM;
return -rte_errno;
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index ef8f057cf9..aa4783beda 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -742,7 +742,7 @@ mlx5_devx_ind_table_create_rqt_attr(struct rte_eth_dev *dev,
unsigned int i, j;
rqt_attr = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rqt_attr) +
- rqt_n * sizeof(uint32_t), 0, SOCKET_ID_ANY);
+ rqt_n * sizeof(uint32_t), 0, RTE_NUMA_ID_ANY);
if (!rqt_attr) {
DRV_LOG(ERR, "Port %u cannot allocate RQT resources.",
dev->data->port_id);
@@ -1108,7 +1108,7 @@ static int
mlx5_rxq_devx_obj_drop_create(struct rte_eth_dev *dev)
{
struct mlx5_priv *priv = dev->data->dev_private;
- int socket_id = dev->device->numa_node;
+ int numa_id = dev->device->numa_node;
struct mlx5_rxq_priv *rxq;
struct mlx5_rxq_ctrl *rxq_ctrl = NULL;
struct mlx5_rxq_obj *rxq_obj = NULL;
@@ -1119,7 +1119,7 @@ mlx5_rxq_devx_obj_drop_create(struct rte_eth_dev *dev)
* They are required to hold pointers for cleanup
* and are only accessible via drop queue DevX objects.
*/
- rxq = mlx5_malloc_numa_tolerant(MLX5_MEM_ZERO, sizeof(*rxq), 0, socket_id);
+ rxq = mlx5_malloc_numa_tolerant(MLX5_MEM_ZERO, sizeof(*rxq), 0, numa_id);
if (rxq == NULL) {
DRV_LOG(ERR, "Port %u could not allocate drop queue private",
dev->data->port_id);
@@ -1127,14 +1127,14 @@ mlx5_rxq_devx_obj_drop_create(struct rte_eth_dev *dev)
goto error;
}
rxq_ctrl = mlx5_malloc_numa_tolerant(MLX5_MEM_ZERO, sizeof(*rxq_ctrl),
- 0, socket_id);
+ 0, numa_id);
if (rxq_ctrl == NULL) {
DRV_LOG(ERR, "Port %u could not allocate drop queue control",
dev->data->port_id);
rte_errno = ENOMEM;
goto error;
}
- rxq_obj = mlx5_malloc_numa_tolerant(MLX5_MEM_ZERO, sizeof(*rxq_obj), 0, socket_id);
+ rxq_obj = mlx5_malloc_numa_tolerant(MLX5_MEM_ZERO, sizeof(*rxq_obj), 0, numa_id);
if (rxq_obj == NULL) {
DRV_LOG(ERR, "Port %u could not allocate drop queue object",
dev->data->port_id);
@@ -1142,7 +1142,7 @@ mlx5_rxq_devx_obj_drop_create(struct rte_eth_dev *dev)
goto error;
}
/* set the CPU socket ID where the rxq_ctrl was allocated */
- rxq_ctrl->socket = socket_id;
+ rxq_ctrl->socket = numa_id;
rxq_obj->rxq_ctrl = rxq_ctrl;
rxq_ctrl->is_hairpin = false;
rxq_ctrl->sh = priv->sh;
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 26ee58d164..2533b52619 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -85,7 +85,7 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
priv->rss_conf.rss_key = mlx5_realloc(priv->rss_conf.rss_key,
MLX5_MEM_RTE,
MLX5_RSS_HASH_KEY_LEN, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!priv->rss_conf.rss_key) {
DRV_LOG(ERR, "port %u cannot allocate RSS hash key memory (%u)",
dev->data->port_id, rxqs_n);
@@ -110,7 +110,7 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
priv->rxq_privs = mlx5_realloc(priv->rxq_privs,
MLX5_MEM_RTE | MLX5_MEM_ZERO,
sizeof(void *) * rxqs_n, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (rxqs_n && priv->rxq_privs == NULL) {
DRV_LOG(ERR, "port %u cannot allocate rxq private data",
dev->data->port_id);
@@ -187,7 +187,7 @@ mlx5_dev_configure_rss_reta(struct rte_eth_dev *dev)
if (priv->skip_default_rss_reta)
return ret;
rss_queue_arr = mlx5_malloc(0, rxqs_n * sizeof(unsigned int), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!rss_queue_arr) {
DRV_LOG(ERR, "port %u cannot allocate RSS queue list (%u)",
dev->data->port_id, rxqs_n);
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index bba466562c..3a567d7301 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -8558,7 +8558,7 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
queue[i] = (*priv->reta_idx)[i];
entry = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*entry), alignof(typeof(*entry)),
- RTE_NUMA_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (entry == NULL) {
rte_errno = ENOMEM;
goto err;
diff --git a/drivers/net/mlx5/mlx5_flow_aso.c b/drivers/net/mlx5/mlx5_flow_aso.c
index caaa319d10..47e64ad39c 100644
--- a/drivers/net/mlx5/mlx5_flow_aso.c
+++ b/drivers/net/mlx5/mlx5_flow_aso.c
@@ -52,7 +52,7 @@ mlx5_aso_reg_mr(struct mlx5_common_device *cdev, size_t length,
int ret;
mr->addr = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO, length, 4096,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!mr->addr) {
DRV_LOG(ERR, "Failed to create ASO bits mem for MR.");
return -1;
@@ -241,7 +241,7 @@ mlx5_aso_sq_create(struct mlx5_common_device *cdev, struct mlx5_aso_sq *sq,
if (mlx5_devx_cq_create(cdev->ctx, &sq->cq.cq_obj,
log_desc_n, &cq_attr,
- SOCKET_ID_ANY))
+ RTE_NUMA_ID_ANY))
goto error;
sq->cq.cq_ci = 0;
sq->cq.log_desc_n = log_desc_n;
@@ -250,7 +250,7 @@ mlx5_aso_sq_create(struct mlx5_common_device *cdev, struct mlx5_aso_sq *sq,
/* for mlx5_aso_wqe that is twice the size of mlx5_wqe */
log_wqbb_n = sq->log_desc_n + 1;
ret = mlx5_devx_sq_create(cdev->ctx, &sq->sq_obj, log_wqbb_n, &sq_attr,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (ret) {
DRV_LOG(ERR, "Can't create SQ object.");
rte_errno = ENOMEM;
@@ -303,7 +303,7 @@ mlx5_aso_mtr_queue_init(struct mlx5_dev_ctx_shared *sh,
if (hws_pool) {
sq = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_aso_sq) * nb_queues,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!sq)
return -1;
hws_pool->sq = sq;
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 9cb7c59b83..48d36de6ab 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -6863,7 +6863,7 @@ flow_dv_pool_create(struct rte_eth_dev *dev, struct mlx5_devx_obj *dcs,
}
size += MLX5_COUNTERS_PER_POOL * MLX5_CNT_SIZE;
size += (!age ? 0 : MLX5_COUNTERS_PER_POOL * MLX5_AGE_SIZE);
- pool = mlx5_malloc(MLX5_MEM_ZERO, size, 0, SOCKET_ID_ANY);
+ pool = mlx5_malloc(MLX5_MEM_ZERO, size, 0, RTE_NUMA_ID_ANY);
if (!pool) {
rte_errno = ENOMEM;
return NULL;
@@ -7195,7 +7195,7 @@ flow_dv_mtr_container_resize(struct rte_eth_dev *dev)
void *old_pools = pools_mng->pools;
uint32_t resize = pools_mng->n + MLX5_MTRS_CONTAINER_RESIZE;
uint32_t mem_size = sizeof(struct mlx5_aso_mtr_pool *) * resize;
- void *pools = mlx5_malloc(MLX5_MEM_ZERO, mem_size, 0, SOCKET_ID_ANY);
+ void *pools = mlx5_malloc(MLX5_MEM_ZERO, mem_size, 0, RTE_NUMA_ID_ANY);
if (!pools) {
rte_errno = ENOMEM;
@@ -7246,7 +7246,7 @@ flow_dv_mtr_pool_create(struct rte_eth_dev *dev, struct mlx5_aso_mtr **mtr_free)
rte_errno = ENODATA;
return NULL;
}
- pool = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*pool), 0, SOCKET_ID_ANY);
+ pool = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*pool), 0, RTE_NUMA_ID_ANY);
if (!pool) {
rte_errno = ENOMEM;
claim_zero(mlx5_devx_cmd_destroy(dcs));
@@ -10398,7 +10398,7 @@ flow_dev_geneve_tlv_option_resource_register(struct rte_eth_dev *dev,
sh->geneve_tlv_option_resource =
mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*geneve_opt_resource),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!sh->geneve_tlv_option_resource) {
claim_zero(mlx5_devx_cmd_destroy(obj));
ret = rte_flow_error_set(error, ENOMEM,
@@ -11782,7 +11782,7 @@ mlx5_flow_matcher_clone_cb(void *tool_ctx __rte_unused,
typeof(*tbl), tbl);
struct mlx5_flow_dv_matcher *resource = mlx5_malloc(MLX5_MEM_ANY,
sizeof(*resource),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!resource) {
rte_flow_error_set(ctx->error, ENOMEM,
@@ -12111,7 +12111,7 @@ mlx5_flow_matcher_create_cb(void *tool_ctx, void *cb_ctx)
int ret;
resource = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*resource), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!resource) {
rte_flow_error_set(ctx->error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
@@ -12993,7 +12993,7 @@ mlx5_flow_dv_dest_array_create_cb(void *tool_ctx __rte_unused, void *cb_ctx)
dest_attr[idx] = (struct mlx5dv_dr_action_dest_attr *)
mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5dv_dr_action_dest_attr),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!dest_attr[idx]) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -13641,7 +13641,7 @@ flow_dv_aso_age_pools_resize(struct rte_eth_dev *dev)
void *old_pools = mng->pools;
uint32_t resize = mng->n + MLX5_ASO_AGE_CONTAINER_RESIZE;
uint32_t mem_size = sizeof(struct mlx5_aso_age_pool *) * resize;
- void *pools = mlx5_malloc(MLX5_MEM_ZERO, mem_size, 0, SOCKET_ID_ANY);
+ void *pools = mlx5_malloc(MLX5_MEM_ZERO, mem_size, 0, RTE_NUMA_ID_ANY);
if (!pools) {
rte_errno = ENOMEM;
@@ -13694,7 +13694,7 @@ flow_dv_age_pool_create(struct rte_eth_dev *dev,
DRV_LOG(ERR, "Failed to create flow_hit_aso_obj using DevX.");
return NULL;
}
- pool = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*pool), 0, SOCKET_ID_ANY);
+ pool = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*pool), 0, RTE_NUMA_ID_ANY);
if (!pool) {
claim_zero(mlx5_devx_cmd_destroy(obj));
rte_errno = ENOMEM;
@@ -14076,7 +14076,7 @@ flow_dv_aso_ct_pools_resize(struct rte_eth_dev *dev)
/* Magic number now, need a macro. */
uint32_t resize = mng->n + 64;
uint32_t mem_size = sizeof(struct mlx5_aso_ct_pool *) * resize;
- void *pools = mlx5_malloc(MLX5_MEM_ZERO, mem_size, 0, SOCKET_ID_ANY);
+ void *pools = mlx5_malloc(MLX5_MEM_ZERO, mem_size, 0, RTE_NUMA_ID_ANY);
if (!pools) {
rte_errno = ENOMEM;
@@ -14131,7 +14131,7 @@ flow_dv_ct_pool_create(struct rte_eth_dev *dev,
mem_size = sizeof(struct mlx5_aso_ct_action) *
MLX5_ASO_CT_ACTIONS_PER_POOL +
sizeof(*pool);
- pool = mlx5_malloc(MLX5_MEM_ZERO, mem_size, 0, SOCKET_ID_ANY);
+ pool = mlx5_malloc(MLX5_MEM_ZERO, mem_size, 0, RTE_NUMA_ID_ANY);
if (!pool) {
rte_errno = ENOMEM;
claim_zero(mlx5_devx_cmd_destroy(obj));
@@ -17347,7 +17347,7 @@ __flow_dv_action_rss_update(struct rte_eth_dev *dev, uint32_t idx,
"cannot modify indirection table");
queue = mlx5_malloc(MLX5_MEM_ZERO,
RTE_ALIGN_CEIL(queue_size, sizeof(void *)),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!queue)
return rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -17885,7 +17885,7 @@ __flow_dv_create_domain_policy_acts(struct rte_eth_dev *dev,
NULL, "Get the wrong "
"rss action struct size");
act_cnt->rss = mlx5_malloc(MLX5_MEM_ZERO,
- rss_size, 0, SOCKET_ID_ANY);
+ rss_size, 0, RTE_NUMA_ID_ANY);
if (!act_cnt->rss)
return -rte_mtr_error_set(error,
ENOTSUP,
@@ -18631,7 +18631,7 @@ __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev,
continue;
color_rule = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_sub_policy_color_rule),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!color_rule) {
DRV_LOG(ERR, "No memory to create color rule.");
goto err_exit;
@@ -18913,7 +18913,7 @@ __flow_dv_create_domain_def_policy(struct rte_eth_dev *dev, uint32_t domain)
if (!def_policy) {
def_policy = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_flow_meter_def_policy),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!def_policy) {
DRV_LOG(ERR, "Failed to alloc default policy table.");
goto def_policy_error;
@@ -19591,7 +19591,7 @@ flow_dv_meter_hierarchy_rule_create(struct rte_eth_dev *dev,
}
color_rule = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_sub_policy_color_rule),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!color_rule) {
rte_spinlock_unlock(&mtr_policy->sl);
rte_flow_error_set(error, ENOMEM,
diff --git a/drivers/net/mlx5/mlx5_flow_flex.c b/drivers/net/mlx5/mlx5_flow_flex.c
index baa5ddd977..7bac78a7a4 100644
--- a/drivers/net/mlx5/mlx5_flow_flex.c
+++ b/drivers/net/mlx5/mlx5_flow_flex.c
@@ -1478,7 +1478,7 @@ mlx5_flex_parser_create_cb(void *list_ctx, void *ctx)
int ret;
fp = mlx5_malloc(MLX5_MEM_ZERO, sizeof(struct mlx5_flex_parser_devx),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!fp)
return NULL;
/* Copy the requested configurations. */
@@ -1551,7 +1551,7 @@ mlx5_flex_parser_clone_cb(void *list_ctx,
RTE_SET_USED(list_ctx);
RTE_SET_USED(entry);
fp = mlx5_malloc(0, sizeof(struct mlx5_flex_parser_devx),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!fp)
return NULL;
memcpy(fp, ctx, sizeof(struct mlx5_flex_parser_devx));
diff --git a/drivers/net/mlx5/mlx5_flow_geneve.c b/drivers/net/mlx5/mlx5_flow_geneve.c
index 4d57bb763f..5256a73ebc 100644
--- a/drivers/net/mlx5/mlx5_flow_geneve.c
+++ b/drivers/net/mlx5/mlx5_flow_geneve.c
@@ -616,7 +616,7 @@ mlx5_geneve_tlv_options_create(void *ctx,
options = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(struct mlx5_geneve_tlv_options),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (options == NULL) {
DRV_LOG(ERR,
"Failed to allocate memory for GENEVE TLV options.");
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 8dabf21b76..80783ae1ca 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -2420,7 +2420,7 @@ mlx5_tbl_translate_reformat(struct mlx5_priv *priv,
shared_rfmt = true;
acts->encap_decap = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*acts->encap_decap) + data_size,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!acts->encap_decap)
return rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -2504,7 +2504,7 @@ mlx5_tbl_translate_modify_header(struct rte_eth_dev *dev,
return ret;
}
acts->mhdr = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*acts->mhdr),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!acts->mhdr)
return rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -2578,7 +2578,7 @@ mlx5_create_ipv6_ext_reformat(struct rte_eth_dev *dev,
flag = mlx5_hw_act_flag[!!attr->group][type];
acts->push_remove = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*acts->push_remove) + push_size,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!acts->push_remove)
return -ENOMEM;
@@ -5358,7 +5358,7 @@ flow_hw_table_create(struct rte_eth_dev *dev,
tbl_mem_size = sizeof(*tbl);
tbl_mem_size += nb_action_templates * priv->nb_queue * sizeof(tbl->rule_acts[0]);
/* Allocate the table memory. */
- tbl = mlx5_malloc(MLX5_MEM_ZERO, tbl_mem_size, RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ tbl = mlx5_malloc(MLX5_MEM_ZERO, tbl_mem_size, RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!tbl)
goto error;
tbl->cfg = *table_cfg;
@@ -5368,7 +5368,7 @@ flow_hw_table_create(struct rte_eth_dev *dev,
goto error;
/* Allocate table of auxiliary flow rule structs. */
tbl->flow_aux = mlx5_malloc(MLX5_MEM_ZERO, sizeof(struct rte_flow_hw_aux) * nb_flows,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!tbl->flow_aux)
goto error;
/* Register the flow group. */
@@ -8275,7 +8275,7 @@ __flow_hw_actions_template_create(struct rte_eth_dev *dev,
return NULL;
len += RTE_ALIGN(orig_act_len, 16);
at = mlx5_malloc(MLX5_MEM_ZERO, len + sizeof(*at),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!at) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -8484,7 +8484,7 @@ flow_hw_prepend_item(const struct rte_flow_item *items,
header_size = sizeof(*copied_items) * (nb_items + 1);
total_size = header_size + (size_t)new_item_size;
- copied_items = mlx5_malloc(MLX5_MEM_ZERO, total_size, 0, SOCKET_ID_ANY);
+ copied_items = mlx5_malloc(MLX5_MEM_ZERO, total_size, 0, RTE_NUMA_ID_ANY);
if (!copied_items) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -9490,7 +9490,7 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev,
if (!tmpl_items)
return NULL;
- it = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*it), 0, SOCKET_ID_ANY);
+ it = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*it), 0, RTE_NUMA_ID_ANY);
if (!it) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -9510,7 +9510,7 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev,
goto error;
}
it_items_size = RTE_ALIGN(it_items_size, 16);
- it->items = mlx5_malloc(MLX5_MEM_ZERO, it_items_size, 0, SOCKET_ID_ANY);
+ it->items = mlx5_malloc(MLX5_MEM_ZERO, it_items_size, 0, RTE_NUMA_ID_ANY);
if (it->items == NULL) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -10006,7 +10006,7 @@ flow_hw_create_vport_actions(struct mlx5_priv *priv)
bool unified_fdb = is_unified_fdb(priv);
priv->hw_vport = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*priv->hw_vport) * RTE_MAX_ETHPORTS,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!priv->hw_vport)
return -ENOMEM;
DRV_LOG(DEBUG, "port %u :: creating vport actions", priv->dev_data->port_id);
@@ -11106,7 +11106,7 @@ flow_hw_create_lacp_miss_tables(struct rte_eth_dev *dev)
if (mlx5_flow_is_steering_disabled())
return 0;
- hw_lacp_miss = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hw_lacp_miss), 0, SOCKET_ID_ANY);
+ hw_lacp_miss = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hw_lacp_miss), 0, RTE_NUMA_ID_ANY);
if (!hw_lacp_miss) {
DRV_LOG(ERR, "port %u Failed to allocate memory for LACP miss tables",
dev->data->port_id);
@@ -11162,7 +11162,7 @@ flow_hw_create_fdb_ctrl_tables(struct rte_eth_dev *dev, struct rte_flow_error *e
uint32_t fdb_def_rule = priv->sh->config.fdb_def_rule;
MLX5_ASSERT(priv->hw_ctrl_fdb == NULL);
- hw_ctrl_fdb = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hw_ctrl_fdb), 0, SOCKET_ID_ANY);
+ hw_ctrl_fdb = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hw_ctrl_fdb), 0, RTE_NUMA_ID_ANY);
if (!hw_ctrl_fdb) {
DRV_LOG(ERR, "port %u failed to allocate memory for FDB control flow templates",
dev->data->port_id);
@@ -11275,7 +11275,7 @@ flow_hw_create_nic_ctrl_tables(struct rte_eth_dev *dev, struct rte_flow_error *e
struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_flow_hw_ctrl_nic *ctrl = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*ctrl),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!ctrl)
return rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
"failed to allocate port control flow table");
@@ -11350,7 +11350,7 @@ flow_hw_ct_pool_create(struct rte_eth_dev *dev,
int reg_id;
uint32_t flags = 0;
- pool = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*pool), 0, SOCKET_ID_ANY);
+ pool = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*pool), 0, RTE_NUMA_ID_ANY);
if (!pool) {
rte_errno = ENOMEM;
return NULL;
@@ -11426,7 +11426,7 @@ mlx5_flow_ct_init(struct rte_eth_dev *dev,
sizeof(*priv->ct_mng);
priv->ct_mng = mlx5_malloc(MLX5_MEM_ZERO, mem_size,
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!priv->ct_mng)
goto err;
ret = mlx5_aso_ct_queue_init(priv->sh, priv->ct_mng,
@@ -11763,7 +11763,7 @@ mlx5_flow_hw_create_ctrl_rx_tables(struct rte_eth_dev *dev)
MLX5_ASSERT(!priv->hw_ctrl_rx);
priv->hw_ctrl_rx = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*priv->hw_ctrl_rx),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!priv->hw_ctrl_rx) {
DRV_LOG(ERR, "Failed to allocate memory for Rx control flow tables");
rte_errno = ENOMEM;
@@ -11853,7 +11853,7 @@ flow_hw_alloc_copy_config(const struct rte_flow_port_attr *port_attr,
unsigned int i;
hw_attr_size = sizeof(*hw_attr) + nb_queue * sizeof(*hw_attr->queue_attr);
- hw_attr = mlx5_malloc(MLX5_MEM_ZERO, hw_attr_size, 0, SOCKET_ID_ANY);
+ hw_attr = mlx5_malloc(MLX5_MEM_ZERO, hw_attr_size, 0, RTE_NUMA_ID_ANY);
if (!hw_attr) {
rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
"Not enough memory to store configuration");
@@ -12078,7 +12078,7 @@ mlx5_hwq_ring_create(uint16_t port_id, uint32_t queue, uint32_t size, const char
char mz_name[RTE_MEMZONE_NAMESIZE];
snprintf(mz_name, sizeof(mz_name), "port_%u_%s_%u", port_id, str, queue);
- return rte_ring_create(mz_name, size, SOCKET_ID_ANY,
+ return rte_ring_create(mz_name, size, RTE_NUMA_ID_ANY,
RING_F_SP_ENQ | RING_F_SC_DEQ | RING_F_EXACT_SZ);
}
@@ -12266,7 +12266,7 @@ __flow_hw_configure(struct rte_eth_dev *dev,
_queue_attr = mlx5_malloc(MLX5_MEM_ZERO,
nb_q_updated *
sizeof(struct rte_flow_queue_attr *),
- 64, SOCKET_ID_ANY);
+ 64, RTE_NUMA_ID_ANY);
if (!_queue_attr) {
rte_errno = ENOMEM;
goto err;
@@ -12284,7 +12284,7 @@ __flow_hw_configure(struct rte_eth_dev *dev,
sizeof(struct mlx5_hw_q_job)) * _queue_attr[i]->size;
}
priv->hw_q = mlx5_malloc(MLX5_MEM_ZERO, mem_size,
- 64, SOCKET_ID_ANY);
+ 64, RTE_NUMA_ID_ANY);
if (!priv->hw_q) {
rte_errno = ENOMEM;
goto err;
@@ -14958,7 +14958,7 @@ mlx5_hw_create_mirror(struct rte_eth_dev *dev,
return NULL;
}
mirror = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*mirror),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!mirror) {
rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_ACTION,
actions, "Failed to allocate mirror context");
@@ -15040,7 +15040,7 @@ mlx5_create_legacy_indlst(struct rte_eth_dev *dev, uint32_t queue,
struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_indlst_legacy *indlst_obj = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(*indlst_obj),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!indlst_obj)
return NULL;
@@ -15835,7 +15835,7 @@ flow_hw_create_ctrl_flow(struct rte_eth_dev *owner_dev,
rte_spinlock_lock(&priv->hw_ctrl_lock);
entry = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_SYS, sizeof(*entry),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!entry) {
DRV_LOG(ERR, "port %u not enough memory to create control flows",
proxy_dev->data->port_id);
@@ -17131,7 +17131,7 @@ __mlx5_reformat_create(struct rte_eth_dev *dev,
return NULL;
}
/* Allocate new list entry. */
- handle = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*handle), 0, SOCKET_ID_ANY);
+ handle = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*handle), 0, RTE_NUMA_ID_ANY);
if (!handle) {
DRV_LOG(ERR, "Reformat: failed to allocate reformat entry");
return NULL;
diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c
index 6d30f31852..8acd6f0944 100644
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -95,7 +95,7 @@ mlx5_flow_meter_init_guest(struct rte_eth_dev *dev)
goto err;
}
priv->hws_mpool = mlx5_malloc(MLX5_MEM_ZERO, sizeof(struct mlx5_aso_mtr_pool),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!priv->hws_mpool) {
rte_errno = ENOMEM;
ret = -rte_errno;
@@ -217,7 +217,7 @@ mlx5_flow_meter_init(struct rte_eth_dev *dev,
sizeof(struct mlx5_aso_mtr) *
nb_meters,
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!priv->mtr_bulk.aso) {
ret = ENOMEM;
rte_flow_error_set(&error, ENOMEM,
@@ -235,7 +235,7 @@ mlx5_flow_meter_init(struct rte_eth_dev *dev,
}
priv->hws_mpool = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_aso_mtr_pool),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!priv->hws_mpool) {
ret = ENOMEM;
rte_flow_error_set(&error, ENOMEM,
@@ -273,7 +273,7 @@ mlx5_flow_meter_init(struct rte_eth_dev *dev,
sizeof(struct mlx5_flow_meter_profile) *
nb_meter_profiles,
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!priv->mtr_profile_arr) {
ret = ENOMEM;
rte_flow_error_set(&error, ENOMEM,
@@ -289,7 +289,7 @@ mlx5_flow_meter_init(struct rte_eth_dev *dev,
sizeof(struct mlx5_flow_meter_policy) *
nb_meter_policies,
RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!priv->mtr_policy_arr) {
ret = ENOMEM;
rte_flow_error_set(&error, ENOMEM,
@@ -829,7 +829,7 @@ mlx5_flow_meter_profile_add(struct rte_eth_dev *dev,
return ret;
/* Meter profile memory allocation. */
fmp = mlx5_malloc(MLX5_MEM_ZERO, sizeof(struct mlx5_flow_meter_profile),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (fmp == NULL)
return -rte_mtr_error_set(error, ENOMEM,
RTE_MTR_ERROR_TYPE_UNSPECIFIED,
@@ -1317,7 +1317,7 @@ mlx5_flow_meter_policy_add(struct rte_eth_dev *dev,
policy_size += sizeof(struct mlx5_flow_meter_sub_policy *);
}
mtr_policy = mlx5_malloc(MLX5_MEM_ZERO, policy_size,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!mtr_policy)
return -rte_mtr_error_set(error, ENOMEM,
RTE_MTR_ERROR_TYPE_METER_POLICY, NULL,
diff --git a/drivers/net/mlx5/mlx5_flow_quota.c b/drivers/net/mlx5/mlx5_flow_quota.c
index b661bd376e..9a78b9a778 100644
--- a/drivers/net/mlx5/mlx5_flow_quota.c
+++ b/drivers/net/mlx5/mlx5_flow_quota.c
@@ -391,7 +391,7 @@ mlx5_quota_alloc_sq(struct mlx5_priv *priv)
qctx->sq = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(qctx->sq[0]) * nb_queues,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!qctx->sq) {
DRV_LOG(DEBUG, "QUOTA: failed to allocate SQ pool");
return -ENOMEM;
@@ -440,7 +440,7 @@ mlx5_quota_alloc_read_buf(struct mlx5_priv *priv)
/* ACCESS MTR ASO WQE reads 2 MTR objects */
rd_buf_size = 2 * sq_size_sum * sizeof(buf[0]);
buf = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO, rd_buf_size,
- page_size, SOCKET_ID_ANY);
+ page_size, RTE_NUMA_ID_ANY);
if (!buf) {
DRV_LOG(DEBUG, "QUOTA: failed to allocate MTR ASO READ buffer [1]");
return -ENOMEM;
@@ -452,7 +452,7 @@ mlx5_quota_alloc_read_buf(struct mlx5_priv *priv)
}
qctx->read_buf = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(qctx->read_buf[0]) * nb_queues,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!qctx->read_buf) {
DRV_LOG(DEBUG, "QUOTA: failed to allocate MTR ASO READ buffer [2]");
return -ENOMEM;
diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index eb576f73d4..d20c02b2ff 100644
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -250,7 +250,7 @@ flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t id __rte_unused)
}
/* Allocate memory for new pool */
size = sizeof(*pool) + sizeof(*cnt) * MLX5_COUNTERS_PER_POOL;
- pool = mlx5_malloc(MLX5_MEM_ZERO, size, 0, SOCKET_ID_ANY);
+ pool = mlx5_malloc(MLX5_MEM_ZERO, size, 0, RTE_NUMA_ID_ANY);
if (!pool)
return 0;
for (i = 0; i < MLX5_COUNTERS_PER_POOL; ++i) {
diff --git a/drivers/net/mlx5/mlx5_hws_cnt.c b/drivers/net/mlx5/mlx5_hws_cnt.c
index d0c4ead71b..15069d0a4a 100644
--- a/drivers/net/mlx5/mlx5_hws_cnt.c
+++ b/drivers/net/mlx5/mlx5_hws_cnt.c
@@ -30,7 +30,7 @@ __hws_cnt_id_load(struct mlx5_hws_cnt_pool *cpool)
cnt_id_t *cnt_arr = NULL;
cnt_arr = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO,
- cnt_num * sizeof(cnt_id_t), 0, SOCKET_ID_ANY);
+ cnt_num * sizeof(cnt_id_t), 0, RTE_NUMA_ID_ANY);
if (cnt_arr == NULL)
return -ENOMEM;
/*
@@ -280,7 +280,7 @@ mlx5_hws_cnt_raw_data_alloc(struct mlx5_dev_ctx_shared *sh, uint32_t n,
MLX5_ASSERT(pgsz > 0);
mng = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO, sizeof(*mng), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (mng == NULL) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -288,7 +288,7 @@ mlx5_hws_cnt_raw_data_alloc(struct mlx5_dev_ctx_shared *sh, uint32_t n,
goto error;
}
mng->raw = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO, sz, pgsz,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (mng->raw == NULL) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -389,7 +389,7 @@ mlx5_hws_cnt_cache_init(const struct mlx5_hws_cnt_pool_cfg *pcfg,
cache = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO,
sizeof(*cache) +
sizeof(((struct mlx5_hws_cnt_pool_caches *)0)->qcache[0])
- * ccfg->q_num, 0, SOCKET_ID_ANY);
+ * ccfg->q_num, 0, RTE_NUMA_ID_ANY);
if (cache == NULL)
return NULL;
/* Store the necessary cache parameters. */
@@ -400,7 +400,7 @@ mlx5_hws_cnt_cache_init(const struct mlx5_hws_cnt_pool_cfg *pcfg,
for (qidx = 0; qidx < ccfg->q_num; qidx++) {
snprintf(mz_name, sizeof(mz_name), "%s_qc/%x", pcfg->name, qidx);
cache->qcache[qidx] = rte_ring_create(mz_name, ccfg->size,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RING_F_SP_ENQ | RING_F_SC_DEQ |
RING_F_EXACT_SZ);
if (cache->qcache[qidx] == NULL)
@@ -428,7 +428,7 @@ mlx5_hws_cnt_pool_init(struct mlx5_dev_ctx_shared *sh,
MLX5_ASSERT(pcfg);
MLX5_ASSERT(ccfg);
cntp = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO, sizeof(*cntp), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (cntp == NULL) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
@@ -467,7 +467,7 @@ mlx5_hws_cnt_pool_init(struct mlx5_dev_ctx_shared *sh,
cnt_num = RTE_MIN((uint32_t)cnt_num, sh->hws_max_nb_counters);
cntp->pool = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO,
sizeof(struct mlx5_hws_cnt) * cnt_num,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (cntp->pool == NULL) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
@@ -476,7 +476,7 @@ mlx5_hws_cnt_pool_init(struct mlx5_dev_ctx_shared *sh,
}
snprintf(mz_name, sizeof(mz_name), "%s_F_RING", pcfg->name);
cntp->free_list = rte_ring_create_elem(mz_name, sizeof(cnt_id_t),
- (uint32_t)cnt_num, SOCKET_ID_ANY,
+ (uint32_t)cnt_num, RTE_NUMA_ID_ANY,
RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ |
RING_F_EXACT_SZ);
if (cntp->free_list == NULL) {
@@ -487,7 +487,7 @@ mlx5_hws_cnt_pool_init(struct mlx5_dev_ctx_shared *sh,
}
snprintf(mz_name, sizeof(mz_name), "%s_R_RING", pcfg->name);
cntp->wait_reset_list = rte_ring_create_elem(mz_name, sizeof(cnt_id_t),
- (uint32_t)cnt_num, SOCKET_ID_ANY,
+ (uint32_t)cnt_num, RTE_NUMA_ID_ANY,
RING_F_MP_HTS_ENQ | RING_F_SC_DEQ | RING_F_EXACT_SZ);
if (cntp->wait_reset_list == NULL) {
rte_flow_error_set(error, ENOMEM,
@@ -497,7 +497,7 @@ mlx5_hws_cnt_pool_init(struct mlx5_dev_ctx_shared *sh,
}
snprintf(mz_name, sizeof(mz_name), "%s_U_RING", pcfg->name);
cntp->reuse_list = rte_ring_create_elem(mz_name, sizeof(cnt_id_t),
- (uint32_t)cnt_num, SOCKET_ID_ANY,
+ (uint32_t)cnt_num, RTE_NUMA_ID_ANY,
RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ | RING_F_EXACT_SZ);
if (cntp->reuse_list == NULL) {
rte_flow_error_set(error, ENOMEM,
@@ -734,7 +734,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev,
int ret = 0;
size_t sz;
- mp_name = mlx5_malloc(MLX5_MEM_ZERO, RTE_MEMZONE_NAMESIZE, 0, SOCKET_ID_ANY);
+ mp_name = mlx5_malloc(MLX5_MEM_ZERO, RTE_MEMZONE_NAMESIZE, 0, RTE_NUMA_ID_ANY);
if (mp_name == NULL) {
ret = rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
"failed to allocate counter pool name prefix");
@@ -853,7 +853,7 @@ mlx5_hws_cnt_svc_init(struct mlx5_dev_ctx_shared *sh,
int ret;
sh->cnt_svc = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO,
- sizeof(*sh->cnt_svc), 0, SOCKET_ID_ANY);
+ sizeof(*sh->cnt_svc), 0, RTE_NUMA_ID_ANY);
if (sh->cnt_svc == NULL)
goto err;
sh->cnt_svc->query_interval = sh->config.cnt_svc.cycle_time;
@@ -1225,14 +1225,14 @@ mlx5_hws_age_info_init(struct rte_eth_dev *dev, uint16_t nb_queues,
sizeof(struct rte_ring *) * nb_queues;
age_info->hw_q_age = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO,
- size, 0, SOCKET_ID_ANY);
+ size, 0, RTE_NUMA_ID_ANY);
if (age_info->hw_q_age == NULL)
return -ENOMEM;
for (qidx = 0; qidx < nb_queues; ++qidx) {
snprintf(mz_name, sizeof(mz_name),
"port_%u_queue_%u_aged_out_ring",
dev->data->port_id, qidx);
- r = rte_ring_create(mz_name, ring_size, SOCKET_ID_ANY,
+ r = rte_ring_create(mz_name, ring_size, RTE_NUMA_ID_ANY,
flags);
if (r == NULL) {
DRV_LOG(ERR, "\"%s\" creation failed: %s",
@@ -1248,7 +1248,7 @@ mlx5_hws_age_info_init(struct rte_eth_dev *dev, uint16_t nb_queues,
} else {
snprintf(mz_name, sizeof(mz_name), "port_%u_aged_out_ring",
dev->data->port_id);
- r = rte_ring_create(mz_name, ring_size, SOCKET_ID_ANY, flags);
+ r = rte_ring_create(mz_name, ring_size, RTE_NUMA_ID_ANY, flags);
if (r == NULL) {
DRV_LOG(ERR, "\"%s\" creation failed: %s", mz_name,
rte_strerror(rte_errno));
diff --git a/drivers/net/mlx5/mlx5_nta_sample.c b/drivers/net/mlx5/mlx5_nta_sample.c
index 158720fb87..8bdbec8c89 100644
--- a/drivers/net/mlx5/mlx5_nta_sample.c
+++ b/drivers/net/mlx5/mlx5_nta_sample.c
@@ -164,7 +164,7 @@ mlx5_nta_sample_cached_mirror_create(void *cache_ctx, void *cb_ctx)
};
struct mlx5_nta_sample_cached_mirror *obj = mlx5_malloc(MLX5_MEM_ANY,
sizeof(*obj), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (obj == NULL)
return NULL;
obj->mirror = mlx5_hw_create_mirror(dev, ctx->table_cfg, mirror_actions, NULL);
@@ -187,7 +187,7 @@ mlx5_nta_sample_cached_mirror_clone(void *tool_ctx __rte_unused,
container_of(entry, struct mlx5_nta_sample_cached_mirror, entry);
struct mlx5_nta_sample_cached_mirror *new_obj = mlx5_malloc(MLX5_MEM_ANY,
sizeof(*new_obj), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (new_obj == NULL)
return NULL;
@@ -245,7 +245,7 @@ serialize_actions(struct mlx5_nta_sample_cached_group_ctx *obj_ctx)
int size = rte_flow_conv(RTE_FLOW_CONV_OP_ACTIONS, NULL, 0, obj_ctx->actions, NULL);
if (size < 0)
return size;
- tgt_buffer = mlx5_malloc(MLX5_MEM_ANY, size, 0, SOCKET_ID_ANY);
+ tgt_buffer = mlx5_malloc(MLX5_MEM_ANY, size, 0, RTE_NUMA_ID_ANY);
if (tgt_buffer == NULL)
return -ENOMEM;
obj_ctx->actions_size = size;
@@ -270,7 +270,7 @@ mlx5_nta_sample_cached_group_create(void *cache_ctx, void *cb_ctx)
if (actions_size < 0)
return NULL;
- obj = mlx5_malloc(MLX5_MEM_ANY, sizeof(*obj), 0, SOCKET_ID_ANY);
+ obj = mlx5_malloc(MLX5_MEM_ANY, sizeof(*obj), 0, RTE_NUMA_ID_ANY);
if (obj == NULL)
return NULL;
obj->group = alloc_cached_group(dev);
@@ -319,7 +319,7 @@ mlx5_nta_sample_cached_group_clone(void *tool_ctx __rte_unused,
container_of(entry, struct mlx5_nta_sample_cached_group, entry);
struct mlx5_nta_sample_cached_group *new_obj;
- new_obj = mlx5_malloc(MLX5_MEM_ANY, sizeof(*new_obj), 0, SOCKET_ID_ANY);
+ new_obj = mlx5_malloc(MLX5_MEM_ANY, sizeof(*new_obj), 0, RTE_NUMA_ID_ANY);
if (new_obj == NULL)
return NULL;
memcpy(new_obj, cached_obj, sizeof(*new_obj));
@@ -351,7 +351,7 @@ mlx5_init_nta_sample_context(struct rte_eth_dev *dev)
.type = "mlx5_nta_sample"
};
struct mlx5_nta_sample_ctx *ctx = mlx5_malloc(MLX5_MEM_ZERO,
- sizeof(*ctx), 0, SOCKET_ID_ANY);
+ sizeof(*ctx), 0, RTE_NUMA_ID_ANY);
if (ctx == NULL)
return -ENOMEM;
@@ -744,7 +744,7 @@ mlx5_nta_create_sample_flow(struct rte_eth_dev *dev,
if (sample_group == 0)
return NULL;
- release = mlx5_malloc(MLX5_MEM_ANY, sizeof(*release), 0, SOCKET_ID_ANY);
+ release = mlx5_malloc(MLX5_MEM_ANY, sizeof(*release), 0, RTE_NUMA_ID_ANY);
if (release == NULL) {
rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_ACTION,
NULL, "Failed to allocate release context");
@@ -804,7 +804,7 @@ mlx5_nta_create_mirror_flow(struct rte_eth_dev *dev,
int ret;
struct rte_flow_hw *base_flow = NULL;
struct mlx5_sample_release_ctx *release = mlx5_malloc(MLX5_MEM_ANY, sizeof(*release),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (release == NULL) {
rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_ACTION,
diff --git a/drivers/net/mlx5/mlx5_nta_split.c b/drivers/net/mlx5/mlx5_nta_split.c
index 327930ecb8..f870e0e38a 100644
--- a/drivers/net/mlx5/mlx5_nta_split.c
+++ b/drivers/net/mlx5/mlx5_nta_split.c
@@ -227,7 +227,7 @@ mlx5_flow_nta_split_metadata(struct rte_eth_dev *dev,
item_size = sizeof(struct rte_flow_item) * 2 +
sizeof(struct mlx5_rte_flow_item_tag);
total_size = pefx_act_size + sfx_act_size + attr_size + item_size;
- prfx_actions = mlx5_malloc(MLX5_MEM_ZERO, total_size, 0, SOCKET_ID_ANY);
+ prfx_actions = mlx5_malloc(MLX5_MEM_ZERO, total_size, 0, RTE_NUMA_ID_ANY);
if (!prfx_actions)
return rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_ACTION,
--git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c
index e2b478b75c..a2ecd8df8c 100644
--- a/drivers/net/mlx5/mlx5_rss.c
+++ b/drivers/net/mlx5/mlx5_rss.c
@@ -53,7 +53,7 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev,
priv->rss_conf.rss_key = mlx5_realloc(priv->rss_conf.rss_key,
MLX5_MEM_RTE,
rss_conf->rss_key_len,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!priv->rss_conf.rss_key) {
rte_errno = ENOMEM;
return -rte_errno;
@@ -130,7 +130,7 @@ mlx5_rss_reta_index_resize(struct rte_eth_dev *dev, unsigned int reta_size)
mem = mlx5_realloc(priv->reta_idx, MLX5_MEM_RTE,
reta_size * sizeof((*priv->reta_idx)[0]), 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!mem) {
rte_errno = ENOMEM;
return -rte_errno;
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index e525cc853d..72f96ba3ad 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -3277,8 +3277,8 @@ mlx5_drop_action_create(struct rte_eth_dev *dev)
if (priv->drop_queue.hrxq)
return priv->drop_queue.hrxq;
- hrxq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hrxq) + MLX5_RSS_HASH_KEY_LEN,
- 0, RTE_NUMA_ID_ANY);
+ hrxq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*hrxq) + MLX5_RSS_HASH_KEY_LEN, 0,
+ RTE_NUMA_ID_ANY);
if (!hrxq) {
DRV_LOG(WARNING,
"Port %u cannot allocate memory for drop queue.",
diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
index 1fbd298c77..5fb6c12d11 100644
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
@@ -354,7 +354,7 @@ mlx5_xstats_reset(struct rte_eth_dev *dev)
mlx5_os_stats_init(dev);
/* Considering to use stack directly. */
counters = mlx5_malloc(MLX5_MEM_SYS, sizeof(*counters) * xstats_ctrl->mlx5_stats_n,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!counters) {
DRV_LOG(WARNING, "port %u unable to allocate memory for xstats counters",
dev->data->port_id);
diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 1dbde509d2..65d403b9e9 100644
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -126,7 +126,7 @@ mlx5_alloc_null_mbuf(uint32_t data_len)
rte_align32pow2(data_len);
struct rte_mbuf *m;
- m = mlx5_malloc(MLX5_MEM_ZERO, alloc_size, 0, SOCKET_ID_ANY);
+ m = mlx5_malloc(MLX5_MEM_ZERO, alloc_size, 0, RTE_NUMA_ID_ANY);
if (m == NULL)
return NULL;
m->buf_addr = RTE_PTR_ADD(m, sizeof(*m));
diff --git a/drivers/net/mlx5/mlx5_tx.c b/drivers/net/mlx5/mlx5_tx.c
index 89e38091b4..7069e69b5e 100644
--- a/drivers/net/mlx5/mlx5_tx.c
+++ b/drivers/net/mlx5/mlx5_tx.c
@@ -908,7 +908,7 @@ int rte_pmd_mlx5_pp_rate_table_query(uint16_t port_id,
return 0;
}
seen = mlx5_malloc(MLX5_MEM_SYS | MLX5_MEM_ZERO,
- priv->txqs_n * sizeof(*seen), 0, SOCKET_ID_ANY);
+ priv->txqs_n * sizeof(*seen), 0, RTE_NUMA_ID_ANY);
if (seen == NULL)
return -ENOMEM;
/*
diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c
index 606743c4b7..45e1c50aeb 100644
--- a/drivers/net/mlx5/mlx5_utils.c
+++ b/drivers/net/mlx5/mlx5_utils.c
@@ -18,8 +18,8 @@
uint32_t a = (uint32_t)(align); \
int so = (int)(socket); \
void *mem = p->cfg.malloc(f, s, a, so); \
- if (mem == NULL && so != SOCKET_ID_ANY) { \
- mem = p->cfg.malloc(f, s, a, SOCKET_ID_ANY); \
+ if (mem == NULL && so != RTE_NUMA_ID_ANY) { \
+ mem = p->cfg.malloc(f, s, a, RTE_NUMA_ID_ANY); \
if (mem) { \
DRV_LOG(WARNING, \
"Allocated %p (size %zu socket %d) through NUMA tolerant fallback", \
@@ -116,7 +116,7 @@ mlx5_ipool_create(struct mlx5_indexed_pool_config *cfg)
return NULL;
pool = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*pool) + cfg->grow_trunk *
sizeof(pool->grow_tbl[0]), RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!pool)
return NULL;
pool->cfg = *cfg;
@@ -174,7 +174,7 @@ mlx5_ipool_grow(struct mlx5_indexed_pool *pool)
p = pool_malloc(pool, MLX5_MEM_ZERO, (pool->n_trunk_valid + n_grow) *
sizeof(struct mlx5_indexed_trunk *),
- RTE_CACHE_LINE_SIZE, rte_socket_id());
+ RTE_CACHE_LINE_SIZE, rte_numa_id());
if (!p)
return -ENOMEM;
if (pool->trunks)
@@ -203,7 +203,7 @@ mlx5_ipool_grow(struct mlx5_indexed_pool *pool)
trunk_size += RTE_CACHE_LINE_ROUNDUP(data_size * pool->cfg.size);
trunk_size += bmp_size;
trunk = pool_malloc(pool, MLX5_MEM_ZERO, trunk_size,
- RTE_CACHE_LINE_SIZE, rte_socket_id());
+ RTE_CACHE_LINE_SIZE, rte_numa_id());
if (!trunk)
return -ENOMEM;
pool->trunks[idx] = trunk;
@@ -279,7 +279,7 @@ mlx5_ipool_grow_bmp(struct mlx5_indexed_pool *pool, uint32_t new_size)
pool->cache_validator.bmp_mem = pool_malloc(pool, MLX5_MEM_ZERO,
bmp_mem_size,
RTE_CACHE_LINE_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (unlikely(!pool->cache_validator.bmp_mem)) {
DRV_LOG_IPOOL(ERR, "Unable to allocate memory for a new bitmap");
return;
@@ -370,7 +370,7 @@ mlx5_ipool_allocate_from_global(struct mlx5_indexed_pool *pool, int cidx)
p = pool_malloc(pool, MLX5_MEM_ZERO, ((trunk_idx + n_grow) *
sizeof(struct mlx5_indexed_trunk *)) +
(cur_max_idx * sizeof(uint32_t)) + sizeof(*p),
- RTE_CACHE_LINE_SIZE, rte_socket_id());
+ RTE_CACHE_LINE_SIZE, rte_numa_id());
if (!p)
return 0;
p->trunks = (struct mlx5_indexed_trunk **)&p->idx[cur_max_idx];
@@ -390,7 +390,7 @@ mlx5_ipool_allocate_from_global(struct mlx5_indexed_pool *pool, int cidx)
data_size = mlx5_trunk_size_get(pool, trunk_idx);
trunk_size += RTE_CACHE_LINE_ROUNDUP(data_size * pool->cfg.size);
trunk = pool_malloc(pool, MLX5_MEM_ZERO, trunk_size,
- RTE_CACHE_LINE_SIZE, rte_socket_id());
+ RTE_CACHE_LINE_SIZE, rte_numa_id());
if (unlikely(!trunk)) {
pool->cfg.free(p);
return 0;
@@ -456,7 +456,7 @@ _mlx5_ipool_get_cache(struct mlx5_indexed_pool *pool, int cidx, uint32_t idx)
pool->cache[cidx] = pool_malloc(pool, MLX5_MEM_ZERO,
sizeof(struct mlx5_ipool_per_lcore) +
(pool->cfg.per_core_cache * sizeof(uint32_t)),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!pool->cache[cidx]) {
DRV_LOG(ERR, "Ipool cache%d allocate failed\n", cidx);
return NULL;
@@ -542,7 +542,7 @@ _mlx5_ipool_malloc_cache(struct mlx5_indexed_pool *pool, int cidx,
pool->cache[cidx] = pool_malloc(pool, MLX5_MEM_ZERO,
sizeof(struct mlx5_ipool_per_lcore) +
(pool->cfg.per_core_cache * sizeof(uint32_t)),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!pool->cache[cidx]) {
DRV_LOG(ERR, "Ipool cache%d allocate failed\n", cidx);
return NULL;
@@ -604,7 +604,7 @@ _mlx5_ipool_free_cache(struct mlx5_indexed_pool *pool, int cidx, uint32_t idx)
pool->cache[cidx] = pool_malloc(pool, MLX5_MEM_ZERO,
sizeof(struct mlx5_ipool_per_lcore) +
(pool->cfg.per_core_cache * sizeof(uint32_t)),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (!pool->cache[cidx]) {
DRV_LOG(ERR, "Ipool cache%d allocate failed\n", cidx);
return;
@@ -910,7 +910,7 @@ mlx5_ipool_flush_cache(struct mlx5_indexed_pool *pool)
bmp_num = mlx5_trunk_idx_offset_get(pool, gc->n_trunk_valid);
mem_size = rte_bitmap_get_memory_footprint(bmp_num);
pool->bmp_mem = pool_malloc(pool, MLX5_MEM_ZERO, mem_size,
- RTE_CACHE_LINE_SIZE, rte_socket_id());
+ RTE_CACHE_LINE_SIZE, rte_numa_id());
if (!pool->bmp_mem) {
DRV_LOG(ERR, "Ipool bitmap mem allocate failed.\n");
return;
@@ -1045,7 +1045,7 @@ mlx5_l3t_create(enum mlx5_l3t_type type)
return NULL;
}
tbl = mlx5_malloc(MLX5_MEM_ZERO, sizeof(struct mlx5_l3t_tbl), 1,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!tbl) {
rte_errno = ENOMEM;
return NULL;
@@ -1282,7 +1282,7 @@ __l3t_set_entry(struct mlx5_l3t_tbl *tbl, uint32_t idx,
g_tbl = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_l3t_level_tbl) +
sizeof(void *) * MLX5_L3T_GT_SIZE, 1,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!g_tbl) {
rte_errno = ENOMEM;
return -1;
@@ -1298,7 +1298,7 @@ __l3t_set_entry(struct mlx5_l3t_tbl *tbl, uint32_t idx,
m_tbl = mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_l3t_level_tbl) +
sizeof(void *) * MLX5_L3T_MT_SIZE, 1,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (!m_tbl) {
rte_errno = ENOMEM;
return -1;
diff --git a/drivers/net/mlx5/windows/mlx5_flow_os.c b/drivers/net/mlx5/windows/mlx5_flow_os.c
index 48d9f8520e..6bfccaaa92 100644
--- a/drivers/net/mlx5/windows/mlx5_flow_os.c
+++ b/drivers/net/mlx5/windows/mlx5_flow_os.c
@@ -91,7 +91,7 @@ mlx5_flow_os_create_flow_matcher(void *ctx,
mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_matcher) +
MLX5_ST_SZ_BYTES(fte_match_param),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!mlx5_matcher) {
rte_errno = ENOMEM;
return -rte_errno;
@@ -139,7 +139,7 @@ mlx5_flow_os_create_flow_action_dest_devx_tir(struct mlx5_devx_obj *tir,
struct mlx5_action *mlx5_action =
mlx5_malloc(MLX5_MEM_ZERO,
sizeof(struct mlx5_action),
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (!mlx5_action) {
rte_errno = ENOMEM;
diff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c
index cc60f07e17..99a95e1144 100644
--- a/drivers/net/mlx5/windows/mlx5_os.c
+++ b/drivers/net/mlx5/windows/mlx5_os.c
@@ -108,7 +108,7 @@ mlx5_init_shared_data(void)
/* Allocate shared memory. */
mz = rte_memzone_reserve(MZ_MLX5_PMD_SHARED_DATA,
sizeof(*mlx5_shared_data),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mz == NULL) {
DRV_LOG(ERR,
"Cannot allocate mlx5 shared data");
@@ -397,7 +397,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
/* Allocate private eth device data. */
priv = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(*priv),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (priv == NULL) {
DRV_LOG(ERR, "priv allocation failure");
err = ENOMEM;
@@ -408,7 +408,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
priv->pci_dev = spawn->pci_dev;
priv->mac = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(*priv->mac) * sh->dev_cap.max_mac_addrs,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (priv->mac == NULL) {
DRV_LOG(ERR, "Failed to allocate MAC address array.");
err = ENOMEM;
@@ -416,7 +416,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
}
priv->mac_own = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
RTE_BITSET_SIZE(sh->dev_cap.max_mac_addrs),
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
if (priv->mac_own == NULL) {
DRV_LOG(ERR, "Failed to allocate MAC ownership bitmap.");
err = ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 170/227] test: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (168 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 169/227] " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 171/227] app/testpmd: " Chengwen Feng
` (57 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test/sample_packet_forward.c | 10 +-
app/test/test_acl.c | 8 +-
app/test/test_bitratestats.c | 2 +-
app/test/test_bpf.c | 8 +-
app/test/test_cksum.c | 2 +-
app/test/test_compressdev.c | 22 ++--
app/test/test_cryptodev.c | 50 ++++-----
app/test/test_cryptodev_asym.c | 8 +-
app/test/test_cryptodev_crosscheck.c | 10 +-
app/test/test_distributor.c | 14 +--
app/test/test_distributor_perf.c | 6 +-
app/test/test_dmadev.c | 4 +-
app/test/test_efd.c | 64 +++++------
app/test/test_efd_perf.c | 22 ++--
app/test/test_ethdev_api.c | 6 +-
app/test/test_event_crypto_adapter.c | 14 +--
app/test/test_event_dma_adapter.c | 6 +-
app/test/test_event_eth_rx_adapter.c | 8 +-
app/test/test_event_eth_tx_adapter.c | 6 +-
app/test/test_event_ring.c | 14 +--
app/test/test_event_timer_adapter.c | 6 +-
app/test/test_event_vector_adapter.c | 8 +-
app/test/test_eventdev.c | 16 +--
app/test/test_external_mem.c | 14 +--
app/test/test_fib.c | 48 ++++----
app/test/test_fib6.c | 56 +++++-----
app/test/test_fib6_perf.c | 2 +-
app/test/test_fib_perf.c | 2 +-
app/test/test_func_reentrancy.c | 12 +-
app/test/test_graph_perf.c | 6 +-
app/test/test_hash.c | 20 ++--
app/test/test_ipfrag.c | 6 +-
app/test/test_ipsec.c | 12 +-
app/test/test_ipsec_perf.c | 12 +-
app/test/test_latencystats.c | 2 +-
app/test/test_link_bonding.c | 22 ++--
app/test/test_link_bonding_mode4.c | 16 +--
| 8 +-
app/test/test_lpm.c | 64 +++++------
app/test/test_lpm6.c | 70 ++++++------
app/test/test_lpm6_perf.c | 2 +-
app/test/test_lpm_perf.c | 4 +-
app/test/test_malloc.c | 146 ++++++++++++-------------
app/test/test_malloc_perf.c | 2 +-
app/test/test_mbuf.c | 18 +--
app/test/test_member_perf.c | 2 +-
app/test/test_mempool.c | 40 +++----
app/test/test_mempool_perf.c | 10 +-
app/test/test_memzone.c | 119 ++++++++++----------
app/test/test_metrics.c | 2 +-
app/test/test_mp_secondary.c | 8 +-
app/test/test_net_ether.c | 2 +-
app/test/test_pcapng.c | 2 +-
app/test/test_pdcp.c | 14 +--
app/test/test_pdump.c | 2 +-
app/test/test_per_lcore.c | 4 +-
app/test/test_pmd_af_packet.c | 10 +-
app/test/test_pmd_memif.c | 2 +-
app/test/test_pmd_pcap.c | 6 +-
app/test/test_pmd_perf.c | 72 ++++++------
app/test/test_pmd_ring.c | 2 +-
app/test/test_pmd_ring_perf.c | 2 +-
app/test/test_pmd_tap.c | 6 +-
app/test/test_reassembly.c | 4 +-
app/test/test_reassembly_perf.c | 4 +-
app/test/test_reorder.c | 20 ++--
app/test/test_rib.c | 20 ++--
app/test/test_rib6.c | 20 ++--
app/test/test_ring.c | 28 ++---
app/test/test_ring.h | 6 +-
app/test/test_ring_perf.c | 20 ++--
app/test/test_security.c | 2 +-
app/test/test_security_inline_macsec.c | 8 +-
app/test/test_security_inline_proto.c | 12 +-
app/test/test_stack.c | 10 +-
app/test/test_stack_perf.c | 14 +--
app/test/test_timer_secondary.c | 4 +-
app/test/virtual_pmd.c | 32 +++---
app/test/virtual_pmd.h | 2 +-
79 files changed, 685 insertions(+), 684 deletions(-)
diff --git a/app/test/sample_packet_forward.c b/app/test/sample_packet_forward.c
index aa897274d8..a7be356751 100644
--- a/app/test/sample_packet_forward.c
+++ b/app/test/sample_packet_forward.c
@@ -30,12 +30,12 @@ test_dev_start(uint16_t port, struct rte_mempool *mp)
if (rc != 0)
return rc;
- rc = rte_eth_rx_queue_setup(port, 0, RING_SIZE, SOCKET_ID_ANY,
+ rc = rte_eth_rx_queue_setup(port, 0, RING_SIZE, RTE_NUMA_ID_ANY,
NULL, mp);
if (rc != 0)
return rc;
- rc = rte_eth_tx_queue_setup(port, 0, RING_SIZE, SOCKET_ID_ANY,
+ rc = rte_eth_tx_queue_setup(port, 0, RING_SIZE, RTE_NUMA_ID_ANY,
NULL);
if (rc != 0)
return rc;
@@ -48,7 +48,7 @@ test_dev_start(uint16_t port, struct rte_mempool *mp)
int
test_ring_setup(struct rte_ring **ring, uint16_t *portid)
{
- *ring = rte_ring_create("R0", RING_SIZE, rte_socket_id(),
+ *ring = rte_ring_create("R0", RING_SIZE, rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (*ring == NULL) {
printf("%s() line %u: rte_ring_create R0 failed",
@@ -56,7 +56,7 @@ test_ring_setup(struct rte_ring **ring, uint16_t *portid)
return -1;
}
*portid = rte_eth_from_rings("net_ringa", ring, NUM_QUEUES,
- ring, NUM_QUEUES, rte_socket_id());
+ ring, NUM_QUEUES, rte_numa_id());
return 0;
}
@@ -87,7 +87,7 @@ int
test_get_mempool(struct rte_mempool **mp, char *poolname)
{
*mp = rte_pktmbuf_pool_create(poolname, NB_MBUF, 32, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (*mp == NULL)
return -1;
return 0;
diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 5d207c80ca..ed8d0c937b 100644
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -34,7 +34,7 @@ RTE_ACL_RULE_DEF(acl_ipv4vlan_rule, RTE_ACL_IPV4VLAN_NUM_FIELDS);
struct rte_acl_param acl_param = {
.name = "acl_ctx",
- .socket_id = SOCKET_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
.rule_size = RTE_ACL_IPV4VLAN_RULE_SZ,
.max_rule_num = 0x30000,
};
@@ -1407,7 +1407,7 @@ test_invalid_parameters(void)
if (rte_eal_has_hugepages()) {
/* invalid NUMA node */
memcpy(¶m, &acl_param, sizeof(param));
- param.socket_id = RTE_MAX_NUMA_NODES + 1;
+ param.numa_id = RTE_MAX_NUMA_NODES + 1;
acx = rte_acl_create(¶m);
if (acx != NULL) {
@@ -1726,11 +1726,11 @@ static struct rte_acl_ctx *acl_ctx;
static void *
running_alloc(char *name, size_t size,
- size_t align, int32_t socket_id, void *udata)
+ size_t align, int32_t numa_id, void *udata)
{
size_t aligned_size = RTE_ALIGN_CEIL(size, align);
RTE_SET_USED(name);
- RTE_SET_USED(socket_id);
+ RTE_SET_USED(numa_id);
if (udata != acl_ctx) {
printf("%s#%i udata mismatch!\n",
diff --git a/app/test/test_bitratestats.c b/app/test/test_bitratestats.c
index 45343aa4c6..8ca9aa5b6d 100644
--- a/app/test/test_bitratestats.c
+++ b/app/test/test_bitratestats.c
@@ -59,7 +59,7 @@ test_stats_bitrate_reg(void)
"without metrics init, ret:%d", ret);
/* Metrics initialization */
- rte_metrics_init(rte_socket_id());
+ rte_metrics_init(rte_numa_id());
/* Test to register bit rate after metrics init */
ret = rte_stats_bitrate_reg(bitrate_data);
TEST_ASSERT((ret >= 0), "Test Failed: rte_stats_bitrate_reg %d", ret);
diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index 032efc6143..45a6245a54 100644
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -4490,11 +4490,11 @@ static int null_vdev_setup(const char *name, uint16_t *port, struct rte_mempool
TEST_ASSERT(ret == 0, "failed to configure port %u: %d", *port, ret);
struct rte_eth_txconf txconf = { };
- ret = rte_eth_tx_queue_setup(*port, 0, BPF_TEST_BURST, SOCKET_ID_ANY, &txconf);
+ ret = rte_eth_tx_queue_setup(*port, 0, BPF_TEST_BURST, RTE_NUMA_ID_ANY, &txconf);
TEST_ASSERT(ret == 0, "failed to setup tx queue port %u: %d", *port, ret);
struct rte_eth_rxconf rxconf = { };
- ret = rte_eth_rx_queue_setup(*port, 0, BPF_TEST_BURST, SOCKET_ID_ANY,
+ ret = rte_eth_rx_queue_setup(*port, 0, BPF_TEST_BURST, RTE_NUMA_ID_ANY,
&rxconf, pool);
TEST_ASSERT(ret == 0, "failed to setup rx queue port %u: %d", *port, ret);
@@ -4623,7 +4623,7 @@ test_bpf_elf_tx_load(load_elf_image_t load_elf_image)
/* Make a pool for packets */
mb_pool = rte_pktmbuf_pool_create("bpf_tx_test_pool", BPF_TEST_POOLSIZE,
0, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
TEST_ASSERT(mb_pool != NULL, "failed to create mempool");
ret = null_vdev_setup(null_dev, &port, mb_pool);
@@ -4712,7 +4712,7 @@ test_bpf_elf_rx_load(load_elf_image_t load_elf_image)
/* Make a pool for packets */
pool = rte_pktmbuf_pool_create("bpf_rx_test_pool", 2 * BPF_TEST_BURST,
0, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
TEST_ASSERT(pool != NULL, "failed to create mempool");
ret = null_vdev_setup(null_dev, &port, pool);
diff --git a/app/test/test_cksum.c b/app/test/test_cksum.c
index d94539820a..6bc9b193b0 100644
--- a/app/test/test_cksum.c
+++ b/app/test/test_cksum.c
@@ -333,7 +333,7 @@ test_cksum(void)
/* create pktmbuf pool if it does not exist */
pktmbuf_pool = rte_pktmbuf_pool_create("test_cksum_mbuf_pool",
NB_MBUF, MEMPOOL_CACHE_SIZE, 0, MBUF_DATA_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (pktmbuf_pool == NULL)
GOTO_FAIL("cannot allocate mbuf pool");
diff --git a/app/test/test_compressdev.c b/app/test/test_compressdev.c
index ed0352a909..36b022d85d 100644
--- a/app/test/test_compressdev.c
+++ b/app/test/test_compressdev.c
@@ -219,7 +219,7 @@ testsuite_setup(void)
NUM_LARGE_MBUFS,
CACHE_SIZE, 0,
max_buf_size + RTE_PKTMBUF_HEADROOM,
- rte_socket_id());
+ rte_numa_id());
if (ts_params->large_mbuf_pool == NULL) {
RTE_LOG(ERR, USER1, "Large mbuf pool could not be created\n");
return TEST_FAILED;
@@ -230,7 +230,7 @@ testsuite_setup(void)
NUM_LARGE_MBUFS * MAX_SEGS,
CACHE_SIZE, 0,
SMALL_SEG_SIZE + RTE_PKTMBUF_HEADROOM,
- rte_socket_id());
+ rte_numa_id());
if (ts_params->small_mbuf_pool == NULL) {
RTE_LOG(ERR, USER1, "Small mbuf pool could not be created\n");
goto exit;
@@ -241,7 +241,7 @@ testsuite_setup(void)
NUM_BIG_MBUFS + 1,
CACHE_SIZE, 0,
MAX_MBUF_SEGMENT_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (ts_params->big_mbuf_pool == NULL) {
RTE_LOG(ERR, USER1, "Big mbuf pool could not be created\n");
goto exit;
@@ -249,7 +249,7 @@ testsuite_setup(void)
ts_params->op_pool = rte_comp_op_pool_create("op_pool", NUM_OPS,
0, sizeof(struct priv_op_data),
- rte_socket_id());
+ rte_numa_id());
if (ts_params->op_pool == NULL) {
RTE_LOG(ERR, USER1, "Operation pool could not be created\n");
goto exit;
@@ -297,7 +297,7 @@ generic_ut_setup(void)
{
/* Configure compressdev (one device, one queue pair) */
struct rte_compressdev_config config = {
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.nb_queue_pairs = 1,
.max_nb_priv_xforms = NUM_MAX_XFORMS,
.max_nb_streams = 1
@@ -309,7 +309,7 @@ generic_ut_setup(void)
}
if (rte_compressdev_queue_pair_setup(0, 0, NUM_MAX_INFLIGHT_OPS,
- rte_socket_id()) < 0) {
+ rte_numa_id()) < 0) {
RTE_LOG(ERR, USER1, "Queue pair setup failed\n");
return -1;
}
@@ -335,7 +335,7 @@ test_compressdev_invalid_configuration(void)
{
struct rte_compressdev_config invalid_config;
struct rte_compressdev_config valid_config = {
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.nb_queue_pairs = 1,
.max_nb_priv_xforms = NUM_MAX_XFORMS,
.max_nb_streams = 1
@@ -368,7 +368,7 @@ test_compressdev_invalid_configuration(void)
/* Invalid queue pair setup, with no number of queue pairs set */
TEST_ASSERT_FAIL(rte_compressdev_queue_pair_setup(0, 0,
- NUM_MAX_INFLIGHT_OPS, rte_socket_id()),
+ NUM_MAX_INFLIGHT_OPS, rte_numa_id()),
"Queue pair setup was successful "
"with no queue pairs set (invalid)\n");
@@ -3065,18 +3065,18 @@ test_compressdev_deflate_stateful_decomp_checksum(void)
static const struct rte_memzone *
make_memzone(const char *name, size_t size)
{
- unsigned int socket_id = rte_socket_id();
+ unsigned int numa_id = rte_numa_id();
char mz_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *memzone;
- snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "%s_%u", name, socket_id);
+ snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "%s_%u", name, numa_id);
memzone = rte_memzone_lookup(mz_name);
if (memzone != NULL && memzone->len != size) {
rte_memzone_free(memzone);
memzone = NULL;
}
if (memzone == NULL) {
- memzone = rte_memzone_reserve_aligned(mz_name, size, socket_id,
+ memzone = rte_memzone_reserve_aligned(mz_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, RTE_CACHE_LINE_SIZE);
if (memzone == NULL)
RTE_LOG(ERR, USER1, "Can't allocate memory zone %s",
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index aa689b297a..d12a5c704a 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -652,7 +652,7 @@ testsuite_setup(void)
ts_params->mbuf_pool = rte_pktmbuf_pool_create(
"CRYPTO_MBUFPOOL",
NUM_MBUFS, MBUF_CACHE_SIZE, 0, MBUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (ts_params->mbuf_pool == NULL) {
RTE_LOG(ERR, USER1, "Can't create CRYPTO_MBUFPOOL\n");
return TEST_FAILED;
@@ -666,7 +666,7 @@ testsuite_setup(void)
ts_params->large_mbuf_pool = rte_pktmbuf_pool_create(
"CRYPTO_LARGE_MBUFPOOL",
1, 0, 0, LARGE_MBUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (ts_params->large_mbuf_pool == NULL) {
RTE_LOG(ERR, USER1,
"Can't create CRYPTO_LARGE_MBUFPOOL\n");
@@ -681,7 +681,7 @@ testsuite_setup(void)
DEFAULT_NUM_XFORMS *
sizeof(struct rte_crypto_sym_xform) +
MAXIMUM_IV_LENGTH,
- rte_socket_id());
+ rte_numa_id());
if (ts_params->op_mpool == NULL) {
RTE_LOG(ERR, USER1, "Can't create CRYPTO_OP_POOL\n");
return TEST_FAILED;
@@ -716,7 +716,7 @@ testsuite_setup(void)
rte_cryptodev_info_get(dev_id, &info);
ts_params->conf.nb_queue_pairs = info.max_nb_queue_pairs;
- ts_params->conf.numa_id = SOCKET_ID_ANY;
+ ts_params->conf.numa_id = RTE_NUMA_ID_ANY;
ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
unsigned int session_size =
@@ -742,7 +742,7 @@ testsuite_setup(void)
ts_params->session_mpool = rte_cryptodev_sym_session_pool_create(
"test_sess_mp", MAX_NB_SESSIONS, session_size, 0, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
TEST_ASSERT_NOT_NULL(ts_params->session_mpool,
"session mempool allocation failed");
@@ -757,7 +757,7 @@ testsuite_setup(void)
for (qp_id = 0; qp_id < info.max_nb_queue_pairs; qp_id++) {
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
dev_id, qp_id, &ts_params->qp_conf,
- rte_cryptodev_socket_id(dev_id)),
+ rte_cryptodev_numa_id(dev_id)),
"Failed to setup queue pair %u on cryptodev %u",
qp_id, dev_id);
}
@@ -1512,7 +1512,7 @@ dev_configure_and_start(uint64_t ff_disable)
memset(ut_params, 0, sizeof(*ut_params));
/* Reconfigure device to default parameters */
- ts_params->conf.numa_id = SOCKET_ID_ANY;
+ ts_params->conf.numa_id = RTE_NUMA_ID_ANY;
ts_params->conf.ff_disable = ff_disable;
ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
ts_params->qp_conf.mp_session = ts_params->session_mpool;
@@ -1526,7 +1526,7 @@ dev_configure_and_start(uint64_t ff_disable)
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0], qp_id,
&ts_params->qp_conf,
- rte_cryptodev_socket_id(ts_params->valid_devs[0])),
+ rte_cryptodev_numa_id(ts_params->valid_devs[0])),
"Failed to setup queue pair %u on cryptodev %u",
qp_id, ts_params->valid_devs[0]);
}
@@ -1614,7 +1614,7 @@ ut_setup_security_rx_inject(void)
ret = rte_eth_rx_queue_setup(0 /* port_id */,
0 /* rx_queue_id */,
1024 /* nb_rx_desc */,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
&rx_conf,
mbuf_pool);
if (ret) {
@@ -1711,7 +1711,7 @@ ext_mbuf_create(struct rte_mempool *mbuf_pool, int pkt_len,
memzone = NULL;
}
if (memzone == NULL) {
- memzone = rte_memzone_reserve_aligned(mz_name, buf_len, SOCKET_ID_ANY,
+ memzone = rte_memzone_reserve_aligned(mz_name, buf_len, RTE_NUMA_ID_ANY,
RTE_MEMZONE_IOVA_CONTIG, RTE_CACHE_LINE_SIZE);
if (memzone == NULL) {
printf("Can't allocate memory zone %s\n", mz_name);
@@ -1981,7 +1981,7 @@ test_queue_pair_descriptor_setup(void)
for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0], qp_id, &qp_conf,
- rte_cryptodev_socket_id(
+ rte_cryptodev_numa_id(
ts_params->valid_devs[0])),
"Failed test for "
"rte_cryptodev_queue_pair_setup: num_inflights "
@@ -1995,7 +1995,7 @@ test_queue_pair_descriptor_setup(void)
for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0], qp_id, &qp_conf,
- rte_cryptodev_socket_id(
+ rte_cryptodev_numa_id(
ts_params->valid_devs[0])),
"Failed test for"
" rte_cryptodev_queue_pair_setup: num_inflights"
@@ -2009,7 +2009,7 @@ test_queue_pair_descriptor_setup(void)
for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0], qp_id, &qp_conf,
- rte_cryptodev_socket_id(
+ rte_cryptodev_numa_id(
ts_params->valid_devs[0])),
"Failed test for "
"rte_cryptodev_queue_pair_setup: num_inflights"
@@ -2023,7 +2023,7 @@ test_queue_pair_descriptor_setup(void)
for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0], qp_id, &qp_conf,
- rte_cryptodev_socket_id(
+ rte_cryptodev_numa_id(
ts_params->valid_devs[0])),
"Failed test for"
" rte_cryptodev_queue_pair_setup:"
@@ -2040,7 +2040,7 @@ test_queue_pair_descriptor_setup(void)
TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0],
qp_id, &qp_conf,
- rte_cryptodev_socket_id(ts_params->valid_devs[0])),
+ rte_cryptodev_numa_id(ts_params->valid_devs[0])),
"Failed test for rte_cryptodev_queue_pair_setup:"
"invalid qp %u on cryptodev %u",
qp_id, ts_params->valid_devs[0]);
@@ -2050,7 +2050,7 @@ test_queue_pair_descriptor_setup(void)
TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0],
qp_id, &qp_conf,
- rte_cryptodev_socket_id(ts_params->valid_devs[0])),
+ rte_cryptodev_numa_id(ts_params->valid_devs[0])),
"Failed test for rte_cryptodev_queue_pair_setup:"
"invalid qp %u on cryptodev %u",
qp_id, ts_params->valid_devs[0]);
@@ -14497,7 +14497,7 @@ test_device_reconfigure(void)
for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0], qp_id, &qp_conf,
- rte_cryptodev_socket_id(
+ rte_cryptodev_numa_id(
ts_params->valid_devs[0])),
"Failed test for "
"rte_cryptodev_queue_pair_setup: num_inflights "
@@ -14519,7 +14519,7 @@ test_device_reconfigure(void)
for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0], qp_id, &qp_conf,
- rte_cryptodev_socket_id(
+ rte_cryptodev_numa_id(
ts_params->valid_devs[0])),
"Failed test for "
"rte_cryptodev_queue_pair_setup: num_inflights "
@@ -15277,7 +15277,7 @@ test_enq_callback_setup(void)
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0], qp_id, &qp_conf,
- rte_cryptodev_socket_id(ts_params->valid_devs[0])),
+ rte_cryptodev_numa_id(ts_params->valid_devs[0])),
"Failed test for "
"rte_cryptodev_queue_pair_setup: num_inflights "
"%u on qp %u on cryptodev %u",
@@ -15402,7 +15402,7 @@ test_deq_callback_setup(void)
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0], qp_id, &qp_conf,
- rte_cryptodev_socket_id(ts_params->valid_devs[0])),
+ rte_cryptodev_numa_id(ts_params->valid_devs[0])),
"Failed test for "
"rte_cryptodev_queue_pair_setup: num_inflights "
"%u on qp %u on cryptodev %u",
@@ -17712,7 +17712,7 @@ scheduler_testsuite_setup(void)
char temp_str[VDEV_ARGS_SIZE] = {"mode=multi-core,"
"ordering=enable,name=cryptodev_test_scheduler,corelist="};
uint16_t worker_core_count = 0;
- uint16_t socket_id = 0;
+ uint16_t numa_id = 0;
if (gbl_driver_id == rte_cryptodev_driver_id_get(
RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD))) {
@@ -17735,7 +17735,7 @@ scheduler_testsuite_setup(void)
strcpy(temp_str, vdev_args);
strlcat(temp_str, ";", sizeof(temp_str));
worker_core_count++;
- socket_id = rte_lcore_to_socket_id(i);
+ numa_id = rte_lcore_to_numa_id(i);
}
if (worker_core_count != 2) {
RTE_LOG(ERR, USER1,
@@ -17745,8 +17745,8 @@ scheduler_testsuite_setup(void)
return TEST_FAILED;
}
strcpy(temp_str, vdev_args);
- ret = snprintf(vdev_args, sizeof(vdev_args), "%s,socket_id=%d", temp_str,
- socket_id);
+ ret = snprintf(vdev_args, sizeof(vdev_args), "%s,numa_id=%d", temp_str,
+ numa_id);
if (ret >= VDEV_ARGS_SIZE) {
RTE_LOG(ERR, USER1,
"Cryptodev scheduler test vdev arg size exceeded\n");
@@ -17835,7 +17835,7 @@ test_scheduler_attach_worker_op(void)
rte_cryptodev_sym_session_pool_create(
"test_sess_mp",
MAX_NB_SESSIONS, session_size,
- 0, 0, SOCKET_ID_ANY);
+ 0, 0, RTE_NUMA_ID_ANY);
TEST_ASSERT_NOT_NULL(ts_params->session_mpool,
"session mempool allocation failed");
}
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index d68fe84cde..e1d63521ac 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -1130,7 +1130,7 @@ testsuite_setup(void)
RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
TEST_NUM_BUFS, 0,
0,
- rte_socket_id());
+ rte_numa_id());
if (ts_params->op_mpool == NULL) {
RTE_LOG(ERR, USER1, "Can't create ASYM_CRYPTO_OP_POOL\n");
return TEST_FAILED;
@@ -1199,14 +1199,14 @@ testsuite_setup(void)
for (qp_id = 0; qp_id < info.max_nb_queue_pairs; qp_id++) {
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
dev_id, qp_id, &ts_params->qp_conf,
- rte_cryptodev_socket_id(dev_id)),
+ rte_cryptodev_numa_id(dev_id)),
"Failed to setup queue pair %u on cryptodev %u ASYM",
qp_id, dev_id);
}
ts_params->session_mpool = rte_cryptodev_asym_session_pool_create(
"test_asym_sess_mp", TEST_NUM_SESSIONS, 0, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
TEST_ASSERT_NOT_NULL(ts_params->session_mpool,
"session mempool allocation failed");
@@ -1262,7 +1262,7 @@ ut_setup_asym(void)
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
ts_params->valid_devs[0], qp_id,
&ts_params->qp_conf,
- rte_cryptodev_socket_id(ts_params->valid_devs[0])),
+ rte_cryptodev_numa_id(ts_params->valid_devs[0])),
"Failed to setup queue pair %u on cryptodev %u",
qp_id, ts_params->valid_devs[0]);
}
diff --git a/app/test/test_cryptodev_crosscheck.c b/app/test/test_cryptodev_crosscheck.c
index d0ff3e0b35..f5eb20d1b3 100644
--- a/app/test/test_cryptodev_crosscheck.c
+++ b/app/test/test_cryptodev_crosscheck.c
@@ -403,7 +403,7 @@ crosscheck_init(void)
/* Create pools for mbufs, crypto operations and sessions */
ts_params->mbuf_pool = rte_pktmbuf_pool_create("CRYPTO_MBUFPOOL", NUM_MBUFS,
- MBUF_CACHE_SIZE, 0, MBUF_SIZE, rte_socket_id());
+ MBUF_CACHE_SIZE, 0, MBUF_SIZE, rte_numa_id());
if (ts_params->mbuf_pool == NULL) {
RTE_LOG(ERR, USER1, "Can't create CRYPTO_MBUFPOOL\n");
return TEST_FAILED;
@@ -412,7 +412,7 @@ crosscheck_init(void)
ts_params->op_mpool = rte_crypto_op_pool_create("MBUF_CRYPTO_SYM_OP_POOL",
RTE_CRYPTO_OP_TYPE_SYMMETRIC, NUM_MBUFS, MBUF_CACHE_SIZE,
DEFAULT_NUM_XFORMS * sizeof(struct rte_crypto_sym_xform) +
- MAXIMUM_IV_LENGTH, rte_socket_id());
+ MAXIMUM_IV_LENGTH, rte_numa_id());
if (ts_params->op_mpool == NULL) {
RTE_LOG(ERR, USER1, "Can't create CRYPTO_OP_POOL\n");
@@ -420,12 +420,12 @@ crosscheck_init(void)
}
ts_params->session_mpool = rte_cryptodev_sym_session_pool_create("test_sess_mp",
- MAX_NB_SESSIONS, session_priv_size, 0, 0, SOCKET_ID_ANY);
+ MAX_NB_SESSIONS, session_priv_size, 0, 0, RTE_NUMA_ID_ANY);
TEST_ASSERT_NOT_NULL(ts_params->session_mpool, "session mempool allocation failed");
/* Setup queue pair conf params */
ts_params->conf.nb_queue_pairs = nb_queue_pairs;
- ts_params->conf.numa_id = SOCKET_ID_ANY;
+ ts_params->conf.numa_id = RTE_NUMA_ID_ANY;
ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
ts_params->qp_conf.mp_session = ts_params->session_mpool;
@@ -525,7 +525,7 @@ dev_configure_and_start(uint64_t ff_disable)
for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
dev_id, qp_id, &ts_params->qp_conf,
- rte_cryptodev_socket_id(dev_id)),
+ rte_cryptodev_numa_id(dev_id)),
"Failed to setup queue pair %u on cryptodev %u",
qp_id, dev_id);
}
diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c
index da0a21ea83..705a6cd06f 100644
--- a/app/test/test_distributor.c
+++ b/app/test/test_distributor.c
@@ -736,7 +736,7 @@ int test_error_distributor_create_name(void)
struct rte_distributor *db = NULL;
char *name = NULL;
- d = rte_distributor_create(name, rte_socket_id(),
+ d = rte_distributor_create(name, rte_numa_id(),
rte_lcore_count() - 1,
RTE_DIST_ALG_SINGLE);
if (d != NULL || rte_errno != EINVAL) {
@@ -744,7 +744,7 @@ int test_error_distributor_create_name(void)
return -1;
}
- db = rte_distributor_create(name, rte_socket_id(),
+ db = rte_distributor_create(name, rte_numa_id(),
rte_lcore_count() - 1,
RTE_DIST_ALG_BURST);
if (db != NULL || rte_errno != EINVAL) {
@@ -762,7 +762,7 @@ int test_error_distributor_create_numworkers(void)
struct rte_distributor *ds = NULL;
struct rte_distributor *db = NULL;
- ds = rte_distributor_create("test_numworkers", rte_socket_id(),
+ ds = rte_distributor_create("test_numworkers", rte_numa_id(),
RTE_MAX_LCORE + 10,
RTE_DIST_ALG_SINGLE);
if (ds != NULL || rte_errno != EINVAL) {
@@ -770,7 +770,7 @@ int test_error_distributor_create_numworkers(void)
return -1;
}
- db = rte_distributor_create("test_numworkers", rte_socket_id(),
+ db = rte_distributor_create("test_numworkers", rte_numa_id(),
RTE_MAX_LCORE + 10,
RTE_DIST_ALG_BURST);
if (db != NULL || rte_errno != EINVAL) {
@@ -847,7 +847,7 @@ test_distributor(void)
}
if (db == NULL) {
- db = rte_distributor_create("Test_dist_burst", rte_socket_id(),
+ db = rte_distributor_create("Test_dist_burst", rte_numa_id(),
rte_lcore_count() - 1,
RTE_DIST_ALG_BURST);
if (db == NULL) {
@@ -861,7 +861,7 @@ test_distributor(void)
if (ds == NULL) {
ds = rte_distributor_create("Test_dist_single",
- rte_socket_id(),
+ rte_numa_id(),
rte_lcore_count() - 1,
RTE_DIST_ALG_SINGLE);
if (ds == NULL) {
@@ -877,7 +877,7 @@ test_distributor(void)
(BIG_BATCH * 2) - 1 : (511 * rte_lcore_count());
if (p == NULL) {
p = rte_pktmbuf_pool_create("DT_MBUF_POOL", nb_bufs, BURST,
- 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (p == NULL) {
printf("Error creating mempool\n");
return -1;
diff --git a/app/test/test_distributor_perf.c b/app/test/test_distributor_perf.c
index e678aecf77..e56297c4c0 100644
--- a/app/test/test_distributor_perf.c
+++ b/app/test/test_distributor_perf.c
@@ -226,7 +226,7 @@ test_distributor_perf(void)
time_cache_line_switch();
if (ds == NULL) {
- ds = rte_distributor_create("Test_perf", rte_socket_id(),
+ ds = rte_distributor_create("Test_perf", rte_numa_id(),
rte_lcore_count() - 1,
RTE_DIST_ALG_SINGLE);
if (ds == NULL) {
@@ -238,7 +238,7 @@ test_distributor_perf(void)
}
if (db == NULL) {
- db = rte_distributor_create("Test_burst", rte_socket_id(),
+ db = rte_distributor_create("Test_burst", rte_numa_id(),
rte_lcore_count() - 1,
RTE_DIST_ALG_BURST);
if (db == NULL) {
@@ -253,7 +253,7 @@ test_distributor_perf(void)
(BIG_BATCH * 2) - 1 : (511 * rte_lcore_count());
if (p == NULL) {
p = rte_pktmbuf_pool_create("DPT_MBUF_POOL", nb_bufs, BURST,
- 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (p == NULL) {
printf("Error creating mempool\n");
return -1;
diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c
index 1cfa8c1e10..246c99cc05 100644
--- a/app/test/test_dmadev.c
+++ b/app/test/test_dmadev.c
@@ -1132,13 +1132,13 @@ test_enq_deq_ops(int16_t dev_id, uint16_t vchan)
ERR_RETURN("Error with rte_dma_info_get()\n");
pkt_pool = rte_pktmbuf_pool_create("pkt_pool", info.max_desc * 2, 0, 0,
- CPY_LEN + RTE_PKTMBUF_HEADROOM, rte_socket_id());
+ CPY_LEN + RTE_PKTMBUF_HEADROOM, rte_numa_id());
if (pkt_pool == NULL)
ERR_RETURN("Error creating pkt pool\n");
ops_pool = rte_mempool_create("ops_pool", info.max_desc,
sizeof(struct rte_dma_op) + (sizeof(struct rte_dma_sge) * 2),
- 0, 0, NULL, NULL, NULL, NULL, rte_socket_id(), 0);
+ 0, 0, NULL, NULL, NULL, NULL, rte_numa_id(), 0);
if (ops_pool == NULL)
ERR_RETURN("Error creating ops pool\n");
diff --git a/app/test/test_efd.c b/app/test/test_efd.c
index 4a4379c563..3a754b19a3 100644
--- a/app/test/test_efd.c
+++ b/app/test/test_efd.c
@@ -30,7 +30,7 @@ test_efd(void)
#else
#define VALUE_BITMASK ((1 << RTE_EFD_VALUE_NUM_BITS) - 1)
#endif
-static unsigned int test_socket_id;
+static unsigned int test_numa_id;
/* 5-tuple key type */
struct __rte_packed_begin flow_key {
@@ -100,18 +100,18 @@ static struct flow_key keys[5] = {
/* Array to store the data */
static efd_value_t data[5];
-static inline uint64_t efd_get_all_sockets_bitmask(void)
+static inline uint64_t efd_get_all_numas_bitmask(void)
{
- uint64_t all_cpu_sockets_bitmask = 0;
+ uint64_t all_cpu_numas_bitmask = 0;
unsigned int i;
unsigned int next_lcore = rte_get_main_lcore();
const int val_true = 1, val_false = 0;
for (i = 0; i < rte_lcore_count(); i++) {
- all_cpu_sockets_bitmask |= 1ULL << rte_lcore_to_socket_id(next_lcore);
+ all_cpu_numas_bitmask |= 1ULL << rte_lcore_to_numa_id(next_lcore);
next_lcore = rte_get_next_lcore(next_lcore, val_false, val_true);
}
- return all_cpu_sockets_bitmask;
+ return all_cpu_numas_bitmask;
}
/*
@@ -130,20 +130,20 @@ static int test_add_delete(void)
handle = rte_efd_create("test_add_delete",
TABLE_SIZE, sizeof(struct flow_key),
- efd_get_all_sockets_bitmask(), test_socket_id);
+ efd_get_all_numas_bitmask(), test_numa_id);
TEST_ASSERT_NOT_NULL(handle, "Error creating the EFD table\n");
data[0] = mrand48() & VALUE_BITMASK;
- TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_socket_id, &keys[0],
+ TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_numa_id, &keys[0],
data[0]),
"Error inserting the key");
print_key_info("Add", &keys[0], data[0]);
- TEST_ASSERT_EQUAL(rte_efd_lookup(handle, test_socket_id, &keys[0]),
+ TEST_ASSERT_EQUAL(rte_efd_lookup(handle, test_numa_id, &keys[0]),
data[0],
"failed to find key");
- TEST_ASSERT_SUCCESS(rte_efd_delete(handle, test_socket_id, &keys[0],
+ TEST_ASSERT_SUCCESS(rte_efd_delete(handle, test_numa_id, &keys[0],
&prev_value),
"failed to delete key");
TEST_ASSERT_EQUAL(prev_value, data[0],
@@ -174,27 +174,27 @@ static int test_add_update_delete(void)
handle = rte_efd_create("test_add_update_delete", TABLE_SIZE,
sizeof(struct flow_key),
- efd_get_all_sockets_bitmask(), test_socket_id);
+ efd_get_all_numas_bitmask(), test_numa_id);
TEST_ASSERT_NOT_NULL(handle, "Error creating the efd table\n");
- TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_socket_id, &keys[1],
+ TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_numa_id, &keys[1],
data[1]), "Error inserting the key");
print_key_info("Add", &keys[1], data[1]);
- TEST_ASSERT_EQUAL(rte_efd_lookup(handle, test_socket_id, &keys[1]),
+ TEST_ASSERT_EQUAL(rte_efd_lookup(handle, test_numa_id, &keys[1]),
data[1], "failed to find key");
print_key_info("Lkp", &keys[1], data[1]);
data[1] = data[1] + 1;
- TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_socket_id, &keys[1],
+ TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_numa_id, &keys[1],
data[1]), "Error re-inserting the key");
print_key_info("Add", &keys[1], data[1]);
- TEST_ASSERT_EQUAL(rte_efd_lookup(handle, test_socket_id, &keys[1]),
+ TEST_ASSERT_EQUAL(rte_efd_lookup(handle, test_numa_id, &keys[1]),
data[1], "failed to find key");
print_key_info("Lkp", &keys[1], data[1]);
- TEST_ASSERT_SUCCESS(rte_efd_delete(handle, test_socket_id, &keys[1],
+ TEST_ASSERT_SUCCESS(rte_efd_delete(handle, test_numa_id, &keys[1],
&prev_value), "failed to delete key");
TEST_ASSERT_EQUAL(prev_value, data[1],
"failed to delete the expected value, got %d, "
@@ -223,7 +223,7 @@ static int test_efd_find_existing(void)
/* Create EFD table. */
handle = rte_efd_create("efd_find_existing", TABLE_SIZE,
sizeof(struct flow_key),
- efd_get_all_sockets_bitmask(), test_socket_id);
+ efd_get_all_numas_bitmask(), test_numa_id);
TEST_ASSERT_NOT_NULL(handle, "Error creating the efd table\n");
/* Try to find existing EFD table */
@@ -259,7 +259,7 @@ static int test_five_keys(void)
handle = rte_efd_create("test_five_keys", TABLE_SIZE,
sizeof(struct flow_key),
- efd_get_all_sockets_bitmask(), test_socket_id);
+ efd_get_all_numas_bitmask(), test_numa_id);
TEST_ASSERT_NOT_NULL(handle, "Error creating the efd table\n");
/* Setup data */
@@ -268,7 +268,7 @@ static int test_five_keys(void)
/* Add */
for (i = 0; i < 5; i++) {
- TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_socket_id,
+ TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_numa_id,
&keys[i], data[i]),
"Error inserting the key");
print_key_info("Add", &keys[i], data[i]);
@@ -278,7 +278,7 @@ static int test_five_keys(void)
for (i = 0; i < 5; i++)
key_array[i] = &keys[i];
- rte_efd_lookup_bulk(handle, test_socket_id, 5,
+ rte_efd_lookup_bulk(handle, test_numa_id, 5,
(void *) &key_array, result);
for (i = 0; i < 5; i++) {
@@ -294,7 +294,7 @@ static int test_five_keys(void)
/* Add - update */
for (i = 0; i < 5; i++) {
- TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_socket_id,
+ TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_numa_id,
&keys[i], data[i]),
"Error inserting the key");
print_key_info("Add", &keys[i], data[i]);
@@ -302,7 +302,7 @@ static int test_five_keys(void)
/* Lookup */
for (i = 0; i < 5; i++) {
- TEST_ASSERT_EQUAL(rte_efd_lookup(handle, test_socket_id,
+ TEST_ASSERT_EQUAL(rte_efd_lookup(handle, test_numa_id,
&keys[i]), data[i],
"failed to find key");
print_key_info("Lkp", &keys[i], data[i]);
@@ -310,7 +310,7 @@ static int test_five_keys(void)
/* Delete */
for (i = 0; i < 5; i++) {
- TEST_ASSERT_SUCCESS(rte_efd_delete(handle, test_socket_id,
+ TEST_ASSERT_SUCCESS(rte_efd_delete(handle, test_numa_id,
&keys[i], &prev_value),
"failed to delete key");
TEST_ASSERT_EQUAL(prev_value, data[i],
@@ -342,8 +342,8 @@ static int test_average_table_utilization(void)
for (j = 0; j < ITERATIONS; j++) {
handle = rte_efd_create("test_efd", num_rules_in,
- EFD_TEST_KEY_LEN, efd_get_all_sockets_bitmask(),
- test_socket_id);
+ EFD_TEST_KEY_LEN, efd_get_all_numas_bitmask(),
+ test_numa_id);
if (handle == NULL) {
printf("efd table creation failed\n");
return -1;
@@ -360,10 +360,10 @@ static int test_average_table_utilization(void)
efd_value_t val = simple_key[0];
- if (rte_efd_update(handle, test_socket_id, simple_key,
+ if (rte_efd_update(handle, test_numa_id, simple_key,
val))
break; /* continue;*/
- if (rte_efd_lookup(handle, test_socket_id, simple_key)
+ if (rte_efd_lookup(handle, test_numa_id, simple_key)
!= val)
lost_keys++;
else
@@ -399,7 +399,7 @@ static int test_efd_creation_with_bad_parameters(void)
printf("Entering %s, **Errors are expected **\n", __func__);
handle = rte_efd_create("creation_with_bad_parameters_0", TABLE_SIZE, 0,
- efd_get_all_sockets_bitmask(), test_socket_id);
+ efd_get_all_numas_bitmask(), test_numa_id);
if (handle != NULL) {
rte_efd_free(handle);
printf("Impossible creating EFD table successfully "
@@ -408,7 +408,7 @@ static int test_efd_creation_with_bad_parameters(void)
}
handle = rte_efd_create("creation_with_bad_parameters_1", TABLE_SIZE,
- sizeof(struct flow_key), 0, test_socket_id);
+ sizeof(struct flow_key), 0, test_numa_id);
if (handle != NULL) {
rte_efd_free(handle);
printf("Impossible creating EFD table successfully "
@@ -417,7 +417,7 @@ static int test_efd_creation_with_bad_parameters(void)
}
handle = rte_efd_create("creation_with_bad_parameters_2", TABLE_SIZE,
- sizeof(struct flow_key), efd_get_all_sockets_bitmask(),
+ sizeof(struct flow_key), efd_get_all_numas_bitmask(),
255);
if (handle != NULL) {
rte_efd_free(handle);
@@ -429,13 +429,13 @@ static int test_efd_creation_with_bad_parameters(void)
/* test with same name should fail */
handle = rte_efd_create("same_name", TABLE_SIZE,
sizeof(struct flow_key),
- efd_get_all_sockets_bitmask(), 0);
+ efd_get_all_numas_bitmask(), 0);
if (handle == NULL) {
printf("Cannot create first EFD table with 'same_name'\n");
return -1;
}
tmp = rte_efd_create("same_name", TABLE_SIZE, sizeof(struct flow_key),
- efd_get_all_sockets_bitmask(), 0);
+ efd_get_all_numas_bitmask(), 0);
if (tmp != NULL) {
printf("Creation of EFD table with same name should fail\n");
rte_efd_free(handle);
@@ -452,7 +452,7 @@ static int test_efd_creation_with_bad_parameters(void)
static int
test_efd(void)
{
- test_socket_id = rte_socket_id();
+ test_numa_id = rte_numa_id();
/* Unit tests */
if (test_add_delete() < 0)
diff --git a/app/test/test_efd_perf.c b/app/test/test_efd_perf.c
index b212e96767..acda25e01e 100644
--- a/app/test/test_efd_perf.c
+++ b/app/test/test_efd_perf.c
@@ -37,20 +37,20 @@ test_efd_perf(void)
#else
#define VALUE_BITMASK ((1 << RTE_EFD_VALUE_NUM_BITS) - 1)
#endif
-static unsigned int test_socket_id;
+static unsigned int test_numa_id;
-static inline uint64_t efd_get_all_sockets_bitmask(void)
+static inline uint64_t efd_get_all_numas_bitmask(void)
{
- uint64_t all_cpu_sockets_bitmask = 0;
+ uint64_t all_cpu_numas_bitmask = 0;
unsigned int i;
unsigned int next_lcore = rte_get_main_lcore();
const int val_true = 1, val_false = 0;
for (i = 0; i < rte_lcore_count(); i++) {
- all_cpu_sockets_bitmask |= 1 << rte_lcore_to_socket_id(next_lcore);
+ all_cpu_numas_bitmask |= 1 << rte_lcore_to_numa_id(next_lcore);
next_lcore = rte_get_next_lcore(next_lcore, val_false, val_true);
}
- return all_cpu_sockets_bitmask;
+ return all_cpu_numas_bitmask;
}
enum operations {
@@ -168,7 +168,7 @@ setup_keys_and_data(struct efd_perf_params *params, unsigned int cycle)
params->efd_table = rte_efd_create("test_efd_perf",
MAX_ENTRIES, params->key_size,
- efd_get_all_sockets_bitmask(), test_socket_id);
+ efd_get_all_numas_bitmask(), test_numa_id);
TEST_ASSERT_NOT_NULL(params->efd_table, "Error creating the efd table\n");
return 0;
@@ -182,7 +182,7 @@ timed_adds(struct efd_perf_params *params)
int32_t ret;
for (i = 0; i < KEYS_TO_ADD; i++) {
- ret = rte_efd_update(params->efd_table, test_socket_id, keys[i],
+ ret = rte_efd_update(params->efd_table, test_numa_id, keys[i],
data[i]);
if (ret != 0) {
printf("Error %d in rte_efd_update - key=0x", ret);
@@ -211,7 +211,7 @@ timed_lookups(struct efd_perf_params *params)
for (i = 0; i < NUM_LOOKUPS / KEYS_TO_ADD; i++) {
for (j = 0; j < KEYS_TO_ADD; j++) {
ret_data = rte_efd_lookup(params->efd_table,
- test_socket_id, keys[j]);
+ test_numa_id, keys[j]);
if (ret_data != data[j]) {
printf("Value mismatch using rte_efd_lookup: "
"key #%d (0x", i);
@@ -248,7 +248,7 @@ timed_lookups_multi(struct efd_perf_params *params)
for (k = 0; k < RTE_EFD_BURST_MAX; k++)
keys_burst[k] = keys[j * RTE_EFD_BURST_MAX + k];
- rte_efd_lookup_bulk(params->efd_table, test_socket_id,
+ rte_efd_lookup_bulk(params->efd_table, test_numa_id,
RTE_EFD_BURST_MAX,
keys_burst, result);
@@ -287,7 +287,7 @@ timed_deletes(struct efd_perf_params *params)
int32_t ret;
for (i = 0; i < KEYS_TO_ADD; i++) {
- ret = rte_efd_delete(params->efd_table, test_socket_id, keys[i],
+ ret = rte_efd_delete(params->efd_table, test_numa_id, keys[i],
NULL);
if (ret != 0) {
@@ -337,7 +337,7 @@ run_all_tbl_perf_tests(void)
printf("Measuring performance, please wait\n");
fflush(stdout);
- test_socket_id = rte_socket_id();
+ test_numa_id = rte_numa_id();
for (i = 0; i < NUM_KEYSIZES; i++) {
diff --git a/app/test/test_ethdev_api.c b/app/test/test_ethdev_api.c
index 76afd0345c..4396ab5d4b 100644
--- a/app/test/test_ethdev_api.c
+++ b/app/test/test_ethdev_api.c
@@ -30,7 +30,7 @@ ethdev_api_queue_status(void)
return TEST_SKIPPED;
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", NUM_MBUF, MBUF_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
RTE_ETH_FOREACH_DEV(port_id) {
memset(ð_conf, 0, sizeof(eth_conf));
@@ -41,7 +41,7 @@ ethdev_api_queue_status(void)
/* RxQ setup */
for (uint16_t queue_id = 0; queue_id < NUM_RXQ; queue_id++) {
ret = rte_eth_rx_queue_setup(port_id, queue_id, NUM_RXD,
- rte_socket_id(), NULL, mbuf_pool);
+ rte_numa_id(), NULL, mbuf_pool);
TEST_ASSERT(ret == 0,
"Port(%u), queue(%u) failed to setup RxQ.\n",
port_id, queue_id);
@@ -50,7 +50,7 @@ ethdev_api_queue_status(void)
/* TxQ setup */
for (uint16_t queue_id = 0; queue_id < NUM_TXQ; queue_id++) {
ret = rte_eth_tx_queue_setup(port_id, queue_id, NUM_TXD,
- rte_socket_id(), NULL);
+ rte_numa_id(), NULL);
TEST_ASSERT(ret == 0,
"Port(%u), queue(%u) failed to setup TxQ.\n",
port_id, queue_id);
diff --git a/app/test/test_event_crypto_adapter.c b/app/test/test_event_crypto_adapter.c
index cac1584f40..aaf7d1b29d 100644
--- a/app/test/test_event_crypto_adapter.c
+++ b/app/test/test_event_crypto_adapter.c
@@ -1052,7 +1052,7 @@ configure_cryptodev(void)
params.mbuf_pool = rte_pktmbuf_pool_create(
"CRYPTO_ADAPTER_MBUFPOOL",
NUM_MBUFS, MBUF_CACHE_SIZE, 0, MBUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (params.mbuf_pool == NULL) {
RTE_LOG(ERR, USER1, "Can't create CRYPTO_MBUFPOOL\n");
return TEST_FAILED;
@@ -1066,7 +1066,7 @@ configure_cryptodev(void)
sizeof(struct rte_crypto_sym_xform) +
MAXIMUM_IV_LENGTH +
sizeof(union rte_event_crypto_metadata),
- rte_socket_id());
+ rte_numa_id());
if (params.op_mpool == NULL) {
RTE_LOG(ERR, USER1, "Can't create CRYPTO_OP_POOL\n");
return TEST_FAILED;
@@ -1100,7 +1100,7 @@ configure_cryptodev(void)
"CRYPTO_ADAPTER_SESSION_MP",
MAX_NB_SESSIONS, session_size, 0,
sizeof(union rte_event_crypto_metadata),
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
TEST_ASSERT_NOT_NULL(params.session_mpool,
"session mempool allocation failed\n");
@@ -1116,7 +1116,7 @@ configure_cryptodev(void)
(DEFAULT_NUM_XFORMS *
sizeof(struct rte_crypto_asym_xform)) +
sizeof(union rte_event_crypto_metadata),
- rte_socket_id());
+ rte_numa_id());
TEST_ASSERT_NOT_NULL(params.asym_op_mpool,
"Can't create CRYPTO_ASYM_OP_POOL\n");
@@ -1125,7 +1125,7 @@ configure_cryptodev(void)
"CRYPTO_AD_ASYM_SESS_MP",
MAX_NB_SESSIONS, 0,
sizeof(union rte_event_crypto_metadata),
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
TEST_ASSERT_NOT_NULL(params.asym_sess_mpool,
"asym session mempool allocation failed\n");
break;
@@ -1133,7 +1133,7 @@ configure_cryptodev(void)
}
conf.nb_queue_pairs = info.max_nb_queue_pairs;
- conf.socket_id = SOCKET_ID_ANY;
+ conf.numa_id = RTE_NUMA_ID_ANY;
conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
TEST_ASSERT_SUCCESS(rte_cryptodev_configure(TEST_CDEV_ID, &conf),
@@ -1145,7 +1145,7 @@ configure_cryptodev(void)
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
TEST_CDEV_ID, TEST_CDEV_QP_ID, &qp_conf,
- rte_cryptodev_socket_id(TEST_CDEV_ID)),
+ rte_cryptodev_numa_id(TEST_CDEV_ID)),
"Failed to setup queue pair %u on cryptodev %u\n",
TEST_CDEV_QP_ID, TEST_CDEV_ID);
diff --git a/app/test/test_event_dma_adapter.c b/app/test/test_event_dma_adapter.c
index be1e05af5b..7d1b2f9905 100644
--- a/app/test/test_event_dma_adapter.c
+++ b/app/test/test_event_dma_adapter.c
@@ -389,17 +389,17 @@ configure_dmadev(void)
params.src_mbuf_pool = rte_pktmbuf_pool_create("DMA_ADAPTER_SRC_MBUFPOOL", NUM_MBUFS,
MBUF_CACHE_SIZE, 0, MBUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
RTE_TEST_ASSERT_NOT_NULL(params.src_mbuf_pool, "Can't create DMA_SRC_MBUFPOOL\n");
params.dst_mbuf_pool = rte_pktmbuf_pool_create("DMA_ADAPTER_DST_MBUFPOOL", NUM_MBUFS,
MBUF_CACHE_SIZE, 0, MBUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
RTE_TEST_ASSERT_NOT_NULL(params.dst_mbuf_pool, "Can't create DMA_DST_MBUFPOOL\n");
elt_size = sizeof(struct rte_dma_op) + (sizeof(struct rte_dma_sge) * 2);
params.op_mpool = rte_mempool_create("EVENT_DMA_OP_POOL", DMA_OP_POOL_SIZE, elt_size, 0,
- 0, NULL, NULL, NULL, NULL, rte_socket_id(), 0);
+ 0, NULL, NULL, NULL, NULL, rte_numa_id(), 0);
RTE_TEST_ASSERT_NOT_NULL(params.op_mpool, "Can't create DMA_OP_POOL\n");
return TEST_SUCCESS;
diff --git a/app/test/test_event_eth_rx_adapter.c b/app/test/test_event_eth_rx_adapter.c
index 7b38935bec..6894093e15 100644
--- a/app/test/test_event_eth_rx_adapter.c
+++ b/app/test/test_event_eth_rx_adapter.c
@@ -86,7 +86,7 @@ port_init_common(uint16_t port, const struct rte_eth_conf *port_conf,
for (q = 0; q < default_params.rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port, q, rx_ring_size,
- rte_eth_dev_socket_id(port), NULL, mp);
+ rte_eth_dev_numa_id(port), NULL, mp);
if (retval < 0)
return retval;
}
@@ -94,7 +94,7 @@ port_init_common(uint16_t port, const struct rte_eth_conf *port_conf,
/* Allocate and set up 1 TX queue per Ethernet port. */
for (q = 0; q < default_params.tx_rings; q++) {
retval = rte_eth_tx_queue_setup(port, q, tx_ring_size,
- rte_eth_dev_socket_id(port), NULL);
+ rte_eth_dev_numa_id(port), NULL);
if (retval < 0)
return retval;
}
@@ -170,7 +170,7 @@ init_port_rx_intr(int num_ports)
MBUF_CACHE_SIZE,
MBUF_PRIV_SIZE,
RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (!default_params.mp)
return -ENOMEM;
@@ -209,7 +209,7 @@ init_ports(int num_ports)
MBUF_CACHE_SIZE,
MBUF_PRIV_SIZE,
RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
else
default_params.mp = ptr;
diff --git a/app/test/test_event_eth_tx_adapter.c b/app/test/test_event_eth_tx_adapter.c
index 0c161897ce..24b47e46f4 100644
--- a/app/test/test_event_eth_tx_adapter.c
+++ b/app/test/test_event_eth_tx_adapter.c
@@ -79,14 +79,14 @@ port_init_common(uint16_t port, const struct rte_eth_conf *port_conf,
for (q = 0; q < default_params.rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port, q, rx_ring_size,
- rte_eth_dev_socket_id(port), NULL, mp);
+ rte_eth_dev_numa_id(port), NULL, mp);
if (retval < 0)
return retval;
}
for (q = 0; q < default_params.tx_rings; q++) {
retval = rte_eth_tx_queue_setup(port, q, tx_ring_size,
- rte_eth_dev_socket_id(port), NULL);
+ rte_eth_dev_numa_id(port), NULL);
if (retval < 0)
return retval;
}
@@ -135,7 +135,7 @@ init_ports(void)
if (!default_params.mp)
default_params.mp = rte_pktmbuf_pool_create("mbuf_pool",
NB_MBUF, 32,
- 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (!default_params.mp)
return -ENOMEM;
diff --git a/app/test/test_event_ring.c b/app/test/test_event_ring.c
index 596faa4e30..b9f9e99118 100644
--- a/app/test/test_event_ring.c
+++ b/app/test/test_event_ring.c
@@ -42,13 +42,13 @@ test_event_ring_creation_with_wrong_size(void)
/* Test if ring size is not power of 2 */
rp = rte_event_ring_create("test_bad_ring_size", RING_SIZE + 1,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (rp != NULL)
return -1;
/* Test if ring size is exceeding the limit */
rp = rte_event_ring_create("test_bad_ring_size", (RTE_RING_SZ_MASK + 1),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (rp != NULL)
return -1;
return 0;
@@ -62,7 +62,7 @@ static int
test_create_count_odd(void)
{
struct rte_event_ring *r = rte_event_ring_create("test_event_ring_count",
- 4097, SOCKET_ID_ANY, 0);
+ 4097, RTE_NUMA_ID_ANY, 0);
if (r != NULL)
return -1;
return 0;
@@ -87,7 +87,7 @@ test_basic_event_enqueue_dequeue(void)
uint16_t ret, free_count, used_count;
memset(evs, 0, sizeof(evs));
- sr = rte_event_ring_create("spsc_ring", 32, rte_socket_id(),
+ sr = rte_event_ring_create("spsc_ring", 32, rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (sr == NULL) {
printf("Failed to create sp/sc ring\n");
@@ -151,14 +151,14 @@ test_event_ring_with_exact_size(void)
static const unsigned int ring_sz = RTE_DIM(ev_array);
unsigned int i;
- std_ring = rte_event_ring_create("std", ring_sz, rte_socket_id(),
+ std_ring = rte_event_ring_create("std", ring_sz, rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (std_ring == NULL) {
printf("%s: error, can't create std ring\n", __func__);
return -1;
}
exact_sz_ring = rte_event_ring_create("exact sz",
- ring_sz, rte_socket_id(),
+ ring_sz, rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ | RING_F_EXACT_SZ);
if (exact_sz_ring == NULL) {
printf("%s: error, can't create exact size ring\n", __func__);
@@ -218,7 +218,7 @@ test_event_ring(void)
{
if (r == NULL)
r = rte_event_ring_create("ev_test", RING_SIZE,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (r == NULL)
return -1;
diff --git a/app/test/test_event_timer_adapter.c b/app/test/test_event_timer_adapter.c
index bf5ff56bed..af12bc19e1 100644
--- a/app/test/test_event_timer_adapter.c
+++ b/app/test/test_event_timer_adapter.c
@@ -338,7 +338,7 @@ _timdev_setup(uint64_t max_tmo_ns, uint64_t bkt_tck_ns, uint64_t flags)
sizeof(struct rte_event_timer), /* element size*/
0, /* cache size*/
0, NULL, NULL, NULL, NULL,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (!eventdev_test_mempool) {
printf("ERROR creating mempool\n");
return TEST_FAILED;
@@ -995,7 +995,7 @@ test_timer_cancel_multicore(void)
{
arm_done = 0;
timer_producer_ring = rte_ring_create("timer_cancel_queue",
- MAX_TIMERS * 2, rte_socket_id(), 0);
+ MAX_TIMERS * 2, rte_numa_id(), 0);
TEST_ASSERT_NOT_NULL(timer_producer_ring,
"Unable to reserve memory for ring");
@@ -1021,7 +1021,7 @@ test_timer_cancel_burst_multicore(void)
{
arm_done = 0;
timer_producer_ring = rte_ring_create("timer_cancel_queue",
- MAX_TIMERS * 2, rte_socket_id(), 0);
+ MAX_TIMERS * 2, rte_numa_id(), 0);
TEST_ASSERT_NOT_NULL(timer_producer_ring,
"Unable to reserve memory for ring");
diff --git a/app/test/test_event_vector_adapter.c b/app/test/test_event_vector_adapter.c
index c6d694421b..606db8105c 100644
--- a/app/test/test_event_vector_adapter.c
+++ b/app/test/test_event_vector_adapter.c
@@ -86,12 +86,12 @@ test_event_vector_adapter_create_multi(void)
TEST_ASSERT_SUCCESS(ret, "Failed to get event vector adapter info");
vector_mp = rte_event_vector_pool_create("vector_mp", MAX_EVENTS, 0, MAX_VECTOR_SIZE,
- rte_socket_id());
+ rte_numa_id());
TEST_ASSERT(vector_mp != NULL, "Failed to create mempool");
conf.event_dev_id = evdev;
- conf.socket_id = rte_socket_id();
+ conf.numa_id = rte_numa_id();
conf.vector_sz = RTE_MIN(MAX_VECTOR_SIZE, info.max_vector_sz);
conf.vector_timeout_ns = info.max_vector_timeout_ns;
conf.vector_mp = vector_mp;
@@ -140,11 +140,11 @@ test_event_vector_adapter_create(void)
TEST_ASSERT_SUCCESS(ret, "Failed to get event vector adapter info");
vector_mp = rte_event_vector_pool_create("vector_mp", MAX_EVENTS, 0, MAX_VECTOR_SIZE,
- rte_socket_id());
+ rte_numa_id());
TEST_ASSERT(vector_mp != NULL, "Failed to create mempool");
conf.event_dev_id = evdev;
- conf.socket_id = rte_socket_id();
+ conf.numa_id = rte_numa_id();
conf.vector_sz = RTE_MIN(MAX_VECTOR_SIZE, info.max_vector_sz);
conf.vector_timeout_ns = RTE_MIN(1E6, info.max_vector_timeout_ns);
conf.vector_mp = vector_mp;
diff --git a/app/test/test_eventdev.c b/app/test/test_eventdev.c
index 1241da38cb..af7e0a773f 100644
--- a/app/test/test_eventdev.c
+++ b/app/test/test_eventdev.c
@@ -70,14 +70,14 @@ test_eventdev_get_dev_id(void)
}
static int
-test_eventdev_socket_id(void)
+test_eventdev_numa_id(void)
{
- int socket_id;
- socket_id = rte_event_dev_socket_id(TEST_DEV_ID);
- TEST_ASSERT(socket_id != -EINVAL, "Failed to get socket_id %d",
- socket_id);
- socket_id = rte_event_dev_socket_id(RTE_EVENT_MAX_DEVS);
- TEST_ASSERT(socket_id == -EINVAL, "Expected -EINVAL %d", socket_id);
+ int numa_id;
+ numa_id = rte_event_dev_numa_id(TEST_DEV_ID);
+ TEST_ASSERT(numa_id != -EINVAL, "Failed to get numa_id %d",
+ numa_id);
+ numa_id = rte_event_dev_numa_id(RTE_EVENT_MAX_DEVS);
+ TEST_ASSERT(numa_id == -EINVAL, "Expected -EINVAL %d", numa_id);
return TEST_SUCCESS;
}
@@ -1407,7 +1407,7 @@ static struct unit_test_suite eventdev_common_testsuite = {
TEST_CASE_ST(NULL, NULL,
test_eventdev_get_dev_id),
TEST_CASE_ST(NULL, NULL,
- test_eventdev_socket_id),
+ test_eventdev_numa_id),
TEST_CASE_ST(NULL, NULL,
test_eventdev_info_get),
TEST_CASE_ST(NULL, NULL,
diff --git a/app/test/test_external_mem.c b/app/test/test_external_mem.c
index 8e6313f4e9..5ee1e05c6f 100644
--- a/app/test/test_external_mem.c
+++ b/app/test/test_external_mem.c
@@ -285,7 +285,7 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
{
const char *heap_name = "heap";
void *ptr = NULL;
- int socket_id;
+ int numa_id;
const struct rte_memzone *mz = NULL, *contig_mz = NULL;
/* create heap */
@@ -296,15 +296,15 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
}
/* get socket ID corresponding to this heap */
- socket_id = rte_malloc_heap_get_numa_id(heap_name);
- if (socket_id < 0) {
+ numa_id = rte_malloc_heap_get_numa_id(heap_name);
+ if (numa_id < 0) {
printf("%s():%i: cannot find socket for external heap\n",
__func__, __LINE__);
goto fail;
}
/* heap is empty, so any allocation should fail */
- ptr = rte_malloc_socket("EXTMEM", 64, 0, socket_id);
+ ptr = rte_malloc_numa("EXTMEM", 64, 0, numa_id);
if (ptr != NULL) {
printf("%s():%i: Allocated from empty heap\n", __func__,
__LINE__);
@@ -324,7 +324,7 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
goto fail;
/* allocate - this now should succeed */
- ptr = rte_malloc_socket("EXTMEM", 64, 0, socket_id);
+ ptr = rte_malloc_numa("EXTMEM", 64, 0, numa_id);
if (ptr == NULL) {
printf("%s():%i: Failed to allocate from external heap\n",
__func__, __LINE__);
@@ -352,7 +352,7 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
}
/* try allocating a memzone */
- mz = rte_memzone_reserve("heap_test", pgsz * 2, socket_id, 0);
+ mz = rte_memzone_reserve("heap_test", pgsz * 2, numa_id, 0);
if (mz == NULL) {
printf("%s():%i: Failed to reserve memzone\n",
__func__, __LINE__);
@@ -361,7 +361,7 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
/* try allocating an IOVA-contiguous memzone - this should succeed
* if we've set up a contiguous IOVA table, and fail if we haven't.
*/
- contig_mz = rte_memzone_reserve("heap_test_contig", pgsz * 2, socket_id,
+ contig_mz = rte_memzone_reserve("heap_test_contig", pgsz * 2, numa_id,
RTE_MEMZONE_IOVA_CONTIG);
if ((iova == NULL) != (contig_mz == NULL)) {
printf("%s():%i: Failed to reserve memzone\n",
diff --git a/app/test/test_fib.c b/app/test/test_fib.c
index bd73399d56..f87e3942ca 100644
--- a/app/test/test_fib.c
+++ b/app/test/test_fib.c
@@ -44,29 +44,29 @@ test_create_invalid(void)
config.type = RTE_FIB_DUMMY;
/* rte_fib_create: fib name == NULL */
- fib = rte_fib_create(NULL, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(NULL, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
/* rte_fib_create: config == NULL */
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, NULL);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, NULL);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
- /* socket_id < -1 is invalid */
+ /* numa_id < -1 is invalid */
fib = rte_fib_create(__func__, -2, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
/* rte_fib_create: max_routes = 0 */
config.max_routes = 0;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
config.max_routes = MAX_ROUTES;
config.type = RTE_FIB_DIR24_8 + 1;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
@@ -74,13 +74,13 @@ test_create_invalid(void)
config.dir24_8.num_tbl8 = MAX_TBL8;
config.dir24_8.nh_sz = RTE_FIB_DIR24_8_8B + 1;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
config.dir24_8.nh_sz = RTE_FIB_DIR24_8_8B;
config.dir24_8.num_tbl8 = 0;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
@@ -104,7 +104,7 @@ test_multiple_create(void)
for (i = 0; i < 100; i++) {
config.max_routes = MAX_ROUTES - i;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
rte_fib_free(fib);
}
@@ -129,7 +129,7 @@ test_free_null(void)
config.default_nh = 0;
config.type = RTE_FIB_DUMMY;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
rte_fib_free(fib);
@@ -167,7 +167,7 @@ test_add_del_invalid(void)
"Call succeeded with invalid parameters\n");
/*Create valid fib to use in rest of test. */
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
/* rte_fib_add: depth > RTE_FIB_MAXDEPTH */
@@ -331,7 +331,7 @@ test_lookup(void)
config.default_nh = def_nh;
config.type = RTE_FIB_DUMMY;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = check_fib(fib);
RTE_TEST_ASSERT(ret == TEST_SUCCESS,
@@ -342,7 +342,7 @@ test_lookup(void)
config.dir24_8.nh_sz = RTE_FIB_DIR24_8_1B;
config.dir24_8.num_tbl8 = 127;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = check_fib(fib);
RTE_TEST_ASSERT(ret == TEST_SUCCESS,
@@ -351,7 +351,7 @@ test_lookup(void)
config.dir24_8.nh_sz = RTE_FIB_DIR24_8_2B;
config.dir24_8.num_tbl8 = MAX_TBL8 - 1;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = check_fib(fib);
RTE_TEST_ASSERT(ret == TEST_SUCCESS,
@@ -360,7 +360,7 @@ test_lookup(void)
config.dir24_8.nh_sz = RTE_FIB_DIR24_8_4B;
config.dir24_8.num_tbl8 = MAX_TBL8;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = check_fib(fib);
RTE_TEST_ASSERT(ret == TEST_SUCCESS,
@@ -369,7 +369,7 @@ test_lookup(void)
config.dir24_8.nh_sz = RTE_FIB_DIR24_8_8B;
config.dir24_8.num_tbl8 = MAX_TBL8;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = check_fib(fib);
RTE_TEST_ASSERT(ret == TEST_SUCCESS,
@@ -401,13 +401,13 @@ test_invalid_rcu(void)
config.rib_ext_sz = 0;
config.default_nh = def_nh;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE);
- qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ qsv = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz, RTE_CACHE_LINE_SIZE,
+ RTE_NUMA_ID_ANY);
RTE_TEST_ASSERT(qsv != NULL, "Can not allocate memory for RCU\n");
status = rte_rcu_qsbr_init(qsv, RTE_MAX_LCORE);
@@ -426,7 +426,7 @@ test_invalid_rcu(void)
config.type = RTE_FIB_DIR24_8;
config.dir24_8.nh_sz = RTE_FIB_DIR24_8_4B;
config.dir24_8.num_tbl8 = MAX_TBL8;
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
/* Call rte_fib_rcu_qsbr_add without fib or config */
@@ -447,8 +447,8 @@ test_invalid_rcu(void)
RTE_TEST_ASSERT(status == 0, "Can not attach RCU to FIB\n");
/* Create and attach another RCU QSBR to FIB table */
- qsv2 = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ qsv2 = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz, RTE_CACHE_LINE_SIZE,
+ RTE_NUMA_ID_ANY);
RTE_TEST_ASSERT(qsv2 != NULL, "Can not allocate memory for RCU\n");
rcu_cfg.v = qsv2;
@@ -532,13 +532,13 @@ test_fib_rcu_sync_rw(void)
config.dir24_8.nh_sz = RTE_FIB_DIR24_8_4B;
config.dir24_8.num_tbl8 = 1;
- g_fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ g_fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(g_fib != NULL, "Failed to create FIB\n");
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(1);
- g_v = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ g_v = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz, RTE_CACHE_LINE_SIZE,
+ RTE_NUMA_ID_ANY);
RTE_TEST_ASSERT(g_v != NULL, "Can not allocate memory for RCU\n");
status = rte_rcu_qsbr_init(g_v, 1);
diff --git a/app/test/test_fib6.c b/app/test/test_fib6.c
index d33226d016..a9ee82c1dd 100644
--- a/app/test/test_fib6.c
+++ b/app/test/test_fib6.c
@@ -54,29 +54,29 @@ test_create_invalid(void)
config.type = RTE_FIB6_DUMMY;
/* rte_fib6_create: fib name == NULL */
- fib = rte_fib6_create(NULL, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(NULL, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
/* rte_fib6_create: config == NULL */
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, NULL);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, NULL);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
- /* socket_id < -1 is invalid */
+ /* numa_id < -1 is invalid */
fib = rte_fib6_create(__func__, -2, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
/* rte_fib6_create: max_routes = 0 */
config.max_routes = 0;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
config.max_routes = MAX_ROUTES;
config.type = RTE_FIB6_TRIE + 1;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
@@ -84,13 +84,13 @@ test_create_invalid(void)
config.trie.num_tbl8 = MAX_TBL8;
config.trie.nh_sz = RTE_FIB6_TRIE_8B + 1;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
config.trie.nh_sz = RTE_FIB6_TRIE_8B;
config.trie.num_tbl8 = 0;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
@@ -114,7 +114,7 @@ test_multiple_create(void)
for (i = 0; i < 100; i++) {
config.max_routes = MAX_ROUTES - i;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
rte_fib6_free(fib);
}
@@ -139,7 +139,7 @@ test_free_null(void)
config.default_nh = 0;
config.type = RTE_FIB6_DUMMY;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
rte_fib6_free(fib);
@@ -178,7 +178,7 @@ test_add_del_invalid(void)
"Call succeeded with invalid parameters\n");
/*Create valid fib to use in rest of test. */
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
/* rte_fib6_add: depth > RTE_IPV6_MAX_DEPTH */
@@ -359,7 +359,7 @@ test_lookup(void)
config.default_nh = def_nh;
config.type = RTE_FIB6_DUMMY;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = check_fib(fib);
RTE_TEST_ASSERT(ret == TEST_SUCCESS,
@@ -370,7 +370,7 @@ test_lookup(void)
config.trie.nh_sz = RTE_FIB6_TRIE_2B;
config.trie.num_tbl8 = MAX_TBL8 - 1;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = check_fib(fib);
RTE_TEST_ASSERT(ret == TEST_SUCCESS,
@@ -379,7 +379,7 @@ test_lookup(void)
config.trie.nh_sz = RTE_FIB6_TRIE_4B;
config.trie.num_tbl8 = MAX_TBL8;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = check_fib(fib);
RTE_TEST_ASSERT(ret == TEST_SUCCESS,
@@ -388,7 +388,7 @@ test_lookup(void)
config.trie.nh_sz = RTE_FIB6_TRIE_8B;
config.trie.num_tbl8 = MAX_TBL8;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = check_fib(fib);
RTE_TEST_ASSERT(ret == TEST_SUCCESS,
@@ -420,13 +420,13 @@ test_invalid_rcu(void)
config.rib_ext_sz = 0;
config.default_nh = def_nh;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE);
- qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ qsv = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz, RTE_CACHE_LINE_SIZE,
+ RTE_NUMA_ID_ANY);
RTE_TEST_ASSERT(qsv != NULL, "Can not allocate memory for RCU\n");
status = rte_rcu_qsbr_init(qsv, RTE_MAX_LCORE);
@@ -445,7 +445,7 @@ test_invalid_rcu(void)
config.type = RTE_FIB6_TRIE;
config.trie.nh_sz = RTE_FIB6_TRIE_4B;
config.trie.num_tbl8 = MAX_TBL8;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
/* Call rte_fib6_rcu_qsbr_add without fib or config */
@@ -466,8 +466,8 @@ test_invalid_rcu(void)
RTE_TEST_ASSERT(status == 0, "Can not attach RCU to FIB\n");
/* Create and attach another RCU QSBR to FIB table */
- qsv2 = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ qsv2 = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz, RTE_CACHE_LINE_SIZE,
+ RTE_NUMA_ID_ANY);
RTE_TEST_ASSERT(qsv2 != NULL, "Can not allocate memory for RCU\n");
rcu_cfg.v = qsv2;
@@ -551,13 +551,13 @@ test_fib_rcu_sync_rw(void)
config.trie.nh_sz = RTE_FIB6_TRIE_4B;
config.trie.num_tbl8 = 1;
- g_fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ g_fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(g_fib != NULL, "Failed to create FIB\n");
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(1);
- g_v = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz, RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ g_v = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz, RTE_CACHE_LINE_SIZE,
+ RTE_NUMA_ID_ANY);
RTE_TEST_ASSERT(g_v != NULL, "Can not allocate memory for RCU\n");
status = rte_rcu_qsbr_init(g_v, 1);
@@ -645,7 +645,7 @@ test_drift(void)
config.trie.nh_sz = RTE_FIB6_TRIE_2B;
config.trie.num_tbl8 = 256;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = rte_fib6_add(fib, &parent, 28, 0xa);
@@ -709,7 +709,7 @@ test_drift_compression(void)
config.trie.nh_sz = RTE_FIB6_TRIE_2B;
config.trie.num_tbl8 = 256;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
/* Compressed: child shares the parent's nh, modify_dp is skipped */
@@ -770,7 +770,7 @@ test_drift_multilevel(void)
config.trie.nh_sz = RTE_FIB6_TRIE_2B;
config.trie.num_tbl8 = 256;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = rte_fib6_add(fib, &grand, 28, 1);
@@ -834,7 +834,7 @@ test_drift_stress(void)
config.trie.nh_sz = RTE_FIB6_TRIE_2B;
config.trie.num_tbl8 = 256;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
for (i = 0; i < 2000; i++) {
@@ -905,7 +905,7 @@ test_drift_tight_pool(void)
config.trie.nh_sz = RTE_FIB6_TRIE_2B;
config.trie.num_tbl8 = 3;
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
ret = rte_fib6_add(fib, &parent, 28, 1);
diff --git a/app/test/test_fib6_perf.c b/app/test/test_fib6_perf.c
index 246bc2d509..f0b65e7886 100644
--- a/app/test/test_fib6_perf.c
+++ b/app/test/test_fib6_perf.c
@@ -100,7 +100,7 @@ test_fib6_perf(void)
*/
generate_large_ips_table(0);
- fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &conf);
+ fib = rte_fib6_create(__func__, RTE_NUMA_ID_ANY, &conf);
TEST_FIB_ASSERT(fib != NULL);
/* Measure add. */
diff --git a/app/test/test_fib_perf.c b/app/test/test_fib_perf.c
index 1b2ad04854..bf190d7541 100644
--- a/app/test/test_fib_perf.c
+++ b/app/test/test_fib_perf.c
@@ -341,7 +341,7 @@ test_fib_perf(void)
print_route_distribution(large_route_table,
(uint32_t) NUM_ROUTE_ENTRIES);
- fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
+ fib = rte_fib_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_FIB_ASSERT(fib != NULL);
/* Measure add. */
diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c
index ee65422054..212e682a7c 100644
--- a/app/test/test_func_reentrancy.c
+++ b/app/test/test_func_reentrancy.c
@@ -115,7 +115,7 @@ ring_create_lookup(__rte_unused void *arg)
/* create the same ring simultaneously on all threads */
for (i = 0; i < MAX_ITER_ONCE; i++) {
- rp = rte_ring_create("fr_test_once", 4096, SOCKET_ID_ANY, 0);
+ rp = rte_ring_create("fr_test_once", 4096, RTE_NUMA_ID_ANY, 0);
if (rp != NULL)
rte_atomic_fetch_add_explicit(&obj_count, 1, rte_memory_order_relaxed);
}
@@ -123,7 +123,7 @@ ring_create_lookup(__rte_unused void *arg)
/* create/lookup new ring several times */
for (i = 0; i < MAX_ITER_MULTI; i++) {
snprintf(ring_name, sizeof(ring_name), "fr_test_%d_%d", lcore_self, i);
- rp = rte_ring_create(ring_name, 4096, SOCKET_ID_ANY, 0);
+ rp = rte_ring_create(ring_name, 4096, RTE_NUMA_ID_ANY, 0);
if (NULL == rp)
return -1;
if (rte_ring_lookup(ring_name) != rp)
@@ -180,7 +180,7 @@ mempool_create_lookup(__rte_unused void *arg)
MEMPOOL_ELT_SIZE, 0, 0,
NULL, NULL,
my_obj_init, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp != NULL)
rte_atomic_fetch_add_explicit(&obj_count, 1, rte_memory_order_relaxed);
}
@@ -192,7 +192,7 @@ mempool_create_lookup(__rte_unused void *arg)
MEMPOOL_ELT_SIZE, 0, 0,
NULL, NULL,
my_obj_init, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (NULL == mp)
return -1;
if (rte_mempool_lookup(mempool_name) != mp)
@@ -378,7 +378,7 @@ lpm_create_free(__rte_unused void *arg)
/* create the same lpm simultaneously on all threads */
for (i = 0; i < MAX_ITER_ONCE; i++) {
- lpm = rte_lpm_create("fr_test_once", SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create("fr_test_once", RTE_NUMA_ID_ANY, &config);
if (lpm != NULL)
rte_atomic_fetch_add_explicit(&obj_count, 1, rte_memory_order_relaxed);
}
@@ -386,7 +386,7 @@ lpm_create_free(__rte_unused void *arg)
/* create multiple fbk tables simultaneously */
for (i = 0; i < MAX_LPM_ITER_TIMES; i++) {
snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d", lcore_self, i);
- lpm = rte_lpm_create(lpm_name, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(lpm_name, RTE_NUMA_ID_ANY, &config);
if (NULL == lpm)
return -1;
diff --git a/app/test/test_graph_perf.c b/app/test/test_graph_perf.c
index 8801714453..ec695a4b0d 100644
--- a/app/test/test_graph_perf.c
+++ b/app/test/test_graph_perf.c
@@ -572,7 +572,7 @@ graph_init(const char *gname, uint8_t nb_srcs, uint8_t nb_sinks,
}
/* Create a Graph */
- gconf.socket_id = SOCKET_ID_ANY;
+ gconf.numa_id = RTE_NUMA_ID_ANY;
gconf.nb_node_patterns = graph_data->nb_nodes;
gconf.node_patterns = (const char **)(uintptr_t)node_patterns;
@@ -646,7 +646,7 @@ measure_perf_get(rte_graph_t graph_id)
if (rte_graph_has_stats_feature()) {
memset(¶m, 0, sizeof(param));
param.f = stdout;
- param.socket_id = SOCKET_ID_ANY;
+ param.numa_id = RTE_NUMA_ID_ANY;
param.graph_patterns = &pattern;
param.nb_graph_patterns = 1;
@@ -1143,7 +1143,7 @@ graph_init_diamond(void)
node_patterns[3] = rte_node_id_to_name(branch);
node_patterns[4] = rte_node_id_to_name(snk);
- gconf.socket_id = SOCKET_ID_ANY;
+ gconf.numa_id = RTE_NUMA_ID_ANY;
gconf.nb_node_patterns = 5;
gconf.node_patterns = (const char **)(uintptr_t)node_patterns;
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index de7fc414e3..0cb1fb9741 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -2012,8 +2012,8 @@ test_hash_rcu_qsbr_add(void)
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE);
- g_qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ g_qsv = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz,
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
RETURN_IF_ERROR_RCU_QSBR(g_qsv == NULL,
"RCU QSBR variable creation failed");
@@ -2034,8 +2034,8 @@ test_hash_rcu_qsbr_add(void)
"Attach RCU QSBR to hash table failed");
/* Create and attach another RCU QSBR to hash table */
- qsv2 = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ qsv2 = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz,
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
RETURN_IF_ERROR_RCU_QSBR(qsv2 == NULL,
"RCU QSBR variable creation failed");
@@ -2116,8 +2116,8 @@ test_hash_rcu_qsbr_dq_mode(uint8_t ext_bkt)
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE);
- g_qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ g_qsv = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz,
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
RETURN_IF_ERROR_RCU_QSBR(g_qsv == NULL,
"RCU QSBR variable creation failed");
@@ -2286,8 +2286,8 @@ test_hash_rcu_qsbr_sync_mode(uint8_t ext_bkt)
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE);
- g_qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ g_qsv = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz,
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
RETURN_IF_ERROR_RCU_QSBR(g_qsv == NULL,
"RCU QSBR variable creation failed");
@@ -2376,8 +2376,8 @@ test_hash_rcu_qsbr_dq_reclaim(void)
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE);
- g_qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(
- NULL, sz, RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ g_qsv = (struct rte_rcu_qsbr *)rte_zmalloc_numa(
+ NULL, sz, RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
RETURN_IF_ERROR_RCU_QSBR(g_qsv == NULL, "RCU QSBR variable creation failed");
status = rte_rcu_qsbr_init(g_qsv, RTE_MAX_LCORE);
diff --git a/app/test/test_ipfrag.c b/app/test/test_ipfrag.c
index 247575d6c5..801f91691b 100644
--- a/app/test/test_ipfrag.c
+++ b/app/test/test_ipfrag.c
@@ -65,7 +65,7 @@ setup_buf_pool(void)
pkt_pool = rte_pktmbuf_pool_create("FRAG_MBUF_POOL",
NUM_MBUFS, BURST, 0,
RTE_MBUF_DEFAULT_BUF_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (pkt_pool == NULL) {
printf("%s: Error creating pkt mempool\n", __func__);
goto bad_setup;
@@ -74,7 +74,7 @@ setup_buf_pool(void)
direct_pool = rte_pktmbuf_pool_create("FRAG_D_MBUF_POOL",
NUM_MBUFS, BURST, 0,
RTE_MBUF_DEFAULT_BUF_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (direct_pool == NULL) {
printf("%s: Error creating direct mempool\n", __func__);
goto bad_setup;
@@ -82,7 +82,7 @@ setup_buf_pool(void)
indirect_pool = rte_pktmbuf_pool_create("FRAG_I_MBUF_POOL",
NUM_MBUFS, BURST, 0,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (indirect_pool == NULL) {
printf("%s: Error creating indirect mempool\n", __func__);
goto bad_setup;
diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index b5a430996d..7596eed159 100644
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -329,7 +329,7 @@ testsuite_setup(void)
ts_params->mbuf_pool = rte_pktmbuf_pool_create(
"CRYPTO_MBUFPOOL",
NUM_MBUFS, MBUF_CACHE_SIZE, 0, MBUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (ts_params->mbuf_pool == NULL) {
RTE_LOG(ERR, USER1, "Can't create CRYPTO_MBUFPOOL\n");
return TEST_FAILED;
@@ -342,7 +342,7 @@ testsuite_setup(void)
DEFAULT_NUM_XFORMS *
sizeof(struct rte_crypto_sym_xform) +
MAXIMUM_IV_LENGTH,
- rte_socket_id());
+ rte_numa_id());
if (ts_params->cop_mpool == NULL) {
RTE_LOG(ERR, USER1, "Can't create CRYPTO_OP_POOL\n");
return TEST_FAILED;
@@ -354,7 +354,7 @@ testsuite_setup(void)
rte_cryptodev_info_get(dev_id, &info);
ts_params->conf.nb_queue_pairs = info.max_nb_queue_pairs;
- ts_params->conf.socket_id = SOCKET_ID_ANY;
+ ts_params->conf.numa_id = RTE_NUMA_ID_ANY;
ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO;
sess_sz = rte_cryptodev_sym_get_private_session_size(dev_id);
@@ -373,7 +373,7 @@ testsuite_setup(void)
ts_params->qp_conf.mp_session =
rte_cryptodev_sym_session_pool_create("test_sess_mp",
- MAX_NB_SESSIONS, sess_sz, 0, 0, SOCKET_ID_ANY);
+ MAX_NB_SESSIONS, sess_sz, 0, 0, RTE_NUMA_ID_ANY);
TEST_ASSERT_NOT_NULL(ts_params->qp_conf.mp_session,
"session mempool allocation failed");
@@ -387,7 +387,7 @@ testsuite_setup(void)
TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
dev_id, 0, &ts_params->qp_conf,
- rte_cryptodev_socket_id(dev_id)),
+ rte_cryptodev_numa_id(dev_id)),
"Failed to setup queue pair %u on cryptodev %u",
0, dev_id);
@@ -430,7 +430,7 @@ ut_setup_ipsec(void)
memset(ut_params, 0, sizeof(*ut_params));
/* Reconfigure device to default parameters */
- ts_params->conf.socket_id = SOCKET_ID_ANY;
+ ts_params->conf.numa_id = RTE_NUMA_ID_ANY;
/* Start the device */
TEST_ASSERT_SUCCESS(rte_cryptodev_start(ts_params->valid_dev),
diff --git a/app/test/test_ipsec_perf.c b/app/test/test_ipsec_perf.c
index a32a2086e9..28e533a760 100644
--- a/app/test/test_ipsec_perf.c
+++ b/app/test/test_ipsec_perf.c
@@ -452,7 +452,7 @@ testsuite_setup(void)
mbuf_pool = rte_pktmbuf_pool_create("IPSEC_PERF_MBUFPOOL",
NUM_MBUFS, MBUF_CACHE_SIZE, 0, MBUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (mbuf_pool == NULL) {
RTE_LOG(ERR, USER1, "Can't create MBUFPOOL\n");
return TEST_FAILED;
@@ -465,29 +465,29 @@ testsuite_setup(void)
DEFAULT_NUM_XFORMS *
sizeof(struct rte_crypto_sym_xform) +
MAXIMUM_IV_LENGTH,
- rte_socket_id());
+ rte_numa_id());
if (cop_pool == NULL) {
RTE_LOG(ERR, USER1, "Can't create CRYPTO_OP_POOL\n");
return TEST_FAILED;
}
ring_inb_prepare = rte_ring_create("ipsec_test_ring_inb_prepare",
- RING_SIZE, SOCKET_ID_ANY, 0);
+ RING_SIZE, RTE_NUMA_ID_ANY, 0);
if (ring_inb_prepare == NULL)
return TEST_FAILED;
ring_inb_process = rte_ring_create("ipsec_test_ring_inb_process",
- RING_SIZE, SOCKET_ID_ANY, 0);
+ RING_SIZE, RTE_NUMA_ID_ANY, 0);
if (ring_inb_process == NULL)
return TEST_FAILED;
ring_outb_prepare = rte_ring_create("ipsec_test_ring_outb_prepare",
- RING_SIZE, SOCKET_ID_ANY, 0);
+ RING_SIZE, RTE_NUMA_ID_ANY, 0);
if (ring_outb_prepare == NULL)
return TEST_FAILED;
ring_outb_process = rte_ring_create("ipsec_test_ring_outb_process",
- RING_SIZE, SOCKET_ID_ANY, 0);
+ RING_SIZE, RTE_NUMA_ID_ANY, 0);
if (ring_outb_process == NULL)
return TEST_FAILED;
diff --git a/app/test/test_latencystats.c b/app/test/test_latencystats.c
index 76498b66b4..19819736c0 100644
--- a/app/test/test_latencystats.c
+++ b/app/test/test_latencystats.c
@@ -39,7 +39,7 @@ static int test_latency_init(void)
int ret = 0;
/* Metrics Initialization */
- rte_metrics_init(rte_socket_id());
+ rte_metrics_init(rte_numa_id());
ret = rte_latencystats_init(1, NULL);
TEST_ASSERT(ret >= 0, "Test Failed: rte_latencystats_init failed");
diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index b9c6718e36..6a4aa332df 100644
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -187,13 +187,13 @@ configure_ethdev(uint16_t port_id, uint8_t start, uint8_t en_isr)
for (q_id = 0; q_id < test_params->nb_rx_q; q_id++)
TEST_ASSERT_SUCCESS(rte_eth_rx_queue_setup(port_id, q_id, RX_RING_SIZE,
- rte_eth_dev_socket_id(port_id), &rx_conf_default,
+ rte_eth_dev_numa_id(port_id), &rx_conf_default,
test_params->mbuf_pool) ,
"rte_eth_rx_queue_setup for port %d failed", port_id);
for (q_id = 0; q_id < test_params->nb_tx_q; q_id++)
TEST_ASSERT_SUCCESS(rte_eth_tx_queue_setup(port_id, q_id, TX_RING_SIZE,
- rte_eth_dev_socket_id(port_id), &tx_conf_default),
+ rte_eth_dev_numa_id(port_id), &tx_conf_default),
"rte_eth_tx_queue_setup for port %d failed", port_id);
if (start)
@@ -230,7 +230,7 @@ test_setup(void)
if (test_params->mbuf_pool == NULL) {
test_params->mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL",
nb_mbuf_per_pool, MBUF_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
TEST_ASSERT_NOT_NULL(test_params->mbuf_pool,
"rte_mempool_create failed");
}
@@ -245,7 +245,7 @@ test_setup(void)
snprintf(pmd_name, RTE_ETH_NAME_MAX_LEN, "eth_virt_%d", i);
test_params->member_port_ids[i] = virtual_ethdev_create(pmd_name,
- mac_addr, rte_socket_id(), 1);
+ mac_addr, rte_numa_id(), 1);
TEST_ASSERT(test_params->member_port_ids[i] >= 0,
"Failed to create virtual virtual ethdev %s", pmd_name);
@@ -269,7 +269,7 @@ test_create_bonding_device(void)
/* Don't try to recreate bonding device if re-running test suite*/
if (test_params->bonding_port_id == -1) {
test_params->bonding_port_id = rte_eth_bond_create(BONDING_DEV_NAME,
- test_params->bonding_mode, rte_socket_id());
+ test_params->bonding_mode, rte_numa_id());
TEST_ASSERT(test_params->bonding_port_id >= 0,
"Failed to create bonding ethdev %s", BONDING_DEV_NAME);
@@ -309,14 +309,14 @@ test_create_bonding_device_with_invalid_params(void)
/* Invalid name */
port_id = rte_eth_bond_create(NULL, test_params->bonding_mode,
- rte_socket_id());
+ rte_numa_id());
TEST_ASSERT(port_id < 0, "Created bonding device unexpectedly");
test_params->bonding_mode = INVALID_BONDING_MODE;
/* Invalid bonding mode */
port_id = rte_eth_bond_create(BONDING_DEV_NAME, test_params->bonding_mode,
- rte_socket_id());
+ rte_numa_id());
TEST_ASSERT(port_id < 0, "Created bonding device unexpectedly.");
test_params->bonding_mode = BONDING_MODE_ROUND_ROBIN;
@@ -460,7 +460,7 @@ test_add_already_bonding_member_to_bonding_device(void)
snprintf(pmd_name, RTE_ETH_NAME_MAX_LEN, "%s_%d", BONDING_DEV_NAME, ++bonding_id);
port_id = rte_eth_bond_create(pmd_name, test_params->bonding_mode,
- rte_socket_id());
+ rte_numa_id());
TEST_ASSERT(port_id >= 0, "Failed to create bonding device.");
TEST_ASSERT(rte_eth_bond_member_add(port_id,
@@ -928,7 +928,7 @@ test_set_bonding_port_initialization_mac_assignment(void)
*/
if (bonding_port_id == -1) {
bonding_port_id = rte_eth_bond_create("net_bonding_mac_ass_test",
- BONDING_MODE_ACTIVE_BACKUP, rte_socket_id());
+ BONDING_MODE_ACTIVE_BACKUP, rte_numa_id());
TEST_ASSERT(bonding_port_id > 0, "failed to create bonding device");
TEST_ASSERT_SUCCESS(configure_ethdev(bonding_port_id, 0, 0),
@@ -946,7 +946,7 @@ test_set_bonding_port_initialization_mac_assignment(void)
"eth_member_%d", i);
member_port_ids[i] = virtual_ethdev_create(pmd_name,
- &member_mac_addr, rte_socket_id(), 1);
+ &member_mac_addr, rte_numa_id(), 1);
TEST_ASSERT(member_port_ids[i] >= 0,
"Failed to create member ethdev %s",
@@ -2062,7 +2062,7 @@ test_roundrobin_verify_polling_member_link_status_change(void)
/* Create member devices with no ISR Support */
if (polling_test_members[i] == -1) {
polling_test_members[i] = virtual_ethdev_create(member_name, mac_addr,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
TEST_ASSERT(polling_test_members[i] >= 0,
"Failed to create virtual ethdev %s\n", member_name);
diff --git a/app/test/test_link_bonding_mode4.c b/app/test/test_link_bonding_mode4.c
index ff13dbed93..aa63fde27e 100644
--- a/app/test/test_link_bonding_mode4.c
+++ b/app/test/test_link_bonding_mode4.c
@@ -204,11 +204,11 @@ configure_ethdev(uint16_t port_id, uint8_t start)
"Failed to configure device %u", port_id);
TEST_ASSERT(rte_eth_rx_queue_setup(port_id, 0, RX_RING_SIZE,
- rte_eth_dev_socket_id(port_id), NULL, test_params.mbuf_pool) == 0,
+ rte_eth_dev_numa_id(port_id), NULL, test_params.mbuf_pool) == 0,
"Failed to setup rx queue.");
TEST_ASSERT(rte_eth_tx_queue_setup(port_id, 0, TX_RING_SIZE,
- rte_eth_dev_socket_id(port_id), NULL) == 0,
+ rte_eth_dev_numa_id(port_id), NULL) == 0,
"Failed to setup tx queue.");
if (start) {
@@ -384,7 +384,7 @@ test_setup(void)
int retval, nb_mbuf_per_pool;
char name[RTE_ETH_NAME_MAX_LEN];
struct member_conf *port;
- const uint8_t socket_id = rte_socket_id();
+ const uint8_t numa_id = rte_numa_id();
uint16_t i;
if (test_params.mbuf_pool == NULL) {
@@ -392,7 +392,7 @@ test_setup(void)
TEST_TX_DESC_MAX + MAX_PKT_BURST;
test_params.mbuf_pool = rte_pktmbuf_pool_create("TEST_MODE4",
nb_mbuf_per_pool, MBUF_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, socket_id);
+ RTE_MBUF_DEFAULT_BUF_SIZE, numa_id);
TEST_ASSERT(test_params.mbuf_pool != NULL,
"rte_mempool_create failed\n");
@@ -405,7 +405,7 @@ test_setup(void)
if (port->rx_queue == NULL) {
retval = snprintf(name, RTE_DIM(name), MEMBER_RX_QUEUE_FMT, i);
TEST_ASSERT(retval <= (int)RTE_DIM(name) - 1, "Name too long");
- port->rx_queue = rte_ring_create(name, RX_RING_SIZE, socket_id, 0);
+ port->rx_queue = rte_ring_create(name, RX_RING_SIZE, numa_id, 0);
TEST_ASSERT(port->rx_queue != NULL,
"Failed to allocate rx ring '%s': %s", name,
rte_strerror(rte_errno));
@@ -414,7 +414,7 @@ test_setup(void)
if (port->tx_queue == NULL) {
retval = snprintf(name, RTE_DIM(name), MEMBER_TX_QUEUE_FMT, i);
TEST_ASSERT(retval <= (int)RTE_DIM(name) - 1, "Name too long");
- port->tx_queue = rte_ring_create(name, TX_RING_SIZE, socket_id, 0);
+ port->tx_queue = rte_ring_create(name, TX_RING_SIZE, numa_id, 0);
TEST_ASSERT_NOT_NULL(port->tx_queue,
"Failed to allocate tx ring '%s': %s", name,
rte_strerror(rte_errno));
@@ -424,7 +424,7 @@ test_setup(void)
retval = snprintf(name, RTE_DIM(name), MEMBER_DEV_NAME_FMT, i);
TEST_ASSERT(retval < (int)RTE_DIM(name) - 1, "Name too long");
retval = rte_eth_from_rings(name, &port->rx_queue, 1,
- &port->tx_queue, 1, socket_id);
+ &port->tx_queue, 1, numa_id);
TEST_ASSERT(retval >= 0,
"Failed to create ring ethdev '%s'\n", name);
@@ -438,7 +438,7 @@ test_setup(void)
if (test_params.bonding_port_id == INVALID_PORT_ID) {
retval = rte_eth_bond_create(BONDING_DEV_NAME, BONDING_MODE_8023AD,
- socket_id);
+ numa_id);
TEST_ASSERT(retval >= 0, "Failed to create bonding ethdev %s",
BONDING_DEV_NAME);
--git a/app/test/test_link_bonding_rssconf.c b/app/test/test_link_bonding_rssconf.c
index 693b0ccd12..f646bae49b 100644
--- a/app/test/test_link_bonding_rssconf.c
+++ b/app/test/test_link_bonding_rssconf.c
@@ -132,13 +132,13 @@ configure_ethdev(uint16_t port_id, struct rte_eth_conf *eth_conf,
for (rxq = 0; rxq < RXTX_QUEUE_COUNT; rxq++) {
TEST_ASSERT(rte_eth_rx_queue_setup(port_id, rxq, RXTX_RING_SIZE,
- rte_eth_dev_socket_id(port_id), NULL,
+ rte_eth_dev_numa_id(port_id), NULL,
test_params.mbuf_pool) == 0, "Failed to setup rx queue.");
}
for (txq = 0; txq < RXTX_QUEUE_COUNT; txq++) {
TEST_ASSERT(rte_eth_tx_queue_setup(port_id, txq, RXTX_RING_SIZE,
- rte_eth_dev_socket_id(port_id), NULL) == 0,
+ rte_eth_dev_numa_id(port_id), NULL) == 0,
"Failed to setup tx queue.");
}
@@ -586,7 +586,7 @@ test_setup(void)
test_params.mbuf_pool = rte_pktmbuf_pool_create(
"RSS_MBUF_POOL", NUM_MBUFS * MEMBER_COUNT,
- MBUF_CACHE_SIZE, 0, MBUF_SIZE, rte_socket_id());
+ MBUF_CACHE_SIZE, 0, MBUF_SIZE, rte_numa_id());
TEST_ASSERT(test_params.mbuf_pool != NULL,
"rte_pktmbuf_pool_create failed\n");
@@ -623,7 +623,7 @@ test_setup(void)
}
if (test_params.bond_port_id == INVALID_PORT_ID) {
- retval = rte_eth_bond_create(BONDING_DEV_NAME, 0, rte_socket_id());
+ retval = rte_eth_bond_create(BONDING_DEV_NAME, 0, rte_numa_id());
TEST_ASSERT(retval >= 0, "Failed to create bonding ethdev %s",
BONDING_DEV_NAME);
diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c
index f4a8031062..52eb109703 100644
--- a/app/test/test_lpm.c
+++ b/app/test/test_lpm.c
@@ -91,16 +91,16 @@ test0(void)
config.flags = 0;
/* rte_lpm_create: lpm name == NULL */
- lpm = rte_lpm_create(NULL, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(NULL, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm == NULL);
/* rte_lpm_create: max_rules = 0 */
/* Note: __func__ inserts the function name, in this case "test0". */
config.max_rules = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm == NULL);
- /* socket_id < -1 is invalid */
+ /* numa_id < -1 is invalid */
config.max_rules = MAX_RULES;
lpm = rte_lpm_create(__func__, -2, &config);
TEST_LPM_ASSERT(lpm == NULL);
@@ -125,7 +125,7 @@ test1(void)
/* rte_lpm_free: Free NULL */
for (i = 0; i < 100; i++) {
config.max_rules = MAX_RULES - i;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
rte_lpm_free(lpm);
@@ -151,7 +151,7 @@ test2(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
rte_lpm_free(lpm);
@@ -180,7 +180,7 @@ test3(void)
TEST_LPM_ASSERT(status < 0);
/*Create valid lpm to use in rest of test. */
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* rte_lpm_add: depth < 1 */
@@ -218,7 +218,7 @@ test4(void)
TEST_LPM_ASSERT(status < 0);
/*Create valid lpm to use in rest of test. */
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* rte_lpm_delete: depth < 1 */
@@ -256,7 +256,7 @@ test5(void)
TEST_LPM_ASSERT(status < 0);
/*Create valid lpm to use in rest of test. */
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* rte_lpm_lookup: depth < 1 */
@@ -286,7 +286,7 @@ test6(void)
uint8_t depth = 24;
int32_t status = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
status = rte_lpm_add(lpm, ip, depth, next_hop_add);
@@ -325,7 +325,7 @@ test7(void)
uint8_t depth = 32;
int32_t status = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
status = rte_lpm_add(lpm, ip, depth, next_hop_add);
@@ -377,7 +377,7 @@ test8(void)
uint8_t depth;
int32_t status = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* Loop with rte_lpm_add. */
@@ -467,7 +467,7 @@ test9(void)
depth = 24;
next_hop_add = 100;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
status = rte_lpm_add(lpm, ip, depth, next_hop_add);
@@ -632,7 +632,7 @@ test10(void)
/* Add rule that covers a TBL24 range previously invalid & lookup
* (& delete & lookup) */
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
ip = RTE_IPV4(128, 0, 0, 0);
@@ -821,7 +821,7 @@ test11(void)
uint8_t depth;
int32_t status = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
ip = RTE_IPV4(128, 0, 0, 0);
@@ -892,7 +892,7 @@ test12(void)
uint8_t depth;
int32_t status = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
ip = RTE_IPV4(128, 0, 0, 0);
@@ -947,7 +947,7 @@ test13(void)
uint8_t depth;
int32_t status = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
ip = RTE_IPV4(128, 0, 0, 0);
@@ -1017,7 +1017,7 @@ test14(void)
uint32_t hop[4];
/* Add enough space for 256 rules for every depth */
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
depth = 32;
@@ -1073,7 +1073,7 @@ test15(void)
config.flags = 0;
/* Create lpm */
- lpm = rte_lpm_create("lpm_find_existing", SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create("lpm_find_existing", RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* Try to find existing lpm */
@@ -1104,7 +1104,7 @@ test16(void)
config.max_rules = 256 * 32;
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- struct rte_lpm *lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ struct rte_lpm *lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
/* ip loops through all possibilities for top 24 bits of address */
for (ip = 0; ip < 0xFFFFFF; ip++) {
@@ -1152,7 +1152,7 @@ test17(void)
uint32_t next_hop_return = 0;
int32_t status = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
if ((status = rte_lpm_add(lpm, ip_10_32, d_ip_10_32,
@@ -1233,7 +1233,7 @@ test18(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
ip = RTE_IPV4(192, 168, 100, 100);
@@ -1302,13 +1302,13 @@ test19(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE);
- qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ qsv = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz,
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
TEST_LPM_ASSERT(qsv != NULL);
status = rte_rcu_qsbr_init(qsv, RTE_MAX_LCORE);
@@ -1326,8 +1326,8 @@ test19(void)
TEST_LPM_ASSERT(status == 0);
/* Create and attach another RCU QSBR to LPM table */
- qsv2 = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ qsv2 = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz,
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
TEST_LPM_ASSERT(qsv2 != NULL);
rcu_cfg.v = qsv2;
@@ -1373,13 +1373,13 @@ test20(void)
config.number_tbl8s = 1;
config.flags = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(1);
- qsv = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ qsv = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz,
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
TEST_LPM_ASSERT(qsv != NULL);
status = rte_rcu_qsbr_init(qsv, 1);
@@ -1504,13 +1504,13 @@ test21(void)
config.number_tbl8s = 1;
config.flags = 0;
- g_lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ g_lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(g_lpm != NULL);
/* Create RCU QSBR variable */
sz = rte_rcu_qsbr_get_memsize(1);
- g_v = (struct rte_rcu_qsbr *)rte_zmalloc_socket(NULL, sz,
- RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ g_v = (struct rte_rcu_qsbr *)rte_zmalloc_numa(NULL, sz,
+ RTE_CACHE_LINE_SIZE, RTE_NUMA_ID_ANY);
TEST_LPM_ASSERT(g_v != NULL);
status = rte_rcu_qsbr_init(g_v, 1);
diff --git a/app/test/test_lpm6.c b/app/test/test_lpm6.c
index 7340331848..f8e59b35e1 100644
--- a/app/test/test_lpm6.c
+++ b/app/test/test_lpm6.c
@@ -107,27 +107,27 @@ test0(void)
config.flags = 0;
/* rte_lpm6_create: lpm name == NULL */
- lpm = rte_lpm6_create(NULL, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(NULL, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm == NULL);
/* rte_lpm6_create: max_rules = 0 */
/* Note: __func__ inserts the function name, in this case "test0". */
config.max_rules = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm == NULL);
- /* socket_id < -1 is invalid */
+ /* numa_id < -1 is invalid */
config.max_rules = MAX_RULES;
lpm = rte_lpm6_create(__func__, -2, &config);
TEST_LPM_ASSERT(lpm == NULL);
/* rte_lpm6_create: number_tbl8s is bigger than the maximum */
config.number_tbl8s = MAX_NUM_TBL8S + 1;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm == NULL);
/* rte_lpm6_create: config = NULL */
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, NULL);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, NULL);
TEST_LPM_ASSERT(lpm == NULL);
return PASS;
@@ -149,15 +149,15 @@ test1(void)
config.flags = 0;
/* rte_lpm6_create: lpm name == LPM1 */
- lpm1 = rte_lpm6_create("LPM1", SOCKET_ID_ANY, &config);
+ lpm1 = rte_lpm6_create("LPM1", RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm1 != NULL);
/* rte_lpm6_create: lpm name == LPM2 */
- lpm2 = rte_lpm6_create("LPM2", SOCKET_ID_ANY, &config);
+ lpm2 = rte_lpm6_create("LPM2", RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm2 != NULL);
/* rte_lpm6_create: lpm name == LPM2 */
- lpm3 = rte_lpm6_create("LPM1", SOCKET_ID_ANY, &config);
+ lpm3 = rte_lpm6_create("LPM1", RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm3 == NULL);
rte_lpm6_free(lpm1);
@@ -183,7 +183,7 @@ test2(void)
/* rte_lpm6_free: Free NULL */
for (i = 0; i < 20; i++) {
config.max_rules = MAX_RULES - i;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
rte_lpm6_free(lpm);
@@ -209,7 +209,7 @@ test3(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
rte_lpm6_free(lpm);
@@ -239,7 +239,7 @@ test4(void)
TEST_LPM_ASSERT(status < 0);
/*Create valid lpm to use in rest of test. */
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* rte_lpm6_add: depth < 1 */
@@ -277,7 +277,7 @@ test5(void)
TEST_LPM_ASSERT(status < 0);
/*Create valid lpm to use in rest of test. */
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* rte_lpm_delete: depth < 1 */
@@ -315,7 +315,7 @@ test6(void)
TEST_LPM_ASSERT(status < 0);
/*Create valid lpm to use in rest of test. */
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* rte_lpm6_lookup: ip = NULL */
@@ -353,7 +353,7 @@ test7(void)
TEST_LPM_ASSERT(status < 0);
/*Create valid lpm to use in rest of test. */
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* rte_lpm6_lookup: ip = NULL */
@@ -391,7 +391,7 @@ test8(void)
TEST_LPM_ASSERT(status < 0);
/*Create valid lpm to use in rest of test. */
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* rte_lpm6_delete: ip = NULL */
@@ -427,7 +427,7 @@ test9(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
status = rte_lpm6_add(lpm, &ip, depth, next_hop_add);
@@ -472,7 +472,7 @@ test10(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
for (i = 1; i < 128; i++) {
@@ -516,7 +516,7 @@ test11(void)
config.number_tbl8s = 16;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
depth = 128;
@@ -577,7 +577,7 @@ test12(void)
config.number_tbl8s = 16;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
depth = 128;
@@ -616,7 +616,7 @@ test13(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
depth = 1;
@@ -665,7 +665,7 @@ test14(void)
config.number_tbl8s = 256;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
for (i = 0; i < 256; i++) {
@@ -711,7 +711,7 @@ test15(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
status = rte_lpm6_add(lpm, &ip, depth, next_hop_add);
@@ -748,7 +748,7 @@ test16(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
status = rte_lpm6_add(lpm, &ip, depth, next_hop_add);
@@ -793,7 +793,7 @@ test17(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* Loop with rte_lpm6_add. */
@@ -865,7 +865,7 @@ test18(void)
depth = 24;
next_hop_add = 100;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
status = rte_lpm6_add(lpm, &ip, depth, next_hop_add);
@@ -1025,7 +1025,7 @@ test19(void)
/* Add rule that covers a TBL24 range previously invalid & lookup
* (& delete & lookup)
*/
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
ip = (struct rte_ipv6_addr)RTE_IPV6(0x8000, 0, 0, 0, 0, 0, 0, 0);
@@ -1221,7 +1221,7 @@ test20(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
ip = (struct rte_ipv6_addr)RTE_IPV6(0x8000, 0, 0, 0, 0, 0, 0, 0);
@@ -1290,7 +1290,7 @@ test21(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
ip_batch[0] = (struct rte_ipv6_addr)RTE_IPV6(0x8000, 0, 0x0001, 0, 0, 0, 0, 0);
@@ -1349,7 +1349,7 @@ test22(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* Adds 5 rules and look them up */
@@ -1466,7 +1466,7 @@ test23(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
ip = (struct rte_ipv6_addr)RTE_IPV6(0x8000, 0, 0, 0, 0, 0, 0, 0);
@@ -1511,7 +1511,7 @@ test24(void)
config.flags = 0;
/* Create lpm */
- lpm = rte_lpm6_create("lpm_find_existing", SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create("lpm_find_existing", RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* Try to find existing lpm */
@@ -1551,7 +1551,7 @@ test25(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
for (i = 0; i < 1000; i++) {
@@ -1607,7 +1607,7 @@ test26(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
status = rte_lpm6_add(lpm, &ip_10_32, d_ip_10_32, next_hop_ip_10_32);
@@ -1679,7 +1679,7 @@ test27(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
depth = 128;
@@ -1729,7 +1729,7 @@ test28(void)
config.number_tbl8s = NUMBER_TBL8S;
config.flags = 0;
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
status = rte_lpm6_add(lpm, &ip, depth, next_hop_add);
diff --git a/app/test/test_lpm6_perf.c b/app/test/test_lpm6_perf.c
index 1860a99ed6..f32cf4f7b8 100644
--- a/app/test/test_lpm6_perf.c
+++ b/app/test/test_lpm6_perf.c
@@ -75,7 +75,7 @@ test_lpm6_perf(void)
*/
generate_large_ips_table(0);
- lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm6_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* Measure add. */
diff --git a/app/test/test_lpm_perf.c b/app/test/test_lpm_perf.c
index bc4bdded64..b3249c80c7 100644
--- a/app/test/test_lpm_perf.c
+++ b/app/test/test_lpm_perf.c
@@ -518,7 +518,7 @@ test_lpm_rcu_perf_multi_writer(uint8_t use_rcu)
config.max_rules = NUM_LDEPTH_ROUTE_ENTRIES;
config.number_tbl8s = NUM_LDEPTH_ROUTE_ENTRIES;
config.flags = 0;
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* Init RCU variable */
@@ -611,7 +611,7 @@ test_lpm_perf(void)
print_route_distribution(large_route_table, (uint32_t) NUM_ROUTE_ENTRIES);
- lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+ lpm = rte_lpm_create(__func__, RTE_NUMA_ID_ANY, &config);
TEST_LPM_ASSERT(lpm != NULL);
/* Measure add. */
diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index 3674dc3f7f..ae6f8a979e 100644
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -33,7 +33,7 @@
#define N 10000
static int
-is_mem_on_socket(int32_t socket);
+is_mem_on_socket(int32_t numa_id);
static int32_t
addr_to_socket(void *addr);
@@ -277,7 +277,7 @@ static int
test_multi_alloc_statistics(void)
{
int ret = -1; /* default return is error, cleared at end on success */
- int socket = 0;
+ int numa_id = 0;
struct rte_malloc_numa_stats pre_stats, post_stats, first_stats, second_stats;
size_t size = 2048;
int align = 1024;
@@ -313,22 +313,22 @@ test_multi_alloc_statistics(void)
printf("Failed to add memory to heap\n");
goto cleanup_allocated_memory;
}
- socket = rte_malloc_heap_get_numa_id(__func__);
- if (socket < 0) {
- printf("Failed to get socket for test malloc heap.\n");
+ numa_id = rte_malloc_heap_get_numa_id(__func__);
+ if (numa_id < 0) {
+ printf("Failed to get numa_id for test malloc heap.\n");
goto cleanup_all;
}
/* Dynamically calculate the overhead by allocating one cacheline and
* then comparing what was allocated from the heap.
*/
- rte_malloc_get_numa_stats(socket, &pre_stats);
+ rte_malloc_get_numa_stats(numa_id, &pre_stats);
- void *dummy = rte_malloc_socket(NULL, RTE_CACHE_LINE_SIZE, 0, socket);
+ void *dummy = rte_malloc_numa(NULL, RTE_CACHE_LINE_SIZE, 0, numa_id);
if (dummy == NULL)
goto cleanup_all;
- rte_malloc_get_numa_stats(socket, &post_stats);
+ rte_malloc_get_numa_stats(numa_id, &post_stats);
/* after subtracting cache line, remainder is overhead */
overhead = post_stats.heap_allocsz_bytes - pre_stats.heap_allocsz_bytes;
@@ -337,16 +337,16 @@ test_multi_alloc_statistics(void)
rte_free(dummy);
/* Now start the real tests */
- rte_malloc_get_numa_stats(socket, &pre_stats);
+ rte_malloc_get_numa_stats(numa_id, &pre_stats);
- void *p1 = rte_malloc_socket("stats", size , align, socket);
+ void *p1 = rte_malloc_numa("stats", size, align, numa_id);
if (!p1)
goto cleanup_all;
rte_free(p1);
rte_malloc_dump_stats(stdout, "stats");
- rte_malloc_get_numa_stats(socket, &post_stats);
+ rte_malloc_get_numa_stats(numa_id, &post_stats);
/* Check statistics reported are correct */
/* All post stats should be equal to pre stats after alloc freed */
if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) ||
@@ -360,23 +360,23 @@ test_multi_alloc_statistics(void)
/* Check two consecutive allocations */
size = 1024;
align = 0;
- rte_malloc_get_numa_stats(socket, &pre_stats);
- void *p2 = rte_malloc_socket("add", size ,align, socket);
+ rte_malloc_get_numa_stats(numa_id, &pre_stats);
+ void *p2 = rte_malloc_numa("add", size, align, numa_id);
if (!p2)
goto cleanup_all;
- rte_malloc_get_numa_stats(socket, &first_stats);
+ rte_malloc_get_numa_stats(numa_id, &first_stats);
- void *p3 = rte_malloc_socket("add2", size,align, socket);
+ void *p3 = rte_malloc_numa("add2", size, align, numa_id);
if (!p3)
goto cleanup_all;
- rte_malloc_get_numa_stats(socket, &second_stats);
+ rte_malloc_get_numa_stats(numa_id, &second_stats);
rte_free(p2);
rte_free(p3);
/* After freeing both allocations check stats return to original */
- rte_malloc_get_numa_stats(socket, &post_stats);
+ rte_malloc_get_numa_stats(numa_id, &post_stats);
if(second_stats.heap_totalsz_bytes != first_stats.heap_totalsz_bytes) {
printf("Incorrect heap statistics: Total size \n");
@@ -442,7 +442,7 @@ test_realloc(void)
#else
static int
-test_realloc_socket(int socket)
+test_realloc_socket(int numa_id)
{
const char hello_str[] = "Hello, world!";
const unsigned size1 = 1024;
@@ -451,15 +451,15 @@ test_realloc_socket(int socket)
const unsigned size4 = size3 + 1024;
/* test data is the same even if element is moved*/
- char *ptr1 = rte_zmalloc_socket(
- NULL, size1, RTE_CACHE_LINE_SIZE, socket);
+ char *ptr1 = rte_zmalloc_numa(
+ NULL, size1, RTE_CACHE_LINE_SIZE, numa_id);
if (!ptr1){
printf("NULL pointer returned from rte_zmalloc\n");
return -1;
}
strlcpy(ptr1, hello_str, size1);
- char *ptr2 = rte_realloc_socket(
- ptr1, size2, RTE_CACHE_LINE_SIZE, socket);
+ char *ptr2 = rte_realloc_numa(
+ ptr1, size2, RTE_CACHE_LINE_SIZE, numa_id);
if (!ptr2){
rte_free(ptr1);
printf("NULL pointer returned from rte_realloc\n");
@@ -483,8 +483,8 @@ test_realloc_socket(int socket)
/* now allocate third element, free the second
* and resize third. It should not move. (ptr1 is now invalid)
*/
- char *ptr3 = rte_zmalloc_socket(
- NULL, size3, RTE_CACHE_LINE_SIZE, socket);
+ char *ptr3 = rte_zmalloc_numa(
+ NULL, size3, RTE_CACHE_LINE_SIZE, numa_id);
if (!ptr3){
printf("NULL pointer returned from rte_zmalloc\n");
rte_free(ptr2);
@@ -499,8 +499,8 @@ test_realloc_socket(int socket)
}
rte_free(ptr2);
/* first resize to half the size of the freed block */
- char *ptr4 = rte_realloc_socket(
- ptr3, size4, RTE_CACHE_LINE_SIZE, socket);
+ char *ptr4 = rte_realloc_numa(
+ ptr3, size4, RTE_CACHE_LINE_SIZE, numa_id);
if (!ptr4){
printf("NULL pointer returned from rte_realloc\n");
rte_free(ptr3);
@@ -512,8 +512,8 @@ test_realloc_socket(int socket)
return -1;
}
/* now resize again to the full size of the freed block */
- ptr4 = rte_realloc_socket(ptr3, size3 + size2 + size1,
- RTE_CACHE_LINE_SIZE, socket);
+ ptr4 = rte_realloc_numa(ptr3, size3 + size2 + size1,
+ RTE_CACHE_LINE_SIZE, numa_id);
if (ptr3 != ptr4){
printf("Unexpected - ptr4 != ptr3 on second resize\n");
rte_free(ptr4);
@@ -524,14 +524,14 @@ test_realloc_socket(int socket)
/* now try a resize to a smaller size, see if it works */
const unsigned size5 = 1024;
const unsigned size6 = size5 / 2;
- char *ptr5 = rte_malloc_socket(
- NULL, size5, RTE_CACHE_LINE_SIZE, socket);
+ char *ptr5 = rte_malloc_numa(
+ NULL, size5, RTE_CACHE_LINE_SIZE, numa_id);
if (!ptr5){
printf("NULL pointer returned from rte_malloc\n");
return -1;
}
- char *ptr6 = rte_realloc_socket(
- ptr5, size6, RTE_CACHE_LINE_SIZE, socket);
+ char *ptr6 = rte_realloc_numa(
+ ptr5, size6, RTE_CACHE_LINE_SIZE, numa_id);
if (!ptr6){
printf("NULL pointer returned from rte_realloc\n");
rte_free(ptr5);
@@ -548,7 +548,7 @@ test_realloc_socket(int socket)
const unsigned size7 = 1024;
const unsigned orig_align = RTE_CACHE_LINE_SIZE;
unsigned new_align = RTE_CACHE_LINE_SIZE * 2;
- char *ptr7 = rte_malloc_socket(NULL, size7, orig_align, socket);
+ char *ptr7 = rte_malloc_numa(NULL, size7, orig_align, numa_id);
if (!ptr7){
printf("NULL pointer returned from rte_malloc\n");
return -1;
@@ -556,7 +556,7 @@ test_realloc_socket(int socket)
/* calc an alignment we don't already have */
while(RTE_PTR_ALIGN(ptr7, new_align) == ptr7)
new_align *= 2;
- char *ptr8 = rte_realloc_socket(ptr7, size7, new_align, socket);
+ char *ptr8 = rte_realloc_numa(ptr7, size7, new_align, numa_id);
if (!ptr8){
printf("NULL pointer returned from rte_realloc\n");
rte_free(ptr7);
@@ -574,21 +574,21 @@ test_realloc_socket(int socket)
*/
unsigned size9 = 1024, size10 = 1024;
unsigned size11 = size9 + size10 + 256;
- char *ptr9 = rte_malloc_socket(
- NULL, size9, RTE_CACHE_LINE_SIZE, socket);
+ char *ptr9 = rte_malloc_numa(
+ NULL, size9, RTE_CACHE_LINE_SIZE, numa_id);
if (!ptr9){
printf("NULL pointer returned from rte_malloc\n");
return -1;
}
- char *ptr10 = rte_malloc_socket(
- NULL, size10, RTE_CACHE_LINE_SIZE, socket);
+ char *ptr10 = rte_malloc_numa(
+ NULL, size10, RTE_CACHE_LINE_SIZE, numa_id);
if (!ptr10){
printf("NULL pointer returned from rte_malloc\n");
return -1;
}
rte_free(ptr9);
- char *ptr11 = rte_realloc_socket(
- ptr10, size11, RTE_CACHE_LINE_SIZE, socket);
+ char *ptr11 = rte_realloc_numa(
+ ptr10, size11, RTE_CACHE_LINE_SIZE, numa_id);
if (!ptr11){
printf("NULL pointer returned from rte_realloc\n");
rte_free(ptr10);
@@ -605,8 +605,8 @@ test_realloc_socket(int socket)
* We should get a malloc of the size requested*/
const size_t size12 = 1024;
size_t size12_check;
- char *ptr12 = rte_realloc_socket(
- NULL, size12, RTE_CACHE_LINE_SIZE, socket);
+ char *ptr12 = rte_realloc_numa(
+ NULL, size12, RTE_CACHE_LINE_SIZE, numa_id);
if (!ptr12){
printf("NULL pointer returned from rte_realloc\n");
return -1;
@@ -638,32 +638,32 @@ static int
test_realloc_numa(void)
{
/* check realloc_socket part */
- int32_t socket_count = 0, socket_allocated, socket;
+ int32_t socket_count = 0, socket_allocated, numa_id;
void *ptr1, *ptr2;
int ret = -1;
size_t size = 1024;
ptr1 = NULL;
- for (socket = 0; socket < RTE_MAX_NUMA_NODES; socket++) {
- if (is_mem_on_socket(socket)) {
+ for (numa_id = 0; numa_id < RTE_MAX_NUMA_NODES; numa_id++) {
+ if (is_mem_on_socket(numa_id)) {
int j = 2;
socket_count++;
while (j--) {
/* j == 1 -> resizing */
- ptr2 = rte_realloc_socket(ptr1, size,
+ ptr2 = rte_realloc_numa(ptr1, size,
RTE_CACHE_LINE_SIZE,
- socket);
+ numa_id);
if (ptr2 == NULL) {
- printf("NULL pointer returned from rte_realloc_socket\n");
+ printf("NULL pointer returned from rte_realloc_numa\n");
goto end;
}
ptr1 = ptr2;
socket_allocated = addr_to_socket(ptr2);
- if (socket_allocated != socket) {
- printf("Requested socket (%d) doesn't mach allocated one (%d)\n",
- socket, socket_allocated);
+ if (socket_allocated != numa_id) {
+ printf("Requested numa_id (%d) doesn't mach allocated one (%d)\n",
+ numa_id, socket_allocated);
goto end;
}
size += RTE_CACHE_LINE_SIZE;
@@ -671,7 +671,7 @@ test_realloc_numa(void)
}
}
- /* Print warning if only a single socket, but don't fail the test */
+ /* Print warning if only a single numa_id, but don't fail the test */
if (socket_count < 2)
printf("WARNING: realloc_socket test needs memory on multiple sockets!\n");
@@ -721,7 +721,7 @@ test_realloc(void)
goto mem_free;
}
- /* run the socket-bound tests */
+ /* run the numa_id-bound tests */
ret = test_realloc_socket(realloc_heap_socket);
if (ret != 0)
goto mem_remove;
@@ -957,24 +957,24 @@ test_malloc_bad_params(void)
static int
check_socket_mem(const struct rte_memseg_list *msl, void *arg)
{
- int32_t *socket = arg;
+ int32_t *numa_id = arg;
if (msl->external)
return 0;
- return *socket == msl->socket_id;
+ return *numa_id == msl->socket_id;
}
-/* Check if memory is available on a specific socket */
+/* Check if memory is available on a specific numa_id */
static int
-is_mem_on_socket(int32_t socket)
+is_mem_on_socket(int32_t numa_id)
{
- return rte_memseg_list_walk(check_socket_mem, &socket);
+ return rte_memseg_list_walk(check_socket_mem, &numa_id);
}
/*
- * Find what socket a memory address is on. Only works for addresses within
+ * Find what numa_id a memory address is on. Only works for addresses within
* memsegs, not heap or stack...
*/
static int32_t
@@ -985,19 +985,19 @@ addr_to_socket(void * addr)
}
-/* Test using rte_[c|m|zm]alloc_socket() on a specific socket */
+/* Test using rte_[c|m|zm]alloc_socket() on a specific numa_id */
static int
-test_alloc_single_socket(int32_t socket)
+test_alloc_single_socket(int32_t numa_id)
{
const char *type = NULL;
const size_t size = 10;
const unsigned align = 0;
char *mem = NULL;
- int32_t desired_socket = (socket == SOCKET_ID_ANY) ?
- (int32_t)rte_socket_id() : socket;
+ int32_t desired_socket = (numa_id == RTE_NUMA_ID_ANY) ?
+ (int32_t)rte_numa_id() : numa_id;
- /* Test rte_calloc_socket() */
- mem = rte_calloc_socket(type, size, sizeof(char), align, socket);
+ /* Test rte_calloc_numa() */
+ mem = rte_calloc_numa(type, size, sizeof(char), align, numa_id);
if (mem == NULL)
return -1;
if (addr_to_socket(mem) != desired_socket) {
@@ -1006,8 +1006,8 @@ test_alloc_single_socket(int32_t socket)
}
rte_free(mem);
- /* Test rte_malloc_socket() */
- mem = rte_malloc_socket(type, size, align, socket);
+ /* Test rte_malloc_numa() */
+ mem = rte_malloc_numa(type, size, align, numa_id);
if (mem == NULL)
return -1;
if (addr_to_socket(mem) != desired_socket) {
@@ -1016,8 +1016,8 @@ test_alloc_single_socket(int32_t socket)
}
rte_free(mem);
- /* Test rte_zmalloc_socket() */
- mem = rte_zmalloc_socket(type, size, align, socket);
+ /* Test rte_zmalloc_numa() */
+ mem = rte_zmalloc_numa(type, size, align, numa_id);
if (mem == NULL)
return -1;
if (addr_to_socket(mem) != desired_socket) {
@@ -1035,28 +1035,28 @@ test_alloc_socket(void)
unsigned socket_count = 0;
unsigned i;
- if (test_alloc_single_socket(SOCKET_ID_ANY) < 0)
+ if (test_alloc_single_socket(RTE_NUMA_ID_ANY) < 0)
return -1;
for (i = 0; i < RTE_MAX_NUMA_NODES; i++) {
if (is_mem_on_socket(i)) {
socket_count++;
if (test_alloc_single_socket(i) < 0) {
- printf("Fail: rte_malloc_socket(..., %u) did not succeed\n",
+ printf("Fail: rte_malloc_numa(..., %u) did not succeed\n",
i);
return -1;
}
}
else {
if (test_alloc_single_socket(i) == 0) {
- printf("Fail: rte_malloc_socket(..., %u) succeeded\n",
+ printf("Fail: rte_malloc_numa(..., %u) succeeded\n",
i);
return -1;
}
}
}
- /* Print warning if only a single socket, but don't fail the test */
+ /* Print warning if only a single numa_id, but don't fail the test */
if (socket_count < 2) {
printf("WARNING: alloc_socket test needs memory on multiple sockets!\n");
}
diff --git a/app/test/test_malloc_perf.c b/app/test/test_malloc_perf.c
index a99bfd8531..3a54100588 100644
--- a/app/test/test_malloc_perf.c
+++ b/app/test/test_malloc_perf.c
@@ -136,7 +136,7 @@ memzone_alloc(const char *name __rte_unused, size_t size, unsigned int align)
char gen_name[RTE_MEMZONE_NAMESIZE];
snprintf(gen_name, sizeof(gen_name), "test-mz-%"PRIx64, rte_rdtsc());
- mz = rte_memzone_reserve_aligned(gen_name, size, SOCKET_ID_ANY,
+ mz = rte_memzone_reserve_aligned(gen_name, size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_1GB | RTE_MEMZONE_SIZE_HINT_ONLY, align);
return (void *)(uintptr_t)mz;
}
diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index db23259745..2289d27ac1 100644
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -758,14 +758,14 @@ test_pktmbuf_pool_bulk(void)
*/
printf("Create mbuf pools for bulk allocation.\n");
pool = rte_pktmbuf_pool_create("test_pktmbuf_bulk",
- NB_MBUF, 0, 0, MBUF_DATA_SIZE, SOCKET_ID_ANY);
+ NB_MBUF, 0, 0, MBUF_DATA_SIZE, RTE_NUMA_ID_ANY);
if (pool == NULL) {
printf("rte_pktmbuf_pool_create() failed. rte_errno %d\n",
rte_errno);
goto err;
}
pool2 = rte_pktmbuf_pool_create("test_pktmbuf_bulk2",
- NB_MBUF, 0, 0, MBUF_DATA_SIZE, SOCKET_ID_ANY);
+ NB_MBUF, 0, 0, MBUF_DATA_SIZE, RTE_NUMA_ID_ANY);
if (pool2 == NULL) {
printf("rte_pktmbuf_pool_create() failed. rte_errno %d\n",
rte_errno);
@@ -1130,7 +1130,7 @@ test_refcnt_mbuf(void)
refcnt_pool = rte_pktmbuf_pool_create(MAKE_STRING(refcnt_pool),
REFCNT_MBUF_NUM, 0, 0, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (refcnt_pool == NULL) {
printf("%s: cannot allocate " MAKE_STRING(refcnt_pool) "\n",
__func__);
@@ -1138,7 +1138,7 @@ test_refcnt_mbuf(void)
}
refcnt_mbuf_ring = rte_ring_create("refcnt_mbuf_ring",
- rte_align32pow2(REFCNT_RING_SIZE), SOCKET_ID_ANY,
+ rte_align32pow2(REFCNT_RING_SIZE), RTE_NUMA_ID_ANY,
RING_F_SP_ENQ);
if (refcnt_mbuf_ring == NULL) {
printf("%s: cannot allocate " MAKE_STRING(refcnt_mbuf_ring)
@@ -2451,7 +2451,7 @@ test_pktmbuf_ext_pinned_buffer(struct rte_mempool *std_pool)
/* Allocate memzone for the external data buffer */
mz = rte_memzone_reserve("pinned_pool",
NB_MBUF * MBUF_DATA_SIZE,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RTE_MEMZONE_2MB | RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL)
GOTO_FAIL("%s: Memzone allocation failed\n", __func__);
@@ -2464,7 +2464,7 @@ test_pktmbuf_ext_pinned_buffer(struct rte_mempool *std_pool)
pinned_pool = rte_pktmbuf_pool_create_extbuf("test_pinned_pool",
NB_MBUF, MEMPOOL_CACHE_SIZE, 0,
- MBUF_DATA_SIZE, SOCKET_ID_ANY,
+ MBUF_DATA_SIZE, RTE_NUMA_ID_ANY,
&ext_mem, 1);
if (pinned_pool == NULL)
GOTO_FAIL("%s: Mbuf pool with pinned external"
@@ -2712,7 +2712,7 @@ test_nb_segs_and_next_reset(void)
struct rte_mempool *pool = NULL;
pool = rte_pktmbuf_pool_create("test_mbuf_reset",
- 3, 0, 0, MBUF_DATA_SIZE, SOCKET_ID_ANY);
+ 3, 0, 0, MBUF_DATA_SIZE, RTE_NUMA_ID_ANY);
if (pool == NULL)
GOTO_FAIL("Failed to create mbuf pool");
@@ -2782,7 +2782,7 @@ test_mbuf(void)
/* create pktmbuf pool if it does not exist */
pktmbuf_pool = rte_pktmbuf_pool_create("test_pktmbuf_pool",
NB_MBUF, MEMPOOL_CACHE_SIZE, 0, MBUF_DATA_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (pktmbuf_pool == NULL) {
printf("cannot allocate mbuf pool\n");
@@ -2799,7 +2799,7 @@ test_mbuf(void)
* room size */
pktmbuf_pool2 = rte_pktmbuf_pool_create("test_pktmbuf_pool2",
NB_MBUF, MEMPOOL_CACHE_SIZE, MBUF2_PRIV_SIZE, 0,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (pktmbuf_pool2 == NULL) {
printf("cannot allocate mbuf pool\n");
diff --git a/app/test/test_member_perf.c b/app/test/test_member_perf.c
index 5bf75bf8d4..2b32a8b17c 100644
--- a/app/test/test_member_perf.c
+++ b/app/test/test_member_perf.c
@@ -658,7 +658,7 @@ run_all_tbl_perf_tests(void)
printf("Measuring performance, please wait\n");
fflush(stdout);
- test_socket_id = rte_socket_id();
+ test_socket_id = rte_numa_id();
for (i = 0; i < NUM_KEYSIZES; i++) {
if (setup_keys_and_data(¶ms, i, 0) < 0) {
diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c
index 0a4d794346..dee785a10b 100644
--- a/app/test/test_mempool.c
+++ b/app/test/test_mempool.c
@@ -90,7 +90,7 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache)
if (use_external_cache) {
/* Create a user-owned mempool cache. */
cache = rte_mempool_cache_create(RTE_MEMPOOL_CACHE_MAX_SIZE,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (cache == NULL)
RET_ERR();
} else {
@@ -198,7 +198,7 @@ static int test_mempool_creation_with_exceeded_cache_size(void)
MEMPOOL_SIZE + 32, 0,
NULL, NULL,
my_obj_init, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp_cov != NULL) {
rte_mempool_free(mp_cov);
@@ -216,7 +216,7 @@ static int test_mempool_creation_with_invalid_flags(void)
MEMPOOL_ELT_SIZE, 0, 0,
NULL, NULL,
NULL, NULL,
- SOCKET_ID_ANY, ~RTE_MEMPOOL_VALID_USER_FLAGS);
+ RTE_NUMA_ID_ANY, ~RTE_MEMPOOL_VALID_USER_FLAGS);
if (mp_cov != NULL) {
rte_mempool_free(mp_cov);
@@ -338,7 +338,7 @@ test_mempool_sp_sc(void)
MEMPOOL_ELT_SIZE, 0, 0,
my_mp_init, NULL,
my_obj_init, NULL,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RTE_MEMPOOL_F_NO_CACHE_ALIGN | RTE_MEMPOOL_F_SP_PUT |
RTE_MEMPOOL_F_SC_GET);
if (mp_spsc == NULL)
@@ -445,7 +445,7 @@ test_mempool_same_name_twice_creation(void)
MEMPOOL_ELT_SIZE, 0, 0,
NULL, NULL,
NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp_tc == NULL)
RET_ERR();
@@ -454,7 +454,7 @@ test_mempool_same_name_twice_creation(void)
MEMPOOL_ELT_SIZE, 0, 0,
NULL, NULL,
NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp_tc2 != NULL) {
rte_mempool_free(mp_tc);
@@ -547,7 +547,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp))
strcpy(name, "empty0");
mp[0] = rte_mempool_create_empty(name, mempool_size,
mempool_elt_size, 0, 0,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
RTE_TEST_ASSERT_NOT_NULL(mp[0], "Cannot create mempool %s: %s",
name, rte_strerror(rte_errno));
for (j = 0; j < CALLBACK_NUM; j++)
@@ -580,7 +580,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp))
strcpy(name, "empty1");
mp[1] = rte_mempool_create_empty(name, mempool_size,
mempool_elt_size, 0, 0,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
RTE_TEST_ASSERT_NOT_NULL(mp[1], "Cannot create mempool %s: %s",
name, rte_strerror(rte_errno));
rte_mempool_set_ops_byname(mp[1], rte_mbuf_best_mempool_ops(), NULL);
@@ -689,7 +689,7 @@ test_mempool_events_safety(void)
mp = rte_mempool_create_empty("empty", MEMPOOL_SIZE,
MEMPOOL_ELT_SIZE, 0, 0,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
RTE_TEST_ASSERT_NOT_NULL(mp, "Cannot create mempool: %s",
rte_strerror(rte_errno));
memset(&data, 0, sizeof(data));
@@ -751,13 +751,13 @@ test_mempool_flag_non_io_set_when_no_iova_contig_set(void)
struct rte_mempool *mp = NULL;
int ret;
- mz = rte_memzone_reserve("test_mempool", size, SOCKET_ID_ANY, 0);
+ mz = rte_memzone_reserve("test_mempool", size, RTE_NUMA_ID_ANY, 0);
RTE_TEST_ASSERT_NOT_NULL(mz, "Cannot allocate memory");
virt = mz->addr;
iova = mz->iova;
mp = rte_mempool_create_empty("empty", MEMPOOL_SIZE,
MEMPOOL_ELT_SIZE, 0, 0,
- SOCKET_ID_ANY, RTE_MEMPOOL_F_NO_IOVA_CONTIG);
+ RTE_NUMA_ID_ANY, RTE_MEMPOOL_F_NO_IOVA_CONTIG);
RTE_TEST_ASSERT_NOT_NULL(mp, "Cannot create mempool: %s",
rte_strerror(rte_errno));
rte_mempool_set_ops_byname(mp, rte_mbuf_best_mempool_ops(), NULL);
@@ -797,13 +797,13 @@ test_mempool_flag_non_io_unset_when_populated_with_valid_iova(void)
* we don't care for contiguous IOVA, on the other hand,
* requiring it could cause spurious test failures.
*/
- mz = rte_memzone_reserve("test_mempool", total_size, SOCKET_ID_ANY, 0);
+ mz = rte_memzone_reserve("test_mempool", total_size, RTE_NUMA_ID_ANY, 0);
RTE_TEST_ASSERT_NOT_NULL(mz, "Cannot allocate memory");
virt = mz->addr;
iova = mz->iova;
mp = rte_mempool_create_empty("empty", MEMPOOL_SIZE,
MEMPOOL_ELT_SIZE, 0, 0,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
RTE_TEST_ASSERT_NOT_NULL(mp, "Cannot create mempool: %s",
rte_strerror(rte_errno));
@@ -866,7 +866,7 @@ test_mempool(void)
MEMPOOL_ELT_SIZE, 0, 0,
NULL, NULL,
my_obj_init, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp_nocache == NULL) {
printf("cannot allocate mp_nocache mempool\n");
@@ -879,7 +879,7 @@ test_mempool(void)
RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
NULL, NULL,
my_obj_init, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp_cache == NULL) {
printf("cannot allocate mp_cache mempool\n");
@@ -891,7 +891,7 @@ test_mempool(void)
MEMPOOL_SIZE,
MEMPOOL_ELT_SIZE,
RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp_anon == NULL)
GOTO_ERR(ret, err);
@@ -914,7 +914,7 @@ test_mempool(void)
RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
NULL, NULL,
my_obj_init, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp_mempool_iter == NULL)
GOTO_ERR(ret, err);
@@ -936,7 +936,7 @@ test_mempool(void)
MEMPOOL_SIZE,
MEMPOOL_ELT_SIZE,
RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp_stack == NULL) {
printf("cannot allocate mp_stack mempool\n");
@@ -959,7 +959,7 @@ test_mempool(void)
MEMPOOL_SIZE,
MEMPOOL_ELT_SIZE,
RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (default_pool == NULL) {
printf("cannot allocate default mempool\n");
@@ -1006,7 +1006,7 @@ test_mempool(void)
mp_alignment = rte_mempool_create("test_alignment",
1, 8, /* the small size guarantees single memory chunk */
0, 0, NULL, NULL, my_obj_init, NULL,
- SOCKET_ID_ANY, RTE_MEMPOOL_F_NO_CACHE_ALIGN);
+ RTE_NUMA_ID_ANY, RTE_MEMPOOL_F_NO_CACHE_ALIGN);
if (mp_alignment == NULL) {
printf("cannot allocate mempool with "
diff --git a/app/test/test_mempool_perf.c b/app/test/test_mempool_perf.c
index e164eca788..d278285e0c 100644
--- a/app/test/test_mempool_perf.c
+++ b/app/test/test_mempool_perf.c
@@ -231,7 +231,7 @@ per_lcore_mempool_test(void *arg)
if (use_external_cache) {
/* Create a user-owned mempool cache. */
cache = rte_mempool_cache_create(external_cache_size,
- SOCKET_ID_ANY);
+ RTE_NUMA_ID_ANY);
if (cache == NULL)
RET_ERR();
} else {
@@ -456,7 +456,7 @@ do_all_mempool_perf_tests(unsigned int cores)
MEMPOOL_ELT_SIZE, 0, 0,
NULL, NULL,
my_obj_init, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp_nocache == NULL) {
printf("cannot allocate mempool (without cache)\n");
goto err;
@@ -469,7 +469,7 @@ do_all_mempool_perf_tests(unsigned int cores)
RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
NULL, NULL,
my_obj_init, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mp_cache == NULL) {
printf("cannot allocate mempool (with cache)\n");
goto err;
@@ -483,7 +483,7 @@ do_all_mempool_perf_tests(unsigned int cores)
MEMPOOL_SIZE,
MEMPOOL_ELT_SIZE,
0, 0,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (default_pool_nocache == NULL) {
printf("cannot allocate %s mempool (without cache)\n", default_pool_ops);
goto err;
@@ -503,7 +503,7 @@ do_all_mempool_perf_tests(unsigned int cores)
MEMPOOL_SIZE,
MEMPOOL_ELT_SIZE,
RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (default_pool_cache == NULL) {
printf("cannot allocate %s mempool (with cache)\n", default_pool_ops);
goto err;
diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index 1b6555df55..b3e76b6e4f 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -29,9 +29,9 @@
*
* - Search for three reserved zones or reserve them if they do not exist:
*
- * - One is on any socket id.
- * - The second is on socket 0.
- * - The last one is on socket 1 (if socket 1 exists).
+ * - One is on any NUMA node id.
+ * - The second is on NUMA node 0.
+ * - The last one is on NUMA node 1 (if NUMA node 1 exists).
*
* - Check that the zones exist.
*
@@ -39,7 +39,7 @@
*
* - Check that zones do not overlap.
*
- * - Check that the zones are on the correct socket id.
+ * - Check that the zones are on the correct NUMA node id.
*
* - Check that a lookup of the first zone returns the same pointer.
*
@@ -74,7 +74,7 @@ test_memzone_invalid_alignment(void)
}
mz = rte_memzone_reserve_aligned(TEST_MEMZONE_NAME("invalid_alignment"),
- 100, SOCKET_ID_ANY, 0, 100);
+ 100, RTE_NUMA_ID_ANY, 0, 100);
if (mz != NULL) {
printf("Zone with invalid alignment has been reserved\n");
return -1;
@@ -94,7 +94,7 @@ test_memzone_invalid_flags(void)
}
mz = rte_memzone_reserve(TEST_MEMZONE_NAME("invalid_flags"),
- 100, SOCKET_ID_ANY, RTE_MEMZONE_IOVA_CONTIG << 1);
+ 100, RTE_NUMA_ID_ANY, RTE_MEMZONE_IOVA_CONTIG << 1);
if (mz != NULL) {
printf("Zone with invalid flags has been reserved\n");
return -1;
@@ -116,7 +116,7 @@ test_memzone_reserving_zone_size_bigger_than_the_maximum(void)
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("zone_size_bigger_than_the_maximum"),
- (size_t)-1, SOCKET_ID_ANY, 0);
+ (size_t)-1, RTE_NUMA_ID_ANY, 0);
if (mz != NULL) {
printf("It is impossible to reserve such big a memzone\n");
return -1;
@@ -186,7 +186,7 @@ test_memzone_reserve_flags(void)
*/
if (hugepage_2MB_avail) {
mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_2M"),
- size, SOCKET_ID_ANY, RTE_MEMZONE_2MB);
+ size, RTE_NUMA_ID_ANY, RTE_MEMZONE_2MB);
if (mz == NULL) {
printf("MEMZONE FLAG 2MB\n");
return -1;
@@ -201,7 +201,7 @@ test_memzone_reserve_flags(void)
}
mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_2M_HINT"),
- size, SOCKET_ID_ANY,
+ size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_2MB|RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL) {
printf("MEMZONE FLAG 2MB\n");
@@ -222,7 +222,7 @@ test_memzone_reserve_flags(void)
if (!hugepage_1GB_avail) {
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_1G_HINT"),
- size, SOCKET_ID_ANY,
+ size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL) {
printf("MEMZONE FLAG 1GB & HINT\n");
@@ -239,7 +239,7 @@ test_memzone_reserve_flags(void)
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_1G"), size,
- SOCKET_ID_ANY, RTE_MEMZONE_1GB);
+ RTE_NUMA_ID_ANY, RTE_MEMZONE_1GB);
if (mz != NULL) {
printf("MEMZONE FLAG 1GB\n");
return -1;
@@ -250,7 +250,7 @@ test_memzone_reserve_flags(void)
/*As with 2MB tests above for 1GB huge page requests*/
if (hugepage_1GB_avail) {
mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_1G"),
- size, SOCKET_ID_ANY, RTE_MEMZONE_1GB);
+ size, RTE_NUMA_ID_ANY, RTE_MEMZONE_1GB);
if (mz == NULL) {
printf("MEMZONE FLAG 1GB\n");
return -1;
@@ -265,7 +265,7 @@ test_memzone_reserve_flags(void)
}
mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_1G_HINT"),
- size, SOCKET_ID_ANY,
+ size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL) {
printf("MEMZONE FLAG 1GB\n");
@@ -286,7 +286,7 @@ test_memzone_reserve_flags(void)
if (!hugepage_2MB_avail) {
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_2M_HINT"),
- size, SOCKET_ID_ANY,
+ size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_2MB|RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL){
printf("MEMZONE FLAG 2MB & HINT\n");
@@ -302,7 +302,7 @@ test_memzone_reserve_flags(void)
}
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_2M"), size,
- SOCKET_ID_ANY, RTE_MEMZONE_2MB);
+ RTE_NUMA_ID_ANY, RTE_MEMZONE_2MB);
if (mz != NULL) {
printf("MEMZONE FLAG 2MB\n");
return -1;
@@ -312,7 +312,7 @@ test_memzone_reserve_flags(void)
if (hugepage_2MB_avail && hugepage_1GB_avail) {
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_2M_HINT"),
- size, SOCKET_ID_ANY,
+ size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_2MB|RTE_MEMZONE_1GB);
if (mz == NULL) {
printf("BOTH SIZES SET\n");
@@ -338,7 +338,7 @@ test_memzone_reserve_flags(void)
*/
if (hugepage_16MB_avail) {
mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_16M"),
- size, SOCKET_ID_ANY, RTE_MEMZONE_16MB);
+ size, RTE_NUMA_ID_ANY, RTE_MEMZONE_16MB);
if (mz == NULL) {
printf("MEMZONE FLAG 16MB\n");
return -1;
@@ -354,7 +354,7 @@ test_memzone_reserve_flags(void)
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_16M_HINT"), size,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RTE_MEMZONE_16MB|RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL) {
printf("MEMZONE FLAG 16MB\n");
@@ -375,7 +375,7 @@ test_memzone_reserve_flags(void)
if (!hugepage_16GB_avail) {
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_16G_HINT"),
- size, SOCKET_ID_ANY,
+ size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_16GB |
RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL) {
@@ -394,7 +394,7 @@ test_memzone_reserve_flags(void)
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_16G"),
size,
- SOCKET_ID_ANY, RTE_MEMZONE_16GB);
+ RTE_NUMA_ID_ANY, RTE_MEMZONE_16GB);
if (mz != NULL) {
printf("MEMZONE FLAG 16GB\n");
return -1;
@@ -404,7 +404,7 @@ test_memzone_reserve_flags(void)
/*As with 16MB tests above for 16GB huge page requests*/
if (hugepage_16GB_avail) {
mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_16G"),
- size, SOCKET_ID_ANY, RTE_MEMZONE_16GB);
+ size, RTE_NUMA_ID_ANY, RTE_MEMZONE_16GB);
if (mz == NULL) {
printf("MEMZONE FLAG 16GB\n");
return -1;
@@ -420,7 +420,7 @@ test_memzone_reserve_flags(void)
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_16G_HINT"), size,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RTE_MEMZONE_16GB|RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL) {
printf("MEMZONE FLAG 16GB\n");
@@ -441,7 +441,7 @@ test_memzone_reserve_flags(void)
if (!hugepage_16MB_avail) {
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_16M_HINT"),
- size, SOCKET_ID_ANY,
+ size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_16MB |
RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL) {
@@ -458,7 +458,7 @@ test_memzone_reserve_flags(void)
}
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_16M"),
- size, SOCKET_ID_ANY, RTE_MEMZONE_16MB);
+ size, RTE_NUMA_ID_ANY, RTE_MEMZONE_16MB);
if (mz != NULL) {
printf("MEMZONE FLAG 16MB\n");
return -1;
@@ -468,7 +468,7 @@ test_memzone_reserve_flags(void)
if (hugepage_16MB_avail && hugepage_16GB_avail) {
mz = rte_memzone_reserve(
TEST_MEMZONE_NAME("flag_zone_16M_HINT"),
- size, SOCKET_ID_ANY,
+ size, RTE_NUMA_ID_ANY,
RTE_MEMZONE_16MB|RTE_MEMZONE_16GB);
if (mz == NULL) {
printf("BOTH SIZES SET\n");
@@ -491,12 +491,12 @@ test_memzone_reserve_flags(void)
/* Find the heap with the greatest free block size */
static size_t
-find_max_block_free_size(unsigned int align, unsigned int socket_id)
+find_max_block_free_size(unsigned int align, unsigned int numa_id)
{
struct rte_malloc_numa_stats stats;
size_t len, overhead;
- if (rte_malloc_get_numa_stats(socket_id, &stats) < 0)
+ if (rte_malloc_get_numa_stats(numa_id, &stats) < 0)
return 0;
len = stats.greatest_free_size;
@@ -519,13 +519,13 @@ test_memzone_reserve_max(void)
{
unsigned int i;
- for (i = 0; i < rte_socket_count(); i++) {
+ for (i = 0; i < rte_numa_count(); i++) {
const struct rte_memzone *mz;
size_t maxlen;
- int socket;
+ int numa_id;
- socket = rte_socket_id_by_idx(i);
- maxlen = find_max_block_free_size(0, socket);
+ numa_id = rte_numa_id_by_idx(i);
+ maxlen = find_max_block_free_size(0, numa_id);
if (maxlen == 0) {
printf("There is no space left!\n");
@@ -533,7 +533,7 @@ test_memzone_reserve_max(void)
}
mz = rte_memzone_reserve(TEST_MEMZONE_NAME("max_zone"), 0,
- socket, 0);
+ numa_id, 0);
if (mz == NULL) {
printf("Failed to reserve a big chunk of memory - %s\n",
rte_strerror(rte_errno));
@@ -565,19 +565,19 @@ test_memzone_reserve_max_aligned(void)
{
unsigned int i;
- for (i = 0; i < rte_socket_count(); i++) {
+ for (i = 0; i < rte_numa_count(); i++) {
const struct rte_memzone *mz;
size_t maxlen, minlen = 0;
- int socket;
+ int numa_id;
- socket = rte_socket_id_by_idx(i);
+ numa_id = rte_numa_id_by_idx(i);
/* random alignment */
const unsigned int align = 1 << ((rte_rand() % 8) + 5); /* from 128 up to 4k alignment */
/* memzone size may be between size and size - align */
- minlen = find_max_block_free_size(align, socket);
- maxlen = find_max_block_free_size(0, socket);
+ minlen = find_max_block_free_size(align, numa_id);
+ maxlen = find_max_block_free_size(0, numa_id);
if (minlen == 0 || maxlen == 0) {
printf("There is no space left for biggest %u-aligned memzone!\n",
@@ -587,7 +587,7 @@ test_memzone_reserve_max_aligned(void)
mz = rte_memzone_reserve_aligned(
TEST_MEMZONE_NAME("max_zone_aligned"),
- 0, socket, 0, align);
+ 0, numa_id, 0, align);
if (mz == NULL) {
printf("Failed to reserve a big chunk of memory - %s\n",
rte_strerror(rte_errno));
@@ -632,27 +632,27 @@ test_memzone_aligned(void)
/* memzone that should automatically be adjusted to align on 64 bytes */
memzone_aligned_32 = rte_memzone_reserve_aligned(
- TEST_MEMZONE_NAME("aligned_32"), 100, SOCKET_ID_ANY, 0,
+ TEST_MEMZONE_NAME("aligned_32"), 100, RTE_NUMA_ID_ANY, 0,
32);
/* memzone that is supposed to be aligned on a 128 byte boundary */
memzone_aligned_128 = rte_memzone_reserve_aligned(
- TEST_MEMZONE_NAME("aligned_128"), 100, SOCKET_ID_ANY, 0,
+ TEST_MEMZONE_NAME("aligned_128"), 100, RTE_NUMA_ID_ANY, 0,
128);
/* memzone that is supposed to be aligned on a 256 byte boundary */
memzone_aligned_256 = rte_memzone_reserve_aligned(
- TEST_MEMZONE_NAME("aligned_256"), 100, SOCKET_ID_ANY, 0,
+ TEST_MEMZONE_NAME("aligned_256"), 100, RTE_NUMA_ID_ANY, 0,
256);
/* memzone that is supposed to be aligned on a 512 byte boundary */
memzone_aligned_512 = rte_memzone_reserve_aligned(
- TEST_MEMZONE_NAME("aligned_512"), 100, SOCKET_ID_ANY, 0,
+ TEST_MEMZONE_NAME("aligned_512"), 100, RTE_NUMA_ID_ANY, 0,
512);
/* memzone that is supposed to be aligned on a 1024 byte boundary */
memzone_aligned_1024 = rte_memzone_reserve_aligned(
- TEST_MEMZONE_NAME("aligned_1024"), 100, SOCKET_ID_ANY,
+ TEST_MEMZONE_NAME("aligned_1024"), 100, RTE_NUMA_ID_ANY,
0, 1024);
printf("check alignments and lengths\n");
@@ -777,8 +777,9 @@ check_memzone_bounded(const char *name, uint32_t len, uint32_t align,
bmask = ~((rte_iova_t)bound - 1);
- if ((mz = rte_memzone_reserve_bounded(name, len, SOCKET_ID_ANY, 0,
- align, bound)) == NULL) {
+ mz = rte_memzone_reserve_bounded(name, len, RTE_NUMA_ID_ANY, 0,
+ align, bound);
+ if (mz == NULL) {
printf("%s(%s): memzone creation failed\n",
__func__, name);
return -1;
@@ -827,7 +828,7 @@ test_memzone_bounded(void)
/* should fail as boundary is not power of two */
memzone_err = rte_memzone_reserve_bounded(
TEST_MEMZONE_NAME("bounded_error_31"), 100,
- SOCKET_ID_ANY, 0, 32, UINT32_MAX);
+ RTE_NUMA_ID_ANY, 0, 32, UINT32_MAX);
if (memzone_err != NULL) {
printf("%s(%s)created a memzone with invalid boundary "
"conditions\n", __func__, memzone_err->name);
@@ -837,7 +838,7 @@ test_memzone_bounded(void)
/* should fail as len is greater then boundary */
memzone_err = rte_memzone_reserve_bounded(
TEST_MEMZONE_NAME("bounded_error_32"), 100,
- SOCKET_ID_ANY, 0, 32, 32);
+ RTE_NUMA_ID_ANY, 0, 32, 32);
if (memzone_err != NULL) {
printf("%s(%s)created a memzone with invalid boundary "
"conditions\n", __func__, memzone_err->name);
@@ -883,9 +884,9 @@ test_memzone_free(void)
}
mz[0] = rte_memzone_reserve(TEST_MEMZONE_NAME("tempzone0"), 2000,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
mz[1] = rte_memzone_reserve(TEST_MEMZONE_NAME("tempzone1"), 4000,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mz[0] > mz[1])
goto exit_test;
@@ -903,7 +904,7 @@ test_memzone_free(void)
goto exit_test;
}
mz[2] = rte_memzone_reserve(TEST_MEMZONE_NAME("tempzone2"), 2000,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mz[2] > mz[1]) {
printf("tempzone2 should have gotten the free entry from tempzone0\n");
@@ -930,7 +931,7 @@ test_memzone_free(void)
do {
snprintf(name, sizeof(name), TEST_MEMZONE_NAME("tempzone%u"),
i);
- mz[i] = rte_memzone_reserve(name, 1, SOCKET_ID_ANY, 0);
+ mz[i] = rte_memzone_reserve(name, 1, RTE_NUMA_ID_ANY, 0);
} while (mz[i++] != NULL);
if (rte_memzone_free(mz[0])) {
@@ -938,7 +939,7 @@ test_memzone_free(void)
goto exit_test;
}
mz[0] = rte_memzone_reserve(TEST_MEMZONE_NAME("tempzone0new"), 0,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mz[0] == NULL) {
printf("Fail to create memzone - tempzone0new - when MAX memzones were "
@@ -987,7 +988,7 @@ test_memzone_basic(void)
memzone_cnt_before = memzone_walk_cnt;
memzone1 = rte_memzone_reserve(TEST_MEMZONE_NAME("testzone1"), 100,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
memzone2 = rte_memzone_reserve(TEST_MEMZONE_NAME("testzone2"), 1000,
0, 0);
@@ -996,7 +997,7 @@ test_memzone_basic(void)
1, 0);
memzone4 = rte_memzone_reserve(TEST_MEMZONE_NAME("testzone4"), 1024,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
/* memzone3 may be NULL if we don't have NUMA */
if (memzone1 == NULL || memzone2 == NULL || memzone4 == NULL)
@@ -1052,12 +1053,12 @@ test_memzone_basic(void)
memzone3->iova, memzone3->len))
return -1;
- printf("check socket ID\n");
+ printf("check numa_id ID\n");
- /* memzone2 must be on socket id 0 and memzone3 on socket 1 */
- if (memzone2->socket_id != 0)
+ /* memzone2 must be on numa_id id 0 and memzone3 on numa_id 1 */
+ if (memzone2->numa_id != 0)
return -1;
- if (memzone3 != NULL && memzone3->socket_id != 1)
+ if (memzone3 != NULL && memzone3->numa_id != 1)
return -1;
printf("test zone lookup\n");
@@ -1067,7 +1068,7 @@ test_memzone_basic(void)
printf("test duplicate zone name\n");
mz = rte_memzone_reserve(TEST_MEMZONE_NAME("testzone1"), 100,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mz != NULL)
return -1;
diff --git a/app/test/test_metrics.c b/app/test/test_metrics.c
index b1c7694b41..68e9d13436 100644
--- a/app/test/test_metrics.c
+++ b/app/test/test_metrics.c
@@ -23,7 +23,7 @@
static int
test_metrics_init(void)
{
- rte_metrics_init(rte_socket_id());
+ rte_metrics_init(rte_numa_id());
return TEST_SUCCESS;
}
diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c
index d89419c253..0ec9666b6c 100644
--- a/app/test/test_mp_secondary.c
+++ b/app/test/test_mp_secondary.c
@@ -132,7 +132,7 @@ run_object_creation_tests(void)
printf("### Testing object creation - expect lots of mz reserve errors!\n");
rte_errno = 0;
- if ((rte_memzone_reserve("test_mz", size, rte_socket_id(),
+ if ((rte_memzone_reserve("test_mz", size, rte_numa_id(),
flags) == NULL) &&
(rte_memzone_lookup("test_mz") == NULL)) {
printf("Error: unexpected return value from rte_memzone_reserve\n");
@@ -142,7 +142,7 @@ run_object_creation_tests(void)
rte_errno = 0;
if ((rte_ring_create(
- "test_ring", size, rte_socket_id(), flags) == NULL) &&
+ "test_ring", size, rte_numa_id(), flags) == NULL) &&
(rte_ring_lookup("test_ring") == NULL)){
printf("Error: unexpected return value from rte_ring_create()\n");
return -1;
@@ -152,7 +152,7 @@ run_object_creation_tests(void)
rte_errno = 0;
if ((rte_mempool_create("test_mp", size, elt_size, cache_size,
priv_data_size, NULL, NULL, NULL, NULL,
- rte_socket_id(), flags) == NULL) &&
+ rte_numa_id(), flags) == NULL) &&
(rte_mempool_lookup("test_mp") == NULL)){
printf("Error: unexpected return value from rte_mempool_create()\n");
return -1;
@@ -183,7 +183,7 @@ run_object_creation_tests(void)
rte_errno=0;
struct rte_lpm_config config;
- config.max_rules = rte_socket_id();
+ config.max_rules = rte_numa_id();
config.number_tbl8s = 256;
config.flags = 0;
if ((rte_lpm_create("test_lpm", size, &config) != NULL) &&
diff --git a/app/test/test_net_ether.c b/app/test/test_net_ether.c
index a1ead2eba8..1b5d8904f7 100644
--- a/app/test/test_net_ether.c
+++ b/app/test/test_net_ether.c
@@ -257,7 +257,7 @@ static int
net_ether_testsuite_setup(void)
{
net_ether_test_pool = rte_pktmbuf_pool_create("net_ether_test_pool", 64, 0, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, SOCKET_ID_ANY);
+ RTE_MBUF_DEFAULT_BUF_SIZE, RTE_NUMA_ID_ANY);
TEST_ASSERT_NOT_NULL(net_ether_test_pool, "Failed to create mempool");
return TEST_SUCCESS;
diff --git a/app/test/test_pcapng.c b/app/test/test_pcapng.c
index 688b58794e..8c1336b324 100644
--- a/app/test/test_pcapng.c
+++ b/app/test/test_pcapng.c
@@ -231,7 +231,7 @@ test_setup(void)
mp = rte_pktmbuf_pool_create_by_ops("pcapng_test_pool",
MAX_BURST * 32, 0, 0,
rte_pcapng_mbuf_size(MAX_DATA_SIZE),
- SOCKET_ID_ANY, "ring_mp_sc");
+ RTE_NUMA_ID_ANY, "ring_mp_sc");
if (mp == NULL) {
printf("Cannot create mempool\n");
goto fail;
diff --git a/app/test/test_pdcp.c b/app/test/test_pdcp.c
index af525cf73a..805b39a80f 100644
--- a/app/test/test_pdcp.c
+++ b/app/test/test_pdcp.c
@@ -275,7 +275,7 @@ cryptodev_init(int dev_id)
struct rte_cryptodev_qp_conf qp_conf;
struct rte_cryptodev_info dev_info;
struct rte_cryptodev_config config;
- int ret, socket_id;
+ int ret, numa_id;
/* Check if device was already initialized */
if (ts_params->cdevs_used[dev_id])
@@ -288,11 +288,11 @@ cryptodev_init(int dev_id)
return -ENODEV;
}
- socket_id = rte_socket_id();
+ numa_id = rte_numa_id();
memset(&config, 0, sizeof(config));
config.nb_queue_pairs = 1;
- config.socket_id = socket_id;
+ config.numa_id = numa_id;
ret = rte_cryptodev_configure(dev_id, &config);
if (ret < 0) {
@@ -303,7 +303,7 @@ cryptodev_init(int dev_id)
memset(&qp_conf, 0, sizeof(qp_conf));
qp_conf.nb_descriptors = NB_DESC;
- ret = rte_cryptodev_queue_pair_setup(dev_id, 0, &qp_conf, socket_id);
+ ret = rte_cryptodev_queue_pair_setup(dev_id, 0, &qp_conf, numa_id);
if (ret < 0) {
RTE_LOG(ERR, USER1, "Could not configure queue pair\n");
return -ENODEV;
@@ -369,7 +369,7 @@ testsuite_setup(void)
memset(ts_params, 0, sizeof(*ts_params));
ts_params->mbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", NUM_MBUFS, MBUF_CACHE_SIZE, 0,
- PDCP_MBUF_SIZE, SOCKET_ID_ANY);
+ PDCP_MBUF_SIZE, RTE_NUMA_ID_ANY);
if (ts_params->mbuf_pool == NULL) {
RTE_LOG(ERR, USER1, "Could not create mbuf pool\n");
return TEST_FAILED;
@@ -377,7 +377,7 @@ testsuite_setup(void)
ts_params->cop_pool = rte_crypto_op_pool_create("cop_pool", RTE_CRYPTO_OP_TYPE_SYMMETRIC,
NUM_MBUFS, MBUF_CACHE_SIZE,
- 2 * MAXIMUM_IV_LENGTH, SOCKET_ID_ANY);
+ 2 * MAXIMUM_IV_LENGTH, RTE_NUMA_ID_ANY);
if (ts_params->cop_pool == NULL) {
RTE_LOG(ERR, USER1, "Could not create crypto_op pool\n");
goto mbuf_pool_free;
@@ -389,7 +389,7 @@ testsuite_setup(void)
ts_params->sess_pool = rte_cryptodev_sym_session_pool_create("sess_pool", nb_sess,
sess_priv_size,
RTE_MEMPOOL_CACHE_MAX_SIZE,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (ts_params->sess_pool == NULL) {
RTE_LOG(ERR, USER1, "Could not create session pool\n");
goto cop_pool_free;
diff --git a/app/test/test_pdump.c b/app/test/test_pdump.c
index f1c9bd9d7e..0d575161d2 100644
--- a/app/test/test_pdump.c
+++ b/app/test/test_pdump.c
@@ -60,7 +60,7 @@ run_pdump_client_tests(void)
if (ret < 0)
return -1;
mp->flags = 0x0000;
- ring_client = rte_ring_create("SR0", RING_SIZE, rte_socket_id(), 0);
+ ring_client = rte_ring_create("SR0", RING_SIZE, rte_numa_id(), 0);
if (ring_client == NULL) {
printf("rte_ring_create SR0 failed");
return -1;
diff --git a/app/test/test_per_lcore.c b/app/test/test_per_lcore.c
index 6e7ba072fd..3b536d332a 100644
--- a/app/test/test_per_lcore.c
+++ b/app/test/test_per_lcore.c
@@ -48,9 +48,9 @@ display_vars(__rte_unused void *arg)
{
unsigned lcore_id = rte_lcore_id();
unsigned var = RTE_PER_LCORE(test);
- unsigned socket_id = rte_lcore_to_socket_id(lcore_id);
+ unsigned int numa_id = rte_lcore_to_numa_id(lcore_id);
- printf("on socket %u, on core %u, variable is %u\n", socket_id, lcore_id, var);
+ printf("on socket %u, on core %u, variable is %u\n", numa_id, lcore_id, var);
if (lcore_id != var)
return -1;
diff --git a/app/test/test_pmd_af_packet.c b/app/test/test_pmd_af_packet.c
index 42456c1d96..774046570a 100644
--- a/app/test/test_pmd_af_packet.c
+++ b/app/test/test_pmd_af_packet.c
@@ -181,7 +181,7 @@ configure_af_packet_port(uint16_t pid, uint16_t nb_rx_q, uint16_t nb_tx_q)
for (q = 0; q < nb_rx_q; q++) {
ret = rte_eth_rx_queue_setup(pid, q, RING_SIZE,
- rte_eth_dev_socket_id(pid),
+ rte_eth_dev_numa_id(pid),
NULL, mp);
if (ret != 0) {
printf("Failed to setup RX queue %u for port %u: %d\n",
@@ -192,7 +192,7 @@ configure_af_packet_port(uint16_t pid, uint16_t nb_rx_q, uint16_t nb_tx_q)
for (q = 0; q < nb_tx_q; q++) {
ret = rte_eth_tx_queue_setup(pid, q, RING_SIZE,
- rte_eth_dev_socket_id(pid),
+ rte_eth_dev_numa_id(pid),
NULL);
if (ret != 0) {
printf("Failed to setup TX queue %u for port %u: %d\n",
@@ -392,7 +392,7 @@ test_af_packet_setup(void)
mp = rte_pktmbuf_pool_create("af_packet_test_pool", NUM_MBUFS,
MBUF_CACHE_SIZE, 0,
RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (mp == NULL) {
printf("Failed to create mempool\n");
return -1;
@@ -1059,12 +1059,12 @@ test_af_packet_multi_queue(void)
for (q = 0; q < num_queues; q++) {
ret = rte_eth_rx_queue_setup(test_port, q, RING_SIZE,
- rte_eth_dev_socket_id(test_port),
+ rte_eth_dev_numa_id(test_port),
NULL, mp);
TEST_ASSERT(ret == 0, "Failed to setup RX queue %u", q);
ret = rte_eth_tx_queue_setup(test_port, q, RING_SIZE,
- rte_eth_dev_socket_id(test_port),
+ rte_eth_dev_numa_id(test_port),
NULL);
TEST_ASSERT(ret == 0, "Failed to setup TX queue %u", q);
}
diff --git a/app/test/test_pmd_memif.c b/app/test/test_pmd_memif.c
index 840ba4bf96..9693765edd 100644
--- a/app/test/test_pmd_memif.c
+++ b/app/test/test_pmd_memif.c
@@ -668,7 +668,7 @@ test_memif_setup(void)
int ret;
mp = rte_pktmbuf_pool_create("memif_test_pool", NB_MBUF, 32, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mp == NULL) {
printf("Error: failed to create mempool: %s\n",
rte_strerror(rte_errno));
diff --git a/app/test/test_pmd_pcap.c b/app/test/test_pmd_pcap.c
index 4fb0f69f3a..27282b60a3 100644
--- a/app/test/test_pmd_pcap.c
+++ b/app/test/test_pmd_pcap.c
@@ -2304,7 +2304,7 @@ test_multi_tx_queue(void)
memset(&tx_conf, 0, sizeof(tx_conf));
for (q = 0; q < MULTI_QUEUE_NUM_QUEUES; q++) {
ret = rte_eth_tx_queue_setup(port_id, q, RING_SIZE,
- rte_eth_dev_socket_id(port_id), &tx_conf);
+ rte_eth_dev_numa_id(port_id), &tx_conf);
TEST_ASSERT_SUCCESS(ret, "Failed to setup TX queue %u: %s", q, rte_strerror(-ret));
}
@@ -2423,7 +2423,7 @@ test_multi_rx_queue_same_file(void)
memset(&rx_conf, 0, sizeof(rx_conf));
for (q = 0; q < MULTI_QUEUE_NUM_QUEUES; q++) {
ret = rte_eth_rx_queue_setup(port_id, q, RING_SIZE,
- rte_eth_dev_socket_id(port_id), &rx_conf, mp);
+ rte_eth_dev_numa_id(port_id), &rx_conf, mp);
TEST_ASSERT_SUCCESS(ret, "Failed to setup RX queue %u: %s", q, rte_strerror(-ret));
}
@@ -2923,7 +2923,7 @@ test_setup(void)
mp = rte_pktmbuf_pool_create("pcap_test_pool", NB_MBUF, 32, 0,
RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
TEST_ASSERT_NOT_NULL(mp, "Failed to create mempool");
return 0;
diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c
index 995b0a6f20..e4ff8bfde9 100644
--- a/app/test/test_pmd_perf.c
+++ b/app/test/test_pmd_perf.c
@@ -15,7 +15,7 @@
#include "test.h"
#define NB_ETHPORTS_USED (1)
-#define NB_SOCKETS (2)
+#define NB_NUMAS (2)
#define MEMPOOL_CACHE_SIZE 250
#define MAX_PKT_BURST (32)
#define RX_DESC_DEFAULT (1024)
@@ -55,7 +55,7 @@
(unsigned)8192)
-static struct rte_mempool *mbufpool[NB_SOCKETS];
+static struct rte_mempool *mbufpool[NB_NUMAS];
/* ethernet addresses of ports */
static struct rte_ether_addr ports_eth_addr[RTE_MAX_ETHPORTS];
@@ -96,7 +96,7 @@ enum {
struct __rte_cache_aligned lcore_conf {
uint8_t status;
- uint8_t socketid;
+ uint8_t numaid;
uint16_t nb_ports;
uint16_t portlist[RTE_MAX_ETHPORTS];
};
@@ -218,8 +218,8 @@ init_lcores(void)
unsigned lcore_id;
for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
- lcore_conf[lcore_id].socketid =
- rte_lcore_to_socket_id(lcore_id);
+ lcore_conf[lcore_id].numaid =
+ rte_lcore_to_numa_id(lcore_id);
if (rte_lcore_is_enabled(lcore_id) == 0) {
lcore_conf[lcore_id].status = LCORE_INVALID;
continue;
@@ -232,7 +232,7 @@ init_lcores(void)
static int
init_mbufpool(unsigned nb_mbuf)
{
- int socketid;
+ int numaid;
unsigned lcore_id;
char s[64];
@@ -240,39 +240,39 @@ init_mbufpool(unsigned nb_mbuf)
if (rte_lcore_is_enabled(lcore_id) == 0)
continue;
- socketid = rte_lcore_to_socket_id(lcore_id);
- if (socketid >= NB_SOCKETS) {
+ numaid = rte_lcore_to_numa_id(lcore_id);
+ if (numaid >= NB_NUMAS) {
rte_exit(EXIT_FAILURE,
"Socket %d of lcore %u is out of range %d\n",
- socketid, lcore_id, NB_SOCKETS);
+ numaid, lcore_id, NB_NUMAS);
}
- if (mbufpool[socketid] == NULL) {
- snprintf(s, sizeof(s), "mbuf_pool_%d", socketid);
- mbufpool[socketid] =
+ if (mbufpool[numaid] == NULL) {
+ snprintf(s, sizeof(s), "mbuf_pool_%d", numaid);
+ mbufpool[numaid] =
rte_pktmbuf_pool_create(s, nb_mbuf,
MEMPOOL_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, socketid);
- if (mbufpool[socketid] == NULL)
+ RTE_MBUF_DEFAULT_BUF_SIZE, numaid);
+ if (mbufpool[numaid] == NULL)
rte_exit(EXIT_FAILURE,
"Cannot init mbuf pool on socket %d\n",
- socketid);
+ numaid);
else
printf("Allocated mbuf pool on socket %d\n",
- socketid);
+ numaid);
}
}
return 0;
}
static uint16_t
-alloc_lcore(int socketid)
+alloc_lcore(int numaid)
{
unsigned lcore_id;
for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
if (LCORE_AVAIL != lcore_conf[lcore_id].status ||
- (socketid != SOCKET_ID_ANY &&
- lcore_conf[lcore_id].socketid != socketid) ||
+ (numaid != RTE_NUMA_ID_ANY &&
+ lcore_conf[lcore_id].numaid != numaid) ||
lcore_id == rte_get_main_lcore())
continue;
lcore_conf[lcore_id].status = LCORE_USED;
@@ -563,9 +563,9 @@ poll_burst(void *args)
printf("start to receive total expect %"PRIu64"\n", total);
pkts_burst = (struct rte_mbuf **)
- rte_calloc_socket("poll_burst",
+ rte_calloc_numa("poll_burst",
total, sizeof(void *),
- RTE_CACHE_LINE_SIZE, conf->socketid);
+ RTE_CACHE_LINE_SIZE, conf->numaid);
if (!pkts_burst)
return -1;
@@ -677,7 +677,7 @@ test_pmd_perf(void)
uint16_t nb_txd = MAX_TRAFFIC_BURST;
uint16_t portid;
uint16_t nb_rx_queue = 1, nb_tx_queue = 1;
- int socketid = -1;
+ int numaid = -1;
int ret;
printf("Start PMD RXTX cycles cost test.\n");
@@ -710,19 +710,19 @@ test_pmd_perf(void)
reset_count();
num = 0;
RTE_ETH_FOREACH_DEV(portid) {
- if (socketid == -1) {
- worker_id = alloc_lcore(rte_eth_dev_socket_id(portid));
+ if (numaid == -1) {
+ worker_id = alloc_lcore(rte_eth_dev_numa_id(portid));
if (worker_id == (uint16_t)-1) {
printf("No avail lcore to run test\n");
return -1;
}
- socketid = rte_lcore_to_socket_id(worker_id);
+ numaid = rte_lcore_to_numa_id(worker_id);
printf("Performance test runs on lcore %u socket %u\n",
- worker_id, socketid);
+ worker_id, numaid);
}
- if (socketid != rte_eth_dev_socket_id(portid) &&
- rte_eth_dev_socket_id(portid) != SOCKET_ID_ANY) {
+ if (numaid != rte_eth_dev_numa_id(portid) &&
+ rte_eth_dev_numa_id(portid) != RTE_NUMA_ID_ANY) {
printf("Skip port %d\n", portid);
continue;
}
@@ -747,7 +747,7 @@ test_pmd_perf(void)
/* tx queue setup */
ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
- socketid, &tx_conf);
+ numaid, &tx_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE,
"rte_eth_tx_queue_setup: err=%d, "
@@ -755,8 +755,8 @@ test_pmd_perf(void)
/* rx queue steup */
ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
- socketid, &rx_conf,
- mbufpool[socketid]);
+ numaid, &rx_conf,
+ mbufpool[numaid]);
if (ret < 0)
rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup: err=%d,"
"port=%d\n", ret, portid);
@@ -783,19 +783,19 @@ test_pmd_perf(void)
if (tx_burst == NULL) {
tx_burst = (struct rte_mbuf **)
- rte_calloc_socket("tx_buff",
+ rte_calloc_numa("tx_buff",
MAX_TRAFFIC_BURST * nb_ports,
sizeof(void *),
- RTE_CACHE_LINE_SIZE, socketid);
+ RTE_CACHE_LINE_SIZE, numaid);
if (!tx_burst)
return -1;
}
- init_traffic(mbufpool[socketid],
+ init_traffic(mbufpool[numaid],
tx_burst, MAX_TRAFFIC_BURST * nb_ports);
printf("Generate %d packets @socket %d\n",
- MAX_TRAFFIC_BURST * nb_ports, socketid);
+ MAX_TRAFFIC_BURST * nb_ports, numaid);
if (sc_flag == SC_CONTINUOUS) {
/* do both rxtx by default */
@@ -813,7 +813,7 @@ test_pmd_perf(void)
/* port tear down */
RTE_ETH_FOREACH_DEV(portid) {
- if (socketid != rte_eth_dev_socket_id(portid))
+ if (numaid != rte_eth_dev_numa_id(portid))
continue;
ret = rte_eth_dev_stop(portid);
diff --git a/app/test/test_pmd_ring.c b/app/test/test_pmd_ring.c
index 1f245f5ad5..e87d0aedf8 100644
--- a/app/test/test_pmd_ring.c
+++ b/app/test/test_pmd_ring.c
@@ -497,7 +497,7 @@ test_pmd_ringcreate_setup(void)
}
mp = rte_pktmbuf_pool_create("mbuf_pool", NB_MBUF, 32,
- 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mp == NULL)
return -1;
diff --git a/app/test/test_pmd_ring_perf.c b/app/test/test_pmd_ring_perf.c
index 3636df5c73..3d36428862 100644
--- a/app/test/test_pmd_ring_perf.c
+++ b/app/test/test_pmd_ring_perf.c
@@ -138,7 +138,7 @@ test_ring_pmd_perf(void)
{
char name[RTE_ETH_NAME_MAX_LEN];
- r = rte_ring_create(RING_NAME, RING_SIZE, rte_socket_id(),
+ r = rte_ring_create(RING_NAME, RING_SIZE, rte_numa_id(),
RING_F_SP_ENQ|RING_F_SC_DEQ);
if (r == NULL && (r = rte_ring_lookup(RING_NAME)) == NULL)
return -1;
diff --git a/app/test/test_pmd_tap.c b/app/test/test_pmd_tap.c
index 6d0e8b4f54..5e6c4982c8 100644
--- a/app/test/test_pmd_tap.c
+++ b/app/test/test_pmd_tap.c
@@ -574,7 +574,7 @@ test_tap_multi_queue(void)
/* Create a separate mempool for multi-queue test */
struct rte_mempool *mq_mp
= rte_pktmbuf_pool_create("tap_mq_pool", NB_MBUF, 32, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mq_mp == NULL) {
printf("Warning: failed to create mempool for multi-queue test: %s\n",
rte_strerror(rte_errno));
@@ -708,7 +708,7 @@ test_tap_setup(void)
/* Create mempool */
mp = rte_pktmbuf_pool_create("tap_test_pool", NB_MBUF, 32, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mp == NULL) {
printf("Error: failed to create mempool: %s\n",
rte_strerror(rte_errno));
@@ -836,7 +836,7 @@ test_tap_rx_queue_setup(void)
*/
printf(" Test: mempool with no usable data room\n");
tiny_mp = rte_pktmbuf_pool_create("tap_tiny_pool", 64, 0, 0,
- RTE_PKTMBUF_HEADROOM, rte_socket_id());
+ RTE_PKTMBUF_HEADROOM, rte_numa_id());
if (tiny_mp == NULL) {
printf("Warning: could not create tiny mempool: %s\n",
rte_strerror(rte_errno));
diff --git a/app/test/test_reassembly.c b/app/test/test_reassembly.c
index 480de8d1dd..5bc1804513 100644
--- a/app/test/test_reassembly.c
+++ b/app/test/test_reassembly.c
@@ -82,7 +82,7 @@ testsuite_setup(void)
rte_log_set_level_pattern("lib.ip_frag", RTE_LOG_NOTICE);
pkt_pool = rte_pktmbuf_pool_create("REASM_POOL", NB_MBUF, MBUF_CACHE,
- 0, MBUF_DATA, SOCKET_ID_ANY);
+ 0, MBUF_DATA, RTE_NUMA_ID_ANY);
return pkt_pool == NULL ? TEST_FAILED : TEST_SUCCESS;
}
@@ -111,7 +111,7 @@ static struct rte_ip_frag_tbl *
tbl_new(uint64_t max_cycles)
{
return rte_ip_frag_table_create(16, MAX_FRAG, 16, max_cycles,
- rte_socket_id());
+ rte_numa_id());
}
/* Build one fragment with a position-dependent payload. */
diff --git a/app/test/test_reassembly_perf.c b/app/test/test_reassembly_perf.c
index 7d3c692547..9fa088758b 100644
--- a/app/test/test_reassembly_perf.c
+++ b/app/test/test_reassembly_perf.c
@@ -58,14 +58,14 @@ reassembly_test_setup(void)
frag_tbl = rte_ip_frag_table_create(MAX_BKTS, MAX_ENTRIES_PER_BKT,
MAX_BKTS * MAX_ENTRIES_PER_BKT, max_ttl_cyc,
- rte_socket_id());
+ rte_numa_id());
if (frag_tbl == NULL)
return TEST_FAILED;
rte_mbuf_set_user_mempool_ops("ring_mp_mc");
pkt_pool = rte_pktmbuf_pool_create(
"reassembly_perf_pool", MAX_FLOWS * MAX_FRAGMENTS, 0, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (pkt_pool == NULL) {
printf("[%s] Failed to create pkt pool\n", __func__);
rte_ip_frag_table_destroy(frag_tbl);
diff --git a/app/test/test_reorder.c b/app/test/test_reorder.c
index 8c68e00869..b2df54b404 100644
--- a/app/test/test_reorder.c
+++ b/app/test/test_reorder.c
@@ -37,15 +37,15 @@ test_reorder_create(void)
{
struct rte_reorder_buffer *b = NULL;
- b = rte_reorder_create(NULL, rte_socket_id(), REORDER_BUFFER_SIZE);
+ b = rte_reorder_create(NULL, rte_numa_id(), REORDER_BUFFER_SIZE);
TEST_ASSERT((b == NULL) && (rte_errno == EINVAL),
"No error on create() with NULL name");
- b = rte_reorder_create("PKT", rte_socket_id(), REORDER_BUFFER_SIZE_INVALID);
+ b = rte_reorder_create("PKT", rte_numa_id(), REORDER_BUFFER_SIZE_INVALID);
TEST_ASSERT((b == NULL) && (rte_errno == EINVAL),
"No error on create() with invalid buffer size param.");
- b = rte_reorder_create("PKT_RO1", rte_socket_id(), REORDER_BUFFER_SIZE);
+ b = rte_reorder_create("PKT_RO1", rte_numa_id(), REORDER_BUFFER_SIZE);
TEST_ASSERT_EQUAL(b, test_params->b,
"New reorder instance created with already existing name");
@@ -112,7 +112,7 @@ test_reorder_free(void)
struct rte_reorder_buffer *b1 = NULL, *b2 = NULL;
const char *name = "test_free";
- b1 = rte_reorder_create(name, rte_socket_id(), 8);
+ b1 = rte_reorder_create(name, rte_numa_id(), 8);
TEST_ASSERT_NOT_NULL(b1, "Failed to create reorder buffer.");
b2 = rte_reorder_find_existing(name);
@@ -144,7 +144,7 @@ test_reorder_insert(void)
* ready_buf: RB[size] = {NULL, NULL, NULL, NULL}
* order_buf: OB[size] = {NULL, NULL, NULL, NULL}
*/
- b = rte_reorder_create("test_insert", rte_socket_id(), size);
+ b = rte_reorder_create("test_insert", rte_numa_id(), size);
TEST_ASSERT_NOT_NULL(b, "Failed to create reorder buffer");
for (i = 0; i < INSERT_NUM_BUFS; i++) {
@@ -236,7 +236,7 @@ test_reorder_drain(void)
* ready_buf: RB[size] = {NULL, NULL, NULL, NULL}
* order_buf: OB[size] = {NULL, NULL, NULL, NULL}
*/
- b = rte_reorder_create("test_drain", rte_socket_id(), size);
+ b = rte_reorder_create("test_drain", rte_numa_id(), size);
TEST_ASSERT_NOT_NULL(b, "Failed to create reorder buffer");
/* Check no drained packets if reorder is empty */
@@ -358,7 +358,7 @@ test_reorder_drain_up_to_seqn(void)
* ready_buf: RB[size] = {NULL, NULL, NULL, NULL}
* order_buf: OB[size] = {NULL, NULL, NULL, NULL}
*/
- b = rte_reorder_create("test_drain_up_to_seqn", rte_socket_id(), size);
+ b = rte_reorder_create("test_drain_up_to_seqn", rte_numa_id(), size);
TEST_ASSERT_NOT_NULL(b, "Failed to create reorder buffer");
for (i = 0; i < DRAIN_TO_NUM_BUFS; i++) {
@@ -438,7 +438,7 @@ test_reorder_set_seqn(void)
* ready_buf: RB[size] = {NULL, NULL, NULL, NULL}
* order_buf: OB[size] = {NULL, NULL, NULL, NULL}
*/
- b = rte_reorder_create("test_min_seqn_set", rte_socket_id(), size);
+ b = rte_reorder_create("test_min_seqn_set", rte_numa_id(), size);
TEST_ASSERT_NOT_NULL(b, "Failed to create reorder buffer");
for (i = 0; i < SET_SEQN_NUM_BUFS; i++) {
@@ -494,7 +494,7 @@ test_setup(void)
{
/* reorder buffer instance creation */
if (test_params->b == NULL) {
- test_params->b = rte_reorder_create("PKT_RO1", rte_socket_id(),
+ test_params->b = rte_reorder_create("PKT_RO1", rte_numa_id(),
REORDER_BUFFER_SIZE);
if (test_params->b == NULL) {
printf("%s: Error creating reorder buffer instance b\n",
@@ -508,7 +508,7 @@ test_setup(void)
if (test_params->p == NULL) {
test_params->p = rte_pktmbuf_pool_create("RO_MBUF_POOL",
NUM_MBUFS, BURST, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (test_params->p == NULL) {
printf("%s: Error creating mempool\n", __func__);
return -1;
diff --git a/app/test/test_rib.c b/app/test/test_rib.c
index a4a683140d..0fe5c89a05 100644
--- a/app/test/test_rib.c
+++ b/app/test/test_rib.c
@@ -39,23 +39,23 @@ test_create_invalid(void)
config.ext_sz = 0;
/* rte_rib_create: rib name == NULL */
- rib = rte_rib_create(NULL, SOCKET_ID_ANY, &config);
+ rib = rte_rib_create(NULL, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib == NULL,
"Call succeeded with invalid parameters\n");
/* rte_rib_create: config == NULL */
- rib = rte_rib_create(__func__, SOCKET_ID_ANY, NULL);
+ rib = rte_rib_create(__func__, RTE_NUMA_ID_ANY, NULL);
RTE_TEST_ASSERT(rib == NULL,
"Call succeeded with invalid parameters\n");
- /* socket_id < -1 is invalid */
+ /* numa_id < -1 is invalid */
rib = rte_rib_create(__func__, -2, &config);
RTE_TEST_ASSERT(rib == NULL,
"Call succeeded with invalid parameters\n");
/* rte_rib_create: max_nodes = 0 */
config.max_nodes = 0;
- rib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib == NULL,
"Call succeeded with invalid parameters\n");
config.max_nodes = MAX_RULES;
@@ -78,7 +78,7 @@ test_multiple_create(void)
for (i = 0; i < 100; i++) {
config.max_nodes = MAX_RULES - i;
- rib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
rte_rib_free(rib);
}
@@ -101,7 +101,7 @@ test_free_null(void)
config.max_nodes = MAX_RULES;
config.ext_sz = 0;
- rib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
rte_rib_free(rib);
@@ -130,7 +130,7 @@ test_insert_invalid(void)
"Call succeeded with invalid parameters\n");
/*Create valid rib to use in rest of test. */
- rib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
/* rte_rib_insert: depth > MAX_DEPTH */
@@ -173,7 +173,7 @@ test_get_fn(void)
config.max_nodes = MAX_RULES;
config.ext_sz = 0;
- rib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
node = rte_rib_insert(rib, ip, depth);
@@ -251,7 +251,7 @@ test_basic(void)
config.max_nodes = MAX_RULES;
config.ext_sz = 0;
- rib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
node = rte_rib_insert(rib, ip, depth);
@@ -304,7 +304,7 @@ test_tree_traversal(void)
config.max_nodes = MAX_RULES;
config.ext_sz = 0;
- rib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
node = rte_rib_insert(rib, ip1, depth);
diff --git a/app/test/test_rib6.c b/app/test/test_rib6.c
index 0295a9640c..f1762bc7d4 100644
--- a/app/test/test_rib6.c
+++ b/app/test/test_rib6.c
@@ -38,23 +38,23 @@ test_create_invalid(void)
config.ext_sz = 0;
/* rte_rib6_create: rib name == NULL */
- rib = rte_rib6_create(NULL, SOCKET_ID_ANY, &config);
+ rib = rte_rib6_create(NULL, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib == NULL,
"Call succeeded with invalid parameters\n");
/* rte_rib6_create: config == NULL */
- rib = rte_rib6_create(__func__, SOCKET_ID_ANY, NULL);
+ rib = rte_rib6_create(__func__, RTE_NUMA_ID_ANY, NULL);
RTE_TEST_ASSERT(rib == NULL,
"Call succeeded with invalid parameters\n");
- /* socket_id < -1 is invalid */
+ /* numa_id < -1 is invalid */
rib = rte_rib6_create(__func__, -2, &config);
RTE_TEST_ASSERT(rib == NULL,
"Call succeeded with invalid parameters\n");
/* rte_rib6_create: max_nodes = 0 */
config.max_nodes = 0;
- rib = rte_rib6_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib == NULL,
"Call succeeded with invalid parameters\n");
config.max_nodes = MAX_RULES;
@@ -77,7 +77,7 @@ test_multiple_create(void)
for (i = 0; i < 100; i++) {
config.max_nodes = MAX_RULES - i;
- rib = rte_rib6_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
rte_rib6_free(rib);
}
@@ -100,7 +100,7 @@ test_free_null(void)
config.max_nodes = MAX_RULES;
config.ext_sz = 0;
- rib = rte_rib6_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
rte_rib6_free(rib);
@@ -130,7 +130,7 @@ test_insert_invalid(void)
"Call succeeded with invalid parameters\n");
/*Create valid rib to use in rest of test. */
- rib = rte_rib6_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
/* rte_rib6_insert: depth > MAX_DEPTH */
@@ -173,7 +173,7 @@ test_get_fn(void)
config.max_nodes = MAX_RULES;
config.ext_sz = 0;
- rib = rte_rib6_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
node = rte_rib6_insert(rib, &ip, depth);
@@ -251,7 +251,7 @@ test_basic(void)
config.max_nodes = MAX_RULES;
config.ext_sz = 0;
- rib = rte_rib6_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
node = rte_rib6_insert(rib, &ip, depth);
@@ -305,7 +305,7 @@ test_tree_traversal(void)
config.max_nodes = MAX_RULES;
config.ext_sz = 0;
- rib = rte_rib6_create(__func__, SOCKET_ID_ANY, &config);
+ rib = rte_rib6_create(__func__, RTE_NUMA_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
node = rte_rib6_insert(rib, &ip1, depth);
diff --git a/app/test/test_ring.c b/app/test/test_ring.c
index 015623659f..cba18d6206 100644
--- a/app/test/test_ring.c
+++ b/app/test/test_ring.c
@@ -506,7 +506,7 @@ test_ring_negative_tests(void)
unsigned int i;
/* Test zero size ring */
- rp = test_ring_create("test_zero_size_ring", -1, 0, SOCKET_ID_ANY, 0);
+ rp = test_ring_create("test_zero_size_ring", -1, 0, RTE_NUMA_ID_ANY, 0);
if (rp != NULL) {
printf("Test failed to detect zero size ring\n");
goto test_fail;
@@ -514,7 +514,7 @@ test_ring_negative_tests(void)
/* Test with esize not a multiple of 4 */
rp = test_ring_create("test_bad_element_size", 23,
- RING_SIZE + 1, SOCKET_ID_ANY, 0);
+ RING_SIZE + 1, RTE_NUMA_ID_ANY, 0);
if (rp != NULL) {
printf("Test failed to detect invalid element size\n");
goto test_fail;
@@ -524,7 +524,7 @@ test_ring_negative_tests(void)
for (i = 0; i < RTE_DIM(esize); i++) {
/* Test if ring size is not power of 2 */
rp = test_ring_create("test_bad_ring_size", esize[i],
- RING_SIZE + 1, SOCKET_ID_ANY, 0);
+ RING_SIZE + 1, RTE_NUMA_ID_ANY, 0);
if (rp != NULL) {
printf("Test failed to detect odd count\n");
goto test_fail;
@@ -532,7 +532,7 @@ test_ring_negative_tests(void)
/* Test if ring size is exceeding the limit */
rp = test_ring_create("test_bad_ring_size", esize[i],
- RTE_RING_SZ_MASK + 1, SOCKET_ID_ANY, 0);
+ RTE_RING_SZ_MASK + 1, RTE_NUMA_ID_ANY, 0);
if (rp != NULL) {
printf("Test failed to detect limits\n");
goto test_fail;
@@ -549,12 +549,12 @@ test_ring_negative_tests(void)
* function to fail correctly
*/
rp = test_ring_create("test_ring_count", esize[i], 4097,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (rp != NULL)
goto test_fail;
rp = test_ring_create("test_ring_negative", esize[i], RING_SIZE,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (rp == NULL) {
printf("test_ring_negative fail to create ring\n");
@@ -570,7 +570,7 @@ test_ring_negative_tests(void)
* ring name.
*/
rt = test_ring_create("test_ring_negative", esize[i], RING_SIZE,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (rt != NULL)
goto test_fail;
@@ -606,7 +606,7 @@ test_ring_burst_bulk_tests1(unsigned int test_idx)
/* Create the ring */
r = test_ring_create("test_ring_burst_bulk_tests", esize[i],
- RING_SIZE, SOCKET_ID_ANY,
+ RING_SIZE, RTE_NUMA_ID_ANY,
test_enqdeq_impl[test_idx].create_flags);
/* alloc dummy object pointers */
@@ -701,7 +701,7 @@ test_ring_burst_bulk_tests2(unsigned int test_idx)
/* Create the ring */
r = test_ring_create("test_ring_burst_bulk_tests", esize[i],
- RING_SIZE, SOCKET_ID_ANY,
+ RING_SIZE, RTE_NUMA_ID_ANY,
test_enqdeq_impl[test_idx].create_flags);
/* alloc dummy object pointers */
@@ -788,7 +788,7 @@ test_ring_burst_bulk_tests3(unsigned int test_idx)
/* Create the ring */
r = test_ring_create("test_ring_burst_bulk_tests", esize[i],
- RING_SIZE, SOCKET_ID_ANY,
+ RING_SIZE, RTE_NUMA_ID_ANY,
test_enqdeq_impl[test_idx].create_flags);
/* alloc dummy object pointers */
@@ -862,7 +862,7 @@ test_ring_burst_bulk_tests4(unsigned int test_idx)
/* Create the ring */
r = test_ring_create("test_ring_burst_bulk_tests", esize[i],
- RING_SIZE, SOCKET_ID_ANY,
+ RING_SIZE, RTE_NUMA_ID_ANY,
test_enqdeq_impl[test_idx].create_flags);
/* alloc dummy object pointers */
@@ -975,7 +975,7 @@ test_ring_basic_ex(void)
for (i = 0; i < RTE_DIM(esize); i++) {
rp = test_ring_create("test_ring_basic_ex", esize[i], RING_SIZE,
- SOCKET_ID_ANY,
+ RTE_NUMA_ID_ANY,
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (rp == NULL) {
printf("%s: failed to create ring\n", __func__);
@@ -1102,14 +1102,14 @@ test_ring_with_exact_size(void)
esize[i]);
std_r = test_ring_create("std", esize[i], ring_sz,
- rte_socket_id(),
+ rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (std_r == NULL) {
printf("%s: error, can't create std ring\n", __func__);
goto test_fail;
}
exact_sz_r = test_ring_create("exact sz", esize[i], ring_sz,
- rte_socket_id(),
+ rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ |
RING_F_EXACT_SZ);
if (exact_sz_r == NULL) {
diff --git a/app/test/test_ring.h b/app/test/test_ring.h
index 2e0ff9c1d6..ce1f1ca990 100644
--- a/app/test/test_ring.h
+++ b/app/test/test_ring.h
@@ -38,14 +38,14 @@
*/
static inline struct rte_ring*
test_ring_create(const char *name, int esize, unsigned int count,
- int socket_id, unsigned int flags)
+ int numa_id, unsigned int flags)
{
/* Legacy queue APIs? */
if (esize == -1)
- return rte_ring_create(name, count, socket_id, flags);
+ return rte_ring_create(name, count, numa_id, flags);
else
return rte_ring_create_elem(name, esize, count,
- socket_id, flags);
+ numa_id, flags);
}
static inline void*
diff --git a/app/test/test_ring_perf.c b/app/test/test_ring_perf.c
index 9a2a481458..28b9c43022 100644
--- a/app/test/test_ring_perf.c
+++ b/app/test/test_ring_perf.c
@@ -86,8 +86,8 @@ get_two_hyperthreads(struct lcore_pair *lcp)
c1 = rte_lcore_to_cpu_id(id1);
c2 = rte_lcore_to_cpu_id(id2);
- s1 = rte_lcore_to_socket_id(id1);
- s2 = rte_lcore_to_socket_id(id2);
+ s1 = rte_lcore_to_numa_id(id1);
+ s2 = rte_lcore_to_numa_id(id2);
if ((c1 == c2) && (s1 == s2)){
lcp->c1 = id1;
lcp->c2 = id2;
@@ -110,8 +110,8 @@ get_two_cores(struct lcore_pair *lcp)
c1 = rte_lcore_to_cpu_id(id1);
c2 = rte_lcore_to_cpu_id(id2);
- s1 = rte_lcore_to_socket_id(id1);
- s2 = rte_lcore_to_socket_id(id2);
+ s1 = rte_lcore_to_numa_id(id1);
+ s2 = rte_lcore_to_numa_id(id2);
if ((c1 != c2) && (s1 == s2)){
lcp->c1 = id1;
lcp->c2 = id2;
@@ -131,8 +131,8 @@ get_two_sockets(struct lcore_pair *lcp)
RTE_LCORE_FOREACH(id2) {
if (id1 == id2)
continue;
- s1 = rte_lcore_to_socket_id(id1);
- s2 = rte_lcore_to_socket_id(id2);
+ s1 = rte_lcore_to_numa_id(id1);
+ s2 = rte_lcore_to_numa_id(id2);
if (s1 != s2){
lcp->c1 = id1;
lcp->c2 = id2;
@@ -509,7 +509,7 @@ test_ring_perf_esize(const int esize)
* Performance test for legacy/_elem APIs
* SP-SC/MP-MC, single
*/
- r = test_ring_create(RING_NAME, esize, RING_SIZE, rte_socket_id(), 0);
+ r = test_ring_create(RING_NAME, esize, RING_SIZE, rte_numa_id(), 0);
if (r == NULL)
goto test_fail;
@@ -587,7 +587,7 @@ test_ring_perf_compression(void)
ring_params.r = rte_ring_create_elem(
RING_NAME, sizeof(void *),
- RING_SIZE, rte_socket_id(),
+ RING_SIZE, rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (ring_params.r == NULL)
@@ -610,7 +610,7 @@ test_ring_perf_compression(void)
*/
ring_params.r = rte_ring_create_elem(
RING_NAME, sizeof(uint32_t),
- RING_SIZE / 2, rte_socket_id(),
+ RING_SIZE / 2, rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (ring_params.r == NULL)
@@ -633,7 +633,7 @@ test_ring_perf_compression(void)
ring_params.r = rte_ring_create_elem(
RING_NAME, sizeof(uint32_t),
- RING_SIZE, rte_socket_id(),
+ RING_SIZE, rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (ring_params.r == NULL)
diff --git a/app/test/test_security.c b/app/test/test_security.c
index be8427b28d..bb6ba5370d 100644
--- a/app/test/test_security.c
+++ b/app/test/test_security.c
@@ -506,7 +506,7 @@ testsuite_setup(void)
SECURITY_TEST_MEMPOOL_SIZE,
SECURITY_TEST_SESSION_OBJ_SZ,
0, 0, NULL, NULL, NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
TEST_ASSERT_NOT_NULL(ts_params->session_mpool,
"Cannot create mempool %s\n", rte_strerror(rte_errno));
diff --git a/app/test/test_security_inline_macsec.c b/app/test/test_security_inline_macsec.c
index a929ff5326..5f1df06bbd 100644
--- a/app/test/test_security_inline_macsec.c
+++ b/app/test/test_security_inline_macsec.c
@@ -145,7 +145,7 @@ init_mempools(unsigned int nb_mbuf)
snprintf(s, sizeof(s), "mbuf_pool");
mbufpool = rte_pktmbuf_pool_create(s, nb_mbuf,
MEMPOOL_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, SOCKET_ID_ANY);
+ RTE_MBUF_DEFAULT_BUF_SIZE, RTE_NUMA_ID_ANY);
if (mbufpool == NULL) {
printf("Cannot init mbuf pool\n");
return TEST_FAILED;
@@ -164,7 +164,7 @@ init_mempools(unsigned int nb_mbuf)
sess_pool = rte_mempool_create(s, nb_sess, sess_sz,
MEMPOOL_CACHE_SIZE, 0,
NULL, NULL, NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (sess_pool == NULL) {
printf("Cannot init sess pool\n");
return TEST_FAILED;
@@ -2434,14 +2434,14 @@ inline_macsec_testsuite_setup(void)
/* tx queue setup */
ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd,
- SOCKET_ID_ANY, &tx_conf);
+ RTE_NUMA_ID_ANY, &tx_conf);
if (ret < 0) {
printf("rte_eth_tx_queue_setup: err=%d, port=%d\n",
ret, port_id);
return ret;
}
/* rx queue steup */
- ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd, SOCKET_ID_ANY,
+ ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd, RTE_NUMA_ID_ANY,
&rx_conf, mbufpool);
if (ret < 0) {
printf("rte_eth_rx_queue_setup: err=%d, port=%d\n",
diff --git a/app/test/test_security_inline_proto.c b/app/test/test_security_inline_proto.c
index 0b1f7fbbab..07c6c62715 100644
--- a/app/test/test_security_inline_proto.c
+++ b/app/test/test_security_inline_proto.c
@@ -512,7 +512,7 @@ init_mempools(unsigned int nb_mbuf)
snprintf(s, sizeof(s), "mbuf_pool");
mbufpool = rte_pktmbuf_pool_create(s, nb_mbuf,
MEMPOOL_CACHE_SIZE, RTE_CACHE_LINE_SIZE,
- RTE_MBUF_DEFAULT_BUF_SIZE, SOCKET_ID_ANY);
+ RTE_MBUF_DEFAULT_BUF_SIZE, RTE_NUMA_ID_ANY);
if (mbufpool == NULL) {
printf("Cannot init mbuf pool\n");
return TEST_FAILED;
@@ -531,7 +531,7 @@ init_mempools(unsigned int nb_mbuf)
sess_pool = rte_mempool_create(s, nb_sess, sess_sz,
MEMPOOL_CACHE_SIZE, 0,
NULL, NULL, NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (sess_pool == NULL) {
printf("Cannot init sess pool\n");
return TEST_FAILED;
@@ -2119,14 +2119,14 @@ inline_ipsec_testsuite_setup(void)
/* tx queue setup */
ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd,
- SOCKET_ID_ANY, &tx_conf);
+ RTE_NUMA_ID_ANY, &tx_conf);
if (ret < 0) {
printf("rte_eth_tx_queue_setup: err=%d, port=%d\n",
ret, port_id);
return ret;
}
/* rx queue steup */
- ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd, SOCKET_ID_ANY,
+ ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd, RTE_NUMA_ID_ANY,
&rx_conf, mbufpool);
if (ret < 0) {
printf("rte_eth_rx_queue_setup: err=%d, port=%d\n",
@@ -2268,7 +2268,7 @@ event_inline_ipsec_testsuite_setup(void)
/* Tx queue setup */
ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd,
- SOCKET_ID_ANY, &tx_conf);
+ RTE_NUMA_ID_ANY, &tx_conf);
if (ret < 0) {
printf("rte_eth_tx_queue_setup: err=%d, port=%d\n",
ret, port_id);
@@ -2276,7 +2276,7 @@ event_inline_ipsec_testsuite_setup(void)
}
/* rx queue steup */
- ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd, SOCKET_ID_ANY,
+ ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd, RTE_NUMA_ID_ANY,
&rx_conf, mbufpool);
if (ret < 0) {
printf("rte_eth_rx_queue_setup: err=%d, port=%d\n",
diff --git a/app/test/test_stack.c b/app/test/test_stack.c
index a3150c1673..4fbf2185ca 100644
--- a/app/test/test_stack.c
+++ b/app/test/test_stack.c
@@ -322,7 +322,7 @@ test_stack_basic(uint32_t flags)
for (i = 0; i < STACK_SIZE; i++)
obj_table[i] = (void *)(uintptr_t)i;
- s = rte_stack_create(__func__, STACK_SIZE, rte_socket_id(), flags);
+ s = rte_stack_create(__func__, STACK_SIZE, rte_numa_id(), flags);
if (s == NULL) {
printf("[%s():%u] failed to create a stack\n",
__func__, __LINE__);
@@ -421,14 +421,14 @@ test_stack_name_reuse(uint32_t flags)
{
struct rte_stack *s[2];
- s[0] = rte_stack_create("test", STACK_SIZE, rte_socket_id(), flags);
+ s[0] = rte_stack_create("test", STACK_SIZE, rte_numa_id(), flags);
if (s[0] == NULL) {
printf("[%s():%u] Failed to create a stack\n",
__func__, __LINE__);
return -1;
}
- s[1] = rte_stack_create("test", STACK_SIZE, rte_socket_id(), flags);
+ s[1] = rte_stack_create("test", STACK_SIZE, rte_numa_id(), flags);
if (s[1] != NULL) {
printf("[%s():%u] Failed to detect re-used name\n",
__func__, __LINE__);
@@ -449,7 +449,7 @@ test_stack_name_length(uint32_t flags)
memset(name, 's', sizeof(name));
name[RTE_STACK_NAMESIZE] = '\0';
- s = rte_stack_create(name, STACK_SIZE, rte_socket_id(), flags);
+ s = rte_stack_create(name, STACK_SIZE, rte_numa_id(), flags);
if (s != NULL) {
printf("[%s():%u] Failed to prevent long name\n",
__func__, __LINE__);
@@ -562,7 +562,7 @@ test_stack_multithreaded(uint32_t flags)
printf("[%s():%u] Running with %u lcores\n",
__func__, __LINE__, rte_lcore_count());
- s = rte_stack_create("test", MAX_BULK * rte_lcore_count(), rte_socket_id(), flags);
+ s = rte_stack_create("test", MAX_BULK * rte_lcore_count(), rte_numa_id(), flags);
if (s == NULL) {
printf("[%s():%u] Failed to create a stack\n",
__func__, __LINE__);
diff --git a/app/test/test_stack_perf.c b/app/test/test_stack_perf.c
index e46251d687..d5433e904a 100644
--- a/app/test/test_stack_perf.c
+++ b/app/test/test_stack_perf.c
@@ -43,8 +43,8 @@ get_two_hyperthreads(struct lcore_pair *lcp)
continue;
core[0] = rte_lcore_to_cpu_id(id[0]);
core[1] = rte_lcore_to_cpu_id(id[1]);
- socket[0] = rte_lcore_to_socket_id(id[0]);
- socket[1] = rte_lcore_to_socket_id(id[1]);
+ socket[0] = rte_lcore_to_numa_id(id[0]);
+ socket[1] = rte_lcore_to_numa_id(id[1]);
if ((core[0] == core[1]) && (socket[0] == socket[1])) {
lcp->c1 = id[0];
lcp->c2 = id[1];
@@ -69,8 +69,8 @@ get_two_cores(struct lcore_pair *lcp)
continue;
core[0] = rte_lcore_to_cpu_id(id[0]);
core[1] = rte_lcore_to_cpu_id(id[1]);
- socket[0] = rte_lcore_to_socket_id(id[0]);
- socket[1] = rte_lcore_to_socket_id(id[1]);
+ socket[0] = rte_lcore_to_numa_id(id[0]);
+ socket[1] = rte_lcore_to_numa_id(id[1]);
if ((core[0] != core[1]) && (socket[0] == socket[1])) {
lcp->c1 = id[0];
lcp->c2 = id[1];
@@ -92,8 +92,8 @@ get_two_sockets(struct lcore_pair *lcp)
RTE_LCORE_FOREACH(id[1]) {
if (id[0] == id[1])
continue;
- socket[0] = rte_lcore_to_socket_id(id[0]);
- socket[1] = rte_lcore_to_socket_id(id[1]);
+ socket[0] = rte_lcore_to_numa_id(id[0]);
+ socket[1] = rte_lcore_to_numa_id(id[1]);
if (socket[0] != socket[1]) {
lcp->c1 = id[0];
lcp->c2 = id[1];
@@ -302,7 +302,7 @@ __test_stack_perf(uint32_t flags)
rte_atomic_store_explicit(&lcore_barrier, 0, rte_memory_order_relaxed);
- s = rte_stack_create(STACK_NAME, STACK_SIZE, rte_socket_id(), flags);
+ s = rte_stack_create(STACK_NAME, STACK_SIZE, rte_numa_id(), flags);
if (s == NULL) {
printf("[%s():%u] failed to create a stack\n",
__func__, __LINE__);
diff --git a/app/test/test_timer_secondary.c b/app/test/test_timer_secondary.c
index 774751c0f5..871fbcd0f5 100644
--- a/app/test/test_timer_secondary.c
+++ b/app/test/test_timer_secondary.c
@@ -141,7 +141,7 @@ test_timer_secondary(void)
if (proc_type == RTE_PROC_PRIMARY) {
mz = rte_memzone_reserve(TEST_INFO_MZ_NAME, sizeof(*test_info),
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
TEST_ASSERT_NOT_NULL(mz, "Couldn't allocate memory for "
"test data");
test_info = mz->addr;
@@ -150,7 +150,7 @@ test_timer_secondary(void)
test_info->tim_mempool = rte_mempool_create("test_timer_mp",
test_info->num_timers, sizeof(struct rte_timer), 0, 0,
- NULL, NULL, NULL, NULL, rte_socket_id(), 0);
+ NULL, NULL, NULL, NULL, rte_numa_id(), 0);
ret = rte_timer_data_alloc(&test_info->timer_data_id);
TEST_ASSERT_SUCCESS(ret, "Failed to allocate timer data "
diff --git a/app/test/virtual_pmd.c b/app/test/virtual_pmd.c
index 74bb3516ab..f0b6ce8187 100644
--- a/app/test/virtual_pmd.c
+++ b/app/test/virtual_pmd.c
@@ -104,14 +104,14 @@ virtual_ethdev_info_get(struct rte_eth_dev *dev __rte_unused,
static int
virtual_ethdev_rx_queue_setup_success(struct rte_eth_dev *dev,
uint16_t rx_queue_id, uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool __rte_unused)
{
struct virtual_ethdev_queue *rx_q;
- rx_q = (struct virtual_ethdev_queue *)rte_zmalloc_socket(NULL,
- sizeof(struct virtual_ethdev_queue), 0, socket_id);
+ rx_q = (struct virtual_ethdev_queue *)rte_zmalloc_numa(NULL,
+ sizeof(struct virtual_ethdev_queue), 0, numa_id);
if (rx_q == NULL)
return -1;
@@ -127,7 +127,7 @@ virtual_ethdev_rx_queue_setup_success(struct rte_eth_dev *dev,
static int
virtual_ethdev_rx_queue_setup_fail(struct rte_eth_dev *dev __rte_unused,
uint16_t rx_queue_id __rte_unused, uint16_t nb_rx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool __rte_unused)
{
@@ -137,13 +137,13 @@ virtual_ethdev_rx_queue_setup_fail(struct rte_eth_dev *dev __rte_unused,
static int
virtual_ethdev_tx_queue_setup_success(struct rte_eth_dev *dev,
uint16_t tx_queue_id, uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct virtual_ethdev_queue *tx_q;
- tx_q = (struct virtual_ethdev_queue *)rte_zmalloc_socket(NULL,
- sizeof(struct virtual_ethdev_queue), 0, socket_id);
+ tx_q = (struct virtual_ethdev_queue *)rte_zmalloc_numa(NULL,
+ sizeof(struct virtual_ethdev_queue), 0, numa_id);
if (tx_q == NULL)
return -1;
@@ -159,7 +159,7 @@ virtual_ethdev_tx_queue_setup_success(struct rte_eth_dev *dev,
static int
virtual_ethdev_tx_queue_setup_fail(struct rte_eth_dev *dev __rte_unused,
uint16_t tx_queue_id __rte_unused, uint16_t nb_tx_desc __rte_unused,
- unsigned int socket_id __rte_unused,
+ unsigned int numa_id __rte_unused,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
return -1;
@@ -504,7 +504,7 @@ virtual_ethdev_get_mbufs_from_tx_queue(uint16_t port_id,
int
virtual_ethdev_create(const char *name, struct rte_ether_addr *mac_addr,
- uint8_t socket_id, uint8_t isr_support)
+ uint8_t numa_id, uint8_t isr_support)
{
struct rte_pci_device *pci_dev = NULL;
struct rte_eth_dev *eth_dev = NULL;
@@ -518,31 +518,31 @@ virtual_ethdev_create(const char *name, struct rte_ether_addr *mac_addr,
* and internal (dev_private) data
*/
- pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, socket_id);
+ pci_dev = rte_zmalloc_numa(name, sizeof(*pci_dev), 0, numa_id);
if (pci_dev == NULL)
goto err;
- pci_drv = rte_zmalloc_socket(name, sizeof(*pci_drv), 0, socket_id);
+ pci_drv = rte_zmalloc_numa(name, sizeof(*pci_drv), 0, numa_id);
if (pci_drv == NULL)
goto err;
- id_table = rte_zmalloc_socket(name, sizeof(*id_table), 0, socket_id);
+ id_table = rte_zmalloc_numa(name, sizeof(*id_table), 0, numa_id);
if (id_table == NULL)
goto err;
id_table->device_id = 0xBEEF;
- dev_private = rte_zmalloc_socket(name, sizeof(*dev_private), 0, socket_id);
+ dev_private = rte_zmalloc_numa(name, sizeof(*dev_private), 0, numa_id);
if (dev_private == NULL)
goto err;
snprintf(name_buf, sizeof(name_buf), "%s_rxQ", name);
- dev_private->rx_queue = rte_ring_create(name_buf, MAX_PKT_BURST, socket_id,
+ dev_private->rx_queue = rte_ring_create(name_buf, MAX_PKT_BURST, numa_id,
0);
if (dev_private->rx_queue == NULL)
goto err;
snprintf(name_buf, sizeof(name_buf), "%s_txQ", name);
- dev_private->tx_queue = rte_ring_create(name_buf, MAX_PKT_BURST, socket_id,
+ dev_private->tx_queue = rte_ring_create(name_buf, MAX_PKT_BURST, numa_id,
0);
if (dev_private->tx_queue == NULL)
goto err;
@@ -552,7 +552,7 @@ virtual_ethdev_create(const char *name, struct rte_ether_addr *mac_addr,
if (eth_dev == NULL)
goto err;
- pci_dev->device.numa_node = socket_id;
+ pci_dev->device.numa_node = numa_id;
pci_dev->device.name = eth_dev->data->name;
pci_drv->driver.name = virtual_ethdev_driver_name;
pci_drv->id_table = id_table;
diff --git a/app/test/virtual_pmd.h b/app/test/virtual_pmd.h
index a5a71d7cb4..4032fd91a7 100644
--- a/app/test/virtual_pmd.h
+++ b/app/test/virtual_pmd.h
@@ -16,7 +16,7 @@ virtual_ethdev_init(void);
int
virtual_ethdev_create(const char *name, struct rte_ether_addr *mac_addr,
- uint8_t socket_id, uint8_t isr_support);
+ uint8_t numa_id, uint8_t isr_support);
void
virtual_ethdev_set_link_status(uint16_t port_id, uint8_t link_status);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 171/227] app/testpmd: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (169 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 170/227] test: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 172/227] app/proc-info: " Chengwen Feng
` (56 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-pmd/cmdline.c | 22 +++----
app/test-pmd/config.c | 10 ++--
app/test-pmd/noisy_vnf.c | 2 +-
app/test-pmd/parameters.c | 46 +++++++--------
app/test-pmd/testpmd.c | 118 +++++++++++++++++++-------------------
app/test-pmd/testpmd.h | 20 +++----
6 files changed, 109 insertions(+), 109 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index cdf73540ec..5de7c2f113 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -3038,7 +3038,7 @@ cmd_setup_rxtx_queue_parsed(
struct cmd_setup_rxtx_queue *res = parsed_result;
struct rte_port *port;
struct rte_mempool *mp;
- unsigned int socket_id;
+ unsigned int numa_id;
uint8_t isrx = 0;
int ret;
@@ -3069,32 +3069,32 @@ cmd_setup_rxtx_queue_parsed(
port = &ports[res->portid];
if (isrx) {
- socket_id = rxring_numa[res->portid];
- if (!numa_support || socket_id == NUMA_NO_CONFIG)
- socket_id = port->socket_id;
+ numa_id = rxring_numa[res->portid];
+ if (!numa_support || numa_id == NUMA_NO_CONFIG)
+ numa_id = port->numa_id;
- mp = mbuf_pool_find_first(socket_id);
+ mp = mbuf_pool_find_first(numa_id);
if (mp == NULL) {
char buf[16];
fprintf(stderr,
"Failed to setup RX queue: No mempool allocation on the socket %s\n",
- socket_id_str(socket_id, buf, sizeof(buf)));
+ socket_id_str(numa_id, buf, sizeof(buf)));
return;
}
ret = rx_queue_setup(res->portid,
res->qid,
port->nb_rx_desc[res->qid],
- socket_id,
+ numa_id,
&port->rxq[res->qid].conf,
mp);
if (ret)
fprintf(stderr, "Failed to setup RX queue: %s\n",
rte_strerror(-ret));
} else {
- socket_id = txring_numa[res->portid];
- if (!numa_support || socket_id == NUMA_NO_CONFIG)
- socket_id = port->socket_id;
+ numa_id = txring_numa[res->portid];
+ if (!numa_support || numa_id == NUMA_NO_CONFIG)
+ numa_id = port->numa_id;
if (port->nb_tx_desc[res->qid] < tx_pkt_nb_segs) {
fprintf(stderr,
@@ -3104,7 +3104,7 @@ cmd_setup_rxtx_queue_parsed(
ret = rte_eth_tx_queue_setup(res->portid,
res->qid,
port->nb_tx_desc[res->qid],
- socket_id,
+ numa_id,
&port->txq[res->qid].conf);
if (ret)
fprintf(stderr, "Failed to setup TX queue: %s\n",
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index ec348cf854..5f26e7f392 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -843,7 +843,7 @@ port_infos_display(portid_t port_id)
if (rte_dev_devargs(dev_info.device) && rte_dev_devargs(dev_info.device)->args)
printf("\nDevargs: %s", rte_dev_devargs(dev_info.device)->args);
printf("\nConnect to socket: %s",
- socket_id_str(port->socket_id, buf, sizeof(buf)));
+ socket_id_str(port->numa_id, buf, sizeof(buf)));
if (port_numa[port_id] != NUMA_NO_CONFIG) {
mp = mbuf_pool_find(port_numa[port_id], 0);
@@ -852,7 +852,7 @@ port_infos_display(portid_t port_id)
port_numa[port_id]);
} else
printf("\nmemory allocation on the socket: %s",
- socket_id_str(port->socket_id, buf, sizeof(buf)));
+ socket_id_str(port->numa_id, buf, sizeof(buf)));
printf("\nLink status: %s\n", (link.link_status) ? ("up") : ("down"));
printf("Link speed: %s\n", rte_eth_link_speed_to_str(link.link_speed));
@@ -5725,17 +5725,17 @@ pkt_fwd_config_display(struct fwd_config *cfg)
printf("Logical Core %u (socket %u) forwards packets on "
"%d streams:",
fwd_lcores_cpuids[lc_id],
- rte_lcore_to_socket_id(fwd_lcores_cpuids[lc_id]),
+ rte_lcore_to_numa_id(fwd_lcores_cpuids[lc_id]),
fwd_lcores[lc_id]->stream_nb);
for (sm_id = 0; sm_id < fwd_lcores[lc_id]->stream_nb; sm_id++) {
fs = fwd_streams[fwd_lcores[lc_id]->stream_idx + sm_id];
printf("\n RX P=%d/Q=%d (socket %s) -> ",
fs->rx_port, fs->rx_queue,
- socket_id_str(ports[fs->rx_port].socket_id,
+ socket_id_str(ports[fs->rx_port].numa_id,
buf, sizeof(buf)));
printf("TX P=%d/Q=%d (socket %s) ",
fs->tx_port, fs->tx_queue,
- socket_id_str(ports[fs->tx_port].socket_id,
+ socket_id_str(ports[fs->tx_port].numa_id,
buf, sizeof(buf)));
print_ethaddr("peer=",
&peer_eth_addrs[fs->peer_addr]);
diff --git a/app/test-pmd/noisy_vnf.c b/app/test-pmd/noisy_vnf.c
index 81d1187cfe..e5c8caeccb 100644
--- a/app/test-pmd/noisy_vnf.c
+++ b/app/test-pmd/noisy_vnf.c
@@ -273,7 +273,7 @@ noisy_fwd_begin(portid_t pi)
if (n->do_buffering) {
snprintf(name, NOISY_STRSIZE, NOISY_RING, pi);
n->f = rte_ring_create(name, noisy_tx_sw_bufsz,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (!n->f)
rte_exit(EXIT_FAILURE,
"rte_ring_create(%d), size %d) failed\n",
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 833b14eda4..c110e956f5 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -632,14 +632,14 @@ parse_fwd_portmask(const char *portmask)
}
static void
-print_invalid_socket_id_error(void)
+print_invalid_numa_id_error(void)
{
unsigned int i = 0;
fprintf(stderr, "Invalid socket id, options are: ");
- for (i = 0; i < num_sockets; i++) {
- fprintf(stderr, "%u%s", socket_ids[i],
- (i == num_sockets - 1) ? "\n" : ",");
+ for (i = 0; i < num_numas; i++) {
+ fprintf(stderr, "%u%s", numa_ids[i],
+ (i == num_numas - 1) ? "\n" : ",");
}
}
@@ -649,7 +649,7 @@ parse_portnuma_config(const char *q_arg)
char s[256];
const char *p, *p0 = q_arg;
char *end;
- uint8_t i, socket_id;
+ uint8_t i, numa_id;
portid_t port_id;
unsigned size;
enum fieldnames {
@@ -685,15 +685,15 @@ parse_portnuma_config(const char *q_arg)
print_valid_ports();
return -1;
}
- socket_id = (uint8_t)int_fld[FLD_SOCKET];
- if (new_socket_id(socket_id)) {
- if (num_sockets >= RTE_MAX_NUMA_NODES) {
- print_invalid_socket_id_error();
+ numa_id = (uint8_t)int_fld[FLD_SOCKET];
+ if (new_numa_id(numa_id)) {
+ if (num_numas >= RTE_MAX_NUMA_NODES) {
+ print_invalid_numa_id_error();
return -1;
}
- socket_ids[num_sockets++] = socket_id;
+ numa_ids[num_numas++] = numa_id;
}
- port_numa[port_id] = socket_id;
+ port_numa[port_id] = numa_id;
}
return 0;
@@ -705,7 +705,7 @@ parse_ringnuma_config(const char *q_arg)
char s[256];
const char *p, *p0 = q_arg;
char *end;
- uint8_t i, ring_flag, socket_id;
+ uint8_t i, ring_flag, numa_id;
portid_t port_id;
unsigned size;
enum fieldnames {
@@ -745,13 +745,13 @@ parse_ringnuma_config(const char *q_arg)
print_valid_ports();
return -1;
}
- socket_id = (uint8_t)int_fld[FLD_SOCKET];
- if (new_socket_id(socket_id)) {
- if (num_sockets >= RTE_MAX_NUMA_NODES) {
- print_invalid_socket_id_error();
+ numa_id = (uint8_t)int_fld[FLD_SOCKET];
+ if (new_numa_id(numa_id)) {
+ if (num_numas >= RTE_MAX_NUMA_NODES) {
+ print_invalid_numa_id_error();
return -1;
}
- socket_ids[num_sockets++] = socket_id;
+ numa_ids[num_numas++] = numa_id;
}
ring_flag = (uint8_t)int_fld[FLD_FLAG];
if ((ring_flag < RX_RING_ONLY) || (ring_flag > RXTX_RING)) {
@@ -763,14 +763,14 @@ parse_ringnuma_config(const char *q_arg)
switch (ring_flag & RXTX_RING) {
case RX_RING_ONLY:
- rxring_numa[port_id] = socket_id;
+ rxring_numa[port_id] = numa_id;
break;
case TX_RING_ONLY:
- txring_numa[port_id] = socket_id;
+ txring_numa[port_id] = numa_id;
break;
case RXTX_RING:
- rxring_numa[port_id] = socket_id;
- txring_numa[port_id] = socket_id;
+ rxring_numa[port_id] = numa_id;
+ txring_numa[port_id] = numa_id;
break;
default:
fprintf(stderr,
@@ -1187,10 +1187,10 @@ launch_args_parse(int argc, char** argv)
break;
case TESTPMD_OPT_SOCKET_NUM_NUM:
n = atoi(optarg);
- if (!new_socket_id((uint8_t)n)) {
+ if (!new_numa_id((uint8_t)n)) {
socket_num = (uint8_t)n;
} else {
- print_invalid_socket_id_error();
+ print_invalid_numa_id_error();
rte_exit(EXIT_FAILURE,
"Invalid socket id");
}
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index bbef4a8580..aca57655c0 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -557,8 +557,8 @@ struct share_group_slot {
static struct share_group_slot share_group_slots[RTE_MAX_ETHPORTS];
-unsigned int num_sockets = 0;
-unsigned int socket_ids[RTE_MAX_NUMA_NODES];
+unsigned int num_numas = 0;
+unsigned int numa_ids[RTE_MAX_NUMA_NODES];
#ifdef RTE_LIB_BITRATESTATS
/* Bitrate statistics */
@@ -824,12 +824,12 @@ char dynf_names[64][RTE_MBUF_DYN_NAMESIZE];
* If yes, return positive value. If not, return zero.
*/
int
-new_socket_id(unsigned int socket_id)
+new_numa_id(unsigned int numa_id)
{
unsigned int i;
- for (i = 0; i < num_sockets; i++) {
- if (socket_ids[i] == socket_id)
+ for (i = 0; i < num_numas; i++) {
+ if (numa_ids[i] == numa_id)
return 0;
}
return 1;
@@ -849,14 +849,14 @@ set_default_fwd_lcores_config(void)
for (i = 0; i < RTE_MAX_LCORE; i++) {
if (!rte_lcore_is_enabled(i))
continue;
- sock_num = rte_lcore_to_socket_id(i);
- if (new_socket_id(sock_num)) {
- if (num_sockets >= RTE_MAX_NUMA_NODES) {
+ sock_num = rte_lcore_to_numa_id(i);
+ if (new_numa_id(sock_num)) {
+ if (num_numas >= RTE_MAX_NUMA_NODES) {
rte_exit(EXIT_FAILURE,
"Total sockets greater than %u\n",
RTE_MAX_NUMA_NODES);
}
- socket_ids[num_sockets++] = sock_num;
+ numa_ids[num_numas++] = sock_num;
}
if (i == rte_get_main_lcore())
continue;
@@ -888,14 +888,14 @@ set_default_fwd_ports_config(void)
fwd_ports_ids[i++] = pt_id;
/* Update sockets info according to the attached device */
- int socket_id = rte_eth_dev_socket_id(pt_id);
- if (socket_id >= 0 && new_socket_id(socket_id)) {
- if (num_sockets >= RTE_MAX_NUMA_NODES) {
+ int numa_id = rte_eth_dev_numa_id(pt_id);
+ if (numa_id >= 0 && new_numa_id(numa_id)) {
+ if (num_numas >= RTE_MAX_NUMA_NODES) {
rte_exit(EXIT_FAILURE,
"Total sockets greater than %u\n",
RTE_MAX_NUMA_NODES);
}
- socket_ids[num_sockets++] = socket_id;
+ numa_ids[num_numas++] = numa_id;
}
}
@@ -1081,13 +1081,13 @@ static int
setup_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, bool huge)
{
struct extmem_param param;
- int socket_id, ret;
+ int numa_id, ret;
memset(¶m, 0, sizeof(param));
/* check if our heap exists */
- socket_id = rte_malloc_heap_get_numa_id(EXTMEM_HEAP_NAME);
- if (socket_id < 0) {
+ numa_id = rte_malloc_heap_get_numa_id(EXTMEM_HEAP_NAME);
+ if (numa_id < 0) {
/* create our heap */
ret = rte_malloc_heap_create(EXTMEM_HEAP_NAME);
if (ret < 0) {
@@ -1197,7 +1197,7 @@ dma_map_cb(struct rte_mempool *mp __rte_unused, void *opaque __rte_unused,
#endif
static unsigned int
-setup_extbuf(uint32_t nb_mbufs, uint16_t mbuf_sz, unsigned int socket_id,
+setup_extbuf(uint32_t nb_mbufs, uint16_t mbuf_sz, unsigned int numa_id,
char *pool_name, struct rte_pktmbuf_extmem **ext_mem)
{
struct rte_pktmbuf_extmem *xmem;
@@ -1229,7 +1229,7 @@ setup_extbuf(uint32_t nb_mbufs, uint16_t mbuf_sz, unsigned int socket_id,
break;
}
mz = rte_memzone_reserve(mz_name, EXTBUF_ZONE_SIZE,
- socket_id,
+ numa_id,
RTE_MEMZONE_IOVA_CONTIG |
RTE_MEMZONE_1GB |
RTE_MEMZONE_SIZE_HINT_ONLY);
@@ -1260,7 +1260,7 @@ setup_extbuf(uint32_t nb_mbufs, uint16_t mbuf_sz, unsigned int socket_id,
*/
static struct rte_mempool *
mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
- unsigned int socket_id, uint16_t size_idx)
+ unsigned int numa_id, uint16_t size_idx)
{
char pool_name[RTE_MEMPOOL_NAMESIZE];
char sock_str[16];
@@ -1270,13 +1270,13 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
mb_size = sizeof(struct rte_mbuf) + mbuf_seg_size;
#endif
- mbuf_poolname_build(socket_id, pool_name, sizeof(pool_name), size_idx);
+ mbuf_poolname_build(numa_id, pool_name, sizeof(pool_name), size_idx);
if (!is_proc_primary()) {
rte_mp = rte_mempool_lookup(pool_name);
if (rte_mp == NULL)
rte_exit(EXIT_FAILURE,
"Get mbuf pool for socket %s failed: %s\n",
- socket_id_str(socket_id, sock_str,
+ socket_id_str(numa_id, sock_str,
sizeof(sock_str)),
rte_strerror(rte_errno));
return rte_mp;
@@ -1285,7 +1285,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
TESTPMD_LOG(INFO,
"create a new mbuf pool <%s>: n=%u, size=%u, socket=%s\n",
pool_name, nb_mbuf, mbuf_seg_size,
- socket_id_str(socket_id, sock_str, sizeof(sock_str)));
+ socket_id_str(numa_id, sock_str, sizeof(sock_str)));
switch (mp_alloc_type) {
case MP_ALLOC_NATIVE:
@@ -1294,7 +1294,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
TESTPMD_LOG(INFO, "preferred mempool ops selected: %s\n",
rte_mbuf_best_mempool_ops());
rte_mp = rte_pktmbuf_pool_create(pool_name, nb_mbuf,
- mb_mempool_cache, 0, mbuf_seg_size, socket_id);
+ mb_mempool_cache, 0, mbuf_seg_size, numa_id);
break;
}
#ifndef RTE_EXEC_ENV_WINDOWS
@@ -1303,7 +1303,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
rte_mp = rte_mempool_create_empty(pool_name, nb_mbuf,
mb_size, (unsigned int) mb_mempool_cache,
sizeof(struct rte_pktmbuf_pool_private),
- socket_id, mempool_flags);
+ numa_id, mempool_flags);
if (rte_mp == NULL)
goto err;
@@ -1345,7 +1345,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
unsigned int ext_num;
ext_num = setup_extbuf(nb_mbuf, mbuf_seg_size,
- socket_id, pool_name, &ext_mem);
+ numa_id, pool_name, &ext_mem);
if (ext_num == 0)
rte_exit(EXIT_FAILURE,
"Can't create pinned data buffers\n");
@@ -1354,7 +1354,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
rte_mbuf_best_mempool_ops());
rte_mp = rte_pktmbuf_pool_create_extbuf
(pool_name, nb_mbuf, mb_mempool_cache,
- 0, mbuf_seg_size, socket_id,
+ 0, mbuf_seg_size, numa_id,
ext_mem, ext_num);
free(ext_mem);
break;
@@ -1371,7 +1371,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
if (rte_mp == NULL) {
rte_exit(EXIT_FAILURE,
"Creation of mbuf pool for socket %s failed: %s\n",
- socket_id_str(socket_id, sock_str, sizeof(sock_str)),
+ socket_id_str(numa_id, sock_str, sizeof(sock_str)),
rte_strerror(rte_errno));
} else if (verbose_level > 0) {
rte_mempool_dump(stdout, rte_mp);
@@ -1384,11 +1384,11 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
* if valid, return 0, else return -1
*/
static int
-check_socket_id(const unsigned int socket_id)
+check_socket_id(const unsigned int numa_id)
{
static int warning_once = 0;
- if (new_socket_id(socket_id)) {
+ if (new_numa_id(numa_id)) {
if (!warning_once && numa_support)
fprintf(stderr,
"Warning: NUMA should be configured manually by using --port-numa-config and --ring-numa-config parameters along with --numa.\n");
@@ -1671,7 +1671,7 @@ get_eth_overhead(struct rte_eth_dev_info *dev_info)
}
static void
-init_config_port_offloads(portid_t pid, uint32_t socket_id)
+init_config_port_offloads(portid_t pid, uint32_t numa_id)
{
struct rte_port *port = &ports[pid];
int ret;
@@ -1707,7 +1707,7 @@ init_config_port_offloads(portid_t pid, uint32_t socket_id)
/* set flag to initialize port/queue */
port->need_reconfig = 1;
port->need_reconfig_queues = 1;
- port->socket_id = socket_id;
+ port->numa_id = numa_id;
port->tx_metadata = 0;
/*
@@ -1736,13 +1736,13 @@ init_config_port_offloads(portid_t pid, uint32_t socket_id)
/*
* Socket id that mbuf pools are created (and named) with when NUMA
- * support is disabled: --socket-num if given, otherwise SOCKET_ID_ANY.
+ * support is disabled: --socket-num if given, otherwise RTE_NUMA_ID_ANY.
*/
static unsigned int
uma_socket_id(void)
{
return socket_num == UMA_NO_CONFIG ?
- (unsigned int)SOCKET_ID_ANY : socket_num;
+ (unsigned int)RTE_NUMA_ID_ANY : socket_num;
}
/*
@@ -1752,22 +1752,22 @@ uma_socket_id(void)
static unsigned int
port_socket_id(portid_t pid)
{
- unsigned int socket_id;
+ unsigned int numa_id;
if (!numa_support)
return uma_socket_id();
- socket_id = port_numa[pid];
- if (socket_id == NUMA_NO_CONFIG) {
- socket_id = rte_eth_dev_socket_id(pid);
+ numa_id = port_numa[pid];
+ if (numa_id == NUMA_NO_CONFIG) {
+ numa_id = rte_eth_dev_numa_id(pid);
/*
- * If socket_id is invalid,
+ * If numa_id is invalid,
* set to the first available socket.
*/
- if (check_socket_id(socket_id) < 0)
- socket_id = socket_ids[0];
+ if (check_socket_id(numa_id) < 0)
+ numa_id = numa_ids[0];
}
- return socket_id;
+ return numa_id;
}
static void
@@ -1828,14 +1828,14 @@ init_config(void)
if (numa_support) {
uint8_t i, j;
- for (i = 0; i < num_sockets; i++)
+ for (i = 0; i < num_numas; i++)
for (j = 0; j < mbuf_data_size_n; j++) {
if (mbuf_data_size[j] == 0)
continue;
mempools[i * MAX_SEGS_BUFFER_SPLIT + j] =
mbuf_pool_create(mbuf_data_size[j],
nb_mbuf_per_pool,
- socket_ids[i], j);
+ numa_ids[i], j);
}
} else {
uint8_t i;
@@ -1861,7 +1861,7 @@ init_config(void)
*/
for (lc_id = 0; lc_id < nb_lcores; lc_id++) {
mbp = mbuf_pool_find_first(
- rte_lcore_to_socket_id(fwd_lcores_cpuids[lc_id]));
+ rte_lcore_to_numa_id(fwd_lcores_cpuids[lc_id]));
if (mbp == NULL)
mbp = mbuf_pool_find_first(numa_support ?
@@ -1899,10 +1899,10 @@ init_config(void)
void
-reconfig(portid_t new_port_id, unsigned socket_id)
+reconfig(portid_t new_port_id, unsigned int numa_id)
{
/* Reconfiguration of Ethernet ports. */
- init_config_port_offloads(new_port_id, socket_id);
+ init_config_port_offloads(new_port_id, numa_id);
init_port_config();
}
@@ -1929,7 +1929,7 @@ init_fwd_streams(void)
nb_txq, port->dev_info.max_tx_queues);
return -1;
}
- port->socket_id = port_socket_id(pid);
+ port->numa_id = port_socket_id(pid);
}
q = RTE_MAX(nb_rxq, nb_txq);
@@ -2745,7 +2745,7 @@ port_is_started(portid_t port_id)
/* Configure the Rx with optional split. */
int
rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp)
{
union rte_eth_rxseg rx_useg[MAX_SEGS_BUFFER_SPLIT] = {};
@@ -2771,7 +2771,7 @@ rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
if (mbuf_data_size[mp_n] == 0) {
rx_seg->mp = NULL;
} else {
- mpx = mbuf_pool_find(socket_id, mp_n);
+ mpx = mbuf_pool_find(numa_id, mp_n);
rx_seg->mp = mpx ? mpx : mp;
}
if (rx_pkt_hdr_protos[i] != 0 && rx_pkt_seg_lengths[i] == 0) {
@@ -2787,7 +2787,7 @@ rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
rx_conf->rx_mempools = NULL;
rx_conf->rx_nmempool = 0;
ret = rte_eth_rx_queue_setup(port_id, rx_queue_id, nb_rx_desc,
- socket_id, rx_conf, NULL);
+ numa_id, rx_conf, NULL);
rx_conf->rx_seg = NULL;
rx_conf->rx_nseg = 0;
} else if (multi_rx_mempool == 1) {
@@ -2809,7 +2809,7 @@ rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
return -ENOTSUP;
}
for (i = 0; i < mbuf_data_size_n; i++) {
- mpx = mbuf_pool_find(socket_id, i);
+ mpx = mbuf_pool_find(numa_id, i);
rx_mempool[i] = mpx ? mpx : mp;
}
rx_conf->rx_mempools = rx_mempool;
@@ -2817,7 +2817,7 @@ rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
rx_conf->rx_seg = NULL;
rx_conf->rx_nseg = 0;
ret = rte_eth_rx_queue_setup(port_id, rx_queue_id, nb_rx_desc,
- socket_id, rx_conf, NULL);
+ numa_id, rx_conf, NULL);
rx_conf->rx_mempools = NULL;
rx_conf->rx_nmempool = 0;
} else {
@@ -2827,7 +2827,7 @@ rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
rx_conf->rx_mempools = NULL;
rx_conf->rx_nmempool = 0;
ret = rte_eth_rx_queue_setup(port_id, rx_queue_id, nb_rx_desc,
- socket_id, rx_conf, mp);
+ numa_id, rx_conf, mp);
}
ports[port_id].rxq[rx_queue_id].state = rx_conf->rx_deferred_start ?
@@ -3033,7 +3033,7 @@ start_port(portid_t pid)
}
configure_rxtx_dump_callbacks(0);
printf("Configuring Port %d (socket %s)\n", pi,
- socket_id_str(port->socket_id,
+ socket_id_str(port->numa_id,
buf, sizeof(buf)));
if (nb_hairpinq > 0 &&
rte_eth_dev_hairpin_capability_get(pi, &cap)) {
@@ -3112,7 +3112,7 @@ start_port(portid_t pid)
else
diag = rte_eth_tx_queue_setup(pi, qi,
port->nb_tx_desc[qi],
- port->socket_id,
+ port->numa_id,
&(port->txq[qi].conf));
if (diag == 0) {
@@ -3159,17 +3159,17 @@ start_port(portid_t pid)
} else {
struct rte_mempool *mp =
mbuf_pool_find_first
- (port->socket_id);
+ (port->numa_id);
if (mp == NULL) {
fprintf(stderr,
"Failed to setup RX queue: No mempool allocation on the socket %s\n",
- socket_id_str(port->socket_id,
+ socket_id_str(port->numa_id,
buf, sizeof(buf)));
return -1;
}
diag = rx_queue_setup(pi, qi,
port->nb_rx_desc[qi],
- port->socket_id,
+ port->numa_id,
&(port->rxq[qi].conf),
mp);
}
@@ -4677,7 +4677,7 @@ main(int argc, char** argv)
#ifdef RTE_LIB_METRICS
/* Init metrics library */
- rte_metrics_init(SOCKET_ID_ANY);
+ rte_metrics_init(RTE_NUMA_ID_ANY);
#endif
#ifdef RTE_LIB_LATENCYSTATS
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 2ca4aaf086..664feb0f34 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -342,7 +342,7 @@ struct rte_port {
struct rte_eth_conf dev_conf; /**< Port configuration. */
struct rte_ether_addr eth_addr; /**< Port ethernet address */
struct rte_eth_stats stats; /**< Last port statistics */
- unsigned int socket_id; /**< For NUMA support */
+ unsigned int numa_id; /**< For NUMA support */
uint16_t parse_tunnel:1; /**< Parse internal headers */
uint16_t tso_segsz; /**< Segmentation offload MSS for non-tunneled packets. */
uint16_t tunnel_tso_segsz; /**< Segmentation offload MSS for tunneled pkts. */
@@ -576,8 +576,8 @@ extern lcoreid_t nb_lcores; /**< Number of logical cores probed at init time. */
extern lcoreid_t nb_cfg_lcores; /**< Number of configured logical cores. */
extern lcoreid_t nb_fwd_lcores; /**< Number of forwarding logical cores. */
extern unsigned int fwd_lcores_cpuids[RTE_MAX_LCORE];
-extern unsigned int num_sockets;
-extern unsigned int socket_ids[RTE_MAX_NUMA_NODES];
+extern unsigned int num_numas;
+extern unsigned int numa_ids[RTE_MAX_NUMA_NODES];
/*
* Configuration of Ethernet ports:
@@ -873,14 +873,14 @@ current_fwd_lcore(void)
void
parse_fwd_portlist(const char *port);
-/* Format a socket id for display, SOCKET_ID_ANY as "any". */
+/* Format a socket id for display, RTE_NUMA_ID_ANY as "any". */
static inline const char *
-socket_id_str(unsigned int socket_id, char *buf, size_t size)
+socket_id_str(unsigned int numa_id, char *buf, size_t size)
{
- if (socket_id == (unsigned int)SOCKET_ID_ANY)
+ if (numa_id == (unsigned int)RTE_NUMA_ID_ANY)
snprintf(buf, size, "any");
else
- snprintf(buf, size, "%u", socket_id);
+ snprintf(buf, size, "%u", numa_id);
return buf;
}
@@ -1000,7 +1000,7 @@ void pkt_fwd_config_display(struct fwd_config *cfg);
void rxtx_config_display(void);
void fwd_config_setup(void);
void set_def_fwd_config(void);
-void reconfig(portid_t new_port_id, unsigned socket_id);
+void reconfig(portid_t new_port_id, unsigned int numa_id);
int init_fwd_streams(void);
void update_fwd_ports(portid_t new_pid);
@@ -1222,7 +1222,7 @@ void set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on);
int
rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp);
int set_queue_rate_limit(portid_t port_id, uint16_t queue_idx, uint32_t rate);
@@ -1275,7 +1275,7 @@ enum print_warning {
};
int port_id_is_invalid(portid_t port_id, enum print_warning warning);
void print_valid_ports(void);
-int new_socket_id(unsigned int socket_id);
+int new_numa_id(unsigned int numa_id);
queueid_t get_allowed_max_nb_rxq(portid_t *pid);
int check_nb_rxq(queueid_t rxq);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 172/227] app/proc-info: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (170 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 171/227] app/testpmd: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 173/227] app/graph: " Chengwen Feng
` (55 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/proc-info/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 1e5eee6787..8e8cc923ce 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -1034,7 +1034,7 @@ show_port(void)
printf("\t -- driver %s device %s socket %d\n",
dev_info.driver_name, rte_dev_name(dev_info.device),
- rte_eth_dev_socket_id(i));
+ rte_eth_dev_numa_id(i));
ret = rte_eth_dev_owner_get(i, &owner);
if (ret == 0 && owner.id != RTE_ETH_DEV_NO_OWNER)
@@ -1631,7 +1631,7 @@ show_mempool(char *name)
"\t -- No IOVA config (%c)\n"
"\t -- Not used for IO (%c)\n",
ptr->name,
- ptr->socket_id,
+ ptr->numa_id,
(flags & RTE_MEMPOOL_F_NO_SPREAD) ? 'y' : 'n',
(flags & RTE_MEMPOOL_F_NO_CACHE_ALIGN) ? 'y' : 'n',
(flags & RTE_MEMPOOL_F_SP_PUT) ? 'y' : 'n',
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 173/227] app/graph: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (171 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 172/227] app/proc-info: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 174/227] app/pdump: " Chengwen Feng
` (54 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/graph/ethdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index ee4b9014e8..1e978ec267 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -433,8 +433,8 @@ ethdev_process(const char *name, struct ethdev_config *params)
}
}
- numa_node = rte_eth_dev_socket_id(port_id);
- if (numa_node == SOCKET_ID_ANY)
+ numa_node = rte_eth_dev_numa_id(port_id);
+ if (numa_node == RTE_NUMA_ID_ANY)
numa_node = 0;
if (params->mtu)
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 174/227] app/pdump: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (172 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 173/227] app/graph: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 175/227] app/dumpcap: " Chengwen Feng
` (53 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/pdump/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/pdump/main.c b/app/pdump/main.c
index 1e62c8adc1..b3458be969 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -595,7 +595,7 @@ configure_vdev(uint16_t port_id)
for (q = 0; q < txRings; q++) {
ret = rte_eth_tx_queue_setup(port_id, q, TX_DESC_PER_QUEUE,
- rte_eth_dev_socket_id(port_id), NULL);
+ rte_eth_dev_numa_id(port_id), NULL);
if (ret < 0)
rte_exit(EXIT_FAILURE, "queue setup failed\n");
}
@@ -645,7 +645,7 @@ create_mp_ring_vdev(void)
pt->total_num_mbufs,
MBUF_POOL_CACHE_SIZE, 0,
pt->mbuf_data_size,
- rte_socket_id(), "ring_mp_mc");
+ rte_numa_id(), "ring_mp_mc");
if (mbuf_pool == NULL) {
cleanup_rings();
rte_exit(EXIT_FAILURE,
@@ -660,7 +660,7 @@ create_mp_ring_vdev(void)
/* create rx_ring */
snprintf(ring_name, SIZE, RX_RING, i);
pt->rx_ring = rte_ring_create(ring_name, pt->ring_size,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (pt->rx_ring == NULL) {
cleanup_rings();
rte_exit(EXIT_FAILURE, "%s:%s:%d\n",
@@ -671,7 +671,7 @@ create_mp_ring_vdev(void)
/* create tx_ring */
snprintf(ring_name, SIZE, TX_RING, i);
pt->tx_ring = rte_ring_create(ring_name, pt->ring_size,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (pt->tx_ring == NULL) {
cleanup_rings();
rte_exit(EXIT_FAILURE, "%s:%s:%d\n",
@@ -743,7 +743,7 @@ create_mp_ring_vdev(void)
/* create rx_ring */
snprintf(ring_name, SIZE, RX_RING, i);
pt->rx_ring = rte_ring_create(ring_name, pt->ring_size,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (pt->rx_ring == NULL) {
cleanup_rings();
rte_exit(EXIT_FAILURE, "%s\n",
@@ -780,7 +780,7 @@ create_mp_ring_vdev(void)
/* create tx_ring */
snprintf(ring_name, SIZE, TX_RING, i);
pt->tx_ring = rte_ring_create(ring_name, pt->ring_size,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (pt->tx_ring == NULL) {
cleanup_rings();
rte_exit(EXIT_FAILURE, "%s\n",
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 175/227] app/dumpcap: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (173 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 174/227] app/pdump: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 176/227] app/test-mldev: " Chengwen Feng
` (52 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/dumpcap/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index 46a6cb251e..0d285cfb09 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -701,7 +701,7 @@ static struct rte_ring *create_ring(void)
"dumpcap-%d", getpid());
ring = rte_ring_create(ring_name, ring_size,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (ring == NULL)
rte_exit(EXIT_FAILURE, "Could not create ring :%s\n",
rte_strerror(rte_errno));
@@ -730,7 +730,7 @@ static struct rte_mempool *create_mempool(void)
mp = rte_pktmbuf_pool_create_by_ops(pool_name, num_mbufs,
MBUF_POOL_CACHE_SIZE, 0,
data_size,
- rte_socket_id(), "ring_mp_mc");
+ rte_numa_id(), "ring_mp_mc");
if (mp == NULL)
rte_exit(EXIT_FAILURE,
"Mempool (%s) creation failed: %s\n", pool_name,
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 176/227] app/test-mldev: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (174 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 175/227] app/dumpcap: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 177/227] app/test-eventdev: " Chengwen Feng
` (51 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-mldev/ml_options.c | 14 +++++++-------
app/test-mldev/ml_options.h | 4 ++--
app/test-mldev/test_common.c | 10 +++++-----
app/test-mldev/test_device_ops.c | 10 +++++-----
app/test-mldev/test_inference_common.c | 26 +++++++++++++-------------
app/test-mldev/test_model_ops.c | 4 ++--
6 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/app/test-mldev/ml_options.c b/app/test-mldev/ml_options.c
index 320f6325ae..b3c2c868c6 100644
--- a/app/test-mldev/ml_options.c
+++ b/app/test-mldev/ml_options.c
@@ -22,7 +22,7 @@ ml_options_default(struct ml_options *opt)
memset(opt, 0, sizeof(*opt));
strlcpy(opt->test_name, "device_ops", ML_TEST_NAME_MAX_LEN);
opt->dev_id = 0;
- opt->socket_id = SOCKET_ID_ANY;
+ opt->numa_id = RTE_NUMA_ID_ANY;
opt->nb_filelist = 0;
opt->quantized_io = false;
opt->repetitions = 1;
@@ -64,9 +64,9 @@ ml_parse_socket_id(struct ml_options *opt, const char *arg)
{
int ret;
- ret = parser_read_int32(&opt->socket_id, arg);
+ ret = parser_read_int32(&opt->numa_id, arg);
if (ret < 0)
- ml_err("Invalid option: socket_id = %s\n", arg);
+ ml_err("Invalid option: numa_id = %s\n", arg);
return ret;
}
@@ -257,7 +257,7 @@ print_usage(char *program)
printf("application options:\n");
printf("\t--test : name of the test application to run\n"
"\t--dev_id : device id of the ML device\n"
- "\t--socket_id : socket_id of application resources\n"
+ "\t--numa_id : numa_id of application resources\n"
"\t--debug : enable debug mode\n"
"\t--help : print help\n");
printf("\n");
@@ -362,10 +362,10 @@ ml_options_dump(struct ml_options *opt)
ml_dump("test", "%s", opt->test_name);
ml_dump("dev_id", "%d", opt->dev_id);
- if (opt->socket_id == SOCKET_ID_ANY)
- ml_dump("socket_id", "%d (SOCKET_ID_ANY)", opt->socket_id);
+ if (opt->numa_id == RTE_NUMA_ID_ANY)
+ ml_dump("numa_id", "%d (RTE_NUMA_ID_ANY)", opt->numa_id);
else
- ml_dump("socket_id", "%d", opt->socket_id);
+ ml_dump("numa_id", "%d", opt->numa_id);
ml_dump("debug", "%s", (opt->debug ? "true" : "false"));
ml_dump("quantized_io", "%s", (opt->quantized_io ? "true" : "false"));
diff --git a/app/test-mldev/ml_options.h b/app/test-mldev/ml_options.h
index edb9dba8f7..5dde5e69cd 100644
--- a/app/test-mldev/ml_options.h
+++ b/app/test-mldev/ml_options.h
@@ -14,7 +14,7 @@
/* Options names */
#define ML_TEST ("test")
#define ML_DEVICE_ID ("dev_id")
-#define ML_SOCKET_ID ("socket_id")
+#define ML_SOCKET_ID ("numa_id")
#define ML_MODELS ("models")
#define ML_FILELIST ("filelist")
#define ML_QUANTIZED_IO ("quantized_io")
@@ -37,7 +37,7 @@ struct ml_filelist {
struct ml_options {
char test_name[ML_TEST_NAME_MAX_LEN];
int16_t dev_id;
- int socket_id;
+ int numa_id;
struct ml_filelist filelist[ML_TEST_MAX_MODELS];
uint8_t nb_filelist;
uint64_t repetitions;
diff --git a/app/test-mldev/test_common.c b/app/test-mldev/test_common.c
index 2f5e6156cf..024fc31ba9 100644
--- a/app/test-mldev/test_common.c
+++ b/app/test-mldev/test_common.c
@@ -86,7 +86,7 @@ int
ml_test_opt_check(struct ml_options *opt)
{
uint16_t dev_count;
- int socket_id;
+ int numa_id;
RTE_SET_USED(opt);
@@ -101,9 +101,9 @@ ml_test_opt_check(struct ml_options *opt)
return -EINVAL;
}
- socket_id = rte_ml_dev_numa_id(opt->dev_id);
- if ((opt->socket_id != SOCKET_ID_ANY) && (opt->socket_id != socket_id)) {
- ml_err("Invalid option, socket_id = %d\n", opt->socket_id);
+ numa_id = rte_ml_dev_numa_id(opt->dev_id);
+ if ((opt->numa_id != RTE_NUMA_ID_ANY) && (opt->numa_id != numa_id)) {
+ ml_err("Invalid option, numa_id = %d\n", opt->numa_id);
return -EINVAL;
}
@@ -140,7 +140,7 @@ ml_test_device_configure(struct ml_test *test, struct ml_options *opt)
}
/* configure device */
- dev_config.numa_id = opt->socket_id;
+ dev_config.numa_id = opt->numa_id;
dev_config.nb_models = t->dev_info.max_models;
dev_config.nb_queue_pairs = opt->queue_pairs;
ret = rte_ml_dev_configure(opt->dev_id, &dev_config);
diff --git a/app/test-mldev/test_device_ops.c b/app/test-mldev/test_device_ops.c
index 6111bb106b..18f4e154aa 100644
--- a/app/test-mldev/test_device_ops.c
+++ b/app/test-mldev/test_device_ops.c
@@ -47,8 +47,8 @@ test_device_setup(struct ml_test *test, struct ml_options *opt)
int ret = 0;
/* allocate for test structure */
- test_device = rte_zmalloc_socket(test->name, sizeof(struct test_device),
- RTE_CACHE_LINE_SIZE, opt->socket_id);
+ test_device = rte_zmalloc_numa(test->name, sizeof(struct test_device),
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
if (test_device == NULL) {
ml_err("failed to allocate memory for test_model");
ret = -ENOMEM;
@@ -107,7 +107,7 @@ test_device_reconfigure(struct ml_test *test, struct ml_options *opt)
qp_conf.nb_desc = opt->queue_size;
qp_conf.cb = NULL;
- ret = rte_ml_dev_queue_pair_setup(opt->dev_id, qp_id, &qp_conf, opt->socket_id);
+ ret = rte_ml_dev_queue_pair_setup(opt->dev_id, qp_id, &qp_conf, opt->numa_id);
if (ret != 0) {
ml_err("Failed to setup ML device queue-pair, dev_id = %d, qp_id = %u\n",
opt->dev_id, qp_id);
@@ -128,7 +128,7 @@ test_device_reconfigure(struct ml_test *test, struct ml_options *opt)
}
/* reconfigure device based on dev_info */
- dev_config.numa_id = opt->socket_id;
+ dev_config.numa_id = opt->numa_id;
dev_config.nb_models = t->cmn.dev_info.max_models;
dev_config.nb_queue_pairs = t->cmn.dev_info.max_queue_pairs;
ret = rte_ml_dev_configure(opt->dev_id, &dev_config);
@@ -142,7 +142,7 @@ test_device_reconfigure(struct ml_test *test, struct ml_options *opt)
qp_conf.nb_desc = t->cmn.dev_info.max_desc;
qp_conf.cb = NULL;
- ret = rte_ml_dev_queue_pair_setup(opt->dev_id, qp_id, &qp_conf, opt->socket_id);
+ ret = rte_ml_dev_queue_pair_setup(opt->dev_id, qp_id, &qp_conf, opt->numa_id);
if (ret != 0) {
ml_err("Failed to setup ML device queue-pair, dev_id = %d, qp_id = %u\n",
opt->dev_id, qp_id);
diff --git a/app/test-mldev/test_inference_common.c b/app/test-mldev/test_inference_common.c
index 3b77f37010..a1826a0853 100644
--- a/app/test-mldev/test_inference_common.c
+++ b/app/test-mldev/test_inference_common.c
@@ -531,8 +531,8 @@ test_inference_setup(struct ml_test *test, struct ml_options *opt)
int ret = 0;
uint32_t i;
- test_inference = rte_zmalloc_socket(test->name, sizeof(struct test_inference),
- RTE_CACHE_LINE_SIZE, opt->socket_id);
+ test_inference = rte_zmalloc_numa(test->name, sizeof(struct test_inference),
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
if (test_inference == NULL) {
ml_err("failed to allocate memory for test_model");
ret = -ENOMEM;
@@ -567,15 +567,15 @@ test_inference_setup(struct ml_test *test, struct ml_options *opt)
t->model[i].state = MODEL_INITIAL;
for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
- t->args[lcore_id].enq_ops = rte_zmalloc_socket(
+ t->args[lcore_id].enq_ops = rte_zmalloc_numa(
"ml_test_enq_ops", opt->burst_size * sizeof(struct rte_ml_op *),
- RTE_CACHE_LINE_SIZE, opt->socket_id);
- t->args[lcore_id].deq_ops = rte_zmalloc_socket(
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
+ t->args[lcore_id].deq_ops = rte_zmalloc_numa(
"ml_test_deq_ops", opt->burst_size * sizeof(struct rte_ml_op *),
- RTE_CACHE_LINE_SIZE, opt->socket_id);
- t->args[lcore_id].reqs = rte_zmalloc_socket(
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
+ t->args[lcore_id].reqs = rte_zmalloc_numa(
"ml_test_requests", opt->burst_size * sizeof(struct ml_request *),
- RTE_CACHE_LINE_SIZE, opt->socket_id);
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
}
for (i = 0; i < RTE_MAX_LCORE; i++) {
@@ -634,7 +634,7 @@ ml_inference_mldev_setup(struct ml_test *test, struct ml_options *opt)
qp_conf.nb_desc = opt->queue_size;
qp_conf.cb = NULL;
- ret = rte_ml_dev_queue_pair_setup(opt->dev_id, qp_id, &qp_conf, opt->socket_id);
+ ret = rte_ml_dev_queue_pair_setup(opt->dev_id, qp_id, &qp_conf, opt->numa_id);
if (ret != 0) {
ml_err("Failed to setup ml device queue-pair, dev_id = %d, qp_id = %u\n",
opt->dev_id, qp_id);
@@ -800,7 +800,7 @@ ml_inference_iomem_setup(struct ml_test *test, struct ml_options *opt, uint16_t
mz_size += t->model[fid].out_dsize;
sprintf(mz_name, "ml_user_data_%d", fid);
- mz = rte_memzone_reserve(mz_name, mz_size, opt->socket_id, 0);
+ mz = rte_memzone_reserve(mz_name, mz_size, opt->numa_id, 0);
if (mz == NULL) {
ml_err("Memzone allocation failed for ml_user_data\n");
ret = -ENOMEM;
@@ -860,7 +860,7 @@ ml_inference_iomem_setup(struct ml_test *test, struct ml_options *opt, uint16_t
t->fid = fid;
sprintf(mp_name, "ml_io_pool_%d", fid);
t->model[fid].io_pool = rte_mempool_create(mp_name, nb_buffers, buff_size, 0, 0, NULL, NULL,
- ml_request_initialize, test, opt->socket_id, 0);
+ ml_request_initialize, test, opt->numa_id, 0);
if (t->model[fid].io_pool == NULL) {
ml_err("Failed to create io pool : %s\n", "ml_io_pool");
ret = -ENOMEM;
@@ -909,7 +909,7 @@ ml_inference_mem_setup(struct ml_test *test, struct ml_options *opt)
/* create op pool */
t->op_pool = rte_ml_op_pool_create("ml_test_op_pool", ML_TEST_MAX_POOL_SIZE, 0, 0,
- opt->socket_id);
+ opt->numa_id);
if (t->op_pool == NULL) {
ml_err("Failed to create op pool : %s\n", "ml_op_pool");
return -ENOMEM;
@@ -920,7 +920,7 @@ ml_inference_mem_setup(struct ml_test *test, struct ml_options *opt)
*/
t->buf_seg_pool = rte_mempool_create("ml_test_mbuf_pool", ML_TEST_MAX_POOL_SIZE * 2,
sizeof(struct rte_ml_buff_seg), 0, 0, NULL, NULL, NULL,
- NULL, opt->socket_id, 0);
+ NULL, opt->numa_id, 0);
if (t->buf_seg_pool == NULL) {
ml_err("Failed to create buf_segs pool : %s\n", "ml_test_mbuf_pool");
rte_ml_op_pool_free(t->op_pool);
diff --git a/app/test-mldev/test_model_ops.c b/app/test-mldev/test_model_ops.c
index b2e875907a..3119ae6733 100644
--- a/app/test-mldev/test_model_ops.c
+++ b/app/test-mldev/test_model_ops.c
@@ -73,8 +73,8 @@ test_model_ops_setup(struct ml_test *test, struct ml_options *opt)
uint32_t i;
/* allocate model ops test structure */
- test_model_ops = rte_zmalloc_socket(test->name, sizeof(struct test_model_ops),
- RTE_CACHE_LINE_SIZE, opt->socket_id);
+ test_model_ops = rte_zmalloc_numa(test->name, sizeof(struct test_model_ops),
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
if (test_model_ops == NULL) {
ml_err("Failed to allocate memory for test_model");
ret = -ENOMEM;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 177/227] app/test-eventdev: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (175 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 176/227] app/test-mldev: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 178/227] app/test-compress-perf: " Chengwen Feng
` (50 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-eventdev/evt_common.h | 2 +-
app/test-eventdev/evt_options.c | 8 +++---
app/test-eventdev/evt_options.h | 2 +-
app/test-eventdev/test_order_common.c | 14 +++++-----
app/test-eventdev/test_perf_common.c | 34 ++++++++++++------------
app/test-eventdev/test_pipeline_common.c | 14 +++++-----
6 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/app/test-eventdev/evt_common.h b/app/test-eventdev/evt_common.h
index ec824f2454..c6503b736e 100644
--- a/app/test-eventdev/evt_common.h
+++ b/app/test-eventdev/evt_common.h
@@ -57,7 +57,7 @@ struct evt_options {
bool wlcores[RTE_MAX_LCORE];
bool crypto_cipher_bit_mode;
int pool_sz;
- int socket_id;
+ int numa_id;
int nb_stages;
int verbose_level;
uint8_t dev_id;
diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_options.c
index 1da0aba386..1a7257cbad 100644
--- a/app/test-eventdev/evt_options.c
+++ b/app/test-eventdev/evt_options.c
@@ -25,7 +25,7 @@ evt_options_default(struct evt_options *opt)
opt->dev_id = 0;
strlcpy(opt->test_name, "order_queue", sizeof(opt->test_name));
opt->nb_flows = 1024;
- opt->socket_id = SOCKET_ID_ANY;
+ opt->numa_id = RTE_NUMA_ID_ANY;
opt->pool_sz = 16 * 1024;
opt->prod_enq_burst_sz = 0;
opt->wkr_deq_dep = 16;
@@ -291,7 +291,7 @@ evt_parse_test_name(struct evt_options *opt, const char *arg)
static int
evt_parse_socket_id(struct evt_options *opt, const char *arg)
{
- opt->socket_id = atoi(arg);
+ opt->numa_id = atoi(arg);
return 0;
}
@@ -482,7 +482,7 @@ usage(char *program)
printf("\t--verbose : verbose level\n"
"\t--dev : device id of the event device\n"
"\t--test : name of the test application to run\n"
- "\t--socket_id : socket_id of application resources\n"
+ "\t--numa_id : numa_id of application resources\n"
"\t--pool_sz : pool size of the mempool\n"
"\t--plcores : list of lcore ids for producers\n"
"\t--wlcores : list of lcore ids for workers\n"
@@ -720,7 +720,7 @@ evt_options_dump(struct evt_options *opt)
evt_dump("test", "%s", opt->test_name);
evt_dump("dev", "%d", opt->dev_id);
evt_dump("verbose_level", "%d", opt->verbose_level);
- evt_dump("socket_id", "%d", opt->socket_id);
+ evt_dump("numa_id", "%d", opt->numa_id);
evt_dump("pool_sz", "%d", opt->pool_sz);
evt_dump("main lcore", "%d", rte_get_main_lcore());
evt_dump("nb_pkts", "%"PRIu64, opt->nb_pkts);
diff --git a/app/test-eventdev/evt_options.h b/app/test-eventdev/evt_options.h
index 4bf712bd19..e4d2e31150 100644
--- a/app/test-eventdev/evt_options.h
+++ b/app/test-eventdev/evt_options.h
@@ -24,7 +24,7 @@
#define EVT_PROD_LCORES ("plcores")
#define EVT_WORK_LCORES ("wlcores")
#define EVT_NB_FLOWS ("nb_flows")
-#define EVT_SOCKET_ID ("socket_id")
+#define EVT_SOCKET_ID ("numa_id")
#define EVT_POOL_SZ ("pool_sz")
#define EVT_WKR_DEQ_DEP ("worker_deq_depth")
#define EVT_NB_PKTS ("nb_pkts")
diff --git a/app/test-eventdev/test_order_common.c b/app/test-eventdev/test_order_common.c
index c0b47fa1d7..1d1765cea4 100644
--- a/app/test-eventdev/test_order_common.c
+++ b/app/test-eventdev/test_order_common.c
@@ -149,8 +149,8 @@ order_test_setup(struct evt_test *test, struct evt_options *opt)
.align = alignof(seqn_t),
};
- test_order = rte_zmalloc_socket(test->name, sizeof(struct test_order),
- RTE_CACHE_LINE_SIZE, opt->socket_id);
+ test_order = rte_zmalloc_numa(test->name, sizeof(struct test_order),
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
if (test_order == NULL) {
evt_err("failed to allocate test_order memory");
goto nomem;
@@ -172,18 +172,18 @@ order_test_setup(struct evt_test *test, struct evt_options *opt)
return -rte_errno;
}
- t->producer_flow_seq = rte_zmalloc_socket("test_producer_flow_seq",
+ t->producer_flow_seq = rte_zmalloc_numa("test_producer_flow_seq",
sizeof(*t->producer_flow_seq) * opt->nb_flows,
- RTE_CACHE_LINE_SIZE, opt->socket_id);
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
if (t->producer_flow_seq == NULL) {
evt_err("failed to allocate t->producer_flow_seq memory");
goto prod_nomem;
}
- t->expected_flow_seq = rte_zmalloc_socket("test_expected_flow_seq",
+ t->expected_flow_seq = rte_zmalloc_numa("test_expected_flow_seq",
sizeof(*t->expected_flow_seq) * opt->nb_flows,
- RTE_CACHE_LINE_SIZE, opt->socket_id);
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
if (t->expected_flow_seq == NULL) {
evt_err("failed to allocate t->expected_flow_seq memory");
@@ -224,7 +224,7 @@ order_mempool_setup(struct evt_test *test, struct evt_options *opt)
t->pool = rte_pktmbuf_pool_create(test->name, opt->pool_sz,
256 /* Cache */, 0,
512, /* Use very small mbufs */
- opt->socket_id);
+ opt->numa_id);
if (t->pool == NULL) {
evt_err("failed to create mempool");
return -ENOMEM;
diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index cb69ed7f1b..9556203824 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -1521,9 +1521,9 @@ perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
p->queue_id = prod * stride;
p->ca.cdev_id = cdev_id;
p->ca.cdev_qp_id = qp_id;
- p->ca.crypto_sess = rte_zmalloc_socket(
+ p->ca.crypto_sess = rte_zmalloc_numa(
NULL, sizeof(void *) * t->nb_flows,
- RTE_CACHE_LINE_SIZE, opt->socket_id);
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
p->t = t;
ret = perf_event_crypto_adapter_setup(t, p);
@@ -1649,7 +1649,7 @@ perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
conf.event_dev_id = opt->dev_id;
conf.vector_sz = opt->vector_size;
conf.vector_timeout_ns = opt->vector_tmo_nsec;
- conf.numa_id = opt->socket_id;
+ conf.numa_id = opt->numa_id;
conf.vector_mp = t->pool;
conf.ev.sched_type = opt->sched_type_list[0];
@@ -1934,14 +1934,14 @@ perf_ethdev_setup(struct evt_test *test, struct evt_options *opt)
}
if (rte_eth_rx_queue_setup(i, 0, NB_RX_DESC,
- rte_socket_id(), NULL, t->pool) < 0) {
+ rte_numa_id(), NULL, t->pool) < 0) {
evt_err("Failed to setup eth port [%d] rx_queue: %d.",
i, 0);
return -EINVAL;
}
if (rte_eth_tx_queue_setup(i, 0, NB_TX_DESC,
- rte_socket_id(), NULL) < 0) {
+ rte_numa_id(), NULL) < 0) {
evt_err("Failed to setup eth port [%d] tx_queue: %d.",
i, 0);
return -EINVAL;
@@ -2010,7 +2010,7 @@ perf_cryptodev_setup(struct evt_test *test, struct evt_options *opt)
t->ca_op_pool = rte_crypto_op_pool_create(
"crypto_op_pool", opt->crypto_op_type, opt->pool_sz,
128, sizeof(union rte_event_crypto_metadata) + EVT_CRYPTO_MAX_IV_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (t->ca_op_pool == NULL) {
evt_err("Failed to create crypto op pool");
return -ENOMEM;
@@ -2019,7 +2019,7 @@ perf_cryptodev_setup(struct evt_test *test, struct evt_options *opt)
nb_sessions = evt_nr_active_lcores(opt->plcores) * t->nb_flows;
t->ca_asym_sess_pool = rte_cryptodev_asym_session_pool_create(
"ca_asym_sess_pool", nb_sessions, 0,
- sizeof(union rte_event_crypto_metadata), SOCKET_ID_ANY);
+ sizeof(union rte_event_crypto_metadata), RTE_NUMA_ID_ANY);
if (t->ca_asym_sess_pool == NULL) {
evt_err("Failed to create sym session pool");
ret = -ENOMEM;
@@ -2038,7 +2038,7 @@ perf_cryptodev_setup(struct evt_test *test, struct evt_options *opt)
t->ca_sess_pool = rte_cryptodev_sym_session_pool_create(
"ca_sess_pool", nb_sessions, max_session_size, 0,
- sizeof(union rte_event_crypto_metadata), SOCKET_ID_ANY);
+ sizeof(union rte_event_crypto_metadata), RTE_NUMA_ID_ANY);
if (t->ca_sess_pool == NULL) {
evt_err("Failed to create sym session pool");
ret = -ENOMEM;
@@ -2050,7 +2050,7 @@ perf_cryptodev_setup(struct evt_test *test, struct evt_options *opt)
nb_elem = RTE_MAX(512U, nb_elem);
nb_elem += evt_nr_active_lcores(opt->wlcores) * 32;
t->ca_vector_pool = rte_event_vector_pool_create("vector_pool", nb_elem, 32,
- opt->vector_size, opt->socket_id);
+ opt->vector_size, opt->numa_id);
if (t->ca_vector_pool == NULL) {
evt_err("Failed to create event vector pool");
ret = -ENOMEM;
@@ -2097,7 +2097,7 @@ perf_cryptodev_setup(struct evt_test *test, struct evt_options *opt)
for (qp_id = 0; qp_id < conf.nb_queue_pairs; qp_id++) {
ret = rte_cryptodev_queue_pair_setup(
cdev_id, qp_id, &qp_conf,
- rte_cryptodev_socket_id(cdev_id));
+ rte_cryptodev_numa_id(cdev_id));
if (ret) {
evt_err("Failed to setup queue pairs on cryptodev %u\n",
cdev_id);
@@ -2237,7 +2237,7 @@ perf_mempool_setup(struct evt_test *test, struct evt_options *opt)
cache_sz, /* cache size*/
0, NULL, NULL,
perf_elt_init, /* obj constructor */
- NULL, opt->socket_id, 0); /* flags */
+ NULL, opt->numa_id, 0); /* flags */
} else if (opt->prod_type == EVT_PROD_TYPE_EVENT_CRYPTO_ADPTR &&
opt->crypto_op_type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) {
t->pool = rte_mempool_create(test->name, /* mempool name */
@@ -2247,7 +2247,7 @@ perf_mempool_setup(struct evt_test *test, struct evt_options *opt)
cache_sz, /* cache size*/
0, NULL, NULL,
NULL, /* obj constructor */
- NULL, opt->socket_id, 0); /* flags */
+ NULL, opt->numa_id, 0); /* flags */
} else if (opt->prod_type == EVT_PROD_TYPE_EVENT_DMA_ADPTR) {
t->pool = rte_mempool_create(test->name, /* mempool name */
opt->pool_sz, /* number of elements*/
@@ -2255,17 +2255,17 @@ perf_mempool_setup(struct evt_test *test, struct evt_options *opt)
(sizeof(struct rte_dma_sge) * 2),
cache_sz, /* cache size*/
0, NULL, NULL, NULL, /* obj constructor */
- NULL, opt->socket_id, 0); /* flags */
+ NULL, opt->numa_id, 0); /* flags */
} else if (opt->prod_type == EVT_PROD_TYPE_EVENT_VECTOR_ADPTR) {
t->pool = rte_event_vector_pool_create(test->name, opt->pool_sz, cache_sz,
- opt->vector_size, opt->socket_id);
+ opt->vector_size, opt->numa_id);
} else {
t->pool = rte_pktmbuf_pool_create(test->name, /* mempool name */
opt->pool_sz, /* number of elements*/
cache_sz, /* cache size*/
0,
RTE_MBUF_DEFAULT_BUF_SIZE,
- opt->socket_id); /* flags */
+ opt->numa_id); /* flags */
}
if (t->pool == NULL) {
@@ -2290,8 +2290,8 @@ perf_test_setup(struct evt_test *test, struct evt_options *opt)
{
void *test_perf;
- test_perf = rte_zmalloc_socket(test->name, sizeof(struct test_perf),
- RTE_CACHE_LINE_SIZE, opt->socket_id);
+ test_perf = rte_zmalloc_numa(test->name, sizeof(struct test_perf),
+ RTE_CACHE_LINE_SIZE, opt->numa_id);
if (test_perf == NULL) {
evt_err("failed to allocate test_perf memory");
goto nomem;
diff --git a/app/test-eventdev/test_pipeline_common.c b/app/test-eventdev/test_pipeline_common.c
index b6af0ad987..56d648c4ea 100644
--- a/app/test-eventdev/test_pipeline_common.c
+++ b/app/test-eventdev/test_pipeline_common.c
@@ -398,7 +398,7 @@ pipeline_ethdev_setup(struct evt_test *test, struct evt_options *opt)
for (j = 0; j < opt->eth_queues; j++) {
if (rte_eth_rx_queue_setup(
- i, j, NB_RX_DESC, rte_socket_id(), &rx_conf,
+ i, j, NB_RX_DESC, rte_numa_id(), &rx_conf,
opt->per_port_pool ? t->pool[i] :
t->pool[0]) < 0) {
evt_err("Failed to setup eth port [%d] rx_queue: %d.",
@@ -408,7 +408,7 @@ pipeline_ethdev_setup(struct evt_test *test, struct evt_options *opt)
}
if (rte_eth_tx_queue_setup(i, 0, NB_TX_DESC,
- rte_socket_id(), NULL) < 0) {
+ rte_numa_id(), NULL) < 0) {
evt_err("Failed to setup eth port [%d] tx_queue: %d.",
i, 0);
return -EINVAL;
@@ -481,7 +481,7 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, uint8_t stride,
nb_elem += evt_nr_active_lcores(opt->wlcores) * 32;
vector_pool = rte_event_vector_pool_create(
"vector_pool", nb_elem, 32, opt->vector_size,
- opt->socket_id);
+ opt->numa_id);
if (vector_pool == NULL) {
evt_err("failed to create event vector pool");
return -ENOMEM;
@@ -776,7 +776,7 @@ pipeline_mempool_setup(struct evt_test *test, struct evt_options *opt)
name, /* mempool name */
opt->pool_sz, /* number of elements*/
0, /* cache size*/
- 0, opt->mbuf_sz, opt->socket_id); /* flags */
+ 0, opt->mbuf_sz, opt->numa_id); /* flags */
if (t->pool[i] == NULL) {
evt_err("failed to create mempool %s", name);
@@ -790,7 +790,7 @@ pipeline_mempool_setup(struct evt_test *test, struct evt_options *opt)
test->name, /* mempool name */
opt->pool_sz, /* number of elements*/
0, /* cache size*/
- 0, opt->mbuf_sz, opt->socket_id); /* flags */
+ 0, opt->mbuf_sz, opt->numa_id); /* flags */
if (t->pool[0] == NULL) {
evt_err("failed to create mempool");
@@ -821,9 +821,9 @@ pipeline_test_setup(struct evt_test *test, struct evt_options *opt)
{
void *test_pipeline;
- test_pipeline = rte_zmalloc_socket(test->name,
+ test_pipeline = rte_zmalloc_numa(test->name,
sizeof(struct test_pipeline), RTE_CACHE_LINE_SIZE,
- opt->socket_id);
+ opt->numa_id);
if (test_pipeline == NULL) {
evt_err("failed to allocate test_pipeline memory");
goto nomem;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 178/227] app/test-compress-perf: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (176 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 177/227] app/test-eventdev: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 179/227] app/test-crypto-perf: " Chengwen Feng
` (49 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
.../comp_perf_test_common.c | 44 +++++++++----------
.../comp_perf_test_cyclecount.c | 6 +--
.../comp_perf_test_throughput.c | 6 +--
.../comp_perf_test_verify.c | 4 +-
app/test-compress-perf/main.c | 22 +++++-----
5 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/app/test-compress-perf/comp_perf_test_common.c b/app/test-compress-perf/comp_perf_test_common.c
index 53685cd57d..a15c26fab3 100644
--- a/app/test-compress-perf/comp_perf_test_common.c
+++ b/app/test-compress-perf/comp_perf_test_common.c
@@ -121,19 +121,19 @@ static const struct rte_memzone *
comp_perf_make_memzone(const char *name, struct cperf_mem_resources *mem,
unsigned int number, size_t size)
{
- unsigned int socket_id = rte_socket_id();
+ unsigned int numa_id = rte_numa_id();
char mz_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *memzone;
snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "%s_s%u_d%u_q%u_%d", name,
- socket_id, mem->dev_id, mem->qp_id, number);
+ numa_id, mem->dev_id, mem->qp_id, number);
memzone = rte_memzone_lookup(mz_name);
if (memzone != NULL && memzone->len != size) {
rte_memzone_free(memzone);
memzone = NULL;
}
if (memzone == NULL) {
- memzone = rte_memzone_reserve_aligned(mz_name, size, socket_id,
+ memzone = rte_memzone_reserve_aligned(mz_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, RTE_CACHE_LINE_SIZE);
if (memzone == NULL)
RTE_LOG(ERR, USER1, "Can't allocate memory zone %s\n",
@@ -148,9 +148,9 @@ comp_perf_allocate_external_mbufs(struct comp_test_data *test_data,
{
uint32_t i;
- mem->comp_memzones = rte_zmalloc_socket(NULL,
+ mem->comp_memzones = rte_zmalloc_numa(NULL,
test_data->total_segs * sizeof(struct rte_memzone *),
- 0, rte_socket_id());
+ 0, rte_numa_id());
if (mem->comp_memzones == NULL) {
RTE_LOG(ERR, USER1,
@@ -158,9 +158,9 @@ comp_perf_allocate_external_mbufs(struct comp_test_data *test_data,
return -1;
}
- mem->decomp_memzones = rte_zmalloc_socket(NULL,
+ mem->decomp_memzones = rte_zmalloc_numa(NULL,
test_data->total_segs * sizeof(struct rte_memzone *),
- 0, rte_socket_id());
+ 0, rte_numa_id());
if (mem->decomp_memzones == NULL) {
RTE_LOG(ERR, USER1,
@@ -168,9 +168,9 @@ comp_perf_allocate_external_mbufs(struct comp_test_data *test_data,
return -1;
}
- mem->comp_buf_infos = rte_zmalloc_socket(NULL,
+ mem->comp_buf_infos = rte_zmalloc_numa(NULL,
test_data->total_segs * sizeof(struct rte_mbuf_ext_shared_info),
- 0, rte_socket_id());
+ 0, rte_numa_id());
if (mem->comp_buf_infos == NULL) {
RTE_LOG(ERR, USER1,
@@ -178,9 +178,9 @@ comp_perf_allocate_external_mbufs(struct comp_test_data *test_data,
return -1;
}
- mem->decomp_buf_infos = rte_zmalloc_socket(NULL,
+ mem->decomp_buf_infos = rte_zmalloc_numa(NULL,
test_data->total_segs * sizeof(struct rte_mbuf_ext_shared_info),
- 0, rte_socket_id());
+ 0, rte_numa_id());
if (mem->decomp_buf_infos == NULL) {
RTE_LOG(ERR, USER1,
@@ -272,7 +272,7 @@ comp_perf_allocate_memory(struct comp_test_data *test_data,
test_data->total_segs,
0, 0,
comp_mbuf_size,
- rte_socket_id());
+ rte_numa_id());
if (mem->comp_buf_pool == NULL) {
RTE_LOG(ERR, USER1, "Mbuf mempool could not be created\n");
return -1;
@@ -284,7 +284,7 @@ comp_perf_allocate_memory(struct comp_test_data *test_data,
test_data->total_segs,
0, 0,
decomp_mbuf_size,
- rte_socket_id());
+ rte_numa_id());
if (mem->decomp_buf_pool == NULL) {
RTE_LOG(ERR, USER1, "Mbuf mempool could not be created\n");
return -1;
@@ -299,7 +299,7 @@ comp_perf_allocate_memory(struct comp_test_data *test_data,
/* one mempool for both src and dst mbufs */
mem->op_pool = rte_comp_op_pool_create(pool_name,
mem->total_bufs * 2,
- 0, 0, rte_socket_id());
+ 0, 0, rte_numa_id());
if (mem->op_pool == NULL) {
RTE_LOG(ERR, USER1, "Comp op mempool could not be created\n");
return -1;
@@ -317,34 +317,34 @@ comp_perf_allocate_memory(struct comp_test_data *test_data,
decomp_data_size = output_data_sz;
}
- mem->compressed_data = rte_zmalloc_socket(NULL, comp_data_size, 0,
- rte_socket_id());
+ mem->compressed_data = rte_zmalloc_numa(NULL, comp_data_size, 0,
+ rte_numa_id());
if (mem->compressed_data == NULL) {
RTE_LOG(ERR, USER1, "Memory to hold the data from the input "
"file could not be allocated\n");
return -1;
}
- mem->decompressed_data = rte_zmalloc_socket(NULL, decomp_data_size, 0,
- rte_socket_id());
+ mem->decompressed_data = rte_zmalloc_numa(NULL, decomp_data_size, 0,
+ rte_numa_id());
if (mem->decompressed_data == NULL) {
RTE_LOG(ERR, USER1, "Memory to hold the data from the input "
"file could not be allocated\n");
return -1;
}
- mem->comp_bufs = rte_zmalloc_socket(NULL,
+ mem->comp_bufs = rte_zmalloc_numa(NULL,
mem->total_bufs * sizeof(struct rte_mbuf *),
- 0, rte_socket_id());
+ 0, rte_numa_id());
if (mem->comp_bufs == NULL) {
RTE_LOG(ERR, USER1, "Memory to hold the compression mbufs"
" could not be allocated\n");
return -1;
}
- mem->decomp_bufs = rte_zmalloc_socket(NULL,
+ mem->decomp_bufs = rte_zmalloc_numa(NULL,
mem->total_bufs * sizeof(struct rte_mbuf *),
- 0, rte_socket_id());
+ 0, rte_numa_id());
if (mem->decomp_bufs == NULL) {
RTE_LOG(ERR, USER1, "Memory to hold the decompression mbufs"
" could not be allocated\n");
diff --git a/app/test-compress-perf/comp_perf_test_cyclecount.c b/app/test-compress-perf/comp_perf_test_cyclecount.c
index 64e8faa55a..cd4de6c0ff 100644
--- a/app/test-compress-perf/comp_perf_test_cyclecount.c
+++ b/app/test-compress-perf/comp_perf_test_cyclecount.c
@@ -176,10 +176,10 @@ main_loop(struct cperf_cyclecount_ctx *ctx, enum rte_comp_xform_type type)
ctx->ops_deq_retries = 0;
/* one array for both enqueue and dequeue */
- ops = rte_zmalloc_socket(NULL,
+ ops = rte_zmalloc_numa(NULL,
(test_data->burst_sz + mem->total_bufs) *
sizeof(struct rte_comp_op *),
- 0, rte_socket_id());
+ 0, rte_numa_id());
if (ops == NULL) {
RTE_LOG(ERR, USER1,
@@ -510,7 +510,7 @@ cperf_cyclecount_test_runner(void *test_ctx)
ctx->ver.options->driver_name,
rte_compressdev_name_get(ctx->ver.mem.dev_id),
ctx->ver.mem.dev_id,
- rte_compressdev_socket_id(ctx->ver.mem.dev_id),
+ rte_compressdev_numa_id(ctx->ver.mem.dev_id),
ctx->ver.mem.qp_id);
/*
diff --git a/app/test-compress-perf/comp_perf_test_throughput.c b/app/test-compress-perf/comp_perf_test_throughput.c
index 089d19c4d4..057e3574bb 100644
--- a/app/test-compress-perf/comp_perf_test_throughput.c
+++ b/app/test-compress-perf/comp_perf_test_throughput.c
@@ -68,9 +68,9 @@ main_loop(struct cperf_benchmark_ctx *ctx, enum rte_comp_xform_type type)
return -1;
}
- ops = rte_zmalloc_socket(NULL,
+ ops = rte_zmalloc_numa(NULL,
2 * mem->total_bufs * sizeof(struct rte_comp_op *),
- 0, rte_socket_id());
+ 0, rte_numa_id());
if (ops == NULL) {
RTE_LOG(ERR, USER1,
@@ -357,7 +357,7 @@ cperf_throughput_test_runner(void *test_ctx)
ctx->ver.options->driver_name,
rte_compressdev_name_get(ctx->ver.mem.dev_id),
ctx->ver.mem.dev_id,
- rte_compressdev_socket_id(ctx->ver.mem.dev_id),
+ rte_compressdev_numa_id(ctx->ver.mem.dev_id),
ctx->ver.mem.qp_id);
/*
diff --git a/app/test-compress-perf/comp_perf_test_verify.c b/app/test-compress-perf/comp_perf_test_verify.c
index 66425d7e3c..d7e9fd143c 100644
--- a/app/test-compress-perf/comp_perf_test_verify.c
+++ b/app/test-compress-perf/comp_perf_test_verify.c
@@ -88,9 +88,9 @@ main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type)
}
- ops = rte_zmalloc_socket(NULL,
+ ops = rte_zmalloc_numa(NULL,
2 * mem->total_bufs * sizeof(struct rte_comp_op *),
- 0, rte_socket_id());
+ 0, rte_numa_id());
if (ops == NULL) {
RTE_LOG(ERR, USER1,
diff --git a/app/test-compress-perf/main.c b/app/test-compress-perf/main.c
index bc2b185da4..eb104d9f04 100644
--- a/app/test-compress-perf/main.c
+++ b/app/test-compress-perf/main.c
@@ -196,7 +196,7 @@ comp_perf_initialize_compressdev(struct comp_test_data *td,
cdev_id = enabled_cdevs[i];
struct rte_compressdev_info cdev_info;
- int socket_id = rte_compressdev_socket_id(cdev_id);
+ int numa_id = rte_compressdev_numa_id(cdev_id);
rte_compressdev_info_get(cdev_id, &cdev_info);
if (cdev_info.max_nb_queue_pairs &&
@@ -216,7 +216,7 @@ comp_perf_initialize_compressdev(struct comp_test_data *td,
/* Configure compressdev */
struct rte_compressdev_config config = {
- .socket_id = socket_id,
+ .numa_id = numa_id,
.nb_queue_pairs = nb_lcores > td->nb_qps
? td->nb_qps : nb_lcores,
.max_nb_priv_xforms = NUM_MAX_XFORMS,
@@ -231,7 +231,7 @@ comp_perf_initialize_compressdev(struct comp_test_data *td,
for (j = 0; j < td->nb_qps; j++) {
ret = rte_compressdev_queue_pair_setup(cdev_id, j,
- NUM_MAX_INFLIGHT_OPS, socket_id);
+ NUM_MAX_INFLIGHT_OPS, numa_id);
if (ret < 0) {
RTE_LOG(ERR, USER1,
"Failed to setup queue pair %u on compressdev %u",
@@ -291,8 +291,8 @@ comp_perf_dump_input_data(struct comp_test_data *td)
goto end;
}
- td->input_data = rte_zmalloc_socket(NULL,
- td->input_data_sz, 0, rte_socket_id());
+ td->input_data = rte_zmalloc_numa(NULL,
+ td->input_data_sz, 0, rte_numa_id());
if (td->input_data == NULL) {
RTE_LOG(ERR, USER1, "Memory to hold the data from the input "
@@ -375,8 +375,8 @@ comp_perf_dump_dictionary_data(struct comp_test_data *td)
goto end;
}
- td->dictionary_data = rte_zmalloc_socket(NULL,
- td->dictionary_data_sz, 0, rte_socket_id());
+ td->dictionary_data = rte_zmalloc_numa(NULL,
+ td->dictionary_data_sz, 0, rte_numa_id());
if (td->dictionary_data == NULL) {
RTE_LOG(ERR, USER1, "Memory to hold the data from the dictionary "
@@ -457,12 +457,12 @@ main(int argc, char **argv)
argc -= ret;
argv += ret;
- test_data = rte_zmalloc_socket(NULL, sizeof(struct comp_test_data),
- 0, rte_socket_id());
+ test_data = rte_zmalloc_numa(NULL, sizeof(struct comp_test_data),
+ 0, rte_numa_id());
if (test_data == NULL)
rte_exit(EXIT_FAILURE, "Cannot reserve memory in socket %d\n",
- rte_socket_id());
+ rte_numa_id());
comp_perf_register_cleanup_on_signal();
@@ -510,7 +510,7 @@ main(int argc, char **argv)
else
test_data->level = test_data->level_lst.list[0];
- printf("\nApp uses socket: %u\n", rte_socket_id());
+ printf("\nApp uses socket: %u\n", rte_numa_id());
printf("Burst size = %u\n", test_data->burst_sz);
printf("Input data size = %zu\n", test_data->input_data_sz);
if (test_data->test == CPERF_TEST_TYPE_PMDCC)
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 179/227] app/test-crypto-perf: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (177 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 178/227] app/test-compress-perf: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 180/227] app/test-bbdev: " Chengwen Feng
` (48 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-crypto-perf/cperf_test_common.c | 6 +--
app/test-crypto-perf/main.c | 54 ++++++++++++------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/app/test-crypto-perf/cperf_test_common.c b/app/test-crypto-perf/cperf_test_common.c
index 0bcaa6dfd8..1e333163d5 100644
--- a/app/test-crypto-perf/cperf_test_common.c
+++ b/app/test-crypto-perf/cperf_test_common.c
@@ -155,11 +155,11 @@ cperf_alloc_common_memory(const struct cperf_options *options,
if (cperf_is_asym_test(options)) {
crypto_op_size += sizeof(struct rte_crypto_asym_op);
snprintf(pool_name, RTE_MEMPOOL_NAMESIZE, "perf_asym_op_pool%u",
- rte_socket_id());
+ rte_numa_id());
*pool = rte_crypto_op_pool_create(
pool_name, RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
options->pool_sz, RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
- rte_socket_id());
+ rte_numa_id());
if (*pool == NULL) {
RTE_LOG(ERR, USER1,
"Cannot allocate mempool for device %u\n",
@@ -234,7 +234,7 @@ cperf_alloc_common_memory(const struct cperf_options *options,
*pool = rte_mempool_create_empty(pool_name,
options->pool_sz, obj_size, 512, 0,
- rte_socket_id(), 0);
+ rte_numa_id(), 0);
if (*pool == NULL) {
RTE_LOG(ERR, USER1,
"Cannot allocate mempool for device %u\n",
diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index c4d844d225..6dfbd03c14 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -87,51 +87,51 @@ const struct cperf_test cperf_testmap[] = {
};
static int
-create_asym_op_pool_socket(int32_t socket_id, uint32_t nb_sessions)
+create_asym_op_pool_socket(int32_t numa_id, uint32_t nb_sessions)
{
char mp_name[RTE_MEMPOOL_NAMESIZE];
struct rte_mempool *mpool = NULL;
- if (session_pool_socket[socket_id].sess_mp == NULL) {
+ if (session_pool_socket[numa_id].sess_mp == NULL) {
snprintf(mp_name, RTE_MEMPOOL_NAMESIZE, "perf_asym_sess_pool%u",
- socket_id);
+ numa_id);
mpool = rte_cryptodev_asym_session_pool_create(mp_name,
- nb_sessions, 0, 0, socket_id);
+ nb_sessions, 0, 0, numa_id);
if (mpool == NULL) {
printf("Cannot create pool \"%s\" on socket %d\n",
- mp_name, socket_id);
+ mp_name, numa_id);
return -ENOMEM;
}
- session_pool_socket[socket_id].sess_mp = mpool;
+ session_pool_socket[numa_id].sess_mp = mpool;
}
return 0;
}
static int
-fill_session_pool_socket(int32_t socket_id, uint32_t session_priv_size,
+fill_session_pool_socket(int32_t numa_id, uint32_t session_priv_size,
uint32_t nb_sessions)
{
char mp_name[RTE_MEMPOOL_NAMESIZE];
struct rte_mempool *sess_mp;
- if (session_pool_socket[socket_id].sess_mp == NULL) {
+ if (session_pool_socket[numa_id].sess_mp == NULL) {
snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
- "sess_mp_%u", socket_id);
+ "sess_mp_%u", numa_id);
sess_mp = rte_cryptodev_sym_session_pool_create(mp_name,
nb_sessions, session_priv_size, 0, 0,
- socket_id);
+ numa_id);
if (sess_mp == NULL) {
printf("Cannot create pool \"%s\" on socket %d\n",
- mp_name, socket_id);
+ mp_name, numa_id);
return -ENOMEM;
}
printf("Allocated pool \"%s\" on socket %d\n",
- mp_name, socket_id);
- session_pool_socket[socket_id].sess_mp = sess_mp;
+ mp_name, numa_id);
+ session_pool_socket[numa_id].sess_mp = sess_mp;
}
return 0;
@@ -211,11 +211,11 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs)
#endif
struct rte_cryptodev_info cdev_info;
- int socket_id = rte_cryptodev_socket_id(cdev_id);
+ int numa_id = rte_cryptodev_numa_id(cdev_id);
- /* Use the first socket if SOCKET_ID_ANY is returned. */
- if (socket_id == SOCKET_ID_ANY)
- socket_id = 0;
+ /* Use the first socket if RTE_NUMA_ID_ANY is returned. */
+ if (numa_id == RTE_NUMA_ID_ANY)
+ numa_id = 0;
rte_cryptodev_info_get(cdev_id, &cdev_info);
@@ -235,7 +235,7 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs)
}
struct rte_cryptodev_config conf = {
.nb_queue_pairs = opts->nb_qps,
- .socket_id = socket_id,
+ .numa_id = numa_id,
};
switch (opts->op_type) {
@@ -317,15 +317,15 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs)
}
if (cperf_is_asym_test(opts))
- ret = create_asym_op_pool_socket(socket_id,
+ ret = create_asym_op_pool_socket(numa_id,
sessions_needed);
else
- ret = fill_session_pool_socket(socket_id, max_sess_size,
+ ret = fill_session_pool_socket(numa_id, max_sess_size,
sessions_needed);
if (ret < 0)
return ret;
- qp_conf.mp_session = session_pool_socket[socket_id].sess_mp;
+ qp_conf.mp_session = session_pool_socket[numa_id].sess_mp;
if (cperf_is_asym_test(opts))
qp_conf.mp_session = NULL;
@@ -341,7 +341,7 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs)
qp_conf.priority = RTE_CRYPTODEV_QP_PRIORITY_LOWEST;
ret = rte_cryptodev_queue_pair_setup(cdev_id, j,
- &qp_conf, socket_id);
+ &qp_conf, numa_id);
if (ret < 0) {
printf("Failed to setup queue pair %u on "
"cryptodev %u", j, cdev_id);
@@ -846,14 +846,14 @@ main(int argc, char **argv)
cdev_id = enabled_cdevs[cdev_index];
- int socket_id = rte_cryptodev_socket_id(cdev_id);
+ int numa_id = rte_cryptodev_numa_id(cdev_id);
- /* Use the first socket if SOCKET_ID_ANY is returned. */
- if (socket_id == SOCKET_ID_ANY)
- socket_id = 0;
+ /* Use the first socket if RTE_NUMA_ID_ANY is returned. */
+ if (numa_id == RTE_NUMA_ID_ANY)
+ numa_id = 0;
ctx[i] = cperf_testmap[opts.test].constructor(
- session_pool_socket[socket_id].sess_mp,
+ session_pool_socket[numa_id].sess_mp,
cdev_id, qp_id,
&opts, t_vec, &op_fns, &sess);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 180/227] app/test-bbdev: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (178 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 179/227] app/test-crypto-perf: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 181/227] app/test-security-perf: " Chengwen Feng
` (47 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-bbdev/test_bbdev.c | 26 ++++-----
app/test-bbdev/test_bbdev_perf.c | 90 ++++++++++++++++----------------
2 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/app/test-bbdev/test_bbdev.c b/app/test-bbdev/test_bbdev.c
index 1f4246a6fa..71e93436a5 100644
--- a/app/test-bbdev/test_bbdev.c
+++ b/app/test-bbdev/test_bbdev.c
@@ -71,7 +71,7 @@ ut_setup(void)
num_queues = 1;
TEST_ASSERT_SUCCESS(rte_bbdev_setup_queues(null_dev_id, num_queues,
- SOCKET_ID_ANY), "Failed to setup queues for bbdev %u",
+ RTE_NUMA_ID_ANY), "Failed to setup queues for bbdev %u",
0);
/* Start the device */
@@ -97,7 +97,7 @@ test_bbdev_configure_invalid_dev_id(void)
for (dev_id = 0; dev_id < RTE_BBDEV_MAX_DEVS; dev_id++) {
if (!rte_bbdev_is_valid(dev_id)) {
TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id,
- num_queues, SOCKET_ID_ANY),
+ num_queues, RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"invalid dev_num %u", dev_id);
TEST_ASSERT(rte_bbdev_intr_enable(dev_id) == -ENODEV,
@@ -130,12 +130,12 @@ test_bbdev_configure_invalid_num_queues(void)
/* Stop the device in case it's started so it can be configured */
rte_bbdev_stop(dev_id);
- TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id, 0, SOCKET_ID_ANY),
+ TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id, 0, RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"invalid num_queues %d", 0);
TEST_ASSERT_SUCCESS(rte_bbdev_setup_queues(dev_id, num_queues,
- SOCKET_ID_ANY),
+ RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"invalid dev_num %u", dev_id);
@@ -153,13 +153,13 @@ test_bbdev_configure_invalid_num_queues(void)
num_queues = info.drv.max_num_queues;
TEST_ASSERT_SUCCESS(rte_bbdev_setup_queues(dev_id, num_queues,
- SOCKET_ID_ANY),
+ RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"invalid num_queues: %u", num_queues);
num_queues++;
TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id, num_queues,
- SOCKET_ID_ANY),
+ RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"invalid num_queues: %u", num_queues);
@@ -188,7 +188,7 @@ test_bbdev_configure_stop_device(void)
"started value: %u", info.started);
TEST_ASSERT_SUCCESS(rte_bbdev_setup_queues(dev_id,
- info.drv.max_num_queues, SOCKET_ID_ANY),
+ info.drv.max_num_queues, RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"device should be stopped, dev_id: %u", dev_id);
@@ -213,7 +213,7 @@ test_bbdev_configure_stop_device(void)
"started value: %u", info.started);
TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id,
- info.drv.max_num_queues, SOCKET_ID_ANY),
+ info.drv.max_num_queues, RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"device should be started, dev_id: %u", dev_id);
@@ -238,7 +238,7 @@ test_bbdev_configure_stop_device(void)
"started value: %u", info.started);
TEST_ASSERT_SUCCESS(rte_bbdev_setup_queues(dev_id,
- info.drv.max_num_queues, SOCKET_ID_ANY),
+ info.drv.max_num_queues, RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"device should be stopped, dev_id: %u", dev_id);
@@ -1104,7 +1104,7 @@ test_bbdev_invalid_driver(void)
/* Tests for rte_bbdev_setup_queues */
dev2->dev_ops = NULL;
- TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id, 1, SOCKET_ID_ANY),
+ TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id, 1, RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"NULL dev_ops structure ");
dev2->dev_ops = dev1.dev_ops;
@@ -1112,7 +1112,7 @@ test_bbdev_invalid_driver(void)
dev_ops_tmp = *dev2->dev_ops;
dev_ops_tmp.info_get = NULL;
dev2->dev_ops = &dev_ops_tmp;
- TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id, 1, SOCKET_ID_ANY),
+ TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id, 1, RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"NULL info_get ");
dev2->dev_ops = dev1.dev_ops;
@@ -1120,14 +1120,14 @@ test_bbdev_invalid_driver(void)
dev_ops_tmp = *dev2->dev_ops;
dev_ops_tmp.queue_release = NULL;
dev2->dev_ops = &dev_ops_tmp;
- TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id, 1, SOCKET_ID_ANY),
+ TEST_ASSERT_FAIL(rte_bbdev_setup_queues(dev_id, 1, RTE_NUMA_ID_ANY),
"Failed test for rte_bbdev_setup_queues: "
"NULL queue_release ");
dev2->dev_ops = dev1.dev_ops;
dev2->data->numa_id = RTE_NUMA_ID_ANY;
TEST_ASSERT_SUCCESS(rte_bbdev_setup_queues(dev_id, 1,
- SOCKET_ID_ANY), "Failed to configure bbdev %u", dev_id);
+ RTE_NUMA_ID_ANY), "Failed to configure bbdev %u", dev_id);
/* Test for rte_bbdev_queue_configure */
dev2->dev_ops = NULL;
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 8e2a26905d..35e3394495 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -22,7 +22,7 @@
#include "main.h"
#include "test_bbdev_vector.h"
-#define GET_SOCKET(socket_id) (((socket_id) == SOCKET_ID_ANY) ? 0 : (socket_id))
+#define GET_SOCKET(numa_id) (((numa_id) == RTE_NUMA_ID_ANY) ? 0 : (numa_id))
#define MAX_QUEUES RTE_MAX_LCORE
#define TEST_REPETITIONS 100
@@ -511,7 +511,7 @@ optimal_mempool_size(unsigned int val)
/* allocates mbuf mempool for inputs and outputs */
static struct rte_mempool *
create_mbuf_pool(struct op_data_entries *entries, uint8_t dev_id,
- int socket_id, unsigned int mbuf_pool_size,
+ int numa_id, unsigned int mbuf_pool_size,
const char *op_type_str)
{
unsigned int i;
@@ -528,11 +528,11 @@ create_mbuf_pool(struct op_data_entries *entries, uint8_t dev_id,
return rte_pktmbuf_pool_create(pool_name, mbuf_pool_size, 0, 0,
RTE_MAX(max_seg_sz + RTE_PKTMBUF_HEADROOM
+ FILLER_HEADROOM,
- (unsigned int)RTE_MBUF_DEFAULT_BUF_SIZE), socket_id);
+ (unsigned int)RTE_MBUF_DEFAULT_BUF_SIZE), numa_id);
}
static int
-create_mempools(struct active_device *ad, int socket_id,
+create_mempools(struct active_device *ad, int numa_id,
enum rte_bbdev_op_type org_op_type, uint16_t num_ops)
{
struct rte_mempool *mp;
@@ -568,12 +568,12 @@ create_mempools(struct active_device *ad, int socket_id,
snprintf(pool_name, sizeof(pool_name), "%s_pool_%u", op_type_str,
ad->dev_id);
mp = rte_bbdev_op_pool_create(pool_name, op_type,
- ops_pool_size, OPS_CACHE_SIZE, socket_id);
+ ops_pool_size, OPS_CACHE_SIZE, numa_id);
TEST_ASSERT_NOT_NULL(mp,
"ERROR Failed to create %u items ops pool for dev %u on socket %u.",
ops_pool_size,
ad->dev_id,
- socket_id);
+ numa_id);
ad->ops_mempool = mp;
/* Do not create inputs and outputs mbufs for BaseBand Null Device */
@@ -584,13 +584,13 @@ create_mempools(struct active_device *ad, int socket_id,
if (in->nb_segments > 0) {
mbuf_pool_size = optimal_mempool_size(ops_pool_size *
in->nb_segments);
- mp = create_mbuf_pool(in, ad->dev_id, socket_id,
+ mp = create_mbuf_pool(in, ad->dev_id, numa_id,
mbuf_pool_size, "in");
TEST_ASSERT_NOT_NULL(mp,
"ERROR Failed to create %u items input pktmbuf pool for dev %u on socket %u.",
mbuf_pool_size,
ad->dev_id,
- socket_id);
+ numa_id);
ad->in_mbuf_pool = mp;
}
@@ -598,14 +598,14 @@ create_mempools(struct active_device *ad, int socket_id,
if (hard_out->nb_segments > 0) {
mbuf_pool_size = optimal_mempool_size(ops_pool_size *
hard_out->nb_segments);
- mp = create_mbuf_pool(hard_out, ad->dev_id, socket_id,
+ mp = create_mbuf_pool(hard_out, ad->dev_id, numa_id,
mbuf_pool_size,
"hard_out");
TEST_ASSERT_NOT_NULL(mp,
"ERROR Failed to create %u items hard output pktmbuf pool for dev %u on socket %u.",
mbuf_pool_size,
ad->dev_id,
- socket_id);
+ numa_id);
ad->hard_out_mbuf_pool = mp;
}
@@ -613,14 +613,14 @@ create_mempools(struct active_device *ad, int socket_id,
if (soft_out->nb_segments > 0) {
mbuf_pool_size = optimal_mempool_size(ops_pool_size *
soft_out->nb_segments);
- mp = create_mbuf_pool(soft_out, ad->dev_id, socket_id,
+ mp = create_mbuf_pool(soft_out, ad->dev_id, numa_id,
mbuf_pool_size,
"soft_out");
TEST_ASSERT_NOT_NULL(mp,
"ERROR Failed to create %uB soft output pktmbuf pool for dev %u on socket %u.",
mbuf_pool_size,
ad->dev_id,
- socket_id);
+ numa_id);
ad->soft_out_mbuf_pool = mp;
}
@@ -628,14 +628,14 @@ create_mempools(struct active_device *ad, int socket_id,
if (harq_in->nb_segments > 0) {
mbuf_pool_size = optimal_mempool_size(ops_pool_size *
harq_in->nb_segments);
- mp = create_mbuf_pool(harq_in, ad->dev_id, socket_id,
+ mp = create_mbuf_pool(harq_in, ad->dev_id, numa_id,
mbuf_pool_size,
"harq_in");
TEST_ASSERT_NOT_NULL(mp,
"ERROR Failed to create %uB harq input pktmbuf pool for dev %u on socket %u.",
mbuf_pool_size,
ad->dev_id,
- socket_id);
+ numa_id);
ad->harq_in_mbuf_pool = mp;
}
@@ -643,14 +643,14 @@ create_mempools(struct active_device *ad, int socket_id,
if (harq_out->nb_segments > 0) {
mbuf_pool_size = optimal_mempool_size(ops_pool_size *
harq_out->nb_segments);
- mp = create_mbuf_pool(harq_out, ad->dev_id, socket_id,
+ mp = create_mbuf_pool(harq_out, ad->dev_id, numa_id,
mbuf_pool_size,
"harq_out");
TEST_ASSERT_NOT_NULL(mp,
"ERROR Failed to create %uB harq output pktmbuf pool for dev %u on socket %u.",
mbuf_pool_size,
ad->dev_id,
- socket_id);
+ numa_id);
ad->harq_out_mbuf_pool = mp;
}
@@ -1222,13 +1222,13 @@ allocate_buffers_on_socket(struct rte_bbdev_op_data **buffers, const int len,
{
int i;
- *buffers = rte_zmalloc_socket(NULL, len, 0, socket);
+ *buffers = rte_zmalloc_numa(NULL, len, 0, socket);
if (*buffers == NULL) {
printf("WARNING: Failed to allocate op_data on socket %d\n",
socket);
/* try to allocate memory on other detected sockets */
for (i = 0; i < socket; i++) {
- *buffers = rte_zmalloc_socket(NULL, len, 0, i);
+ *buffers = rte_zmalloc_numa(NULL, len, 0, i);
if (*buffers != NULL)
break;
}
@@ -1344,7 +1344,7 @@ fill_queue_buffers(struct test_op_params *op_params,
struct rte_mempool *harq_in_mp, struct rte_mempool *harq_out_mp,
uint16_t queue_id,
const struct rte_bbdev_op_cap *capabilities,
- uint16_t min_alignment, const int socket_id)
+ uint16_t min_alignment, const int numa_id)
{
int ret;
enum op_data_type type;
@@ -1359,11 +1359,11 @@ fill_queue_buffers(struct test_op_params *op_params,
};
struct rte_bbdev_op_data **queue_ops[DATA_NUM_TYPES] = {
- &op_params->q_bufs[socket_id][queue_id].inputs,
- &op_params->q_bufs[socket_id][queue_id].soft_outputs,
- &op_params->q_bufs[socket_id][queue_id].hard_outputs,
- &op_params->q_bufs[socket_id][queue_id].harq_inputs,
- &op_params->q_bufs[socket_id][queue_id].harq_outputs,
+ &op_params->q_bufs[numa_id][queue_id].inputs,
+ &op_params->q_bufs[numa_id][queue_id].soft_outputs,
+ &op_params->q_bufs[numa_id][queue_id].hard_outputs,
+ &op_params->q_bufs[numa_id][queue_id].harq_inputs,
+ &op_params->q_bufs[numa_id][queue_id].harq_outputs,
};
for (type = DATA_INPUT; type < DATA_NUM_TYPES; ++type) {
@@ -1374,7 +1374,7 @@ fill_queue_buffers(struct test_op_params *op_params,
ret = allocate_buffers_on_socket(queue_ops[type],
n * sizeof(struct rte_bbdev_op_data),
- socket_id);
+ numa_id);
TEST_ASSERT_SUCCESS(ret,
"Couldn't allocate memory for rte_bbdev_op_data structs");
@@ -3035,7 +3035,7 @@ static int
run_test_case_on_device(test_case_function *test_case_func, uint8_t dev_id,
struct test_op_params *op_params)
{
- int t_ret, f_ret, socket_id = SOCKET_ID_ANY;
+ int t_ret, f_ret, numa_id = RTE_NUMA_ID_ANY;
unsigned int i;
struct active_device *ad;
unsigned int burst_sz = get_burst_sz();
@@ -3050,9 +3050,9 @@ run_test_case_on_device(test_case_function *test_case_func, uint8_t dev_id,
struct rte_bbdev_info info;
rte_bbdev_info_get(ad->dev_id, &info);
- socket_id = GET_SOCKET(info.socket_id);
+ numa_id = GET_SOCKET(info.numa_id);
- f_ret = create_mempools(ad, socket_id, op_type,
+ f_ret = create_mempools(ad, numa_id, op_type,
get_num_ops());
if (f_ret != TEST_SUCCESS) {
printf("Couldn't create mempools");
@@ -3109,7 +3109,7 @@ run_test_case_on_device(test_case_function *test_case_func, uint8_t dev_id,
ad->queue_ids[i],
capabilities,
info.drv.min_alignment,
- socket_id);
+ numa_id);
if (f_ret != TEST_SUCCESS) {
printf("Couldn't init queue buffers");
goto fail;
@@ -3474,7 +3474,7 @@ throughput_intr_lcore_ldpc_dec(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_atomic_store_explicit(&tp->processing_status, 0, rte_memory_order_relaxed);
rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
@@ -3578,7 +3578,7 @@ throughput_intr_lcore_dec(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_atomic_store_explicit(&tp->processing_status, 0, rte_memory_order_relaxed);
rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
@@ -3675,7 +3675,7 @@ throughput_intr_lcore_enc(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_atomic_store_explicit(&tp->processing_status, 0, rte_memory_order_relaxed);
rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
@@ -3769,7 +3769,7 @@ throughput_intr_lcore_ldpc_enc(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_atomic_store_explicit(&tp->processing_status, 0, rte_memory_order_relaxed);
rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
@@ -3865,7 +3865,7 @@ throughput_intr_lcore_fft(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_atomic_store_explicit(&tp->processing_status, 0, rte_memory_order_relaxed);
rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
@@ -3959,7 +3959,7 @@ throughput_intr_lcore_mldts(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_atomic_store_explicit(&tp->processing_status, 0, rte_memory_order_relaxed);
rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
@@ -4049,7 +4049,7 @@ throughput_pmd_lcore_dec(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_wait_until_equal_16((uint16_t *)(uintptr_t)&tp->op_params->sync, SYNC_START,
rte_memory_order_relaxed);
@@ -4169,7 +4169,7 @@ bler_pmd_lcore_ldpc_dec(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_wait_until_equal_16((uint16_t *)(uintptr_t)&tp->op_params->sync, SYNC_START,
rte_memory_order_relaxed);
@@ -4305,7 +4305,7 @@ bler_pmd_lcore_turbo_dec(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_wait_until_equal_16((uint16_t *)(uintptr_t)&tp->op_params->sync, SYNC_START,
rte_memory_order_relaxed);
@@ -4429,7 +4429,7 @@ throughput_pmd_lcore_ldpc_dec(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_wait_until_equal_16((uint16_t *)(uintptr_t)&tp->op_params->sync, SYNC_START,
rte_memory_order_relaxed);
@@ -4561,7 +4561,7 @@ throughput_pmd_lcore_enc(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_wait_until_equal_16((uint16_t *)(uintptr_t)&tp->op_params->sync, SYNC_START,
rte_memory_order_relaxed);
@@ -4663,7 +4663,7 @@ throughput_pmd_lcore_ldpc_enc(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_wait_until_equal_16((uint16_t *)(uintptr_t)&tp->op_params->sync, SYNC_START,
rte_memory_order_relaxed);
@@ -4765,7 +4765,7 @@ throughput_pmd_lcore_fft(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_wait_until_equal_16((uint16_t *)(uintptr_t)&tp->op_params->sync, SYNC_START,
rte_memory_order_relaxed);
@@ -4864,7 +4864,7 @@ throughput_pmd_lcore_mldts(void *arg)
"NUM_OPS cannot exceed %u for this device",
info.drv.queue_size_lim);
- bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
rte_wait_until_equal_16((uint16_t *)(uintptr_t)&tp->op_params->sync, SYNC_START,
rte_memory_order_relaxed);
@@ -5772,7 +5772,7 @@ validation_latency_test(struct active_device *ad,
"BURST_SIZE should be <= %u", MAX_BURST);
rte_bbdev_info_get(ad->dev_id, &info);
- bufs = &op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
op_type_str = rte_bbdev_op_type_str(op_type);
TEST_ASSERT_NOT_NULL(op_type_str, "Invalid op type: %u", op_type);
@@ -6378,7 +6378,7 @@ offload_cost_test(struct active_device *ad,
"BURST_SIZE should be <= %u", MAX_BURST);
rte_bbdev_info_get(ad->dev_id, &info);
- bufs = &op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+ bufs = &op_params->q_bufs[GET_SOCKET(info.numa_id)][queue_id];
op_type_str = rte_bbdev_op_type_str(op_type);
TEST_ASSERT_NOT_NULL(op_type_str, "Invalid op type: %u", op_type);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 181/227] app/test-security-perf: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (179 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 180/227] app/test-bbdev: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 182/227] app/test-regex: " Chengwen Feng
` (46 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-security-perf/test_security_perf.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/test-security-perf/test_security_perf.c b/app/test-security-perf/test_security_perf.c
index dd377a6027..bebcdf922a 100644
--- a/app/test-security-perf/test_security_perf.c
+++ b/app/test-security-perf/test_security_perf.c
@@ -58,7 +58,7 @@ cryptodev_init(struct test_ctx *ctx, uint8_t nb_lcores)
struct rte_cryptodev_info dev_info;
struct rte_cryptodev_config config;
unsigned int j, nb_qp, qps_reqd;
- uint8_t socket_id;
+ uint8_t numa_id;
uint32_t dev_cnt;
int ret, core_id;
void *sec_ctx;
@@ -86,7 +86,7 @@ cryptodev_init(struct test_ctx *ctx, uint8_t nb_lcores)
sec_ctx = rte_cryptodev_get_sec_ctx(0);
ctx->sec_ctx = sec_ctx;
- socket_id = rte_socket_id();
+ numa_id = rte_numa_id();
qps_reqd = nb_lcores;
core_id = 0;
i = 0;
@@ -108,7 +108,7 @@ cryptodev_init(struct test_ctx *ctx, uint8_t nb_lcores)
memset(&config, 0, sizeof(config));
config.nb_queue_pairs = nb_qp;
- config.socket_id = socket_id;
+ config.numa_id = numa_id;
ret = rte_cryptodev_configure(i, &config);
if (ret < 0) {
@@ -123,7 +123,7 @@ cryptodev_init(struct test_ctx *ctx, uint8_t nb_lcores)
for (j = 0; j < nb_qp; j++) {
ret = rte_cryptodev_queue_pair_setup(i, j, &qp_conf,
- socket_id);
+ numa_id);
if (ret < 0) {
RTE_LOG(ERR, USER1,
"Could not configure queue pair:"
@@ -178,7 +178,7 @@ mempool_init(struct test_ctx *ctx, uint8_t nb_lcores)
sess_mpool = rte_cryptodev_sym_session_pool_create("test_sess_mp",
nb_sess_total, sec_sess_sz, RTE_MEMPOOL_CACHE_MAX_SIZE,
- 0, SOCKET_ID_ANY);
+ 0, RTE_NUMA_ID_ANY);
if (sess_mpool == NULL) {
RTE_LOG(ERR, USER1, "Could not create mempool\n");
return -1;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 182/227] app/test-regex: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (180 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 181/227] app/test-security-perf: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 183/227] app/test-flow-perf: " Chengwen Feng
` (45 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-regex/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/test-regex/main.c b/app/test-regex/main.c
index 81719f2e04..3b9a21bc92 100644
--- a/app/test-regex/main.c
+++ b/app/test-regex/main.c
@@ -425,7 +425,7 @@ run_regex(void *args)
0, 0, (nb_segs == 1) ? MBUF_SIZE :
(rte_align32pow2(job_len + (data_len % nb_jobs)) /
nb_segs + RTE_PKTMBUF_HEADROOM),
- rte_socket_id());
+ rte_numa_id());
if (mbuf_mp == NULL) {
printf("Error, can't create memory pool\n");
return -ENOMEM;
@@ -689,8 +689,8 @@ distribute_qps_to_lcores(uint32_t nb_cores, uint32_t nb_qps,
if (detected_lcores >= nb_cores)
break;
qps_per_lcore[detected_lcores].lcore_id = lcore_id;
- socket = rte_lcore_to_socket_id(lcore_id);
- if (socket == SOCKET_ID_ANY)
+ socket = rte_lcore_to_numa_id(lcore_id);
+ if (socket == RTE_NUMA_ID_ANY)
socket = 0;
qps_per_lcore[detected_lcores].socket = socket;
qps_per_lcore[detected_lcores].qp_id_base = min_qp_id;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 183/227] app/test-flow-perf: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (181 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 182/227] app/test-regex: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 184/227] examples/bbdev_app: " Chengwen Feng
` (44 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-flow-perf/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c
index db7269315c..5f83713a98 100644
--- a/app/test-flow-perf/main.c
+++ b/app/test-flow-perf/main.c
@@ -2088,7 +2088,7 @@ init_port(void)
mbuf_mp = rte_pktmbuf_pool_create("mbuf_pool",
total_mbuf_num, mbuf_cache_size,
0, mbuf_size,
- rte_socket_id());
+ rte_numa_id());
if (mbuf_mp == NULL)
rte_exit(EXIT_FAILURE, "Error: can't init mbuf pool\n");
@@ -2136,7 +2136,7 @@ init_port(void)
rxq_conf = dev_info.default_rxconf;
for (std_queue = 0; std_queue < rx_queues_count; std_queue++) {
ret = rte_eth_rx_queue_setup(port_id, std_queue, rxd_count,
- rte_eth_dev_socket_id(port_id),
+ rte_eth_dev_numa_id(port_id),
&rxq_conf,
mbuf_mp);
if (ret < 0)
@@ -2148,7 +2148,7 @@ init_port(void)
txq_conf = dev_info.default_txconf;
for (std_queue = 0; std_queue < tx_queues_count; std_queue++) {
ret = rte_eth_tx_queue_setup(port_id, std_queue, txd_count,
- rte_eth_dev_socket_id(port_id),
+ rte_eth_dev_numa_id(port_id),
&txq_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE,
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 184/227] examples/bbdev_app: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (182 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 183/227] app/test-flow-perf: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 185/227] examples/bond: " Chengwen Feng
` (43 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/bbdev_app/main.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/examples/bbdev_app/main.c b/examples/bbdev_app/main.c
index 8c16d7c556..396ba9d1eb 100644
--- a/examples/bbdev_app/main.c
+++ b/examples/bbdev_app/main.c
@@ -467,7 +467,7 @@ initialize_ports(struct app_config_params *app_params,
for (q = 0; q < app_params->num_enc_cores; q++) {
ret = rte_eth_rx_queue_setup(port_id, q,
RX_DESC_DEFAULT,
- rte_eth_dev_socket_id(port_id),
+ rte_eth_dev_numa_id(port_id),
NULL, ethdev_mbuf_mempool);
if (ret < 0) {
printf("rte_eth_rx_queue_setup: err=%d, queue=%u\n",
@@ -479,7 +479,7 @@ initialize_ports(struct app_config_params *app_params,
for (q = 0; q < app_params->num_dec_cores; q++) {
ret = rte_eth_tx_queue_setup(port_id, q,
TX_DESC_DEFAULT,
- rte_eth_dev_socket_id(port_id), NULL);
+ rte_eth_dev_numa_id(port_id), NULL);
if (ret < 0) {
printf("rte_eth_tx_queue_setup: err=%d, queue=%u\n",
ret, q);
@@ -1079,10 +1079,10 @@ main(int argc, char **argv)
/*create bbdev op pools*/
bbdev_op_pools[RTE_BBDEV_OP_TURBO_DEC] =
rte_bbdev_op_pool_create("bbdev_op_pool_dec",
- RTE_BBDEV_OP_TURBO_DEC, NB_MBUF, 128, rte_socket_id());
+ RTE_BBDEV_OP_TURBO_DEC, NB_MBUF, 128, rte_numa_id());
bbdev_op_pools[RTE_BBDEV_OP_TURBO_ENC] =
rte_bbdev_op_pool_create("bbdev_op_pool_enc",
- RTE_BBDEV_OP_TURBO_ENC, NB_MBUF, 128, rte_socket_id());
+ RTE_BBDEV_OP_TURBO_ENC, NB_MBUF, 128, rte_numa_id());
if ((bbdev_op_pools[RTE_BBDEV_OP_TURBO_DEC] == NULL) ||
(bbdev_op_pools[RTE_BBDEV_OP_TURBO_ENC] == NULL))
@@ -1094,7 +1094,7 @@ main(int argc, char **argv)
flags |= RING_F_SC_DEQ;
enc_to_dec_ring = rte_ring_create("enc_to_dec_ring",
- rte_align32pow2(NB_MBUF), rte_socket_id(), flags);
+ rte_align32pow2(NB_MBUF), rte_numa_id(), flags);
/* Get the number of available bbdev devices */
nb_bbdevs = rte_bbdev_count();
@@ -1112,14 +1112,14 @@ main(int argc, char **argv)
/* create the mbuf mempool for ethdev pkts */
ethdev_mbuf_mempool = rte_pktmbuf_pool_create("ethdev_mbuf_pool",
NB_MBUF, MEMPOOL_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (ethdev_mbuf_mempool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create ethdev mbuf mempool\n");
/* create the mbuf mempool for encoder output */
bbdev_mbuf_mempool = rte_pktmbuf_pool_create("bbdev_mbuf_pool",
NB_MBUF, MEMPOOL_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (bbdev_mbuf_mempool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create ethdev mbuf mempool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 185/227] examples/bond: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (183 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 184/227] examples/bbdev_app: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 186/227] examples/distributor: " Chengwen Feng
` (42 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/bond/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/bond/main.c b/examples/bond/main.c
index 99359cd6fb..ef1b074f37 100644
--- a/examples/bond/main.c
+++ b/examples/bond/main.c
@@ -166,7 +166,7 @@ member_port_init(uint16_t portid)
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = local_port_conf.rxmode.offloads;
retval = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&rxq_conf,
mbuf_pool);
if (retval < 0)
@@ -177,7 +177,7 @@ member_port_init(uint16_t portid)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = local_port_conf.txmode.offloads;
retval = rte_eth_tx_queue_setup(portid, 0, nb_txd,
- rte_eth_dev_socket_id(portid), &txq_conf);
+ rte_eth_dev_numa_id(portid), &txq_conf);
if (retval < 0)
rte_exit(retval, "port %u: TX queue 0 setup failed (res=%d)",
@@ -216,7 +216,7 @@ bond_port_init(void)
uint16_t wait_counter = 20;
retval = rte_eth_bond_create("net_bonding0", BONDING_MODE_ALB,
- 0 /*SOCKET_ID_ANY*/);
+ 0 /*RTE_NUMA_ID_ANY*/);
if (retval < 0)
rte_exit(EXIT_FAILURE,
"Failed to create bond port\n");
@@ -253,7 +253,7 @@ bond_port_init(void)
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = local_port_conf.rxmode.offloads;
retval = rte_eth_rx_queue_setup(BOND_PORT, 0, nb_rxd,
- rte_eth_dev_socket_id(BOND_PORT),
+ rte_eth_dev_numa_id(BOND_PORT),
&rxq_conf, mbuf_pool);
if (retval < 0)
rte_exit(retval, " port %u: RX queue 0 setup failed (res=%d)",
@@ -263,7 +263,7 @@ bond_port_init(void)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = local_port_conf.txmode.offloads;
retval = rte_eth_tx_queue_setup(BOND_PORT, 0, nb_txd,
- rte_eth_dev_socket_id(BOND_PORT), &txq_conf);
+ rte_eth_dev_numa_id(BOND_PORT), &txq_conf);
if (retval < 0)
rte_exit(retval, "port %u: TX queue 0 setup failed (res=%d)",
@@ -698,7 +698,7 @@ main(int argc, char *argv[])
rte_exit(EXIT_FAILURE, "You can have max 4 ports\n");
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", NB_MBUF, 32,
- 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 186/227] examples/distributor: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (184 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 185/227] examples/bond: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 187/227] examples/dma: " Chengwen Feng
` (41 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/distributor/main.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/examples/distributor/main.c b/examples/distributor/main.c
index 344da03814..a81e09b6ef 100644
--- a/examples/distributor/main.c
+++ b/examples/distributor/main.c
@@ -156,7 +156,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
for (q = 0; q < rxRings; q++) {
retval = rte_eth_rx_queue_setup(port, q, nb_rxd,
- rte_eth_dev_socket_id(port),
+ rte_eth_dev_numa_id(port),
NULL, mbuf_pool);
if (retval < 0)
return retval;
@@ -166,7 +166,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
txconf.offloads = port_conf.txmode.offloads;
for (q = 0; q < txRings; q++) {
retval = rte_eth_tx_queue_setup(port, q, nb_txd,
- rte_eth_dev_socket_id(port),
+ rte_eth_dev_numa_id(port),
&txconf);
if (retval < 0)
return retval;
@@ -226,7 +226,7 @@ static int
lcore_rx(struct lcore_params *p)
{
const uint16_t nb_ports = rte_eth_dev_count_avail();
- const int socket_id = rte_socket_id();
+ const int numa_id = rte_numa_id();
uint16_t port;
struct rte_mbuf *bufs[BURST_SIZE*2];
@@ -235,8 +235,8 @@ lcore_rx(struct lcore_params *p)
if ((enabled_port_mask & (1 << port)) == 0)
continue;
- if (rte_eth_dev_socket_id(port) >= 0 &&
- rte_eth_dev_socket_id(port) != socket_id)
+ if (rte_eth_dev_numa_id(port) >= 0 &&
+ rte_eth_dev_numa_id(port) != numa_id)
printf("WARNING, port %u is on remote NUMA node to "
"RX thread.\n\tPerformance will not "
"be optimal.\n", port);
@@ -295,7 +295,7 @@ lcore_rx_and_distributor(struct lcore_params *p)
{
struct rte_distributor *d = p->d;
const uint16_t nb_ports = rte_eth_dev_count_avail();
- const int socket_id = rte_socket_id();
+ const int numa_id = rte_numa_id();
uint16_t port;
struct rte_mbuf *bufs[BURST_SIZE*2];
@@ -304,8 +304,8 @@ lcore_rx_and_distributor(struct lcore_params *p)
if ((enabled_port_mask & (1 << port)) == 0)
continue;
- if (rte_eth_dev_socket_id(port) > 0 &&
- rte_eth_dev_socket_id(port) != socket_id)
+ if (rte_eth_dev_numa_id(port) > 0 &&
+ rte_eth_dev_numa_id(port) != numa_id)
printf("WARNING, port %u is on remote NUMA node to "
"RX thread.\n\tPerformance will not "
"be optimal.\n", port);
@@ -465,7 +465,7 @@ static int
lcore_tx(struct rte_ring *in_r)
{
static struct output_buffer tx_buffers[RTE_MAX_ETHPORTS];
- const int socket_id = rte_socket_id();
+ const int numa_id = rte_numa_id();
uint16_t port;
RTE_ETH_FOREACH_DEV(port) {
@@ -473,8 +473,8 @@ lcore_tx(struct rte_ring *in_r)
if ((enabled_port_mask & (1 << port)) == 0)
continue;
- if (rte_eth_dev_socket_id(port) >= 0 &&
- rte_eth_dev_socket_id(port) != socket_id)
+ if (rte_eth_dev_numa_id(port) >= 0 &&
+ rte_eth_dev_numa_id(port) != numa_id)
printf("WARNING, port %u is on remote NUMA node to "
"TX thread.\n\tPerformance will not "
"be optimal.\n", port);
@@ -828,7 +828,7 @@ main(int argc, char *argv[])
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL",
NUM_MBUFS * nb_ports, MBUF_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
nb_ports_available = nb_ports;
@@ -854,7 +854,7 @@ main(int argc, char *argv[])
"All available ports are disabled. Please set portmask.\n");
}
- d = rte_distributor_create("PKT_DIST", rte_socket_id(),
+ d = rte_distributor_create("PKT_DIST", rte_numa_id(),
num_workers,
RTE_DIST_ALG_BURST);
if (d == NULL)
@@ -865,12 +865,12 @@ main(int argc, char *argv[])
* by scheduler core
*/
dist_tx_ring = rte_ring_create("Output_ring", SCHED_TX_RING_SZ,
- rte_socket_id(), RING_F_SC_DEQ | RING_F_SP_ENQ);
+ rte_numa_id(), RING_F_SC_DEQ | RING_F_SP_ENQ);
if (dist_tx_ring == NULL)
rte_exit(EXIT_FAILURE, "Cannot create output ring\n");
rx_dist_ring = rte_ring_create("Input_ring", SCHED_RX_RING_SZ,
- rte_socket_id(), RING_F_SC_DEQ | RING_F_SP_ENQ);
+ rte_numa_id(), RING_F_SC_DEQ | RING_F_SP_ENQ);
if (rx_dist_ring == NULL)
rte_exit(EXIT_FAILURE, "Cannot create output ring\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 187/227] examples/dma: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (185 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 186/227] examples/distributor: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 188/227] examples/ethtool: " Chengwen Feng
` (40 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/dma/dmafwd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/dma/dmafwd.c b/examples/dma/dmafwd.c
index fea1c3e669..12298a5779 100644
--- a/examples/dma/dmafwd.c
+++ b/examples/dma/dmafwd.c
@@ -832,7 +832,7 @@ assign_rings(void)
/* Create ring for inter core communication */
cfg.ports[i].rx_to_tx_ring = rte_ring_create(
ring_name, ring_size,
- rte_socket_id(), RING_F_SP_ENQ | RING_F_SC_DEQ);
+ rte_numa_id(), RING_F_SP_ENQ | RING_F_SC_DEQ);
if (cfg.ports[i].rx_to_tx_ring == NULL)
rte_exit(EXIT_FAILURE, "Ring create failed: %s\n",
@@ -943,7 +943,7 @@ port_init(uint16_t portid, struct rte_mempool *mbuf_pool)
rxq_conf.offloads = local_port_conf.rxmode.offloads;
for (i = 0; i < nb_queues; i++) {
ret = rte_eth_rx_queue_setup(portid, i, nb_rxd,
- rte_eth_dev_socket_id(portid), &rxq_conf,
+ rte_eth_dev_numa_id(portid), &rxq_conf,
mbuf_pool);
if (ret < 0)
rte_exit(EXIT_FAILURE,
@@ -955,7 +955,7 @@ port_init(uint16_t portid, struct rte_mempool *mbuf_pool)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&txq_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE,
@@ -1047,7 +1047,7 @@ main(int argc, char **argv)
sz = max_frame_size + RTE_PKTMBUF_HEADROOM;
sz = RTE_MAX(sz, (size_t)RTE_MBUF_DEFAULT_BUF_SIZE);
dma_pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", nb_mbufs,
- MEMPOOL_CACHE_SIZE, 0, sz, rte_socket_id());
+ MEMPOOL_CACHE_SIZE, 0, sz, rte_numa_id());
if (dma_pktmbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
/* >8 End of allocates mempool to hold the mbufs. */
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 188/227] examples/ethtool: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (186 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 187/227] examples/dma: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 189/227] examples/eventdev_pipeline: " Chengwen Feng
` (39 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/ethtool/ethtool-app/main.c | 6 +++---
examples/ethtool/lib/rte_ethtool.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/ethtool/ethtool-app/main.c b/examples/ethtool/ethtool-app/main.c
index ddd256cd7b..bd87e5430d 100644
--- a/examples/ethtool/ethtool-app/main.c
+++ b/examples/ethtool/ethtool-app/main.c
@@ -118,7 +118,7 @@ static void setup_ports(struct app_config *ptr_cfg, int cnt_ports)
size_pktpool, PKTPOOL_CACHE,
0,
RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id()
+ rte_numa_id()
);
if (ptr_port->pkt_pool == NULL)
rte_exit(EXIT_FAILURE,
@@ -140,14 +140,14 @@ static void setup_ports(struct app_config *ptr_cfg, int cnt_ports)
if (rte_eth_rx_queue_setup(
idx_port, 0, nb_rxd,
- rte_eth_dev_socket_id(idx_port), NULL,
+ rte_eth_dev_numa_id(idx_port), NULL,
ptr_port->pkt_pool) < 0)
rte_exit(EXIT_FAILURE,
"rte_eth_rx_queue_setup failed"
);
if (rte_eth_tx_queue_setup(
idx_port, 0, nb_txd,
- rte_eth_dev_socket_id(idx_port), NULL) < 0)
+ rte_eth_dev_numa_id(idx_port), NULL) < 0)
rte_exit(EXIT_FAILURE,
"rte_eth_tx_queue_setup failed"
);
diff --git a/examples/ethtool/lib/rte_ethtool.c b/examples/ethtool/lib/rte_ethtool.c
index 0b88a27e7d..b3edbc71ad 100644
--- a/examples/ethtool/lib/rte_ethtool.c
+++ b/examples/ethtool/lib/rte_ethtool.c
@@ -444,12 +444,12 @@ rte_ethtool_set_ringparam(uint16_t port_id,
return stat;
stat = rte_eth_tx_queue_setup(port_id, 0, ring_param->tx_pending,
- rte_eth_dev_socket_id(port_id), NULL);
+ rte_eth_dev_numa_id(port_id), NULL);
if (stat != 0)
return stat;
stat = rte_eth_rx_queue_setup(port_id, 0, ring_param->rx_pending,
- rte_eth_dev_socket_id(port_id), NULL, rx_qinfo.mp);
+ rte_eth_dev_numa_id(port_id), NULL, rx_qinfo.mp);
if (stat != 0)
return stat;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 189/227] examples/eventdev_pipeline: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (187 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 188/227] examples/ethtool: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 190/227] examples/fips_validation: " Chengwen Feng
` (38 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/eventdev_pipeline/pipeline_worker_generic.c | 6 +++---
examples/eventdev_pipeline/pipeline_worker_tx.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/eventdev_pipeline/pipeline_worker_generic.c b/examples/eventdev_pipeline/pipeline_worker_generic.c
index 77d9d91043..47669bf66c 100644
--- a/examples/eventdev_pipeline/pipeline_worker_generic.c
+++ b/examples/eventdev_pipeline/pipeline_worker_generic.c
@@ -357,7 +357,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool)
/* Allocate and set up 1 RX queue per Ethernet port. */
for (q = 0; q < rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port, q, rx_ring_size,
- rte_eth_dev_socket_id(port), &rx_conf,
+ rte_eth_dev_numa_id(port), &rx_conf,
mbuf_pool);
if (retval < 0)
return retval;
@@ -368,7 +368,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool)
/* Allocate and set up 1 TX queue per Ethernet port. */
for (q = 0; q < tx_rings; q++) {
retval = rte_eth_tx_queue_setup(port, q, tx_ring_size,
- rte_eth_dev_socket_id(port), &txconf);
+ rte_eth_dev_numa_id(port), &txconf);
if (retval < 0)
return retval;
}
@@ -407,7 +407,7 @@ init_ports(uint16_t num_ports)
/* cache_size */ 512,
/* priv_size*/ 0,
/* data_room_size */ RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
RTE_ETH_FOREACH_DEV(portid)
if (port_init(portid, mp) != 0)
diff --git a/examples/eventdev_pipeline/pipeline_worker_tx.c b/examples/eventdev_pipeline/pipeline_worker_tx.c
index 174976a1b5..fae9481f56 100644
--- a/examples/eventdev_pipeline/pipeline_worker_tx.c
+++ b/examples/eventdev_pipeline/pipeline_worker_tx.c
@@ -702,7 +702,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool)
/* Allocate and set up 1 RX queue per Ethernet port. */
for (q = 0; q < rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port, q, rx_ring_size,
- rte_eth_dev_socket_id(port), &rx_conf,
+ rte_eth_dev_numa_id(port), &rx_conf,
mbuf_pool);
if (retval < 0)
return retval;
@@ -713,7 +713,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool)
/* Allocate and set up 1 TX queue per Ethernet port. */
for (q = 0; q < tx_rings; q++) {
retval = rte_eth_tx_queue_setup(port, q, tx_ring_size,
- rte_eth_dev_socket_id(port), &txconf);
+ rte_eth_dev_numa_id(port), &txconf);
if (retval < 0)
return retval;
}
@@ -752,7 +752,7 @@ init_ports(uint16_t num_ports)
/* cache_size */ 512,
/* priv_size*/ 0,
/* data_room_size */ RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
RTE_ETH_FOREACH_DEV(portid)
if (port_init(portid, mp) != 0)
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 190/227] examples/fips_validation: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (188 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 189/227] examples/eventdev_pipeline: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 191/227] examples/flow_filtering: " Chengwen Feng
` (37 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/fips_validation/fips_dev_self_test.c | 10 +++++-----
examples/fips_validation/main.c | 14 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/examples/fips_validation/fips_dev_self_test.c b/examples/fips_validation/fips_dev_self_test.c
index 667f5da4e7..5807b4ac90 100644
--- a/examples/fips_validation/fips_dev_self_test.c
+++ b/examples/fips_validation/fips_dev_self_test.c
@@ -1533,7 +1533,7 @@ fips_dev_auto_test_init(uint8_t dev_id, struct fips_dev_auto_test_env *env)
char name[128];
int ret;
- conf.socket_id = rte_cryptodev_socket_id(dev_id);
+ conf.numa_id = rte_cryptodev_numa_id(dev_id);
conf.nb_queue_pairs = 1;
conf.ff_disable = 0;
@@ -1547,7 +1547,7 @@ fips_dev_auto_test_init(uint8_t dev_id, struct fips_dev_auto_test_env *env)
memset(env, 0, sizeof(*env));
env->mpool = rte_pktmbuf_pool_create(name, 128, 0, 0,
- UINT16_MAX, rte_cryptodev_socket_id(dev_id));
+ UINT16_MAX, rte_cryptodev_numa_id(dev_id));
if (!env->mpool) {
ret = -ENOMEM;
goto error_exit;
@@ -1561,7 +1561,7 @@ fips_dev_auto_test_init(uint8_t dev_id, struct fips_dev_auto_test_env *env)
RTE_CRYPTO_OP_TYPE_SYMMETRIC,
16, 0,
16,
- rte_socket_id());
+ rte_numa_id());
if (!env->op_pool) {
ret = -ENOMEM;
goto error_exit;
@@ -1571,7 +1571,7 @@ fips_dev_auto_test_init(uint8_t dev_id, struct fips_dev_auto_test_env *env)
snprintf(name, 128, "%s%u", "SELF_TEST_SESS_POOL", dev_id);
env->sess_pool = rte_cryptodev_sym_session_pool_create(name,
- 128, sess_sz, 0, 0, rte_cryptodev_socket_id(dev_id));
+ 128, sess_sz, 0, 0, rte_cryptodev_numa_id(dev_id));
if (!env->sess_pool) {
ret = -ENOMEM;
goto error_exit;
@@ -1580,7 +1580,7 @@ fips_dev_auto_test_init(uint8_t dev_id, struct fips_dev_auto_test_env *env)
qp_conf.mp_session = env->sess_pool;
ret = rte_cryptodev_queue_pair_setup(dev_id, 0, &qp_conf,
- rte_cryptodev_socket_id(dev_id));
+ rte_cryptodev_numa_id(dev_id));
if (ret < 0)
goto error_exit;
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index 2b6d55aa51..f17062f8b9 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -95,7 +95,7 @@ cryptodev_fips_validate_app_sym_init(void)
ret = -ENOMEM;
sym->sess_mpool = rte_cryptodev_sym_session_pool_create(
- "FIPS_SYM_SESS_MEMPOOL", 16, sess_sz, 0, 0, rte_socket_id());
+ "FIPS_SYM_SESS_MEMPOOL", 16, sess_sz, 0, 0, rte_numa_id());
if (!sym->sess_mpool)
goto error_exit;
@@ -104,7 +104,7 @@ cryptodev_fips_validate_app_sym_init(void)
RTE_CRYPTO_OP_TYPE_SYMMETRIC,
1, 0,
16,
- rte_socket_id());
+ rte_numa_id());
if (!sym->op_pool)
goto error_exit;
@@ -140,7 +140,7 @@ cryptodev_fips_validate_app_asym_init(void)
ret = -ENOMEM;
asym->sess_mpool = rte_cryptodev_asym_session_pool_create(
- "FIPS_ASYM_SESS_MEMPOOL", 16, 0, 0, rte_socket_id());
+ "FIPS_ASYM_SESS_MEMPOOL", 16, 0, 0, rte_numa_id());
if (!asym->sess_mpool)
goto error_exit;
@@ -149,7 +149,7 @@ cryptodev_fips_validate_app_asym_init(void)
RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
1, 0,
16,
- rte_socket_id());
+ rte_numa_id());
if (!asym->op_pool)
goto error_exit;
@@ -179,7 +179,7 @@ cryptodev_fips_validate_app_asym_uninit(void)
static int
cryptodev_fips_validate_app_init(void)
{
- struct rte_cryptodev_config conf = {rte_socket_id(), 1, 0};
+ struct rte_cryptodev_config conf = {rte_numa_id(), 1, 0};
struct rte_cryptodev_qp_conf qp_conf = {128, NULL};
uint32_t nb_mbufs = UINT16_MAX / env.mbuf_data_room + 1;
int ret;
@@ -201,7 +201,7 @@ cryptodev_fips_validate_app_init(void)
ret = -ENOMEM;
env.mpool = rte_pktmbuf_pool_create("FIPS_MEMPOOL", nb_mbufs,
0, 0, sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM +
- env.mbuf_data_room, rte_socket_id());
+ env.mbuf_data_room, rte_numa_id());
if (!env.mpool)
return ret;
@@ -218,7 +218,7 @@ cryptodev_fips_validate_app_init(void)
qp_conf.mp_session = env.sym.sess_mpool;
ret = rte_cryptodev_queue_pair_setup(env.dev_id, 0, &qp_conf,
- rte_socket_id());
+ rte_numa_id());
if (ret < 0)
goto error_exit;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 191/227] examples/flow_filtering: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (189 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 190/227] examples/fips_validation: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 192/227] examples/ip_fragmentation: " Chengwen Feng
` (36 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/flow_filtering/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
index b4ccaacea1..b29feeb5ab 100644
--- a/examples/flow_filtering/main.c
+++ b/examples/flow_filtering/main.c
@@ -191,7 +191,7 @@ init_port(void)
/* Configuring number of RX and TX queues connected to single port. */
for (i = 0; i < NR_QUEUES; i++) {
ret = rte_eth_rx_queue_setup(port_id, i, 512,
- rte_eth_dev_socket_id(port_id),
+ rte_eth_dev_numa_id(port_id),
&rxq_conf,
mbuf_pool);
if (ret < 0) {
@@ -206,7 +206,7 @@ init_port(void)
for (i = 0; i < NR_QUEUES; i++) {
ret = rte_eth_tx_queue_setup(port_id, i, 512,
- rte_eth_dev_socket_id(port_id),
+ rte_eth_dev_numa_id(port_id),
&txq_conf);
if (ret < 0) {
rte_exit(EXIT_FAILURE,
@@ -334,7 +334,7 @@ main(int argc, char **argv)
/* Allocates a mempool to hold the mbufs. 8< */
mbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", 4096, 128, 0,
RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
/* >8 End of allocating a mempool to hold the mbufs. */
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 192/227] examples/ip_fragmentation: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (190 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 191/227] examples/flow_filtering: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 193/227] examples/ip_reassembly: " Chengwen Feng
` (35 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/ip_fragmentation/main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index 132550e497..d429f526e1 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -788,9 +788,9 @@ init_mem(void)
if (rte_lcore_is_enabled(lcore_id) == 0)
continue;
- socket = rte_lcore_to_socket_id(lcore_id);
+ socket = rte_lcore_to_numa_id(lcore_id);
- if (socket == SOCKET_ID_ANY)
+ if (socket == RTE_NUMA_ID_ANY)
socket = 0;
if (socket_direct_pool[socket] == NULL) {
@@ -928,8 +928,8 @@ main(int argc, char **argv)
qconf = &lcore_queue_conf[rx_lcore_id];
}
- socket = (int) rte_lcore_to_socket_id(rx_lcore_id);
- if (socket == SOCKET_ID_ANY)
+ socket = (int) rte_lcore_to_numa_id(rx_lcore_id);
+ if (socket == RTE_NUMA_ID_ANY)
socket = 0;
rxq = &qconf->rx_queue_list[qconf->n_rx_queue];
@@ -1011,7 +1011,7 @@ main(int argc, char **argv)
if (queueid >= dev_info.nb_tx_queues)
break;
- socket = (int) rte_lcore_to_socket_id(lcore_id);
+ socket = (int) rte_lcore_to_numa_id(lcore_id);
printf("txq=%u,%d ", lcore_id, queueid);
fflush(stdout);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 193/227] examples/ip_reassembly: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (191 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 192/227] examples/ip_fragmentation: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 194/227] examples/ipsec-secgw: " Chengwen Feng
` (34 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/ip_reassembly/main.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c
index 321a50b1f6..6df7a395c6 100644
--- a/examples/ip_reassembly/main.c
+++ b/examples/ip_reassembly/main.c
@@ -827,8 +827,8 @@ setup_port_tbl(struct lcore_queue_conf *qconf, uint32_t lcore, int socket,
n = RTE_MAX(max_flow_num, 2UL * MAX_PKT_BURST);
sz = sizeof (*mtb) + sizeof (mtb->m_table[0]) * n;
- if ((mtb = rte_zmalloc_socket(__func__, sz, RTE_CACHE_LINE_SIZE,
- socket)) == NULL) {
+ mtb = rte_zmalloc_numa(__func__, sz, RTE_CACHE_LINE_SIZE, socket);
+ if (mtb == NULL) {
RTE_LOG(ERR, IP_RSMBL, "%s() for lcore: %u, port: %u "
"failed to allocate %zu bytes\n",
__func__, lcore, port, sz);
@@ -849,8 +849,8 @@ setup_queue_tbl(struct rx_queue *rxq, uint32_t lcore, uint32_t queue)
uint64_t frag_cycles;
char buf[RTE_MEMPOOL_NAMESIZE];
- socket = rte_lcore_to_socket_id(lcore);
- if (socket == SOCKET_ID_ANY)
+ socket = rte_lcore_to_numa_id(lcore);
+ if (socket == RTE_NUMA_ID_ANY)
socket = 0;
/* Each table entry holds information about packet fragmentation. 8< */
@@ -920,9 +920,9 @@ init_mem(void)
if (rte_lcore_is_enabled(lcore_id) == 0)
continue;
- socket = rte_lcore_to_socket_id(lcore_id);
+ socket = rte_lcore_to_numa_id(lcore_id);
- if (socket == SOCKET_ID_ANY)
+ if (socket == RTE_NUMA_ID_ANY)
socket = 0;
if (socket_lpm[socket] == NULL) {
@@ -1070,8 +1070,8 @@ main(int argc, char **argv)
qconf = &lcore_queue_conf[rx_lcore_id];
}
- socket = rte_lcore_to_socket_id(portid);
- if (socket == SOCKET_ID_ANY)
+ socket = rte_lcore_to_numa_id(portid);
+ if (socket == RTE_NUMA_ID_ANY)
socket = 0;
queueid = qconf->n_rx_queue;
@@ -1152,7 +1152,7 @@ main(int argc, char **argv)
if (rte_lcore_is_enabled(lcore_id) == 0)
continue;
- socket = (int) rte_lcore_to_socket_id(lcore_id);
+ socket = (int) rte_lcore_to_numa_id(lcore_id);
printf("txq=%u,%d,%d ", lcore_id, queueid, socket);
fflush(stdout);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 194/227] examples/ipsec-secgw: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (192 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 193/227] examples/ip_reassembly: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 195/227] examples/ipv4_multicast: " Chengwen Feng
` (33 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/ipsec-secgw/event_helper.c | 14 +--
examples/ipsec-secgw/ipsec-secgw.c | 132 ++++++++++++++--------------
examples/ipsec-secgw/ipsec.h | 8 +-
examples/ipsec-secgw/ipsec_worker.c | 56 ++++++------
examples/ipsec-secgw/rt.c | 22 ++---
examples/ipsec-secgw/sa.c | 30 +++----
examples/ipsec-secgw/sad.c | 12 +--
examples/ipsec-secgw/sad.h | 2 +-
examples/ipsec-secgw/sp4.c | 12 +--
examples/ipsec-secgw/sp6.c | 12 +--
10 files changed, 150 insertions(+), 150 deletions(-)
diff --git a/examples/ipsec-secgw/event_helper.c b/examples/ipsec-secgw/event_helper.c
index fc9fa1b000..a1c3e29787 100644
--- a/examples/ipsec-secgw/event_helper.c
+++ b/examples/ipsec-secgw/event_helper.c
@@ -806,7 +806,7 @@ eh_initialize_crypto_adapter(struct eventmode_conf *em_conf)
const uint8_t nb_qp_per_cdev = 1;
uint8_t eventdev_id, cdev_id, n;
uint32_t cap, nb_elem;
- int ret, socket_id;
+ int ret, numa_id;
if (!em_conf->enable_event_crypto_adapter)
return 0;
@@ -874,12 +874,12 @@ eh_initialize_crypto_adapter(struct eventmode_conf *em_conf)
*/
nb_elem = (qp_desc_nb / queue_conf.vector_sz) + 1;
nb_elem *= nb_qp_per_cdev;
- socket_id = rte_cryptodev_socket_id(cdev_id);
+ numa_id = rte_cryptodev_numa_id(cdev_id);
snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
- "QP_VEC_%u_%u", socket_id, cdev_id);
+ "QP_VEC_%u_%u", numa_id, cdev_id);
queue_conf.vector_mp = rte_event_vector_pool_create(
mp_name, nb_elem, 0,
- queue_conf.vector_sz, socket_id);
+ queue_conf.vector_sz, numa_id);
if (queue_conf.vector_mp == NULL) {
EH_LOG_ERR("failed to create event vector pool");
return -ENOMEM;
@@ -990,7 +990,7 @@ eh_rx_adapter_configure(struct eventmode_conf *em_conf,
struct rte_event_dev_info evdev_default_conf = {0};
struct rte_event_port_conf port_conf = {0};
struct rx_adapter_connection_info *conn;
- uint32_t service_id, socket_id, nb_elem;
+ uint32_t service_id, numa_id, nb_elem;
struct rte_mempool *vector_pool = NULL;
uint32_t lcore_id = rte_lcore_id();
int ret, portid, nb_ports = 0;
@@ -1012,7 +1012,7 @@ eh_rx_adapter_configure(struct eventmode_conf *em_conf,
nb_ports++;
if (em_conf->ext_params.event_vector) {
- socket_id = rte_lcore_to_socket_id(lcore_id);
+ numa_id = rte_lcore_to_numa_id(lcore_id);
if (em_conf->vector_pool_sz) {
nb_elem = em_conf->vector_pool_sz;
@@ -1026,7 +1026,7 @@ eh_rx_adapter_configure(struct eventmode_conf *em_conf,
nb_elem += rte_lcore_count() * 32;
vector_pool = rte_event_vector_pool_create(
"vector_pool", nb_elem, 32,
- em_conf->ext_params.vector_size, socket_id);
+ em_conf->ext_params.vector_size, numa_id);
if (vector_pool == NULL) {
EH_LOG_ERR("failed to create event vector pool");
return -ENOMEM;
diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index 2741faf04e..e0fc6fb77e 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -251,7 +251,7 @@ static struct rte_eth_conf port_conf = {
},
};
-struct socket_ctx socket_ctx[NB_SOCKETS];
+struct socket_ctx socket_ctx[NB_NUMAS];
bool per_port_pool;
@@ -699,7 +699,7 @@ ipsec_poll_mode_worker(void)
uint64_t prev_tsc, diff_tsc, cur_tsc;
uint16_t i, nb_rx, portid, queueid;
struct lcore_conf *qconf;
- int32_t rc, socket_id;
+ int32_t rc, numa_id;
const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1)
/ US_PER_S * BURST_TX_DRAIN_US;
struct lcore_rx_queue *rxql;
@@ -708,21 +708,21 @@ ipsec_poll_mode_worker(void)
lcore_id = rte_lcore_id();
qconf = &lcore_conf[lcore_id];
rxql = qconf->rx_queue_list;
- socket_id = rte_lcore_to_socket_id(lcore_id);
+ numa_id = rte_lcore_to_numa_id(lcore_id);
- qconf->rt4_ctx = socket_ctx[socket_id].rt_ip4;
- qconf->rt6_ctx = socket_ctx[socket_id].rt_ip6;
- qconf->inbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_in;
- qconf->inbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_in;
- qconf->inbound.sa_ctx = socket_ctx[socket_id].sa_in;
+ qconf->rt4_ctx = socket_ctx[numa_id].rt_ip4;
+ qconf->rt6_ctx = socket_ctx[numa_id].rt_ip6;
+ qconf->inbound.sp4_ctx = socket_ctx[numa_id].sp_ip4_in;
+ qconf->inbound.sp6_ctx = socket_ctx[numa_id].sp_ip6_in;
+ qconf->inbound.sa_ctx = socket_ctx[numa_id].sa_in;
qconf->inbound.cdev_map = cdev_map_in;
qconf->inbound.lcore_id = lcore_id;
- qconf->outbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_out;
- qconf->outbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_out;
- qconf->outbound.sa_ctx = socket_ctx[socket_id].sa_out;
+ qconf->outbound.sp4_ctx = socket_ctx[numa_id].sp_ip4_out;
+ qconf->outbound.sp6_ctx = socket_ctx[numa_id].sp_ip6_out;
+ qconf->outbound.sa_ctx = socket_ctx[numa_id].sa_out;
qconf->outbound.cdev_map = cdev_map_out;
qconf->outbound.lcore_id = lcore_id;
- qconf->frag.pool_indir = socket_ctx[socket_id].mbuf_pool_indir;
+ qconf->frag.pool_indir = socket_ctx[numa_id].mbuf_pool_indir;
rc = ipsec_sad_lcore_cache_init(app_sa_prm.cache_sz);
if (rc != 0) {
@@ -812,7 +812,7 @@ check_poll_mode_params(struct eh_conf *eh_conf)
uint32_t lcore;
uint16_t portid;
uint16_t i;
- int32_t socket_id;
+ int32_t numa_id;
if (!eh_conf)
return -EINVAL;
@@ -832,11 +832,11 @@ check_poll_mode_params(struct eh_conf *eh_conf)
"lcore mask\n", lcore);
return -1;
}
- socket_id = rte_lcore_to_socket_id(lcore);
- if (socket_id != 0 && numa_on == 0) {
+ numa_id = rte_lcore_to_numa_id(lcore);
+ if (numa_id != 0 && numa_on == 0) {
printf("warning: lcore %u is on socket %d "
"with numa off\n",
- lcore, socket_id);
+ lcore, numa_id);
}
portid = lcore_params[i].port_id;
if ((enabled_port_mask & (1 << portid)) == 0) {
@@ -1701,7 +1701,7 @@ cryptodevs_init(enum eh_pkt_transfer_mode mode)
params.key_len = sizeof(struct cdev_key);
params.hash_func = rte_jhash;
params.hash_func_init_val = 0;
- params.socket_id = rte_socket_id();
+ params.numa_id = rte_numa_id();
params.name = "cdev_map_in";
cdev_map_in = rte_hash_create(¶ms);
@@ -1739,10 +1739,10 @@ cryptodevs_init(enum eh_pkt_transfer_mode mode)
continue;
total_nb_qps += qp;
- dev_conf.socket_id = rte_cryptodev_socket_id(cdev_id);
- /* Use the first socket if SOCKET_ID_ANY is returned. */
- if (dev_conf.socket_id == SOCKET_ID_ANY)
- dev_conf.socket_id = 0;
+ dev_conf.numa_id = rte_cryptodev_numa_id(cdev_id);
+ /* Use the first socket if RTE_NUMA_ID_ANY is returned. */
+ if (dev_conf.numa_id == RTE_NUMA_ID_ANY)
+ dev_conf.numa_id = 0;
dev_conf.nb_queue_pairs = qp;
dev_conf.ff_disable = RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO;
@@ -1759,10 +1759,10 @@ cryptodevs_init(enum eh_pkt_transfer_mode mode)
qp_conf.nb_descriptors = qp_desc_nb;
qp_conf.mp_session =
- socket_ctx[dev_conf.socket_id].session_pool;
+ socket_ctx[dev_conf.numa_id].session_pool;
for (qp = 0; qp < dev_conf.nb_queue_pairs; qp++)
if (rte_cryptodev_queue_pair_setup(cdev_id, qp,
- &qp_conf, dev_conf.socket_id))
+ &qp_conf, dev_conf.numa_id))
rte_panic("Failed to setup queue %u for "
"cdev_id %u\n", 0, cdev_id);
@@ -1926,7 +1926,7 @@ port_init(uint16_t portid, uint64_t req_rx_offloads, uint64_t req_tx_offloads,
uint16_t nb_tx_queue, nb_rx_queue;
uint16_t tx_queueid, rx_queueid, queue;
uint32_t lcore_id;
- int32_t ret, socket_id;
+ int32_t ret, numa_id;
struct lcore_conf *qconf;
struct rte_ether_addr ethaddr;
struct rte_eth_conf local_port_conf = port_conf;
@@ -2050,18 +2050,18 @@ port_init(uint16_t portid, uint64_t req_rx_offloads, uint64_t req_tx_offloads,
continue;
if (numa_on)
- socket_id = (uint8_t)rte_lcore_to_socket_id(lcore_id);
+ numa_id = (uint8_t)rte_lcore_to_numa_id(lcore_id);
else
- socket_id = 0;
+ numa_id = 0;
/* init TX queue */
- printf("Setup txq=%u,%d,%d\n", lcore_id, tx_queueid, socket_id);
+ printf("Setup txq=%u,%d,%d\n", lcore_id, tx_queueid, numa_id);
txconf = &dev_info.default_txconf;
txconf->offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(portid, tx_queueid, nb_txd,
- socket_id, txconf);
+ numa_id, txconf);
if (ret < 0)
rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: "
"err=%d, port=%d\n", ret, portid);
@@ -2082,18 +2082,18 @@ port_init(uint16_t portid, uint64_t req_rx_offloads, uint64_t req_tx_offloads,
rx_queueid = qconf->rx_queue_list[queue].queue_id;
printf("Setup rxq=%d,%d,%d\n", portid, rx_queueid,
- socket_id);
+ numa_id);
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = local_port_conf.rxmode.offloads;
if (per_port_pool)
- pool = socket_ctx[socket_id].mbuf_pool[portid];
+ pool = socket_ctx[numa_id].mbuf_pool[portid];
else
- pool = socket_ctx[socket_id].mbuf_pool[0];
+ pool = socket_ctx[numa_id].mbuf_pool[0];
ret = rte_eth_rx_queue_setup(portid, rx_queueid,
- nb_rxd, socket_id, &rxq_conf, pool);
+ nb_rxd, numa_id, &rxq_conf, pool);
if (ret < 0)
rte_exit(EXIT_FAILURE,
"rte_eth_rx_queue_setup: err=%d, "
@@ -2165,32 +2165,32 @@ max_session_size(void)
}
static void
-session_pool_init(struct socket_ctx *ctx, int32_t socket_id, size_t sess_sz)
+session_pool_init(struct socket_ctx *ctx, int32_t numa_id, size_t sess_sz)
{
char mp_name[RTE_MEMPOOL_NAMESIZE];
struct rte_mempool *sess_mp;
uint32_t nb_sess;
snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
- "sess_mp_%u", socket_id);
+ "sess_mp_%u", numa_id);
nb_sess = (get_nb_crypto_sessions() + CDEV_MP_CACHE_SZ *
rte_lcore_count());
nb_sess = RTE_MAX(nb_sess, CDEV_MP_CACHE_SZ *
CDEV_MP_CACHE_MULTIPLIER);
sess_mp = rte_cryptodev_sym_session_pool_create(
mp_name, nb_sess, sess_sz, CDEV_MP_CACHE_SZ,
- 0, socket_id);
+ 0, numa_id);
ctx->session_pool = sess_mp;
if (ctx->session_pool == NULL)
rte_exit(EXIT_FAILURE,
- "Cannot init session pool on socket %d\n", socket_id);
+ "Cannot init session pool on socket %d\n", numa_id);
else
- printf("Allocated session pool on socket %d\n", socket_id);
+ printf("Allocated session pool on socket %d\n", numa_id);
}
static void
-pool_init(struct socket_ctx *ctx, int32_t socket_id, int portid,
+pool_init(struct socket_ctx *ctx, int32_t numa_id, int portid,
uint32_t nb_mbuf)
{
char s[64];
@@ -2198,15 +2198,15 @@ pool_init(struct socket_ctx *ctx, int32_t socket_id, int portid,
/* mbuf_pool is initialised by the pool_init() function*/
- if (socket_ctx[socket_id].mbuf_pool[portid])
+ if (socket_ctx[numa_id].mbuf_pool[portid])
return;
- snprintf(s, sizeof(s), "mbuf_pool_%d_%d", socket_id, portid);
+ snprintf(s, sizeof(s), "mbuf_pool_%d_%d", numa_id, portid);
ctx->mbuf_pool[portid] = rte_pktmbuf_pool_create(s, nb_mbuf,
MEMPOOL_CACHE_SIZE,
ipsec_metadata_size(),
frame_buf_size,
- socket_id);
+ numa_id);
/*
* if multi-segment support is enabled, then create a pool
@@ -2214,17 +2214,17 @@ pool_init(struct socket_ctx *ctx, int32_t socket_id, int portid,
*/
ms = multi_seg_required();
if (ms != 0 && !ctx->mbuf_pool_indir) {
- snprintf(s, sizeof(s), "mbuf_pool_indir_%d", socket_id);
+ snprintf(s, sizeof(s), "mbuf_pool_indir_%d", numa_id);
ctx->mbuf_pool_indir = rte_pktmbuf_pool_create(s, nb_mbuf,
- MEMPOOL_CACHE_SIZE, 0, 0, socket_id);
+ MEMPOOL_CACHE_SIZE, 0, 0, numa_id);
}
if (ctx->mbuf_pool[portid] == NULL ||
(ms != 0 && ctx->mbuf_pool_indir == NULL))
rte_exit(EXIT_FAILURE, "Cannot init mbuf pool on socket %d\n",
- socket_id);
+ numa_id);
else
- printf("Allocated mbuf pool on socket %d\n", socket_id);
+ printf("Allocated mbuf pool on socket %d\n", numa_id);
}
static int
@@ -2357,7 +2357,7 @@ reassemble_lcore_init(struct lcore_conf *lc, uint32_t cid)
const struct rte_eth_rxtx_callback *cb;
/* create fragment table */
- sid = rte_lcore_to_socket_id(cid);
+ sid = rte_lcore_to_numa_id(cid);
frag_cycles = (rte_get_tsc_hz() + NS_PER_S - 1) /
NS_PER_S * frag_ttl_ns;
@@ -2929,7 +2929,7 @@ main(int32_t argc, char **argv)
uint32_t lcore_id, nb_txq, nb_rxq = 0;
uint32_t cdev_id;
uint32_t i;
- uint8_t socket_id;
+ uint8_t numa_id;
uint16_t portid, nb_crypto_qp, nb_ports = 0;
uint64_t req_rx_offloads[RTE_MAX_ETHPORTS];
uint64_t req_tx_offloads[RTE_MAX_ETHPORTS];
@@ -3014,27 +3014,27 @@ main(int32_t argc, char **argv)
continue;
if (numa_on)
- socket_id = (uint8_t)rte_lcore_to_socket_id(lcore_id);
+ numa_id = (uint8_t)rte_lcore_to_numa_id(lcore_id);
else
- socket_id = 0;
+ numa_id = 0;
if (per_port_pool) {
RTE_ETH_FOREACH_DEV(portid) {
if ((enabled_port_mask & (1 << portid)) == 0)
continue;
- pool_init(&socket_ctx[socket_id], socket_id,
+ pool_init(&socket_ctx[numa_id], numa_id,
portid, nb_bufs_in_pool);
}
} else {
- pool_init(&socket_ctx[socket_id], socket_id, 0,
+ pool_init(&socket_ctx[numa_id], numa_id, 0,
nb_bufs_in_pool);
}
- if (socket_ctx[socket_id].session_pool)
+ if (socket_ctx[numa_id].session_pool)
continue;
- session_pool_init(&socket_ctx[socket_id], socket_id, sess_sz);
+ session_pool_init(&socket_ctx[numa_id], numa_id, sess_sz);
}
printf("Number of mbufs in packet pool %d\n", nb_bufs_in_pool);
@@ -3117,15 +3117,15 @@ main(int32_t argc, char **argv)
}
/* Replicate each context per socket */
- for (i = 0; i < NB_SOCKETS && i < rte_socket_count(); i++) {
- socket_id = rte_socket_id_by_idx(i);
- if ((socket_ctx[socket_id].session_pool != NULL) &&
- (socket_ctx[socket_id].sa_in == NULL) &&
- (socket_ctx[socket_id].sa_out == NULL)) {
- sa_init(&socket_ctx[socket_id], socket_id, eh_conf->mode_params);
- sp4_init(&socket_ctx[socket_id], socket_id);
- sp6_init(&socket_ctx[socket_id], socket_id);
- rt_init(&socket_ctx[socket_id], socket_id);
+ for (i = 0; i < NB_NUMAS && i < rte_numa_count(); i++) {
+ numa_id = rte_numa_id_by_idx(i);
+ if ((socket_ctx[numa_id].session_pool != NULL) &&
+ (socket_ctx[numa_id].sa_in == NULL) &&
+ (socket_ctx[numa_id].sa_out == NULL)) {
+ sa_init(&socket_ctx[numa_id], numa_id, eh_conf->mode_params);
+ sp4_init(&socket_ctx[numa_id], numa_id);
+ sp6_init(&socket_ctx[numa_id], numa_id);
+ rt_init(&socket_ctx[numa_id], numa_id);
}
}
@@ -3170,10 +3170,10 @@ main(int32_t argc, char **argv)
eh_conf_uninit(eh_conf);
/* Destroy inbound and outbound sessions */
- for (i = 0; i < NB_SOCKETS && i < rte_socket_count(); i++) {
- socket_id = rte_socket_id_by_idx(i);
- sessions_free(socket_ctx[socket_id].sa_in);
- sessions_free(socket_ctx[socket_id].sa_out);
+ for (i = 0; i < NB_NUMAS && i < rte_numa_count(); i++) {
+ numa_id = rte_numa_id_by_idx(i);
+ sessions_free(socket_ctx[numa_id].sa_in);
+ sessions_free(socket_ctx[numa_id].sa_out);
}
for (cdev_id = 0; cdev_id < rte_cryptodev_count(); cdev_id++) {
diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index 20757eeba1..bdd607fbdd 100644
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -412,10 +412,10 @@ outbound_sa_lookup(struct sa_ctx *sa_ctx, uint32_t sa_idx[],
void *sa[], uint16_t nb_pkts);
void
-sp4_init(struct socket_ctx *ctx, int32_t socket_id);
+sp4_init(struct socket_ctx *ctx, int32_t numa_id);
void
-sp6_init(struct socket_ctx *ctx, int32_t socket_id);
+sp6_init(struct socket_ctx *ctx, int32_t numa_id);
/*
* Search through SP rules for given SPI.
@@ -438,11 +438,11 @@ int
sa_spi_present(struct sa_ctx *sa_ctx, uint32_t spi, int inbound);
void
-sa_init(struct socket_ctx *ctx, int32_t socket_id,
+sa_init(struct socket_ctx *ctx, int32_t numa_id,
const struct eventmode_conf *em_conf);
void
-rt_init(struct socket_ctx *ctx, int32_t socket_id);
+rt_init(struct socket_ctx *ctx, int32_t numa_id);
int
sa_check_offloads(uint16_t port_id, uint64_t *rx_offloads,
diff --git a/examples/ipsec-secgw/ipsec_worker.c b/examples/ipsec-secgw/ipsec_worker.c
index 1dd4696e6a..637017ffbc 100644
--- a/examples/ipsec-secgw/ipsec_worker.c
+++ b/examples/ipsec-secgw/ipsec_worker.c
@@ -1199,7 +1199,7 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links,
struct rte_mbuf *pkt;
struct rte_event ev;
uint32_t lcore_id;
- int32_t socket_id;
+ int32_t numa_id;
int16_t port_id;
/* Check if we have links registered for this lcore */
@@ -1214,13 +1214,13 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links,
lcore_id = rte_lcore_id();
/* Get socket ID */
- socket_id = rte_lcore_to_socket_id(lcore_id);
+ numa_id = rte_lcore_to_numa_id(lcore_id);
/*
* Prepare security sessions table. In outbound driver mode
* we always use first session configured for a given port
*/
- prepare_out_sessions_tbl(socket_ctx[socket_id].sa_out, data,
+ prepare_out_sessions_tbl(socket_ctx[numa_id].sa_out, data,
RTE_MAX_ETHPORTS);
RTE_LOG(INFO, IPSEC,
@@ -1324,7 +1324,7 @@ ipsec_wrkr_non_burst_int_port_app_mode(struct eh_event_link_info *links,
unsigned int nb_rx = 0, nb_tx;
struct rte_event ev;
uint32_t lcore_id;
- int32_t socket_id;
+ int32_t numa_id;
int ret;
/* Check if we have links registered for this lcore */
@@ -1339,18 +1339,18 @@ ipsec_wrkr_non_burst_int_port_app_mode(struct eh_event_link_info *links,
lcore_id = rte_lcore_id();
/* Get socket ID */
- socket_id = rte_lcore_to_socket_id(lcore_id);
+ numa_id = rte_lcore_to_numa_id(lcore_id);
/* Save routing table */
- lconf.rt.rt4_ctx = socket_ctx[socket_id].rt_ip4;
- lconf.rt.rt6_ctx = socket_ctx[socket_id].rt_ip6;
- lconf.inbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_in;
- lconf.inbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_in;
- lconf.inbound.sa_ctx = socket_ctx[socket_id].sa_in;
+ lconf.rt.rt4_ctx = socket_ctx[numa_id].rt_ip4;
+ lconf.rt.rt6_ctx = socket_ctx[numa_id].rt_ip6;
+ lconf.inbound.sp4_ctx = socket_ctx[numa_id].sp_ip4_in;
+ lconf.inbound.sp6_ctx = socket_ctx[numa_id].sp_ip6_in;
+ lconf.inbound.sa_ctx = socket_ctx[numa_id].sa_in;
lconf.inbound.lcore_id = lcore_id;
- lconf.outbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_out;
- lconf.outbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_out;
- lconf.outbound.sa_ctx = socket_ctx[socket_id].sa_out;
+ lconf.outbound.sp4_ctx = socket_ctx[numa_id].sp_ip4_out;
+ lconf.outbound.sp6_ctx = socket_ctx[numa_id].sp_ip6_out;
+ lconf.outbound.sa_ctx = socket_ctx[numa_id].sa_out;
lconf.outbound.ipv4_offloads = tx_offloads.ipv4_offloads;
lconf.outbound.ipv6_offloads = tx_offloads.ipv6_offloads;
lconf.outbound.lcore_id = lcore_id;
@@ -1604,7 +1604,7 @@ ipsec_poll_mode_wrkr_inl_pr(void)
struct ipsec_traffic trf;
struct lcore_conf *qconf;
uint16_t v4_num, v6_num;
- int32_t socket_id;
+ int32_t numa_id;
uint32_t lcore_id;
int32_t i, nb_rx;
uint16_t portid, queueid;
@@ -1613,21 +1613,21 @@ ipsec_poll_mode_wrkr_inl_pr(void)
lcore_id = rte_lcore_id();
qconf = &lcore_conf[lcore_id];
rxql = qconf->rx_queue_list;
- socket_id = rte_lcore_to_socket_id(lcore_id);
+ numa_id = rte_lcore_to_numa_id(lcore_id);
stats = &core_statistics[lcore_id];
- rt4_ctx = socket_ctx[socket_id].rt_ip4;
- rt6_ctx = socket_ctx[socket_id].rt_ip6;
+ rt4_ctx = socket_ctx[numa_id].rt_ip4;
+ rt6_ctx = socket_ctx[numa_id].rt_ip6;
- sp4_in = socket_ctx[socket_id].sp_ip4_in;
- sp6_in = socket_ctx[socket_id].sp_ip6_in;
- in_ctx = socket_ctx[socket_id].sa_in;
+ sp4_in = socket_ctx[numa_id].sp_ip4_in;
+ sp6_in = socket_ctx[numa_id].sp_ip6_in;
+ in_ctx = socket_ctx[numa_id].sa_in;
- sp4_out = socket_ctx[socket_id].sp_ip4_out;
- sp6_out = socket_ctx[socket_id].sp_ip6_out;
- out_ctx = socket_ctx[socket_id].sa_out;
+ sp4_out = socket_ctx[numa_id].sp_ip4_out;
+ sp6_out = socket_ctx[numa_id].sp_ip6_out;
+ out_ctx = socket_ctx[numa_id].sa_out;
- qconf->frag.pool_indir = socket_ctx[socket_id].mbuf_pool_indir;
+ qconf->frag.pool_indir = socket_ctx[numa_id].mbuf_pool_indir;
if (qconf->nb_rx_queue == 0) {
RTE_LOG(DEBUG, IPSEC, "lcore %u has nothing to do\n",
@@ -1735,7 +1735,7 @@ ipsec_poll_mode_wrkr_inl_pr_ss(void)
struct lcore_conf *qconf;
struct sa_ctx *out_ctx;
uint32_t i, nb_rx, j;
- int32_t socket_id;
+ int32_t numa_id;
uint32_t lcore_id;
uint16_t portid, queueid;
@@ -1743,10 +1743,10 @@ ipsec_poll_mode_wrkr_inl_pr_ss(void)
lcore_id = rte_lcore_id();
qconf = &lcore_conf[lcore_id];
rxql = qconf->rx_queue_list;
- socket_id = rte_lcore_to_socket_id(lcore_id);
+ numa_id = rte_lcore_to_numa_id(lcore_id);
/* Get SA info */
- out_ctx = socket_ctx[socket_id].sa_out;
+ out_ctx = socket_ctx[numa_id].sa_out;
if (out_ctx && single_sa_idx < out_ctx->nb_sa) {
sa = &out_ctx->sa[single_sa_idx];
ips = ipsec_get_primary_session(sa);
@@ -1757,7 +1757,7 @@ ipsec_poll_mode_wrkr_inl_pr_ss(void)
sa_out_proto = IPPROTO_IP;
}
- qconf->frag.pool_indir = socket_ctx[socket_id].mbuf_pool_indir;
+ qconf->frag.pool_indir = socket_ctx[numa_id].mbuf_pool_indir;
if (qconf->nb_rx_queue == 0) {
RTE_LOG(DEBUG, IPSEC, "lcore %u has nothing to do\n",
diff --git a/examples/ipsec-secgw/rt.c b/examples/ipsec-secgw/rt.c
index 132e200adb..8a68526acc 100644
--- a/examples/ipsec-secgw/rt.c
+++ b/examples/ipsec-secgw/rt.c
@@ -122,7 +122,7 @@ parse_rt_tokens(char **tokens, uint32_t n_tokens,
}
void
-rt_init(struct socket_ctx *ctx, int32_t socket_id)
+rt_init(struct socket_ctx *ctx, int32_t numa_id)
{
char name[PATH_MAX];
uint32_t i;
@@ -138,11 +138,11 @@ rt_init(struct socket_ctx *ctx, int32_t socket_id)
if (ctx->rt_ip4 != NULL)
rte_exit(EXIT_FAILURE, "IPv4 Routing Table for socket %u "
- "already initialized\n", socket_id);
+ "already initialized\n", numa_id);
if (ctx->rt_ip6 != NULL)
rte_exit(EXIT_FAILURE, "IPv6 Routing Table for socket %u "
- "already initialized\n", socket_id);
+ "already initialized\n", numa_id);
if (nb_rt_ip4 == 0 && nb_rt_ip6 == 0)
RTE_LOG(WARNING, IPSEC, "No Routing rule specified\n");
@@ -151,13 +151,13 @@ rt_init(struct socket_ctx *ctx, int32_t socket_id)
RT_IPV4_MAX_RULES);
/* create the LPM table */
- snprintf(name, sizeof(name), "%s_%u", "rt_ip4", socket_id);
+ snprintf(name, sizeof(name), "%s_%u", "rt_ip4", numa_id);
conf.max_rules = RT_IPV4_MAX_RULES;
conf.number_tbl8s = RTE_LPM_TBL8_NUM_ENTRIES;
- lpm = rte_lpm_create(name, socket_id, &conf);
+ lpm = rte_lpm_create(name, numa_id, &conf);
if (lpm == NULL)
rte_exit(EXIT_FAILURE, "Unable to create %s LPM table "
- "on socket %d\n", name, socket_id);
+ "on socket %d\n", name, numa_id);
/* populate the LPM table */
for (i = 0; i < nb_rt_ip4; i++) {
@@ -165,7 +165,7 @@ rt_init(struct socket_ctx *ctx, int32_t socket_id)
rt_ip4[i].if_out);
if (ret < 0)
rte_exit(EXIT_FAILURE, "Fail to add entry num %u to %s "
- "LPM table on socket %d\n", i, name, socket_id);
+ "LPM table on socket %d\n", i, name, numa_id);
uint32_t_to_char(rt_ip4[i].ip, &a, &b, &c, &d);
printf("LPM: Adding route %hhu.%hhu.%hhu.%hhu/%hhu (%hhu)\n",
@@ -173,13 +173,13 @@ rt_init(struct socket_ctx *ctx, int32_t socket_id)
rt_ip4[i].if_out);
}
- snprintf(name, sizeof(name), "%s_%u", "rt_ip6", socket_id);
+ snprintf(name, sizeof(name), "%s_%u", "rt_ip6", numa_id);
conf6.max_rules = RT_IPV6_MAX_RULES;
conf6.number_tbl8s = RTE_LPM_TBL8_NUM_ENTRIES;
- lpm6 = rte_lpm6_create(name, socket_id, &conf6);
+ lpm6 = rte_lpm6_create(name, numa_id, &conf6);
if (lpm6 == NULL)
rte_exit(EXIT_FAILURE, "Unable to create %s LPM table "
- "on socket %d\n", name, socket_id);
+ "on socket %d\n", name, numa_id);
/* populate the LPM table */
for (i = 0; i < nb_rt_ip6; i++) {
@@ -187,7 +187,7 @@ rt_init(struct socket_ctx *ctx, int32_t socket_id)
rt_ip6[i].if_out);
if (ret < 0)
rte_exit(EXIT_FAILURE, "Fail to add entry num %u to %s "
- "LPM table on socket %d\n", i, name, socket_id);
+ "LPM table on socket %d\n", i, name, numa_id);
printf("LPM6: Adding route "
" %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hhx (%hhx)\n",
diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index b5068765b6..3c1b5f4023 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -1077,21 +1077,21 @@ print_one_sa_rule(const struct ipsec_sa *sa, int inbound)
}
static struct sa_ctx *
-sa_create(const char *name, int32_t socket_id, uint32_t nb_sa)
+sa_create(const char *name, int32_t numa_id, uint32_t nb_sa)
{
char s[PATH_MAX];
struct sa_ctx *sa_ctx;
uint32_t mz_size;
const struct rte_memzone *mz;
- snprintf(s, sizeof(s), "%s_%u", name, socket_id);
+ snprintf(s, sizeof(s), "%s_%u", name, numa_id);
/* Create SA context */
printf("Creating SA context with %u maximum entries on socket %d\n",
- nb_sa, socket_id);
+ nb_sa, numa_id);
mz_size = sizeof(struct ipsec_xf) * nb_sa;
- mz = rte_memzone_reserve(s, mz_size, socket_id,
+ mz = rte_memzone_reserve(s, mz_size, numa_id,
RTE_MEMZONE_1GB | RTE_MEMZONE_SIZE_HINT_ONLY);
if (mz == NULL) {
printf("Failed to allocate SA XFORM memory\n");
@@ -1637,7 +1637,7 @@ ipsec_satbl_init(struct sa_ctx *ctx, uint32_t nb_ent, int32_t socket,
tsz = sz * nb_ent;
- ctx->satbl = rte_zmalloc_socket(NULL, tsz, RTE_CACHE_LINE_SIZE, socket);
+ ctx->satbl = rte_zmalloc_numa(NULL, tsz, RTE_CACHE_LINE_SIZE, socket);
if (ctx->satbl == NULL) {
RTE_LOG(ERR, IPSEC,
"%s(%p, %u, %d): failed to allocate %zu bytes\n",
@@ -1695,7 +1695,7 @@ sa_spi_present(struct sa_ctx *sa_ctx, uint32_t spi, int inbound)
}
void
-sa_init(struct socket_ctx *ctx, int32_t socket_id,
+sa_init(struct socket_ctx *ctx, int32_t numa_id,
const struct eventmode_conf *em_conf)
{
int32_t rc;
@@ -1708,21 +1708,21 @@ sa_init(struct socket_ctx *ctx, int32_t socket_id,
if (ctx->sa_in != NULL)
rte_exit(EXIT_FAILURE, "Inbound SA DB for socket %u already "
- "initialized\n", socket_id);
+ "initialized\n", numa_id);
if (ctx->sa_out != NULL)
rte_exit(EXIT_FAILURE, "Outbound SA DB for socket %u already "
- "initialized\n", socket_id);
+ "initialized\n", numa_id);
if (nb_sa_in > 0) {
name = "sa_in";
- ctx->sa_in = sa_create(name, socket_id, nb_sa_in);
+ ctx->sa_in = sa_create(name, numa_id, nb_sa_in);
if (ctx->sa_in == NULL)
rte_exit(EXIT_FAILURE, "Error [%d] creating SA "
"context %s in socket %d\n", rte_errno,
- name, socket_id);
+ name, numa_id);
- rc = ipsec_sad_create(name, &ctx->sa_in->sad, socket_id,
+ rc = ipsec_sad_create(name, &ctx->sa_in->sad, numa_id,
&sa_in_cnt);
if (rc != 0)
rte_exit(EXIT_FAILURE, "failed to init SAD\n");
@@ -1732,7 +1732,7 @@ sa_init(struct socket_ctx *ctx, int32_t socket_id,
if (app_sa_prm.enable != 0) {
rc = ipsec_satbl_init(ctx->sa_in, nb_sa_in,
- socket_id, ctx, ipsec_ctx, em_conf);
+ numa_id, ctx, ipsec_ctx, em_conf);
if (rc != 0)
rte_exit(EXIT_FAILURE,
"failed to init inbound SAs\n");
@@ -1742,11 +1742,11 @@ sa_init(struct socket_ctx *ctx, int32_t socket_id,
if (nb_sa_out > 0) {
name = "sa_out";
- ctx->sa_out = sa_create(name, socket_id, nb_sa_out);
+ ctx->sa_out = sa_create(name, numa_id, nb_sa_out);
if (ctx->sa_out == NULL)
rte_exit(EXIT_FAILURE, "Error [%d] creating SA "
"context %s in socket %d\n", rte_errno,
- name, socket_id);
+ name, numa_id);
RTE_LCORE_FOREACH(lcore_id)
ipsec_ctx[lcore_id] = &lcore_conf[lcore_id].outbound;
@@ -1754,7 +1754,7 @@ sa_init(struct socket_ctx *ctx, int32_t socket_id,
if (app_sa_prm.enable != 0) {
rc = ipsec_satbl_init(ctx->sa_out, nb_sa_out,
- socket_id, ctx, ipsec_ctx, em_conf);
+ numa_id, ctx, ipsec_ctx, em_conf);
if (rc != 0)
rte_exit(EXIT_FAILURE,
"failed to init outbound SAs\n");
diff --git a/examples/ipsec-secgw/sad.c b/examples/ipsec-secgw/sad.c
index 5b2c0e6792..38619e61be 100644
--- a/examples/ipsec-secgw/sad.c
+++ b/examples/ipsec-secgw/sad.c
@@ -89,13 +89,13 @@ ipsec_sad_lcore_cache_init(uint32_t nb_cache_ent)
cache_mem_sz = sizeof(struct ipsec_sa *) * cache_elem;
if (cache_mem_sz != 0) {
- cache->v4 = rte_zmalloc_socket(NULL, cache_mem_sz,
- RTE_CACHE_LINE_SIZE, rte_socket_id());
+ cache->v4 = rte_zmalloc_numa(NULL, cache_mem_sz,
+ RTE_CACHE_LINE_SIZE, rte_numa_id());
if (cache->v4 == NULL)
return -rte_errno;
- cache->v6 = rte_zmalloc_socket(NULL, cache_mem_sz,
- RTE_CACHE_LINE_SIZE, rte_socket_id());
+ cache->v6 = rte_zmalloc_numa(NULL, cache_mem_sz,
+ RTE_CACHE_LINE_SIZE, rte_numa_id());
if (cache->v6 == NULL)
return -rte_errno;
@@ -107,7 +107,7 @@ ipsec_sad_lcore_cache_init(uint32_t nb_cache_ent)
int
ipsec_sad_create(const char *name, struct ipsec_sad *sad,
- int socket_id, struct ipsec_sa_cnt *sa_cnt)
+ int numa_id, struct ipsec_sa_cnt *sa_cnt)
{
int ret;
struct rte_ipsec_sad_conf sad_conf;
@@ -120,7 +120,7 @@ ipsec_sad_create(const char *name, struct ipsec_sad *sad,
if (ret < 0 || ret >= RTE_IPSEC_SAD_NAMESIZE)
return -ENAMETOOLONG;
- sad_conf.socket_id = socket_id;
+ sad_conf.numa_id = numa_id;
sad_conf.flags = 0;
/* Make SAD have extra 25% of required number of entries */
sad_conf.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = sa_cnt->nb_v4 * 5 / 4;
diff --git a/examples/ipsec-secgw/sad.h b/examples/ipsec-secgw/sad.h
index 328729b58c..f53a06139f 100644
--- a/examples/ipsec-secgw/sad.h
+++ b/examples/ipsec-secgw/sad.h
@@ -22,7 +22,7 @@ struct ipsec_sad_cache {
RTE_DECLARE_PER_LCORE(struct ipsec_sad_cache, sad_cache);
int ipsec_sad_create(const char *name, struct ipsec_sad *sad,
- int socket_id, struct ipsec_sa_cnt *sa_cnt);
+ int numa_id, struct ipsec_sa_cnt *sa_cnt);
int ipsec_sad_add(struct ipsec_sad *sad, struct ipsec_sa *sa);
diff --git a/examples/ipsec-secgw/sp4.c b/examples/ipsec-secgw/sp4.c
index 9c0badd062..6ab4fdb3c7 100644
--- a/examples/ipsec-secgw/sp4.c
+++ b/examples/ipsec-secgw/sp4.c
@@ -488,7 +488,7 @@ acl4_init(const char *name, int32_t socketid, const struct acl4_rules *rules,
dump_ip4_rules(rules, rules_nb, 1);
acl_param.name = s;
- acl_param.socket_id = socketid;
+ acl_param.numa_id = socketid;
acl_param.rule_size = RTE_ACL_RULE_SZ(RTE_DIM(ip4_defs));
acl_param.max_rule_num = rules_nb;
@@ -552,7 +552,7 @@ check_spi_value(struct sa_ctx *sa_ctx, int inbound)
}
void
-sp4_init(struct socket_ctx *ctx, int32_t socket_id)
+sp4_init(struct socket_ctx *ctx, int32_t numa_id)
{
const char *name;
@@ -561,11 +561,11 @@ sp4_init(struct socket_ctx *ctx, int32_t socket_id)
if (ctx->sp_ip4_in != NULL)
rte_exit(EXIT_FAILURE, "Inbound SP DB for socket %u already "
- "initialized\n", socket_id);
+ "initialized\n", numa_id);
if (ctx->sp_ip4_out != NULL)
rte_exit(EXIT_FAILURE, "Outbound SP DB for socket %u already "
- "initialized\n", socket_id);
+ "initialized\n", numa_id);
if (check_spi_value(ctx->sa_in, 1) < 0)
rte_exit(EXIT_FAILURE,
@@ -578,7 +578,7 @@ sp4_init(struct socket_ctx *ctx, int32_t socket_id)
if (nb_acl4_rules_in > 0) {
name = "sp_ip4_in";
ctx->sp_ip4_in = (struct sp_ctx *)acl4_init(name,
- socket_id, acl4_rules_in, nb_acl4_rules_in);
+ numa_id, acl4_rules_in, nb_acl4_rules_in);
} else
RTE_LOG(WARNING, IPSEC, "No IPv4 SP Inbound rule "
"specified\n");
@@ -586,7 +586,7 @@ sp4_init(struct socket_ctx *ctx, int32_t socket_id)
if (nb_acl4_rules_out > 0) {
name = "sp_ip4_out";
ctx->sp_ip4_out = (struct sp_ctx *)acl4_init(name,
- socket_id, acl4_rules_out, nb_acl4_rules_out);
+ numa_id, acl4_rules_out, nb_acl4_rules_out);
} else
RTE_LOG(WARNING, IPSEC, "No IPv4 SP Outbound rule "
"specified\n");
diff --git a/examples/ipsec-secgw/sp6.c b/examples/ipsec-secgw/sp6.c
index 8aff843812..90a869bddf 100644
--- a/examples/ipsec-secgw/sp6.c
+++ b/examples/ipsec-secgw/sp6.c
@@ -633,7 +633,7 @@ acl6_init(const char *name, int32_t socketid, const struct acl6_rules *rules,
dump_ip6_rules(rules, rules_nb, 1);
acl_param.name = s;
- acl_param.socket_id = socketid;
+ acl_param.numa_id = socketid;
acl_param.rule_size = RTE_ACL_RULE_SZ(RTE_DIM(ip6_defs));
acl_param.max_rule_num = rules_nb;
@@ -697,7 +697,7 @@ check_spi_value(struct sa_ctx *sa_ctx, int inbound)
}
void
-sp6_init(struct socket_ctx *ctx, int32_t socket_id)
+sp6_init(struct socket_ctx *ctx, int32_t numa_id)
{
const char *name;
@@ -706,11 +706,11 @@ sp6_init(struct socket_ctx *ctx, int32_t socket_id)
if (ctx->sp_ip6_in != NULL)
rte_exit(EXIT_FAILURE, "Inbound IPv6 SP DB for socket %u "
- "already initialized\n", socket_id);
+ "already initialized\n", numa_id);
if (ctx->sp_ip6_out != NULL)
rte_exit(EXIT_FAILURE, "Outbound IPv6 SP DB for socket %u "
- "already initialized\n", socket_id);
+ "already initialized\n", numa_id);
if (check_spi_value(ctx->sa_in, 1) < 0)
rte_exit(EXIT_FAILURE,
@@ -723,7 +723,7 @@ sp6_init(struct socket_ctx *ctx, int32_t socket_id)
if (nb_acl6_rules_in > 0) {
name = "sp_ip6_in";
ctx->sp_ip6_in = (struct sp_ctx *)acl6_init(name,
- socket_id, acl6_rules_in, nb_acl6_rules_in);
+ numa_id, acl6_rules_in, nb_acl6_rules_in);
} else
RTE_LOG(WARNING, IPSEC, "No IPv6 SP Inbound rule "
"specified\n");
@@ -731,7 +731,7 @@ sp6_init(struct socket_ctx *ctx, int32_t socket_id)
if (nb_acl6_rules_out > 0) {
name = "sp_ip6_out";
ctx->sp_ip6_out = (struct sp_ctx *)acl6_init(name,
- socket_id, acl6_rules_out, nb_acl6_rules_out);
+ numa_id, acl6_rules_out, nb_acl6_rules_out);
} else
RTE_LOG(WARNING, IPSEC, "No IPv6 SP Outbound rule "
"specified\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 195/227] examples/ipv4_multicast: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (193 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 194/227] examples/ipsec-secgw: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 196/227] examples/l2fwd: " Chengwen Feng
` (32 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/ipv4_multicast/main.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index 1cb621cb8b..4f31cd9d77 100644
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -124,7 +124,7 @@ static struct rte_fbk_hash_params mcast_hash_params = {
.name = "MCAST_HASH",
.entries = 1024,
.entries_per_bucket = 4,
- .socket_id = 0,
+ .numa_id = 0,
.hash_func = NULL,
.init_val = 0,
};
@@ -560,7 +560,7 @@ init_mcast_hash(void)
{
uint32_t i;
- mcast_hash_params.socket_id = rte_socket_id();
+ mcast_hash_params.numa_id = rte_numa_id();
mcast_hash = rte_fbk_hash_create(&mcast_hash_params);
if (mcast_hash == NULL){
return -1;
@@ -665,19 +665,19 @@ main(int argc, char **argv)
/* Create the mbuf pools. 8< */
packet_pool = rte_pktmbuf_pool_create("packet_pool", NB_PKT_MBUF, 32,
- 0, PKT_MBUF_DATA_SIZE, rte_socket_id());
+ 0, PKT_MBUF_DATA_SIZE, rte_numa_id());
if (packet_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init packet mbuf pool\n");
header_pool = rte_pktmbuf_pool_create("header_pool", NB_HDR_MBUF, 32,
- 0, HDR_MBUF_DATA_SIZE, rte_socket_id());
+ 0, HDR_MBUF_DATA_SIZE, rte_numa_id());
if (header_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init header mbuf pool\n");
clone_pool = rte_pktmbuf_pool_create("clone_pool", NB_CLONE_MBUF, 32,
- 0, 0, rte_socket_id());
+ 0, 0, rte_numa_id());
if (clone_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init clone mbuf pool\n");
@@ -764,7 +764,7 @@ main(int argc, char **argv)
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = local_port_conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&rxq_conf,
packet_pool);
if (ret < 0)
@@ -783,7 +783,7 @@ main(int argc, char **argv)
txconf = &dev_info.default_txconf;
txconf->offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(portid, queueid, nb_txd,
- rte_lcore_to_socket_id(lcore_id), txconf);
+ rte_lcore_to_numa_id(lcore_id), txconf);
if (ret < 0)
rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d, "
"port=%d\n", ret, portid);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 196/227] examples/l2fwd: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (194 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 195/227] examples/ipv4_multicast: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 197/227] examples/l2fwd-cat: " Chengwen Feng
` (31 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/l2fwd/main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index 851816423f..7a0a63241a 100644
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -766,7 +766,7 @@ main(int argc, char **argv)
/* Create the mbuf pool. 8< */
l2fwd_pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", nb_mbufs,
MEMPOOL_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (l2fwd_pktmbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
/* >8 End of create the mbuf pool. */
@@ -825,7 +825,7 @@ main(int argc, char **argv)
rxq_conf.offloads = local_port_conf.rxmode.offloads;
/* RX queue setup. 8< */
ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&rxq_conf,
l2fwd_pktmbuf_pool);
if (ret < 0)
@@ -838,7 +838,7 @@ main(int argc, char **argv)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&txq_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n",
@@ -846,9 +846,9 @@ main(int argc, char **argv)
/* >8 End of init one TX queue on each port. */
/* Initialize TX buffers */
- tx_buffer[portid] = rte_zmalloc_socket("tx_buffer",
+ tx_buffer[portid] = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(MAX_PKT_BURST), 0,
- rte_eth_dev_socket_id(portid));
+ rte_eth_dev_numa_id(portid));
if (tx_buffer[portid] == NULL)
rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
portid);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 197/227] examples/l2fwd-cat: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (195 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 196/227] examples/l2fwd: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 198/227] examples/l2fwd-crypto: " Chengwen Feng
` (30 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/l2fwd-cat/l2fwd-cat.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/l2fwd-cat/l2fwd-cat.c b/examples/l2fwd-cat/l2fwd-cat.c
index 6e16705e99..cf5772fac5 100644
--- a/examples/l2fwd-cat/l2fwd-cat.c
+++ b/examples/l2fwd-cat/l2fwd-cat.c
@@ -52,7 +52,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
/* Allocate and set up 1 RX queue per Ethernet port. */
for (q = 0; q < rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port, q, nb_rxd,
- rte_eth_dev_socket_id(port), NULL, mbuf_pool);
+ rte_eth_dev_numa_id(port), NULL, mbuf_pool);
if (retval < 0)
return retval;
}
@@ -60,7 +60,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
/* Allocate and set up 1 TX queue per Ethernet port. */
for (q = 0; q < tx_rings; q++) {
retval = rte_eth_tx_queue_setup(port, q, nb_txd,
- rte_eth_dev_socket_id(port), NULL);
+ rte_eth_dev_numa_id(port), NULL);
if (retval < 0)
return retval;
}
@@ -102,9 +102,9 @@ lcore_main(void)
* for best performance.
*/
RTE_ETH_FOREACH_DEV(port)
- if (rte_eth_dev_socket_id(port) >= 0 &&
- rte_eth_dev_socket_id(port) !=
- (int)rte_socket_id())
+ if (rte_eth_dev_numa_id(port) >= 0 &&
+ rte_eth_dev_numa_id(port) !=
+ (int)rte_numa_id())
printf("WARNING, port %u is on remote NUMA node to "
"polling thread.\n\tPerformance will "
"not be optimal.\n", port);
@@ -183,7 +183,7 @@ main(int argc, char *argv[])
/* Creates a new mempool in memory to hold the mbufs. */
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", NUM_MBUFS * nb_ports,
- MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 198/227] examples/l2fwd-crypto: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (196 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 197/227] examples/l2fwd-cat: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 199/227] examples/l2fwd-event: " Chengwen Feng
` (29 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/l2fwd-crypto/main.c | 38 ++++++++++++++++++------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 84399463da..1b195a816e 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -672,12 +672,12 @@ static void *
initialize_crypto_session(struct l2fwd_crypto_options *options, uint8_t cdev_id)
{
struct rte_crypto_sym_xform *first_xform;
- int retval = rte_cryptodev_socket_id(cdev_id);
+ int retval = rte_cryptodev_numa_id(cdev_id);
if (retval < 0)
return NULL;
- uint8_t socket_id = (uint8_t) retval;
+ uint8_t numa_id = (uint8_t) retval;
if (options->xform_chain == L2FWD_CRYPTO_AEAD) {
first_xform = &options->aead_xform;
@@ -694,7 +694,7 @@ initialize_crypto_session(struct l2fwd_crypto_options *options, uint8_t cdev_id)
}
return rte_cryptodev_sym_session_create(cdev_id, first_xform,
- session_pool_socket[socket_id].sess_mp);
+ session_pool_socket[numa_id].sess_mp);
}
/* >8 End of creation of session. */
@@ -2350,18 +2350,18 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
if (check_capabilities(options, cdev_id) < 0)
continue;
- retval = rte_cryptodev_socket_id(cdev_id);
+ retval = rte_cryptodev_numa_id(cdev_id);
if (retval < 0) {
printf("Invalid crypto device id used\n");
return -1;
}
- uint8_t socket_id = (uint8_t) retval;
+ uint8_t numa_id = (uint8_t) retval;
struct rte_cryptodev_config conf = {
.nb_queue_pairs = 1,
- .socket_id = socket_id,
+ .numa_id = numa_id,
.ff_disable = RTE_CRYPTODEV_FF_SECURITY,
};
@@ -2379,23 +2379,23 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
} else
sessions_needed = enabled_cdev_count;
- if (session_pool_socket[socket_id].sess_mp == NULL) {
+ if (session_pool_socket[numa_id].sess_mp == NULL) {
char mp_name[RTE_MEMPOOL_NAMESIZE];
snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
- "sess_mp_%u", socket_id);
+ "sess_mp_%u", numa_id);
- session_pool_socket[socket_id].sess_mp =
+ session_pool_socket[numa_id].sess_mp =
rte_cryptodev_sym_session_pool_create(
mp_name, sessions_needed, max_sess_sz,
- 0, 0, socket_id);
- if (session_pool_socket[socket_id].sess_mp == NULL) {
+ 0, 0, numa_id);
+ if (session_pool_socket[numa_id].sess_mp == NULL) {
printf("Cannot create pool on socket %d\n",
- socket_id);
+ numa_id);
return -ENOMEM;
}
printf("Allocated pool \"%s\" on socket %d\n",
- mp_name, socket_id);
+ mp_name, numa_id);
}
/* Set AEAD parameters */
@@ -2537,10 +2537,10 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
}
qp_conf.nb_descriptors = 2048;
- qp_conf.mp_session = session_pool_socket[socket_id].sess_mp;
+ qp_conf.mp_session = session_pool_socket[numa_id].sess_mp;
retval = rte_cryptodev_queue_pair_setup(cdev_id, 0, &qp_conf,
- socket_id);
+ numa_id);
if (retval < 0) {
printf("Failed to setup queue pair %u on cryptodev %u",
0, cdev_id);
@@ -2619,7 +2619,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = local_port_conf.rxmode.offloads;
retval = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&rxq_conf, l2fwd_pktmbuf_pool);
if (retval < 0) {
printf("rte_eth_rx_queue_setup:err=%d, port=%u\n",
@@ -2632,7 +2632,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = local_port_conf.txmode.offloads;
retval = rte_eth_tx_queue_setup(portid, 0, nb_txd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&txq_conf);
if (retval < 0) {
printf("rte_eth_tx_queue_setup:err=%d, port=%u\n",
@@ -2766,14 +2766,14 @@ main(int argc, char **argv)
l2fwd_pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", NB_MBUF, 512,
RTE_ALIGN(sizeof(struct rte_crypto_op),
RTE_CACHE_LINE_SIZE),
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (l2fwd_pktmbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
/* create crypto op pool */
l2fwd_crypto_op_pool = rte_crypto_op_pool_create("crypto_op_pool",
RTE_CRYPTO_OP_TYPE_SYMMETRIC, NB_MBUF, 128, MAXIMUM_IV_LENGTH,
- rte_socket_id());
+ rte_numa_id());
if (l2fwd_crypto_op_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create crypto op pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 199/227] examples/l2fwd-event: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (197 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 198/227] examples/l2fwd-crypto: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 200/227] examples/l2fwd-jobstats: " Chengwen Feng
` (28 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/l2fwd-event/l2fwd_common.c | 4 ++--
examples/l2fwd-event/l2fwd_poll.c | 4 ++--
examples/l2fwd-event/main.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/l2fwd-event/l2fwd_common.c b/examples/l2fwd-event/l2fwd_common.c
index caacf6cd63..9b636724b7 100644
--- a/examples/l2fwd-event/l2fwd_common.c
+++ b/examples/l2fwd-event/l2fwd_common.c
@@ -83,7 +83,7 @@ l2fwd_event_init_ports(struct l2fwd_resources *rsrc)
rxq_conf.offloads = local_port_conf.rxmode.offloads;
/* Using lcore to poll one or several ports. 8< */
ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd,
- rte_eth_dev_socket_id(port_id),
+ rte_eth_dev_numa_id(port_id),
&rxq_conf,
rsrc->pktmbuf_pool);
if (ret < 0)
@@ -97,7 +97,7 @@ l2fwd_event_init_ports(struct l2fwd_resources *rsrc)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd,
- rte_eth_dev_socket_id(port_id),
+ rte_eth_dev_numa_id(port_id),
&txq_conf);
if (ret < 0)
rte_panic("rte_eth_tx_queue_setup:err=%d, port=%u\n",
diff --git a/examples/l2fwd-event/l2fwd_poll.c b/examples/l2fwd-event/l2fwd_poll.c
index 73fefac67b..432d80e311 100644
--- a/examples/l2fwd-event/l2fwd_poll.c
+++ b/examples/l2fwd-event/l2fwd_poll.c
@@ -147,9 +147,9 @@ l2fwd_poll_init_tx_buffers(struct l2fwd_resources *rsrc)
RTE_ETH_FOREACH_DEV(port_id) {
/* Initialize TX buffers */
- poll_rsrc->tx_buffer[port_id] = rte_zmalloc_socket("tx_buffer",
+ poll_rsrc->tx_buffer[port_id] = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(MAX_PKT_BURST), 0,
- rte_eth_dev_socket_id(port_id));
+ rte_eth_dev_numa_id(port_id));
if (poll_rsrc->tx_buffer[port_id] == NULL)
rte_panic("Cannot allocate buffer for tx on port %u\n",
port_id);
diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c
index 6ab59eb4ef..c011ec61db 100644
--- a/examples/l2fwd-event/main.c
+++ b/examples/l2fwd-event/main.c
@@ -664,7 +664,7 @@ main(int argc, char **argv)
/* Create the mbuf pool. 8< */
rsrc->pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool",
nb_mbufs, MEMPOOL_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (rsrc->pktmbuf_pool == NULL)
rte_panic("Cannot init mbuf pool\n");
/* >8 End of creation of mbuf pool. */
@@ -677,7 +677,7 @@ main(int argc, char **argv)
nb_vec = RTE_MAX(512U, nb_vec);
nb_vec += rte_lcore_count() * 32;
rsrc->evt_vec_pool = rte_event_vector_pool_create(
- "vector_pool", nb_vec, 32, vec_size, rte_socket_id());
+ "vector_pool", nb_vec, 32, vec_size, rte_numa_id());
if (rsrc->evt_vec_pool == NULL)
rte_panic("Cannot init event vector pool\n");
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 200/227] examples/l2fwd-jobstats: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (198 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 199/227] examples/l2fwd-event: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 201/227] examples/l2fwd-keepalive: " Chengwen Feng
` (27 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/l2fwd-jobstats/main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c
index f654831897..0f5117f587 100644
--- a/examples/l2fwd-jobstats/main.c
+++ b/examples/l2fwd-jobstats/main.c
@@ -781,7 +781,7 @@ main(int argc, char **argv)
/* Create the mbuf pool. 8< */
l2fwd_pktmbuf_pool =
rte_pktmbuf_pool_create("mbuf_pool", NB_MBUF, 32,
- 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (l2fwd_pktmbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
/* >8 End of creation of mbuf pool. */
@@ -897,7 +897,7 @@ main(int argc, char **argv)
rxq_conf.offloads = local_port_conf.rxmode.offloads;
/* RX queue initialization. 8< */
ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&rxq_conf,
l2fwd_pktmbuf_pool);
if (ret < 0)
@@ -910,7 +910,7 @@ main(int argc, char **argv)
txq_conf.offloads = local_port_conf.txmode.offloads;
fflush(stdout);
ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&txq_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE,
@@ -919,9 +919,9 @@ main(int argc, char **argv)
/* >8 End of init one TX queue on each port. */
/* Initialize TX buffers */
- tx_buffer[portid] = rte_zmalloc_socket("tx_buffer",
+ tx_buffer[portid] = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(MAX_PKT_BURST), 0,
- rte_eth_dev_socket_id(portid));
+ rte_eth_dev_numa_id(portid));
if (tx_buffer[portid] == NULL)
rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
portid);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 201/227] examples/l2fwd-keepalive: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (199 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 200/227] examples/l2fwd-jobstats: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 202/227] examples/l2fwd-macsec: " Chengwen Feng
` (26 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/l2fwd-keepalive/main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c
index 889274ddae..e6865ae541 100644
--- a/examples/l2fwd-keepalive/main.c
+++ b/examples/l2fwd-keepalive/main.c
@@ -560,7 +560,7 @@ main(int argc, char **argv)
l2fwd_pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool",
total_nb_mbufs, 32, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (l2fwd_pktmbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
@@ -670,7 +670,7 @@ main(int argc, char **argv)
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = local_port_conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&rxq_conf,
l2fwd_pktmbuf_pool);
if (ret < 0)
@@ -683,7 +683,7 @@ main(int argc, char **argv)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&txq_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE,
@@ -691,9 +691,9 @@ main(int argc, char **argv)
ret, portid);
/* Initialize TX buffers */
- tx_buffer[portid] = rte_zmalloc_socket("tx_buffer",
+ tx_buffer[portid] = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(MAX_PKT_BURST), 0,
- rte_eth_dev_socket_id(portid));
+ rte_eth_dev_numa_id(portid));
if (tx_buffer[portid] == NULL)
rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
portid);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 202/227] examples/l2fwd-macsec: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (200 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 201/227] examples/l2fwd-keepalive: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 203/227] examples/l3fwd: " Chengwen Feng
` (25 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/l2fwd-macsec/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/l2fwd-macsec/main.c b/examples/l2fwd-macsec/main.c
index 33113cb0f5..aee0d8e06b 100644
--- a/examples/l2fwd-macsec/main.c
+++ b/examples/l2fwd-macsec/main.c
@@ -1379,7 +1379,7 @@ main(int argc, char **argv)
/* Create the mbuf pool. 8< */
l2fwd_pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", nb_mbufs,
MEMPOOL_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (l2fwd_pktmbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
/* >8 End of create the mbuf pool. */
@@ -1438,7 +1438,7 @@ main(int argc, char **argv)
rxq_conf.offloads = local_port_conf.rxmode.offloads;
/* RX queue setup. 8< */
ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&rxq_conf,
l2fwd_pktmbuf_pool);
if (ret < 0)
@@ -1451,7 +1451,7 @@ main(int argc, char **argv)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&txq_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n",
@@ -1459,9 +1459,9 @@ main(int argc, char **argv)
/* >8 End of init one TX queue on each port. */
/* Initialize TX buffers */
- tx_buffer[portid] = rte_zmalloc_socket("tx_buffer",
+ tx_buffer[portid] = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(MAX_PKT_BURST), 0,
- rte_eth_dev_socket_id(portid));
+ rte_eth_dev_numa_id(portid));
if (tx_buffer[portid] == NULL)
rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
portid);
@@ -1514,7 +1514,7 @@ main(int argc, char **argv)
nb_sess, sess_sz,
SESSION_POOL_CACHE_SIZE, 0,
NULL, NULL, NULL, NULL,
- SOCKET_ID_ANY, 0);
+ RTE_NUMA_ID_ANY, 0);
if (mcs_port_params[portid].sess_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init sess pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 203/227] examples/l3fwd: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (201 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 202/227] examples/l2fwd-macsec: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 204/227] examples/l3fwd-graph: " Chengwen Feng
` (24 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/l3fwd/l3fwd_acl.c | 22 +++++++++++-----------
examples/l3fwd/l3fwd_em.c | 4 ++--
examples/l3fwd/main.c | 8 ++++----
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/examples/l3fwd/l3fwd_acl.c b/examples/l3fwd/l3fwd_acl.c
index 4ee3411d2a..54aa3dc9ba 100644
--- a/examples/l3fwd/l3fwd_acl.c
+++ b/examples/l3fwd/l3fwd_acl.c
@@ -692,7 +692,7 @@ app_acl_init(struct rte_acl_rule *route_base,
socketid);
acl_param.name = name;
- acl_param.socket_id = socketid;
+ acl_param.numa_id = socketid;
acl_param.rule_size = RTE_ACL_RULE_SZ(dim);
acl_param.max_rule_num = MAX_ACL_RULE_NUM;
@@ -935,7 +935,7 @@ dump_ipv6_rules(struct acl6_rule *rule, int num, int extra)
/* Function to setup acl. */
void
-setup_acl(const int socket_id)
+setup_acl(const int numa_id)
{
if (check_acl_config() != 0)
rte_exit(EXIT_FAILURE, "Failed to get valid ACL options\n");
@@ -955,24 +955,24 @@ setup_acl(const int socket_id)
dump_ipv6_rules((struct acl6_rule *)acl_base_ipv6, acl_num_ipv6, 1);
/* Check sockets a context should be created on */
- if (socket_id >= NB_SOCKETS) {
+ if (numa_id >= NB_SOCKETS) {
acl_log("Socket %d is out "
"of range %d\n",
- socket_id, NB_SOCKETS);
+ numa_id, NB_SOCKETS);
acl_free_routes();
return;
}
- rte_acl_free(acl_config.acx_ipv4[socket_id]);
- rte_acl_free(acl_config.acx_ipv6[socket_id]);
+ rte_acl_free(acl_config.acx_ipv4[numa_id]);
+ rte_acl_free(acl_config.acx_ipv6[numa_id]);
- acl_config.acx_ipv4[socket_id] = app_acl_init(route_base_ipv4,
+ acl_config.acx_ipv4[numa_id] = app_acl_init(route_base_ipv4,
acl_base_ipv4, route_num_ipv4, acl_num_ipv4,
- 0, socket_id);
+ 0, numa_id);
- acl_config.acx_ipv6[socket_id] = app_acl_init(route_base_ipv6,
+ acl_config.acx_ipv6[numa_id] = app_acl_init(route_base_ipv6,
acl_base_ipv6, route_num_ipv6, acl_num_ipv6,
- 1, socket_id);
+ 1, numa_id);
#ifdef L3FWDACL_DEBUG
acl_config.rule_ipv4 = (struct acl4_rule *)acl_base_ipv4;
@@ -1091,7 +1091,7 @@ acl_main_loop(__rte_unused void *dummy)
prev_tsc = 0;
lcore_id = rte_lcore_id();
qconf = &lcore_conf[lcore_id];
- socketid = rte_lcore_to_socket_id(lcore_id);
+ socketid = rte_lcore_to_numa_id(lcore_id);
if (qconf->n_rx_queue == 0) {
RTE_LOG(INFO, L3FWD, "lcore %u has nothing to do\n", lcore_id);
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index d8748a0edd..730ea29d96 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -991,7 +991,7 @@ setup_hash(const int socketid)
/* create ipv4 hash */
snprintf(s, sizeof(s), "ipv4_l3fwd_hash_%d", socketid);
ipv4_l3fwd_hash_params.name = s;
- ipv4_l3fwd_hash_params.socket_id = socketid;
+ ipv4_l3fwd_hash_params.numa_id = socketid;
ipv4_l3fwd_em_lookup_struct[socketid] =
rte_hash_create(&ipv4_l3fwd_hash_params);
if (ipv4_l3fwd_em_lookup_struct[socketid] == NULL)
@@ -1002,7 +1002,7 @@ setup_hash(const int socketid)
/* create ipv6 hash */
snprintf(s, sizeof(s), "ipv6_l3fwd_hash_%d", socketid);
ipv6_l3fwd_hash_params.name = s;
- ipv6_l3fwd_hash_params.socket_id = socketid;
+ ipv6_l3fwd_hash_params.numa_id = socketid;
ipv6_l3fwd_em_lookup_struct[socketid] =
rte_hash_create(&ipv6_l3fwd_hash_params);
if (ipv6_l3fwd_em_lookup_struct[socketid] == NULL)
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 9532150a47..1731aa51e2 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -311,7 +311,7 @@ check_lcore_params(void)
return -1;
}
- socketid = rte_lcore_to_socket_id(lcore);
+ socketid = rte_lcore_to_numa_id(lcore);
if (socketid != 0 && numa_on == 0) {
printf("warning: lcore %u is on socket %d with numa off\n",
lcore, socketid);
@@ -1133,7 +1133,7 @@ init_mem(uint16_t portid, unsigned int nb_mbuf)
continue;
if (numa_on)
- socketid = rte_lcore_to_socket_id(lcore_id);
+ socketid = rte_lcore_to_numa_id(lcore_id);
else
socketid = 0;
@@ -1474,7 +1474,7 @@ l3fwd_poll_resource_setup(void)
if (numa_on)
socketid =
- (uint8_t)rte_lcore_to_socket_id(lcore_id);
+ (uint8_t)rte_lcore_to_numa_id(lcore_id);
else
socketid = 0;
@@ -1516,7 +1516,7 @@ l3fwd_poll_resource_setup(void)
if (numa_on)
socketid =
- (uint8_t)rte_lcore_to_socket_id(lcore_id);
+ (uint8_t)rte_lcore_to_numa_id(lcore_id);
else
socketid = 0;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 204/227] examples/l3fwd-graph: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (202 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 203/227] examples/l3fwd: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 205/227] examples/l3fwd-power: " Chengwen Feng
` (23 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/l3fwd-graph/main.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c
index 08fe177fc2..fc1603781c 100644
--- a/examples/l3fwd-graph/main.c
+++ b/examples/l3fwd-graph/main.c
@@ -218,7 +218,7 @@ check_lcore_params(void)
printf("Error: lcore %u is main lcore\n", lcore);
return -1;
}
- socketid = rte_lcore_to_socket_id(lcore);
+ socketid = rte_lcore_to_numa_id(lcore);
if ((socketid != 0) && (numa_on == 0)) {
printf("Warning: lcore %u is on socket %d with numa off\n",
lcore, socketid);
@@ -653,7 +653,7 @@ init_mem(uint16_t portid, uint32_t nb_mbuf)
continue;
if (numa_on)
- socketid = rte_lcore_to_socket_id(lcore_id);
+ socketid = rte_lcore_to_numa_id(lcore_id);
else
socketid = 0;
@@ -769,7 +769,7 @@ print_stats(void)
/* Prepare stats object */
memset(&s_param, 0, sizeof(s_param));
s_param.f = stdout;
- s_param.socket_id = SOCKET_ID_ANY;
+ s_param.numa_id = RTE_NUMA_ID_ANY;
s_param.graph_patterns = &pattern;
s_param.nb_graph_patterns = 1;
@@ -889,7 +889,7 @@ graph_config_mcore_dispatch(struct rte_graph_param graph_conf)
}
graph_conf.nb_node_patterns = nb_patterns + n_rx_node;
- graph_conf.socket_id = rte_lcore_to_socket_id(main_lcore_id);
+ graph_conf.numa_id = rte_lcore_to_numa_id(main_lcore_id);
qconf = &lcore_conf[main_lcore_id];
snprintf(qconf->name, sizeof(qconf->name), "worker_%u",
@@ -972,7 +972,7 @@ graph_config_rtc(struct rte_graph_param graph_conf)
qconf->rx_queue_list[i].node_name;
}
graph_conf.nb_node_patterns = nb_patterns + i;
- graph_conf.socket_id = rte_lcore_to_socket_id(lcore_id);
+ graph_conf.numa_id = rte_lcore_to_numa_id(lcore_id);
snprintf(qconf->name, sizeof(qconf->name), "worker_%u",
lcore_id);
graph_id = rte_graph_create(qconf->name, &graph_conf);
@@ -1155,7 +1155,7 @@ main(int argc, char **argv)
qconf = &lcore_conf[lcore_id];
if (numa_on)
- socketid = (uint8_t)rte_lcore_to_socket_id(
+ socketid = (uint8_t)rte_lcore_to_numa_id(
lcore_id);
else
socketid = 0;
@@ -1204,7 +1204,7 @@ main(int argc, char **argv)
queueid = qconf->rx_queue_list[queue].queue_id;
if (numa_on)
- socketid = (uint8_t)rte_lcore_to_socket_id(
+ socketid = (uint8_t)rte_lcore_to_numa_id(
lcore_id);
else
socketid = 0;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 205/227] examples/l3fwd-power: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (203 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 204/227] examples/l3fwd-graph: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 206/227] examples/link_status_interrupt: " Chengwen Feng
` (22 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/l3fwd-power/main.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 5b4cb9f210..4017722122 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1414,7 +1414,7 @@ check_lcore_params(void)
"mask\n", lcore);
return -1;
}
- socketid = rte_lcore_to_socket_id(lcore);
+ socketid = rte_lcore_to_numa_id(lcore);
if (socketid != 0 && numa_on == 0) {
printf("warning: lcore %u is on socket %d with numa "
"off\n", lcore, socketid);
@@ -1944,7 +1944,7 @@ setup_hash(int socketid)
/* create ipv4 hash */
snprintf(s, sizeof(s), "ipv4_l3fwd_hash_%d", socketid);
ipv4_l3fwd_hash_params.name = s;
- ipv4_l3fwd_hash_params.socket_id = socketid;
+ ipv4_l3fwd_hash_params.numa_id = socketid;
ipv4_l3fwd_lookup_struct[socketid] =
rte_hash_create(&ipv4_l3fwd_hash_params);
if (ipv4_l3fwd_lookup_struct[socketid] == NULL)
@@ -1954,7 +1954,7 @@ setup_hash(int socketid)
/* create ipv6 hash */
snprintf(s, sizeof(s), "ipv6_l3fwd_hash_%d", socketid);
ipv6_l3fwd_hash_params.name = s;
- ipv6_l3fwd_hash_params.socket_id = socketid;
+ ipv6_l3fwd_hash_params.numa_id = socketid;
ipv6_l3fwd_lookup_struct[socketid] =
rte_hash_create(&ipv6_l3fwd_hash_params);
if (ipv6_l3fwd_lookup_struct[socketid] == NULL)
@@ -2046,7 +2046,7 @@ init_mem(unsigned nb_mbuf)
continue;
if (numa_on)
- socketid = rte_lcore_to_socket_id(lcore_id);
+ socketid = rte_lcore_to_numa_id(lcore_id);
else
socketid = 0;
@@ -2738,9 +2738,9 @@ main(int argc, char **argv)
/* Initialize TX buffers */
qconf = &lcore_conf[lcore_id];
- qconf->tx_buffer[portid] = rte_zmalloc_socket("tx_buffer",
+ qconf->tx_buffer[portid] = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(MAX_PKT_BURST), 0,
- rte_eth_dev_socket_id(portid));
+ rte_eth_dev_numa_id(portid));
if (qconf->tx_buffer[portid] == NULL)
rte_exit(EXIT_FAILURE, "Can't allocate tx buffer for port %u\n",
portid);
@@ -2759,7 +2759,7 @@ main(int argc, char **argv)
if (numa_on)
socketid = \
- (uint8_t)rte_lcore_to_socket_id(lcore_id);
+ (uint8_t)rte_lcore_to_numa_id(lcore_id);
else
socketid = 0;
@@ -2811,7 +2811,7 @@ main(int argc, char **argv)
if (numa_on)
socketid = \
- (uint8_t)rte_lcore_to_socket_id(lcore_id);
+ (uint8_t)rte_lcore_to_numa_id(lcore_id);
else
socketid = 0;
@@ -2918,7 +2918,7 @@ main(int argc, char **argv)
unsigned int i;
/* Init metrics library */
- rte_metrics_init(rte_socket_id());
+ rte_metrics_init(rte_numa_id());
/** Register stats with metrics library */
for (i = 0; i < NUM_TELSTATS; i++)
ptr_strings[i] = telstats_strings[i].name;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 206/227] examples/link_status_interrupt: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (204 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 205/227] examples/l3fwd-power: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 207/227] examples/multi_process: " Chengwen Feng
` (21 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/link_status_interrupt/main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c
index b5fac31400..64657c6e10 100644
--- a/examples/link_status_interrupt/main.c
+++ b/examples/link_status_interrupt/main.c
@@ -553,7 +553,7 @@ main(int argc, char **argv)
/* create the mbuf pool */
lsi_pktmbuf_pool =
rte_pktmbuf_pool_create("mbuf_pool", NB_MBUF, 32, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (lsi_pktmbuf_pool == NULL)
rte_panic("Cannot init mbuf pool\n");
@@ -673,7 +673,7 @@ main(int argc, char **argv)
rxq_conf.offloads = local_port_conf.rxmode.offloads;
/* RX queue initialization. 8< */
ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&rxq_conf,
lsi_pktmbuf_pool);
if (ret < 0)
@@ -686,7 +686,7 @@ main(int argc, char **argv)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
- rte_eth_dev_socket_id(portid),
+ rte_eth_dev_numa_id(portid),
&txq_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d,port=%u\n",
@@ -694,9 +694,9 @@ main(int argc, char **argv)
/* >8 End of init one TX queue. */
/* Initialize TX buffers */
- tx_buffer[portid] = rte_zmalloc_socket("tx_buffer",
+ tx_buffer[portid] = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(MAX_PKT_BURST), 0,
- rte_eth_dev_socket_id(portid));
+ rte_eth_dev_numa_id(portid));
if (tx_buffer[portid] == NULL)
rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
(unsigned) portid);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 207/227] examples/multi_process: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (205 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 206/227] examples/link_status_interrupt: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 208/227] examples/ntb: " Chengwen Feng
` (20 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
.../client_server_mp/mp_client/client.c | 4 ++--
.../client_server_mp/mp_server/init.c | 14 +++++++-------
examples/multi_process/simple_mp/main.c | 6 +++---
examples/multi_process/symmetric_mp/main.c | 6 +++---
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/examples/multi_process/client_server_mp/mp_client/client.c b/examples/multi_process/client_server_mp/mp_client/client.c
index 087c38ef73..8f6f5bfd5e 100644
--- a/examples/multi_process/client_server_mp/mp_client/client.c
+++ b/examples/multi_process/client_server_mp/mp_client/client.c
@@ -135,9 +135,9 @@ configure_tx_buffer(uint16_t port_id, uint16_t size)
int ret;
/* Initialize TX buffers */
- tx_buffer[port_id] = rte_zmalloc_socket("tx_buffer",
+ tx_buffer[port_id] = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(size), 0,
- rte_eth_dev_socket_id(port_id));
+ rte_eth_dev_numa_id(port_id));
if (tx_buffer[port_id] == NULL)
rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
port_id);
diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index 09cb363ab8..ed00540bdb 100644
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -75,7 +75,7 @@ init_mbuf_pools(void)
printf("Creating mbuf pool '%s' [%u mbufs] ...\n",
PKTMBUF_POOL_NAME, num_mbufs);
pktmbuf_pool = rte_pktmbuf_pool_create(PKTMBUF_POOL_NAME, num_mbufs,
- MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
return pktmbuf_pool == NULL; /* 0 on success */
}
@@ -127,14 +127,14 @@ init_port(uint16_t port_num)
for (q = 0; q < rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port_num, q, rx_ring_size,
- rte_eth_dev_socket_id(port_num),
+ rte_eth_dev_numa_id(port_num),
NULL, pktmbuf_pool);
if (retval < 0) return retval;
}
for ( q = 0; q < tx_rings; q ++ ) {
retval = rte_eth_tx_queue_setup(port_num, q, tx_ring_size,
- rte_eth_dev_socket_id(port_num),
+ rte_eth_dev_numa_id(port_num),
NULL);
if (retval < 0) return retval;
}
@@ -160,7 +160,7 @@ static int
init_shm_rings(void)
{
unsigned i;
- unsigned socket_id;
+unsigned int numa_id
const char * q_name;
const unsigned ringsize = CLIENT_QUEUE_RINGSIZE;
@@ -171,10 +171,10 @@ init_shm_rings(void)
for (i = 0; i < num_clients; i++) {
/* Create an RX queue for each client */
- socket_id = rte_socket_id();
+ numa_id = rte_numa_id();
q_name = get_rx_queue_name(i);
clients[i].rx_q = rte_ring_create(q_name,
- ringsize, socket_id,
+ ringsize, numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ ); /* single prod, single cons */
if (clients[i].rx_q == NULL)
rte_exit(EXIT_FAILURE, "Cannot create rx ring queue for client %u\n", i);
@@ -263,7 +263,7 @@ init(int argc, char *argv[])
/* set up array for port data */
mz = rte_memzone_reserve(MZ_PORT_INFO, sizeof(*ports),
- rte_socket_id(), NO_FLAGS);
+ rte_numa_id(), NO_FLAGS);
if (mz == NULL)
rte_exit(EXIT_FAILURE, "Cannot reserve memory zone for port information\n");
memset(mz->addr, 0, sizeof(*ports));
diff --git a/examples/multi_process/simple_mp/main.c b/examples/multi_process/simple_mp/main.c
index d73d1358ff..7378e1677e 100644
--- a/examples/multi_process/simple_mp/main.c
+++ b/examples/multi_process/simple_mp/main.c
@@ -89,12 +89,12 @@ main(int argc, char **argv)
/* Start of ring structure. 8< */
if (rte_eal_process_type() == RTE_PROC_PRIMARY){
- send_ring = rte_ring_create(_PRI_2_SEC, ring_size, rte_socket_id(), flags);
- recv_ring = rte_ring_create(_SEC_2_PRI, ring_size, rte_socket_id(), flags);
+ send_ring = rte_ring_create(_PRI_2_SEC, ring_size, rte_numa_id(), flags);
+ recv_ring = rte_ring_create(_SEC_2_PRI, ring_size, rte_numa_id(), flags);
message_pool = rte_mempool_create(_MSG_POOL, pool_size,
STR_TOKEN_SIZE, pool_cache, priv_data_sz,
NULL, NULL, NULL, NULL,
- rte_socket_id(), flags);
+ rte_numa_id(), flags);
} else {
recv_ring = rte_ring_lookup(_PRI_2_SEC);
send_ring = rte_ring_lookup(_SEC_2_PRI);
diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c
index 19347b403c..0207a92aae 100644
--- a/examples/multi_process/symmetric_mp/main.c
+++ b/examples/multi_process/symmetric_mp/main.c
@@ -263,7 +263,7 @@ smp_port_init(uint16_t port, struct rte_mempool *mbuf_pool,
rxq_conf.offloads = port_conf.rxmode.offloads;
for (q = 0; q < rx_rings; q ++) {
retval = rte_eth_rx_queue_setup(port, q, nb_rxd,
- rte_eth_dev_socket_id(port),
+ rte_eth_dev_numa_id(port),
&rxq_conf,
mbuf_pool);
if (retval < 0)
@@ -274,7 +274,7 @@ smp_port_init(uint16_t port, struct rte_mempool *mbuf_pool,
txq_conf.offloads = port_conf.txmode.offloads;
for (q = 0; q < tx_rings; q ++) {
retval = rte_eth_tx_queue_setup(port, q, nb_txd,
- rte_eth_dev_socket_id(port),
+ rte_eth_dev_numa_id(port),
&txq_conf);
if (retval < 0)
return retval;
@@ -470,7 +470,7 @@ main(int argc, char **argv)
rte_mempool_lookup(_SMP_MBUF_POOL) :
rte_pktmbuf_pool_create(_SMP_MBUF_POOL, NB_MBUFS,
MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (mp == NULL)
rte_exit(EXIT_FAILURE, "Cannot get memory pool for buffers\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 208/227] examples/ntb: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (206 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 207/227] examples/multi_process: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 209/227] examples/packet_ordering: " Chengwen Feng
` (19 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/ntb/ntb_fwd.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/examples/ntb/ntb_fwd.c b/examples/ntb/ntb_fwd.c
index a53e8aae24..ac9cb2f71b 100644
--- a/examples/ntb/ntb_fwd.c
+++ b/examples/ntb/ntb_fwd.c
@@ -1098,7 +1098,7 @@ static struct rte_mempool *
ntb_mbuf_pool_create(uint16_t mbuf_seg_size, uint32_t nb_mbuf,
struct ntb_dev_info ntb_info,
struct ntb_dev_config *ntb_conf,
- unsigned int socket_id)
+ unsigned int numa_id)
{
size_t mz_len, total_elt_sz, max_mz_len, left_sz;
struct rte_pktmbuf_pool_private mbp_priv;
@@ -1110,12 +1110,12 @@ ntb_mbuf_pool_create(uint16_t mbuf_seg_size, uint32_t nb_mbuf,
uint32_t mz_id;
int ret;
- snprintf(pool_name, sizeof(pool_name), "ntb_mbuf_pool_%u", socket_id);
+ snprintf(pool_name, sizeof(pool_name), "ntb_mbuf_pool_%u", numa_id);
mp = rte_mempool_create_empty(pool_name, nb_mbuf,
(mbuf_seg_size + sizeof(struct rte_mbuf)),
MEMPOOL_CACHE_SIZE,
sizeof(struct rte_pktmbuf_pool_private),
- socket_id, 0);
+ numa_id, 0);
if (mp == NULL)
return NULL;
@@ -1161,7 +1161,7 @@ ntb_mbuf_pool_create(uint16_t mbuf_seg_size, uint32_t nb_mbuf,
* for a memory window of this length.
*/
align = rte_pmd_ntb_get_mem_align(dev_id, mz_id, mz_len);
- mz = rte_memzone_reserve_aligned(mz_name, mz_len, socket_id,
+ mz = rte_memzone_reserve_aligned(mz_name, mz_len, numa_id,
RTE_MEMZONE_IOVA_CONTIG, align);
if (mz == NULL) {
printf("Cannot allocate %" PRIu64 " aligned memzone"
@@ -1258,7 +1258,7 @@ main(int argc, char **argv)
nb_mbuf = nb_desc * num_queues * 2 * 2 + rte_lcore_count() *
MEMPOOL_CACHE_SIZE;
mbuf_pool = ntb_mbuf_pool_create(ntb_buf_size, nb_mbuf, ntb_info,
- &ntb_conf, rte_socket_id());
+ &ntb_conf, rte_numa_id());
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool.\n");
@@ -1327,13 +1327,13 @@ main(int argc, char **argv)
/* Setup ethdev queue if ethdev exists */
for (i = 0; i < num_queues; i++) {
ret = rte_eth_rx_queue_setup(eth_port_id, i, nb_desc,
- rte_eth_dev_socket_id(eth_port_id),
+ rte_eth_dev_numa_id(eth_port_id),
ð_rx_conf, mbuf_pool);
if (ret < 0)
rte_exit(EXIT_FAILURE,
"Failed to setup eth rxq %u.\n", i);
ret = rte_eth_tx_queue_setup(eth_port_id, i, nb_desc,
- rte_eth_dev_socket_id(eth_port_id),
+ rte_eth_dev_numa_id(eth_port_id),
ð_tx_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE,
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 209/227] examples/packet_ordering: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (207 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 208/227] examples/ntb: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 210/227] examples/pipeline: " Chengwen Feng
` (18 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/packet_ordering/main.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/examples/packet_ordering/main.c b/examples/packet_ordering/main.c
index 0279faf081..b931ab86ae 100644
--- a/examples/packet_ordering/main.c
+++ b/examples/packet_ordering/main.c
@@ -254,9 +254,9 @@ configure_tx_buffers(struct rte_eth_dev_tx_buffer *tx_buffer[])
continue;
/* Initialize TX buffers */
- tx_buffer[port_id] = rte_zmalloc_socket("tx_buffer",
+ tx_buffer[port_id] = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(MAX_PKTS_BURST), 0,
- rte_eth_dev_socket_id(port_id));
+ rte_eth_dev_numa_id(port_id));
if (tx_buffer[port_id] == NULL)
rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
port_id);
@@ -309,7 +309,7 @@ configure_eth_port(uint16_t port_id)
for (q = 0; q < rxRings; q++) {
ret = rte_eth_rx_queue_setup(port_id, q, nb_rxd,
- rte_eth_dev_socket_id(port_id), NULL,
+ rte_eth_dev_numa_id(port_id), NULL,
mbuf_pool);
if (ret < 0)
return ret;
@@ -319,7 +319,7 @@ configure_eth_port(uint16_t port_id)
txconf.offloads = port_conf.txmode.offloads;
for (q = 0; q < txRings; q++) {
ret = rte_eth_tx_queue_setup(port_id, q, nb_txd,
- rte_eth_dev_socket_id(port_id), &txconf);
+ rte_eth_dev_numa_id(port_id), &txconf);
if (ret < 0)
return ret;
}
@@ -719,7 +719,7 @@ main(int argc, char **argv)
mbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", MBUF_PER_POOL,
MBUF_POOL_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "%s\n", rte_strerror(rte_errno));
@@ -747,18 +747,18 @@ main(int argc, char **argv)
}
/* Create rings for inter core communication */
- rx_to_workers = rte_ring_create("rx_to_workers", RING_SIZE, rte_socket_id(),
+ rx_to_workers = rte_ring_create("rx_to_workers", RING_SIZE, rte_numa_id(),
RING_F_SP_ENQ);
if (rx_to_workers == NULL)
rte_exit(EXIT_FAILURE, "%s\n", rte_strerror(rte_errno));
- workers_to_tx = rte_ring_create("workers_to_tx", RING_SIZE, rte_socket_id(),
+ workers_to_tx = rte_ring_create("workers_to_tx", RING_SIZE, rte_numa_id(),
RING_F_SC_DEQ);
if (workers_to_tx == NULL)
rte_exit(EXIT_FAILURE, "%s\n", rte_strerror(rte_errno));
if (!disable_reorder) {
- send_args.buffer = rte_reorder_create("PKT_RO", rte_socket_id(),
+ send_args.buffer = rte_reorder_create("PKT_RO", rte_numa_id(),
REORDER_BUFFER_SIZE);
if (send_args.buffer == NULL)
rte_exit(EXIT_FAILURE, "%s\n", rte_strerror(rte_errno));
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 210/227] examples/pipeline: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (208 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 209/227] examples/packet_ordering: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 211/227] examples/ptpclient: " Chengwen Feng
` (17 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/pipeline/obj.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/pipeline/obj.c b/examples/pipeline/obj.c
index 9f49df190e..edc437c60d 100644
--- a/examples/pipeline/obj.c
+++ b/examples/pipeline/obj.c
@@ -125,8 +125,8 @@ ethdev_config(const char *name, struct ethdev_params *params)
}
}
- numa_node = rte_eth_dev_socket_id(port_id);
- if (numa_node == SOCKET_ID_ANY)
+ numa_node = rte_eth_dev_numa_id(port_id);
+ if (numa_node == RTE_NUMA_ID_ANY)
numa_node = 0;
status = rte_eth_dev_configure(
@@ -205,7 +205,7 @@ cryptodev_config(const char *name, struct cryptodev_params *params)
struct rte_cryptodev_config dev_conf;
struct rte_cryptodev_qp_conf queue_conf;
uint8_t dev_id;
- uint32_t socket_id, i;
+ uint32_t numa_id, i;
int status;
/* Check input parameters. */
@@ -225,11 +225,11 @@ cryptodev_config(const char *name, struct cryptodev_params *params)
if (params->n_queue_pairs > dev_info.max_nb_queue_pairs)
return -EINVAL;
- socket_id = rte_cryptodev_socket_id(dev_id);
+ numa_id = rte_cryptodev_numa_id(dev_id);
/* Configure the crypto device. */
memset(&dev_conf, 0, sizeof(dev_conf));
- dev_conf.socket_id = socket_id;
+ dev_conf.numa_id = numa_id;
dev_conf.nb_queue_pairs = params->n_queue_pairs;
dev_conf.ff_disable = 0;
@@ -243,7 +243,7 @@ cryptodev_config(const char *name, struct cryptodev_params *params)
queue_conf.mp_session = NULL;
for (i = 0; i < params->n_queue_pairs; i++) {
- status = rte_cryptodev_queue_pair_setup(dev_id, i, &queue_conf, socket_id);
+ status = rte_cryptodev_queue_pair_setup(dev_id, i, &queue_conf, numa_id);
if (status)
return status;
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 211/227] examples/ptpclient: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (209 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 210/227] examples/pipeline: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 212/227] examples/ptp_tap_relay_sw: " Chengwen Feng
` (16 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/ptpclient/ptpclient.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c
index 59ce892742..acfe31f636 100644
--- a/examples/ptpclient/ptpclient.c
+++ b/examples/ptpclient/ptpclient.c
@@ -181,7 +181,7 @@ port_init(uint16_t port, struct rte_mempool *mp)
rxconf->offloads = port_conf.rxmode.offloads;
retval = rte_eth_rx_queue_setup(port, q, nb_rxd,
- rte_eth_dev_socket_id(port), rxconf, mp);
+ rte_eth_dev_numa_id(port), rxconf, mp);
if (retval < 0)
return retval;
@@ -195,7 +195,7 @@ port_init(uint16_t port, struct rte_mempool *mp)
txconf->offloads = port_conf.txmode.offloads;
retval = rte_eth_tx_queue_setup(port, q, nb_txd,
- rte_eth_dev_socket_id(port), txconf);
+ rte_eth_dev_numa_id(port), txconf);
if (retval < 0)
return retval;
}
@@ -736,7 +736,7 @@ main(int argc, char *argv[])
/* Creates a new mempool in memory to hold the mbufs. 8< */
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", NUM_MBUFS * nb_ports,
- MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
/* >8 End of a new mempool in memory to hold the mbufs. */
if (mbuf_pool == NULL)
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 212/227] examples/ptp_tap_relay_sw: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (210 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 211/227] examples/ptpclient: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 213/227] examples/qos_meter: " Chengwen Feng
` (15 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/ptp_tap_relay_sw/ptp_tap_relay_sw.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/ptp_tap_relay_sw/ptp_tap_relay_sw.c b/examples/ptp_tap_relay_sw/ptp_tap_relay_sw.c
index f9a44812ed..75f521d9e8 100644
--- a/examples/ptp_tap_relay_sw/ptp_tap_relay_sw.c
+++ b/examples/ptp_tap_relay_sw/ptp_tap_relay_sw.c
@@ -146,12 +146,12 @@ port_init(uint16_t port, struct rte_mempool *mp)
return ret;
ret = rte_eth_rx_queue_setup(port, 0, nb_rxd,
- rte_eth_dev_socket_id(port), NULL, mp);
+ rte_eth_dev_numa_id(port), NULL, mp);
if (ret < 0)
return ret;
ret = rte_eth_tx_queue_setup(port, 0, nb_txd,
- rte_eth_dev_socket_id(port), NULL);
+ rte_eth_dev_numa_id(port), NULL);
if (ret < 0)
return ret;
@@ -393,7 +393,7 @@ main(int argc, char **argv)
mp = rte_pktmbuf_pool_create("MBUF_POOL", NUM_MBUFS * nb_ports,
MBUF_CACHE, 0,
RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (mp == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 213/227] examples/qos_meter: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (211 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 212/227] examples/ptp_tap_relay_sw: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 214/227] examples/qos_sched: " Chengwen Feng
` (14 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/qos_meter/main.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c
index 59759355cd..efe6d3b63c 100644
--- a/examples/qos_meter/main.c
+++ b/examples/qos_meter/main.c
@@ -319,7 +319,7 @@ main(int argc, char **argv)
/* Buffer pool init */
pool = rte_pktmbuf_pool_create("pool", NB_MBUF, MEMPOOL_CACHE_SIZE,
- 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (pool == NULL)
rte_exit(EXIT_FAILURE, "Buffer pool creation error\n");
@@ -359,7 +359,7 @@ main(int argc, char **argv)
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(port_rx, NIC_RX_QUEUE, nb_rxd,
- rte_eth_dev_socket_id(port_rx),
+ rte_eth_dev_numa_id(port_rx),
&rxq_conf, pool);
if (ret < 0)
rte_exit(EXIT_FAILURE, "Port %d RX queue setup error (%d)\n", port_rx, ret);
@@ -367,7 +367,7 @@ main(int argc, char **argv)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(port_rx, NIC_TX_QUEUE, nb_txd,
- rte_eth_dev_socket_id(port_rx),
+ rte_eth_dev_numa_id(port_rx),
&txq_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE, "Port %d TX queue setup error (%d)\n", port_rx, ret);
@@ -409,7 +409,7 @@ main(int argc, char **argv)
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(port_tx, NIC_RX_QUEUE, nb_rxd,
- rte_eth_dev_socket_id(port_tx),
+ rte_eth_dev_numa_id(port_tx),
NULL, pool);
if (ret < 0)
rte_exit(EXIT_FAILURE, "Port %d RX queue setup error (%d)\n", port_tx, ret);
@@ -417,14 +417,14 @@ main(int argc, char **argv)
txq_conf = dev_info.default_txconf;
txq_conf.offloads = conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(port_tx, NIC_TX_QUEUE, nb_txd,
- rte_eth_dev_socket_id(port_tx),
+ rte_eth_dev_numa_id(port_tx),
NULL);
if (ret < 0)
rte_exit(EXIT_FAILURE, "Port %d TX queue setup error (%d)\n", port_tx, ret);
- tx_buffer = rte_zmalloc_socket("tx_buffer",
+ tx_buffer = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(RTE_MBUF_F_TX_BURST_MAX), 0,
- rte_eth_dev_socket_id(port_tx));
+ rte_eth_dev_numa_id(port_tx));
if (tx_buffer == NULL)
rte_exit(EXIT_FAILURE, "Port %d TX buffer allocation error\n",
port_tx);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 214/227] examples/qos_sched: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (212 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 213/227] examples/qos_meter: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 215/227] examples/rxtx_callbacks: " Chengwen Feng
` (13 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/qos_sched/args.c | 4 ++--
examples/qos_sched/init.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
index 04e2a0e03c..739cc5dab9 100644
--- a/examples/qos_sched/args.c
+++ b/examples/qos_sched/args.c
@@ -394,8 +394,8 @@ app_parse_args(int argc, char **argv)
qos_conf[i].wt_core);
return -1;
}
- uint32_t rx_sock = rte_lcore_to_socket_id(qos_conf[i].rx_core);
- uint32_t wt_sock = rte_lcore_to_socket_id(qos_conf[i].wt_core);
+ uint32_t rx_sock = rte_lcore_to_numa_id(qos_conf[i].rx_core);
+ uint32_t wt_sock = rte_lcore_to_numa_id(qos_conf[i].wt_core);
if (rx_sock != wt_sock) {
RTE_LOG(ERR, APP, "pfc %u: RX and WT must be on the same socket\n", i + 1);
return -1;
diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index 9f4b2e0082..40dece4146 100644
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -127,7 +127,7 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
fflush(stdout);
rx_conf.offloads = local_port_conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(portid, 0, (uint16_t)ring_conf.rx_size,
- rte_eth_dev_socket_id(portid), &rx_conf, mp);
+ rte_eth_dev_numa_id(portid), &rx_conf, mp);
if (ret < 0)
rte_exit(EXIT_FAILURE,
"rte_eth_tx_queue_setup: err=%d, port=%u\n",
@@ -137,7 +137,7 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
fflush(stdout);
tx_conf.offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(portid, 0,
- (uint16_t)ring_conf.tx_size, rte_eth_dev_socket_id(portid), &tx_conf);
+ (uint16_t)ring_conf.tx_size, rte_eth_dev_numa_id(portid), &tx_conf);
if (ret < 0)
rte_exit(EXIT_FAILURE,
"rte_eth_tx_queue_setup: err=%d, port=%u queue=%d\n",
@@ -333,7 +333,7 @@ int app_init(void)
/* Initialize each active flow */
for(i = 0; i < nb_pfc; i++) {
- uint32_t socket = rte_lcore_to_socket_id(qos_conf[i].rx_core);
+ uint32_t socket = rte_lcore_to_numa_id(qos_conf[i].rx_core);
struct rte_ring *ring;
struct rte_eth_link link;
int retry_count = 100, retry_delay = 100; /* try every 100ms for 10 sec */
@@ -360,7 +360,7 @@ int app_init(void)
qos_conf[i].mbuf_pool = rte_pktmbuf_pool_create(pool_name,
mp_size, burst_conf.rx_burst * 4, 0,
RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_eth_dev_socket_id(qos_conf[i].rx_port));
+ rte_eth_dev_numa_id(qos_conf[i].rx_port));
if (qos_conf[i].mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init mbuf pool for socket %u\n", i);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 215/227] examples/rxtx_callbacks: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (213 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 214/227] examples/qos_sched: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 216/227] examples/server_node_efd: " Chengwen Feng
` (12 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/rxtx_callbacks/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/rxtx_callbacks/main.c b/examples/rxtx_callbacks/main.c
index 4682921285..02c5c69cd7 100644
--- a/examples/rxtx_callbacks/main.c
+++ b/examples/rxtx_callbacks/main.c
@@ -173,7 +173,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
for (q = 0; q < rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port, q, nb_rxd,
- rte_eth_dev_socket_id(port), &rxconf, mbuf_pool);
+ rte_eth_dev_numa_id(port), &rxconf, mbuf_pool);
if (retval < 0)
return retval;
}
@@ -182,7 +182,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
txconf.offloads = port_conf.txmode.offloads;
for (q = 0; q < tx_rings; q++) {
retval = rte_eth_tx_queue_setup(port, q, nb_txd,
- rte_eth_dev_socket_id(port), &txconf);
+ rte_eth_dev_numa_id(port), &txconf);
if (retval < 0)
return retval;
}
@@ -250,9 +250,9 @@ lcore_main(void)
uint16_t port;
RTE_ETH_FOREACH_DEV(port)
- if (rte_eth_dev_socket_id(port) >= 0 &&
- rte_eth_dev_socket_id(port) !=
- (int)rte_socket_id())
+ if (rte_eth_dev_numa_id(port) >= 0 &&
+ rte_eth_dev_numa_id(port) !=
+ (int)rte_numa_id())
printf("WARNING, port %u is on remote NUMA node to "
"polling thread.\n\tPerformance will "
"not be optimal.\n", port);
@@ -322,7 +322,7 @@ main(int argc, char *argv[])
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL",
NUM_MBUFS * nb_ports, MBUF_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 216/227] examples/server_node_efd: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (214 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 215/227] examples/rxtx_callbacks: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 217/227] examples/skeleton: " Chengwen Feng
` (11 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/server_node_efd/efd_node/node.c | 6 +++---
examples/server_node_efd/efd_server/init.c | 22 +++++++++++-----------
examples/server_node_efd/efd_server/main.c | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/examples/server_node_efd/efd_node/node.c b/examples/server_node_efd/efd_node/node.c
index fc2aa5ffef..2eaf1ad692 100644
--- a/examples/server_node_efd/efd_node/node.c
+++ b/examples/server_node_efd/efd_node/node.c
@@ -139,9 +139,9 @@ configure_tx_buffer(uint16_t port_id, uint16_t size)
int ret;
/* Initialize TX buffers */
- tx_buffer[port_id] = rte_zmalloc_socket("tx_buffer",
+ tx_buffer[port_id] = rte_zmalloc_numa("tx_buffer",
RTE_ETH_TX_BUFFER_SIZE(size), 0,
- rte_eth_dev_socket_id(port_id));
+ rte_eth_dev_numa_id(port_id));
if (tx_buffer[port_id] == NULL)
rte_exit(EXIT_FAILURE,
"Cannot allocate buffer for tx on port %u\n", port_id);
@@ -201,7 +201,7 @@ create_hash_table(const struct shared_info *info)
struct rte_hash_parameters hash_params = {
.entries = num_flows_node * 2, /* table load = 50% */
.key_len = sizeof(uint32_t), /* Store IPv4 dest IP address */
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.hash_func_init_val = 0,
};
diff --git a/examples/server_node_efd/efd_server/init.c b/examples/server_node_efd/efd_server/init.c
index 9644627219..633c7b0bb2 100644
--- a/examples/server_node_efd/efd_server/init.c
+++ b/examples/server_node_efd/efd_server/init.c
@@ -77,7 +77,7 @@ init_mbuf_pools(void)
printf("Creating mbuf pool '%s' [%u mbufs] ...\n",
PKTMBUF_POOL_NAME, num_mbufs);
pktmbuf_pool = rte_pktmbuf_pool_create(PKTMBUF_POOL_NAME, num_mbufs,
- MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
return pktmbuf_pool == NULL; /* 0 on success */
}
@@ -136,7 +136,7 @@ init_port(uint16_t port_num)
for (q = 0; q < rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port_num, q, rx_ring_size,
- rte_eth_dev_socket_id(port_num),
+ rte_eth_dev_numa_id(port_num),
NULL, pktmbuf_pool);
if (retval < 0)
return retval;
@@ -146,7 +146,7 @@ init_port(uint16_t port_num)
txconf.offloads = port_conf.txmode.offloads;
for (q = 0; q < tx_rings; q++) {
retval = rte_eth_tx_queue_setup(port_num, q, tx_ring_size,
- rte_eth_dev_socket_id(port_num),
+ rte_eth_dev_numa_id(port_num),
&txconf);
if (retval < 0)
return retval;
@@ -174,7 +174,7 @@ static int
init_shm_rings(void)
{
unsigned int i;
- unsigned int socket_id;
+ unsigned int numa_id;
const char *q_name;
const unsigned int ringsize = NODE_QUEUE_RINGSIZE;
@@ -186,10 +186,10 @@ init_shm_rings(void)
for (i = 0; i < num_nodes; i++) {
/* Create an RX queue for each node */
- socket_id = rte_socket_id();
+ numa_id = rte_numa_id();
q_name = get_rx_queue_name(i);
nodes[i].rx_q = rte_ring_create(q_name,
- ringsize, socket_id,
+ ringsize, numa_id,
RING_F_SP_ENQ | RING_F_SC_DEQ);
if (nodes[i].rx_q == NULL)
rte_exit(EXIT_FAILURE, "Cannot create rx ring queue "
@@ -207,11 +207,11 @@ init_shm_rings(void)
static void
create_efd_table(void)
{
- uint8_t socket_id = rte_socket_id();
+ uint8_t numa_id = rte_numa_id();
/* create table */
efd_table = rte_efd_create("flow table", num_flows * 2, sizeof(uint32_t),
- 1 << socket_id, socket_id);
+ 1 << numa_id, numa_id);
if (efd_table == NULL)
rte_exit(EXIT_FAILURE, "Problem creating the flow table\n");
@@ -223,7 +223,7 @@ populate_efd_table(void)
unsigned int i;
int32_t ret;
uint32_t ip_dst;
- uint8_t socket_id = rte_socket_id();
+ uint8_t numa_id = rte_numa_id();
uint64_t node_id;
/* Add flows in table */
@@ -231,7 +231,7 @@ populate_efd_table(void)
node_id = i % num_nodes;
ip_dst = rte_cpu_to_be_32(i);
- ret = rte_efd_update(efd_table, socket_id,
+ ret = rte_efd_update(efd_table, numa_id,
(void *)&ip_dst, (efd_value_t)node_id);
if (ret < 0)
rte_exit(EXIT_FAILURE, "Unable to add entry %u in "
@@ -325,7 +325,7 @@ init(int argc, char *argv[])
/* set up array for port data */
mz = rte_memzone_reserve(MZ_SHARED_INFO, sizeof(*info),
- rte_socket_id(), NO_FLAGS);
+ rte_numa_id(), NO_FLAGS);
if (mz == NULL)
rte_exit(EXIT_FAILURE, "Cannot reserve memory zone "
"for port information\n");
diff --git a/examples/server_node_efd/efd_server/main.c b/examples/server_node_efd/efd_server/main.c
index 70a7372d4a..88af8eed1b 100644
--- a/examples/server_node_efd/efd_server/main.c
+++ b/examples/server_node_efd/efd_server/main.c
@@ -255,7 +255,7 @@ enqueue_rx_packet(uint8_t node, struct rte_mbuf *buf)
/* Processing packets. 8< */
static void
process_packets(uint32_t port_num __rte_unused, struct rte_mbuf *pkts[],
- uint16_t rx_count, unsigned int socket_id)
+ uint16_t rx_count, unsigned int numa_id)
{
uint16_t i;
uint8_t node;
@@ -273,7 +273,7 @@ process_packets(uint32_t port_num __rte_unused, struct rte_mbuf *pkts[],
key_ptrs[i] = (void *)&ipv4_dst_ip[i];
}
- rte_efd_lookup_bulk(efd_table, socket_id, rx_count,
+ rte_efd_lookup_bulk(efd_table, numa_id, rx_count,
(const void **) key_ptrs, data);
for (i = 0; i < rx_count; i++) {
node = (uint8_t) ((uintptr_t)data[i]);
@@ -303,7 +303,7 @@ static void
do_packet_forwarding(void)
{
unsigned int port_num = 0; /* indexes the port[] array */
- unsigned int socket_id = rte_socket_id();
+ unsigned int numa_id = rte_numa_id();
for (;;) {
struct rte_mbuf *buf[PACKET_READ_SIZE];
@@ -316,7 +316,7 @@ do_packet_forwarding(void)
/* Now process the NIC packets read */
if (likely(rx_count > 0))
- process_packets(port_num, buf, rx_count, socket_id);
+ process_packets(port_num, buf, rx_count, numa_id);
/* move to next port */
if (++port_num == info->num_ports)
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 217/227] examples/skeleton: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (215 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 216/227] examples/server_node_efd: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 218/227] examples/vhost: " Chengwen Feng
` (10 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/skeleton/basicfwd.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/skeleton/basicfwd.c b/examples/skeleton/basicfwd.c
index e8c18d5b87..652d0f10c7 100644
--- a/examples/skeleton/basicfwd.c
+++ b/examples/skeleton/basicfwd.c
@@ -66,7 +66,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
/* Allocate and set up 1 RX queue per Ethernet port. */
for (q = 0; q < rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port, q, nb_rxd,
- rte_eth_dev_socket_id(port), NULL, mbuf_pool);
+ rte_eth_dev_numa_id(port), NULL, mbuf_pool);
if (retval < 0)
return retval;
}
@@ -76,7 +76,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
/* Allocate and set up 1 TX queue per Ethernet port. */
for (q = 0; q < tx_rings; q++) {
retval = rte_eth_tx_queue_setup(port, q, nb_txd,
- rte_eth_dev_socket_id(port), &txconf);
+ rte_eth_dev_numa_id(port), &txconf);
if (retval < 0)
return retval;
}
@@ -123,9 +123,9 @@ lcore_main(void)
* for best performance.
*/
RTE_ETH_FOREACH_DEV(port)
- if (rte_eth_dev_socket_id(port) >= 0 &&
- rte_eth_dev_socket_id(port) !=
- (int)rte_socket_id())
+ if (rte_eth_dev_numa_id(port) >= 0 &&
+ rte_eth_dev_numa_id(port) !=
+ (int)rte_numa_id())
printf("WARNING, port %u is on remote NUMA node to "
"polling thread.\n\tPerformance will "
"not be optimal.\n", port);
@@ -194,7 +194,7 @@ main(int argc, char *argv[])
/* Create and allocate a mempool to hold the mbufs. 8< */
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", NUM_MBUFS * nb_ports,
- MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
/* >8 End of allocating mempool to hold mbuf. */
if (mbuf_pool == NULL)
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 218/227] examples/vhost: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (216 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 217/227] examples/skeleton: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 219/227] examples/vhost_crypto: " Chengwen Feng
` (9 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/vhost/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index e7434fd189..898625fd02 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -320,7 +320,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
rxconf->offloads = port_conf.rxmode.offloads;
for (q = 0; q < rx_rings; q ++) {
retval = rte_eth_rx_queue_setup(port, q, rx_ring_size,
- rte_eth_dev_socket_id(port),
+ rte_eth_dev_numa_id(port),
rxconf,
mbuf_pool);
if (retval < 0) {
@@ -333,7 +333,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
txconf->offloads = port_conf.txmode.offloads;
for (q = 0; q < tx_rings; q ++) {
retval = rte_eth_tx_queue_setup(port, q, tx_ring_size,
- rte_eth_dev_socket_id(port),
+ rte_eth_dev_numa_id(port),
txconf);
if (retval < 0) {
RTE_LOG(ERR, VHOST_PORT,
@@ -1559,7 +1559,7 @@ main(int argc, char *argv[])
*/
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", total_num_mbufs,
MBUF_CACHE_SIZE, 0, MBUF_DATA_SIZE,
- rte_socket_id());
+ rte_numa_id());
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 219/227] examples/vhost_crypto: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (217 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 218/227] examples/vhost: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 220/227] examples/vm_power_manager: " Chengwen Feng
` (8 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/vhost_crypto/main.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/examples/vhost_crypto/main.c b/examples/vhost_crypto/main.c
index 53bd8fa825..7f28d507f1 100644
--- a/examples/vhost_crypto/main.c
+++ b/examples/vhost_crypto/main.c
@@ -313,7 +313,7 @@ new_device(int vid)
}
ret = rte_vhost_crypto_create(vid, info->cid, info->sess_pool,
- rte_lcore_to_socket_id(options.los[i].lcore_id));
+ rte_lcore_to_numa_id(options.los[i].lcore_id));
if (ret) {
RTE_LOG(ERR, USER1, "Cannot create vhost crypto\n");
return ret;
@@ -510,8 +510,8 @@ main(int argc, char *argv[])
struct lcore_option *lo = &options.los[i];
struct vhost_crypto_info *info;
- info = rte_zmalloc_socket(NULL, sizeof(*info),
- RTE_CACHE_LINE_SIZE, rte_lcore_to_socket_id(
+ info = rte_zmalloc_numa(NULL, sizeof(*info),
+ RTE_CACHE_LINE_SIZE, rte_lcore_to_numa_id(
lo->lcore_id));
if (!info) {
ret = -ENOMEM;
@@ -544,7 +544,7 @@ main(int argc, char *argv[])
}
config.nb_queue_pairs = dev_info.max_nb_queue_pairs;
- config.socket_id = rte_lcore_to_socket_id(lo->lcore_id);
+ config.numa_id = rte_lcore_to_numa_id(lo->lcore_id);
config.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
ret = rte_cryptodev_configure(info->cid, &config);
@@ -560,13 +560,13 @@ main(int argc, char *argv[])
SESSION_MAP_ENTRIES,
rte_cryptodev_sym_get_private_session_size(
info->cid), 0, 0,
- rte_lcore_to_socket_id(lo->lcore_id));
+ rte_lcore_to_numa_id(lo->lcore_id));
cop_type = RTE_CRYPTO_OP_TYPE_SYMMETRIC;
} else {
snprintf(name, 127, "ASYM_SESS_POOL_%u", lo->lcore_id);
info->sess_pool = rte_cryptodev_asym_session_pool_create(name,
SESSION_MAP_ENTRIES, 0, 64,
- rte_lcore_to_socket_id(lo->lcore_id));
+ rte_lcore_to_numa_id(lo->lcore_id));
cop_type = RTE_CRYPTO_OP_TYPE_ASYMMETRIC;
}
@@ -579,7 +579,7 @@ main(int argc, char *argv[])
info->cop_pool = rte_crypto_op_pool_create(name,
cop_type, NB_MEMPOOL_OBJS,
NB_CACHE_OBJS, VHOST_CRYPTO_MAX_IV_LEN,
- rte_lcore_to_socket_id(lo->lcore_id));
+ rte_lcore_to_numa_id(lo->lcore_id));
if (!info->cop_pool) {
RTE_LOG(ERR, USER1, "Failed to create crypto pool");
@@ -596,7 +596,7 @@ main(int argc, char *argv[])
for (j = 0; j < dev_info.max_nb_queue_pairs; j++) {
ret = rte_cryptodev_queue_pair_setup(info->cid, j,
- &qp_conf, rte_lcore_to_socket_id(
+ &qp_conf, rte_lcore_to_numa_id(
lo->lcore_id));
if (ret < 0) {
RTE_LOG(ERR, USER1, "Failed to configure qp\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 220/227] examples/vm_power_manager: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (218 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 219/227] examples/vhost_crypto: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:52 ` [PATCH 221/227] examples/vmdq: " Chengwen Feng
` (7 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/vm_power_manager/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index d6f18187a7..47e9c2abbb 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -84,7 +84,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
/* Allocate and set up 1 RX queue per Ethernet port. */
for (q = 0; q < rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port, q, RX_RING_SIZE,
- rte_eth_dev_socket_id(port), NULL, mbuf_pool);
+ rte_eth_dev_numa_id(port), NULL, mbuf_pool);
if (retval < 0)
return retval;
}
@@ -94,7 +94,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
/* Allocate and set up 1 TX queue per Ethernet port. */
for (q = 0; q < tx_rings; q++) {
retval = rte_eth_tx_queue_setup(port, q, TX_RING_SIZE,
- rte_eth_dev_socket_id(port), &txq_conf);
+ rte_eth_dev_numa_id(port), &txq_conf);
if (retval < 0)
return retval;
}
@@ -360,7 +360,7 @@ main(int argc, char **argv)
if (nb_ports > 0) {
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL",
NUM_MBUFS * nb_ports, MBUF_CACHE_SIZE, 0,
- RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 221/227] examples/vmdq: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (219 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 220/227] examples/vm_power_manager: " Chengwen Feng
@ 2026-11-03 14:52 ` Chengwen Feng
2026-11-03 14:53 ` [PATCH 222/227] examples/vmdq_dcb: " Chengwen Feng
` (6 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:52 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/vmdq/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c
index 63ac44deba..1a852cae95 100644
--- a/examples/vmdq/main.c
+++ b/examples/vmdq/main.c
@@ -280,7 +280,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
txconf->offloads = port_conf.txmode.offloads;
for (q = 0; q < rxRings; q++) {
retval = rte_eth_rx_queue_setup(port, q, rxRingSize,
- rte_eth_dev_socket_id(port),
+ rte_eth_dev_numa_id(port),
rxconf,
mbuf_pool);
if (retval < 0) {
@@ -291,7 +291,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
for (q = 0; q < txRings; q++) {
retval = rte_eth_tx_queue_setup(port, q, txRingSize,
- rte_eth_dev_socket_id(port),
+ rte_eth_dev_numa_id(port),
txconf);
if (retval < 0) {
printf("initialise tx queue %d failed\n", q);
@@ -653,7 +653,7 @@ main(int argc, char *argv[])
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL",
NUM_MBUFS_PER_PORT * nb_ports, MBUF_CACHE_SIZE,
- 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 222/227] examples/vmdq_dcb: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (220 preceding siblings ...)
2026-11-03 14:52 ` [PATCH 221/227] examples/vmdq: " Chengwen Feng
@ 2026-11-03 14:53 ` Chengwen Feng
2026-11-03 14:53 ` [PATCH 223/227] eal: deprecate legacy socket API aliases Chengwen Feng
` (5 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:53 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/vmdq_dcb/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c
index 563b4f9ce1..a41362984e 100644
--- a/examples/vmdq_dcb/main.c
+++ b/examples/vmdq_dcb/main.c
@@ -303,7 +303,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
for (q = 0; q < num_queues; q++) {
retval = rte_eth_rx_queue_setup(port, q, rxRingSize,
- rte_eth_dev_socket_id(port),
+ rte_eth_dev_numa_id(port),
NULL,
mbuf_pool);
if (retval < 0) {
@@ -316,7 +316,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
txq_conf.offloads = port_conf.txmode.offloads;
for (q = 0; q < num_queues; q++) {
retval = rte_eth_tx_queue_setup(port, q, txRingSize,
- rte_eth_dev_socket_id(port),
+ rte_eth_dev_numa_id(port),
&txq_conf);
if (retval < 0) {
printf("initialize tx queue %d failed\n", q);
@@ -687,7 +687,7 @@ main(int argc, char *argv[])
mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL",
NUM_MBUFS_PER_PORT * nb_ports, MBUF_CACHE_SIZE,
- 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+ 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
if (mbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 223/227] eal: deprecate legacy socket API aliases
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (221 preceding siblings ...)
2026-11-03 14:53 ` [PATCH 222/227] examples/vmdq_dcb: " Chengwen Feng
@ 2026-11-03 14:53 ` Chengwen Feng
2026-11-03 14:53 ` [PATCH 224/227] doc: use NUMA node terminology Chengwen Feng
` (4 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:53 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Complete the socket to NUMA node terminology migration:
- Rename the numa_id fields of rte_memseg, rte_memseg_list,
rte_memzone and rte_service_spec (were socket_id), keeping
socket_id as a deprecated union alias, and switch the
remaining in-tree users accordingly.
- Mark the legacy socket-named functions as deprecated:
rte_socket_id(), rte_socket_count(), rte_socket_id_by_idx(),
rte_lcore_to_socket_id(), the rte_malloc_socket() family,
rte_malloc_heap_get_socket(), rte_malloc_get_socket_stats(),
rte_malloc_heap_socket_is_external(), rte_eth_dev_socket_id(),
rte_cryptodev_socket_id(), rte_compressdev_socket_id(),
rte_event_dev_socket_id() and rte_rawdev_socket_id().
- Mark the SOCKET_ID_ANY macro as deprecated; use
RTE_NUMA_ID_ANY instead.
Update the deprecation notices and the 26.11 release notes
accordingly.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/proc-info/main.c | 4 +--
app/test/test_malloc.c | 4 +--
app/test/test_memzone.c | 8 +++---
doc/guides/rel_notes/deprecation.rst | 27 +++++++++++++++----
doc/guides/rel_notes/release_26_11.rst | 9 +++++++
drivers/common/qat/qat_qp.c | 4 +--
drivers/common/zsda/zsda_qp.c | 2 +-
drivers/crypto/bcmfs/bcmfs_qp.c | 4 +--
drivers/crypto/ccp/ccp_dev.c | 4 +--
drivers/event/sw/sw_evdev.c | 2 +-
drivers/net/failsafe/failsafe_intr.c | 2 +-
.../link_mgmt/link_100g/nt4ga_link_100g.c | 2 +-
.../link_agx_100g/nt4ga_agx_link_100g.c | 2 +-
drivers/net/ntnic/ntnic_ethdev.c | 6 ++---
drivers/net/ring/rte_eth_ring.c | 2 +-
drivers/net/sfc/sfc_mae_counter.c | 2 +-
drivers/net/sfc/sfc_repr_proxy.c | 2 +-
drivers/net/softnic/rte_eth_softnic_thread.c | 2 +-
lib/compressdev/rte_compressdev.h | 1 +
lib/cryptodev/rte_cryptodev.h | 1 +
lib/dispatcher/rte_dispatcher.c | 2 +-
lib/eal/common/eal_common_dynmem.c | 2 +-
lib/eal/common/eal_common_memory.c | 10 +++----
lib/eal/common/eal_common_memzone.c | 4 +--
lib/eal/common/malloc_heap.c | 12 ++++-----
lib/eal/freebsd/eal.c | 2 +-
lib/eal/include/rte_lcore.h | 5 ++++
lib/eal/include/rte_malloc.h | 7 +++++
lib/eal/include/rte_memory.h | 24 ++++++++++++++---
lib/eal/include/rte_memzone.h | 10 ++++++-
lib/eal/include/rte_service_component.h | 12 +++++++--
lib/eal/linux/eal.c | 2 +-
lib/eal/linux/eal_memalloc.c | 6 ++---
lib/eal/linux/eal_memory.c | 6 ++---
lib/eal/windows/eal_memalloc.c | 8 +++---
lib/ethdev/ethdev_driver.c | 2 +-
lib/ethdev/rte_ethdev.h | 1 +
lib/eventdev/rte_event_crypto_adapter.c | 2 +-
lib/eventdev/rte_event_dma_adapter.c | 2 +-
lib/eventdev/rte_event_eth_rx_adapter.c | 2 +-
lib/eventdev/rte_event_eth_tx_adapter.c | 2 +-
lib/eventdev/rte_event_timer_adapter.c | 2 +-
lib/eventdev/rte_event_vector_adapter.c | 2 +-
lib/eventdev/rte_eventdev.h | 1 +
lib/mempool/rte_mempool.c | 4 +--
lib/rawdev/rte_rawdev.h | 1 +
lib/ring/rte_ring.c | 4 +--
lib/table/rte_swx_table_wm.c | 2 +-
48 files changed, 152 insertions(+), 77 deletions(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 8e8cc923ce..1fd06e866c 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -1587,7 +1587,7 @@ show_ring(char *name)
"\t -- Single Producer Enqueue (%u)\n"
"\t -- Single Consumer Dequeue (%u)\n",
ptr->name,
- ptr->memzone->socket_id,
+ ptr->memzone->numa_id,
ptr->flags & RING_F_SP_ENQ,
ptr->flags & RING_F_SC_DEQ);
printf(" - size (%u) mask (0x%x) capacity (%u)\n",
@@ -1649,7 +1649,7 @@ show_mempool(char *name)
ptr->trailer_size,
ptr->private_data_size);
printf(" - memezone - socket %d\n",
- ptr->mz->socket_id);
+ ptr->mz->numa_id);
printf(" - Count: avail (%u), in use (%u)\n",
rte_mempool_avail_count(ptr),
rte_mempool_in_use_count(ptr));
diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index ae6f8a979e..34ef99d787 100644
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -962,7 +962,7 @@ check_socket_mem(const struct rte_memseg_list *msl, void *arg)
if (msl->external)
return 0;
- return *numa_id == msl->socket_id;
+ return *numa_id == msl->numa_id;
}
/* Check if memory is available on a specific numa_id */
@@ -981,7 +981,7 @@ static int32_t
addr_to_socket(void * addr)
{
const struct rte_memseg *ms = rte_mem_virt2memseg(addr, NULL);
- return ms == NULL ? -1 : ms->socket_id;
+ return ms == NULL ? -1 : ms->numa_id;
}
diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index b3e76b6e4f..1ebbf6286b 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -576,7 +576,7 @@ test_memzone_reserve_max_aligned(void)
const unsigned int align = 1 << ((rte_rand() % 8) + 5); /* from 128 up to 4k alignment */
/* memzone size may be between size and size - align */
- minlen = find_max_block_free_size(align, numa_id);
+ minlen = find_max_block_free_size(align, socket);
maxlen = find_max_block_free_size(0, numa_id);
if (minlen == 0 || maxlen == 0) {
@@ -587,7 +587,7 @@ test_memzone_reserve_max_aligned(void)
mz = rte_memzone_reserve_aligned(
TEST_MEMZONE_NAME("max_zone_aligned"),
- 0, numa_id, 0, align);
+ 0, socket, 0, align);
if (mz == NULL) {
printf("Failed to reserve a big chunk of memory - %s\n",
rte_strerror(rte_errno));
@@ -1053,9 +1053,9 @@ test_memzone_basic(void)
memzone3->iova, memzone3->len))
return -1;
- printf("check numa_id ID\n");
+ printf("check socket ID\n");
- /* memzone2 must be on numa_id id 0 and memzone3 on numa_id 1 */
+ /* memzone2 must be on socket id 0 and memzone3 on socket 1 */
if (memzone2->numa_id != 0)
return -1;
if (memzone3 != NULL && memzone3->numa_id != 1)
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 297ce8415c..c8226db555 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -16,16 +16,33 @@ Other API and ABI deprecation notices are to be posted below.
Deprecation Notices
-------------------
-* lib: The public structures use ``socket_id`` to refer to a NUMA node,
+* lib/eal: The public structures use ``socket_id`` to refer to a NUMA node,
which conflates CPU sockets with NUMA memory nodes.
The field is renamed to ``numa_id``, keeping ``socket_id``
as a deprecated union alias.
- The following structures are affected: ``rte_hash_parameters``,
- ``rte_fbk_hash_params``, ``rte_member_parameters`` /
- ``rte_member_setsum``, ``rte_mempool`` and ``rte_compressdev_config``
- (more structures will follow in this release).
+ Affected structures include: ``rte_acl_param``, ``rte_bbdev_data``,
+ ``rte_bbdev_info``, ``rte_bbdev_queue_conf``, ``rte_compressdev_config``,
+ ``rte_cryptodev_config``, ``rte_event_timer_adapter_conf``,
+ ``rte_event_vector_adapter_conf``, ``rte_fbk_hash_params``,
+ ``rte_graph``, ``rte_graph_cluster_stats_param``, ``rte_graph_param``,
+ ``rte_gro_param``, ``rte_hash_parameters``, ``rte_ipsec_sad_conf``,
+ ``rte_member_parameters``, ``rte_member_setsum``, ``rte_memseg``,
+ ``rte_memseg_list``, ``rte_memzone``, ``rte_ml_dev_config``,
+ ``rte_mempool``, ``rte_rawdev``, ``rte_rawdev_info`` and
+ ``rte_service_spec``.
Applications should switch to ``numa_id``.
+* eal/lib: The legacy socket-named functions
+ ``rte_socket_id()``, ``rte_socket_count()``, ``rte_socket_id_by_idx()``,
+ ``rte_lcore_to_socket_id()``, the ``rte_malloc_socket()`` family,
+ ``rte_malloc_heap_get_socket()``, ``rte_malloc_get_socket_stats()``,
+ ``rte_malloc_heap_socket_is_external()``, ``rte_eth_dev_socket_id()``,
+ ``rte_cryptodev_socket_id()``, ``rte_compressdev_socket_id()``,
+ ``rte_event_dev_socket_id()`` and ``rte_rawdev_socket_id()``
+ are deprecated aliases of their NUMA-named replacements,
+ and will be removed in a future release.
+ The ``SOCKET_ID_ANY`` macro is deprecated; use ``RTE_NUMA_ID_ANY``.
+
* kvargs: The function ``rte_kvargs_process`` will get a new parameter
for returning key match count. It will ease handling of no-match case.
diff --git a/doc/guides/rel_notes/release_26_11.rst b/doc/guides/rel_notes/release_26_11.rst
index 0298d7bb36..eed7b643c4 100644
--- a/doc/guides/rel_notes/release_26_11.rst
+++ b/doc/guides/rel_notes/release_26_11.rst
@@ -475,6 +475,15 @@ Removed Items
API Changes
-----------
+* eal/lib: The socket-based naming has been fully migrated to NUMA node
+ terminology. The legacy socket-named functions (``rte_socket_id()``,
+ ``rte_malloc_socket()`` family, ``rte_eth_dev_socket_id()`` and friends)
+ and the ``SOCKET_ID_ANY`` macro are deprecated aliases of the
+ NUMA-named APIs and will be removed in a future release.
+ The ``socket_id`` fields of public structures are deprecated union
+ aliases of ``numa_id``.
+
+
.. This section should contain API changes. Sample format:
* sample: Add a short 1-2 sentence description of the API change
diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
index 0d4d2dda52..d6029f392d 100644
--- a/drivers/common/qat/qat_qp.c
+++ b/drivers/common/qat/qat_qp.c
@@ -317,7 +317,7 @@ queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size,
if (mz != 0) {
if (((size_t)queue_size <= mz->len) &&
((numa_id == RTE_NUMA_ID_ANY) ||
- (numa_id == mz->socket_id))) {
+ (numa_id == mz->numa_id))) {
QAT_LOG(DEBUG, "re-use memzone already "
"allocated for %s", queue_name);
return mz;
@@ -327,7 +327,7 @@ queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size,
"allocated %s, size %u, socket %d. "
"Requested size %u, socket %u",
queue_name, (uint32_t)mz->len,
- mz->socket_id, queue_size, numa_id);
+ mz->numa_id, queue_size, numa_id);
return NULL;
}
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
index 257898bed5..b2c89c3ca8 100644
--- a/drivers/common/zsda/zsda_qp.c
+++ b/drivers/common/zsda/zsda_qp.c
@@ -551,7 +551,7 @@ zsda_queue_dma_zone_reserve(const char *queue_name,
if (mz != 0) {
if (((size_t)queue_size <= mz->len) &&
((numa_id == (RTE_NUMA_ID_ANY & 0xffff)) ||
- (numa_id == (mz->socket_id & 0xffff)))) {
+ (numa_id == (mz->numa_id & 0xffff)))) {
ZSDA_LOG(DEBUG,
"re-use memzone already allocated for %s",
queue_name);
diff --git a/drivers/crypto/bcmfs/bcmfs_qp.c b/drivers/crypto/bcmfs/bcmfs_qp.c
index feaaa81015..003dc201b6 100644
--- a/drivers/crypto/bcmfs/bcmfs_qp.c
+++ b/drivers/crypto/bcmfs/bcmfs_qp.c
@@ -71,7 +71,7 @@ queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size,
if (mz != NULL) {
if (((size_t)queue_size <= mz->len) &&
(numa_id == RTE_NUMA_ID_ANY ||
- numa_id == mz->socket_id)) {
+ numa_id == mz->numa_id)) {
BCMFS_LOG(DEBUG, "re-use memzone already "
"allocated for %s", queue_name);
return mz;
@@ -81,7 +81,7 @@ queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size,
"allocated %s, size %u, socket %d. "
"Requested size %u, socket %u",
queue_name, (uint32_t)mz->len,
- mz->socket_id, queue_size, numa_id);
+ mz->numa_id, queue_size, numa_id);
return NULL;
}
diff --git a/drivers/crypto/ccp/ccp_dev.c b/drivers/crypto/ccp/ccp_dev.c
index defbb1e5a8..bb7c662808 100644
--- a/drivers/crypto/ccp/ccp_dev.c
+++ b/drivers/crypto/ccp/ccp_dev.c
@@ -93,7 +93,7 @@ ccp_queue_dma_zone_reserve(const char *queue_name,
if (mz != 0) {
if (((size_t)queue_size <= mz->len) &&
((numa_id == RTE_NUMA_ID_ANY) ||
- (numa_id == mz->socket_id))) {
+ (numa_id == mz->numa_id))) {
CCP_LOG_INFO("re-use memzone already "
"allocated for %s", queue_name);
return mz;
@@ -102,7 +102,7 @@ ccp_queue_dma_zone_reserve(const char *queue_name,
"allocated %s, size %u, socket %d. "
"Requested size %u, socket %u",
queue_name, (uint32_t)mz->len,
- mz->socket_id, queue_size, numa_id);
+ mz->numa_id, queue_size, numa_id);
return NULL;
}
diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index b2dc61142a..bccb0661b6 100644
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -1116,7 +1116,7 @@ sw_probe(struct rte_vdev_device *vdev)
snprintf(service.name, sizeof(service.name), "%s_service", name);
snprintf(sw->service_name, sizeof(sw->service_name), "%s_service",
name);
- service.socket_id = numa_id;
+ service.numa_id = numa_id;
service.callback = sw_sched_service_func;
service.callback_userdata = (void *)dev;
diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/failsafe_intr.c
index 68b7310b85..dd05b6d99b 100644
--- a/drivers/net/failsafe/failsafe_intr.c
+++ b/drivers/net/failsafe/failsafe_intr.c
@@ -134,7 +134,7 @@ fs_rx_event_proxy_service_install(struct fs_priv *priv)
memset(&service, 0, sizeof(struct rte_service_spec));
snprintf(service.name, sizeof(service.name), "%s_Rx_service",
priv->data->name);
- service.socket_id = priv->data->numa_node;
+ service.numa_id = priv->data->numa_node;
service.callback = fs_rx_event_proxy_routine;
service.callback_userdata = priv;
diff --git a/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c b/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c
index b9b3738454..674775641d 100644
--- a/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c
+++ b/drivers/net/ntnic/link_mgmt/link_100g/nt4ga_link_100g.c
@@ -721,7 +721,7 @@ static int nt4ga_link_100g_ports_init(struct adapter_info_s *p_adapter_info, nth
struct rte_service_spec adapter_monitor_service = {
.name = "ntnic-adapter-monitor",
.callback = nt4ga_link_100g_mon,
- .socket_id = RTE_NUMA_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
.callback_userdata = p_adapter_info,
};
diff --git a/drivers/net/ntnic/link_mgmt/link_agx_100g/nt4ga_agx_link_100g.c b/drivers/net/ntnic/link_mgmt/link_agx_100g/nt4ga_agx_link_100g.c
index c4e12b1c25..9eb8dba62c 100644
--- a/drivers/net/ntnic/link_mgmt/link_agx_100g/nt4ga_agx_link_100g.c
+++ b/drivers/net/ntnic/link_mgmt/link_agx_100g/nt4ga_agx_link_100g.c
@@ -1023,7 +1023,7 @@ int nt4ga_agx_link_100g_ports_init(struct adapter_info_s *p_adapter_info, nthw_f
struct rte_service_spec adapter_monitor_service = {
.name = "ntnic-adapter_agx-monitor",
.callback = nt4ga_agx_link_100g_mon,
- .socket_id = RTE_NUMA_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
.callback_userdata = p_adapter_info,
};
diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c
index 02c3be52e8..4b3c7b9c61 100644
--- a/drivers/net/ntnic/ntnic_ethdev.c
+++ b/drivers/net/ntnic/ntnic_ethdev.c
@@ -2443,7 +2443,7 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev)
struct rte_service_spec flm_update_spec = {
.name = "ntnic-flm_update_service",
.callback = adapter_flm_update_service,
- .socket_id = RTE_NUMA_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
.callback_userdata = p_drv
};
@@ -2460,7 +2460,7 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev)
struct rte_service_spec stat_spec = {
.name = "ntnic-stat_collect_service",
.callback = adapter_stat_service,
- .socket_id = RTE_NUMA_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
.callback_userdata = p_drv
};
@@ -2634,7 +2634,7 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev)
if (fpga_info->profile == FPGA_INFO_PROFILE_INLINE) {
struct rte_service_spec port_event_spec = {
.callback = port_event_service,
- .socket_id = RTE_NUMA_ID_ANY,
+ .numa_id = RTE_NUMA_ID_ANY,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
.callback_userdata = internals
};
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 9af86f4226..6da09ca3d7 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -520,7 +520,7 @@ int
rte_eth_from_ring(struct rte_ring *r)
{
return rte_eth_from_rings(r->name, &r, 1, &r, 1,
- r->memzone ? r->memzone->socket_id : RTE_NUMA_ID_ANY);
+ r->memzone ? r->memzone->numa_id : RTE_NUMA_ID_ANY);
}
static int
diff --git a/drivers/net/sfc/sfc_mae_counter.c b/drivers/net/sfc/sfc_mae_counter.c
index fc500527bc..bb2291861c 100644
--- a/drivers/net/sfc/sfc_mae_counter.c
+++ b/drivers/net/sfc/sfc_mae_counter.c
@@ -589,7 +589,7 @@ sfc_mae_counter_service_register(struct sfc_adapter *sa,
/* Prepare service info */
memset(&service, 0, sizeof(service));
rte_strscpy(service.name, counter_service_name, sizeof(service.name));
- service.socket_id = sa->numa_id;
+ service.numa_id = sa->numa_id;
service.callback = sfc_mae_counter_service_routine;
service.callback_userdata = sa;
sfc_mae_counter_registry_prepare(counter_registry, sa,
diff --git a/drivers/net/sfc/sfc_repr_proxy.c b/drivers/net/sfc/sfc_repr_proxy.c
index 3e9615911a..f1bac21e1f 100644
--- a/drivers/net/sfc/sfc_repr_proxy.c
+++ b/drivers/net/sfc/sfc_repr_proxy.c
@@ -916,7 +916,7 @@ sfc_repr_proxy_attach(struct sfc_adapter *sa)
memset(&service, 0, sizeof(service));
snprintf(service.name, sizeof(service.name),
"net_sfc_%hu_repr_proxy", sfc_sa2shared(sa)->port_id);
- service.socket_id = rte_lcore_to_numa_id(cid);
+ service.numa_id = rte_lcore_to_numa_id(cid);
service.callback = sfc_repr_proxy_routine;
service.callback_userdata = rp;
diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c
index f45b63f481..e6b3ee69d8 100644
--- a/drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/drivers/net/softnic/rte_eth_softnic_thread.c
@@ -137,7 +137,7 @@ thread_sc_service_up(struct pmd_internals *softnic, uint32_t thread_id)
service_params.callback = rte_pmd_softnic_run_internal;
service_params.callback_userdata = dev;
service_params.capabilities = 0;
- service_params.socket_id = (int)softnic->params.cpu_id;
+ service_params.numa_id = (int)softnic->params.cpu_id;
/* service register */
status = rte_service_component_register(&service_params, &t->service_id);
diff --git a/lib/compressdev/rte_compressdev.h b/lib/compressdev/rte_compressdev.h
index e96d2b328a..9cec4e3245 100644
--- a/lib/compressdev/rte_compressdev.h
+++ b/lib/compressdev/rte_compressdev.h
@@ -194,6 +194,7 @@ rte_compressdev_numa_id(uint8_t dev_id);
* -1 if returned is the dev_id value is out of range.
*/
int
+__rte_deprecated_msg("use the NUMA node API")
rte_compressdev_socket_id(uint8_t dev_id);
/** Compress device configuration structure */
diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
index a1afb7e927..514036661d 100644
--- a/lib/cryptodev/rte_cryptodev.h
+++ b/lib/cryptodev/rte_cryptodev.h
@@ -858,6 +858,7 @@ rte_cryptodev_numa_id(uint8_t dev_id);
* -1 if returned is the dev_id value is out of range.
*/
int
+__rte_deprecated_msg("use the NUMA node API")
rte_cryptodev_socket_id(uint8_t dev_id);
/** Crypto device configuration structure */
diff --git a/lib/dispatcher/rte_dispatcher.c b/lib/dispatcher/rte_dispatcher.c
index 3f33a03de1..f90add0881 100644
--- a/lib/dispatcher/rte_dispatcher.c
+++ b/lib/dispatcher/rte_dispatcher.c
@@ -239,7 +239,7 @@ evd_service_register(struct rte_dispatcher *dispatcher)
.callback = evd_process,
.callback_userdata = dispatcher,
.capabilities = RTE_SERVICE_CAP_MT_SAFE,
- .socket_id = dispatcher->numa_id
+ .numa_id = dispatcher->numa_id
};
int rc;
diff --git a/lib/eal/common/eal_common_dynmem.c b/lib/eal/common/eal_common_dynmem.c
index 56fa190280..912e9893f1 100644
--- a/lib/eal/common/eal_common_dynmem.c
+++ b/lib/eal/common/eal_common_dynmem.c
@@ -191,7 +191,7 @@ hugepage_count_walk(const struct rte_memseg_list *msl, void *arg)
if (msl->page_sz != hpi->hugepage_sz)
return 0;
- hpi->num_pages[msl->socket_id] += msl->memseg_arr.len;
+ hpi->num_pages[msl->numa_id] += msl->memseg_arr.len;
return 0;
}
diff --git a/lib/eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c
index cd22c254a1..b0dda5df43 100644
--- a/lib/eal/common/eal_common_memory.c
+++ b/lib/eal/common/eal_common_memory.c
@@ -214,7 +214,7 @@ eal_memseg_list_init_named(struct rte_memseg_list *msl, const char *name,
}
msl->page_sz = page_sz;
- msl->socket_id = numa_id;
+ msl->numa_id = numa_id;
msl->base_va = NULL;
msl->heap = heap;
@@ -307,7 +307,7 @@ eal_memseg_list_populate(struct rte_memseg_list *msl, void *addr, int n_segs)
ms->iova = RTE_BAD_IOVA;
ms->addr = addr;
ms->hugepage_sz = page_sz;
- ms->socket_id = 0;
+ ms->numa_id = 0;
ms->len = page_sz;
rte_fbarray_set_used(arr, i);
@@ -484,7 +484,7 @@ dump_memseg(const struct rte_memseg_list *msl, const struct rte_memseg *ms,
ms->iova,
ms->len,
ms->addr,
- ms->socket_id,
+ ms->numa_id,
ms->hugepage_sz,
ms->nchannel,
ms->nrank,
@@ -1275,7 +1275,7 @@ handle_eal_memzone_info_request(const char *cmd __rte_unused,
rte_tel_data_add_dict_uint(d, "Length", mz->len);
snprintf(addr, ADDR_STR, "%p", mz->addr);
rte_tel_data_add_dict_string(d, "Address", addr);
- rte_tel_data_add_dict_int(d, "Socket", mz->socket_id);
+ rte_tel_data_add_dict_int(d, "Socket", mz->numa_id);
rte_tel_data_add_dict_uint(d, "Flags", mz->flags);
/* go through each page occupied by this memzone */
@@ -1481,7 +1481,7 @@ handle_eal_memseg_info_request(const char *cmd __rte_unused,
ms_end_addr = ms_start_addr + ms->len;
ms_size = ms->len;
hugepage_size = ms->hugepage_sz;
- ms_socket_id = ms->socket_id;
+ ms_socket_id = ms->numa_id;
ms_flags = ms->flags;
rte_mcfg_mem_read_unlock();
diff --git a/lib/eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c
index d325193b9d..a1132433b3 100644
--- a/lib/eal/common/eal_common_memzone.c
+++ b/lib/eal/common/eal_common_memzone.c
@@ -232,7 +232,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
elem->size - elem->pad - MALLOC_ELEM_OVERHEAD :
requested_len;
mz->hugepage_sz = elem->msl->page_sz;
- mz->socket_id = elem->msl->socket_id;
+ mz->numa_id = elem->msl->numa_id;
mz->flags = 0;
return mz;
@@ -393,7 +393,7 @@ dump_memzone(const struct rte_memzone *mz, void *arg)
mz->name,
mz->len,
mz->addr,
- mz->socket_id,
+ mz->numa_id,
mz->flags);
/* go through each page occupied by this memzone */
diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index eb92ebc9b7..7863c1af9b 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -115,7 +115,7 @@ malloc_add_seg(const struct rte_memseg_list *msl,
if (msl->external)
return 0;
- heap_idx = malloc_numa_to_heap_id(msl->socket_id);
+ heap_idx = malloc_numa_to_heap_id(msl->numa_id);
if (heap_idx < 0) {
EAL_LOG(ERR, "Memseg list has invalid NUMA node ID");
return -1;
@@ -136,7 +136,7 @@ malloc_add_seg(const struct rte_memseg_list *msl,
heap->total_size += len;
EAL_LOG(DEBUG, "Added %zuM to heap on NUMA node %i", len >> 20,
- msl->socket_id);
+ msl->numa_id);
return 0;
}
@@ -559,7 +559,7 @@ alloc_more_mem_on_socket(struct malloc_heap *heap, size_t size, int numa_id,
for (i = 0; i < RTE_MAX_MEMSEG_LISTS; i++) {
struct rte_memseg_list *msl = &mcfg->memsegs[i];
- if (msl->socket_id != numa_id)
+ if (msl->numa_id != numa_id)
continue;
if (msl->base_va == NULL)
@@ -1031,7 +1031,7 @@ malloc_heap_free(struct malloc_elem *elem)
unmapped = true;
EAL_LOG(DEBUG, "Heap on NUMA node %d was shrunk by %zdMB",
- msl->socket_id, aligned_len >> 20ULL);
+ msl->numa_id, aligned_len >> 20ULL);
rte_mcfg_mem_write_unlock();
free_unlock:
@@ -1217,13 +1217,13 @@ malloc_heap_create_external_seg(void *va_addr, rte_iova_t iova_addrs[],
ms->len = page_sz;
ms->nchannel = rte_memory_get_nchannel();
ms->nrank = rte_memory_get_nrank();
- ms->socket_id = numa_id;
+ ms->numa_id = numa_id;
}
/* set up the memseg list */
msl->base_va = va_addr;
msl->page_sz = page_sz;
- msl->socket_id = numa_id;
+ msl->numa_id = numa_id;
msl->len = seg_len;
msl->version = 0;
msl->external = 1;
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index de4918f954..31622c441d 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -356,7 +356,7 @@ check_socket(const struct rte_memseg_list *msl, void *arg)
if (msl->external)
return 0;
- if (msl->socket_id == *numa_id && msl->memseg_arr.count != 0)
+ if (msl->numa_id == *numa_id && msl->memseg_arr.count != 0)
return 1;
return 0;
diff --git a/lib/eal/include/rte_lcore.h b/lib/eal/include/rte_lcore.h
index 904d80fe28..ee30251be2 100644
--- a/lib/eal/include/rte_lcore.h
+++ b/lib/eal/include/rte_lcore.h
@@ -12,6 +12,7 @@
*/
#include <stdio.h>
+#include <rte_common.h>
#include <rte_compat.h>
#include <rte_config.h>
#include <rte_per_lcore.h>
@@ -135,6 +136,7 @@ unsigned int rte_numa_id(void);
* @return
* the ID of current lcoreid's NUMA node
*/
+__rte_deprecated_msg("use the NUMA node API")
unsigned int rte_socket_id(void);
/**
@@ -159,6 +161,7 @@ rte_numa_count(void);
* the number of NUMA ID's as recognized by EAL
*/
unsigned int
+__rte_deprecated_msg("use the NUMA node API")
rte_socket_count(void);
/**
@@ -192,6 +195,7 @@ rte_numa_id_by_idx(unsigned int idx);
* - -1 on error, with errno set to EINVAL
*/
int
+__rte_deprecated_msg("use the NUMA node API")
rte_socket_id_by_idx(unsigned int idx);
/**
@@ -216,6 +220,7 @@ rte_lcore_to_numa_id(unsigned int lcore_id);
* the ID of lcoreid's NUMA node
*/
unsigned int
+__rte_deprecated_msg("use the NUMA node API")
rte_lcore_to_socket_id(unsigned int lcore_id);
/**
diff --git a/lib/eal/include/rte_malloc.h b/lib/eal/include/rte_malloc.h
index 9d5d582e1a..bb4c08f859 100644
--- a/lib/eal/include/rte_malloc.h
+++ b/lib/eal/include/rte_malloc.h
@@ -233,6 +233,7 @@ rte_realloc_numa(void *ptr, size_t size, unsigned int align, int numa_id)
* - Otherwise, the pointer to the reallocated memory.
*/
void *
+__rte_deprecated_msg("use the NUMA node API")
rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
__rte_alloc_size(2) __rte_alloc_align(3)
__rte_malloc __rte_dealloc_free;
@@ -291,6 +292,7 @@ rte_malloc_numa(const char *type, size_t size, unsigned int align, int numa_id)
* - Otherwise, the pointer to the allocated object.
*/
void *
+__rte_deprecated_msg("use the NUMA node API")
rte_malloc_socket(const char *type, size_t size, unsigned int align, int socket)
__rte_alloc_size(2) __rte_alloc_align(3)
__rte_malloc __rte_dealloc_free;
@@ -353,6 +355,7 @@ rte_zmalloc_numa(const char *type, size_t size, unsigned int align, int numa_id)
* - Otherwise, the pointer to the allocated object.
*/
void *
+__rte_deprecated_msg("use the NUMA node API")
rte_zmalloc_socket(const char *type, size_t size, unsigned int align, int socket)
__rte_alloc_size(2) __rte_alloc_align(3)
__rte_malloc __rte_dealloc_free;
@@ -415,6 +418,7 @@ rte_calloc_numa(const char *type, size_t num, size_t size, unsigned int align, i
* - Otherwise, the pointer to the allocated object.
*/
void *
+__rte_deprecated_msg("use the NUMA node API")
rte_calloc_socket(const char *type, size_t num, size_t size, unsigned int align, int socket)
__rte_alloc_size(2, 3) __rte_alloc_align(4)
__rte_malloc __rte_dealloc_free;
@@ -471,6 +475,7 @@ rte_malloc_get_numa_stats(int numa_id,
* Pointer to structure storing statistics on success
*/
int
+__rte_deprecated_msg("use the NUMA node API")
rte_malloc_get_socket_stats(int socket,
struct rte_malloc_numa_stats *socket_stats);
@@ -665,6 +670,7 @@ rte_malloc_heap_get_numa_id(const char *name);
* ENOENT - heap identified by the name ``name`` was not found
*/
int
+__rte_deprecated_msg("use the NUMA node API")
rte_malloc_heap_get_socket(const char *name);
/**
@@ -695,6 +701,7 @@ rte_malloc_heap_numa_is_external(int numa_id);
* -1 if socket ID is invalid
*/
int
+__rte_deprecated_msg("use the NUMA node API")
rte_malloc_heap_socket_is_external(int socket_id);
/**
diff --git a/lib/eal/include/rte_memory.h b/lib/eal/include/rte_memory.h
index 2633550524..ef47510b34 100644
--- a/lib/eal/include/rte_memory.h
+++ b/lib/eal/include/rte_memory.h
@@ -42,7 +42,7 @@ extern "C" {
/**
* Legacy alias of RTE_NUMA_ID_ANY.
*/
-#define SOCKET_ID_ANY RTE_NUMA_ID_ANY
+#define SOCKET_ID_ANY (RTE_DEPRECATED(SOCKET_ID_ANY) RTE_NUMA_ID_ANY)
/** Prevent this segment from being freed back to the OS. */
#define RTE_MEMSEG_FLAG_DO_NOT_FREE RTE_BIT32(0)
@@ -60,10 +60,18 @@ struct __rte_packed_begin rte_memseg {
};
size_t len; /**< Length of the segment. */
uint64_t hugepage_sz; /**< The pagesize of underlying memory */
- int32_t socket_id; /**< NUMA socket ID. */
+ union {
+ /** NUMA node ID. */
+ int32_t numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int32_t socket_id;
+ };
uint32_t nchannel; /**< Number of channels. */
uint32_t nrank; /**< Number of ranks. */
- uint32_t flags; /**< Memseg-specific flags */
+ uint32_t flags; /**< Memseg-specific flag bits */
} __rte_packed_end;
/**
@@ -78,7 +86,15 @@ struct rte_memseg_list {
/**< Makes sure addr is always 64-bits */
};
uint64_t page_sz; /**< Page size for all memsegs in this list. */
- int socket_id; /**< Socket ID for all memsegs in this list. */
+ union {
+ /** NUMA node ID for all memsegs in this list. */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
volatile uint32_t version; /**< version number for multiprocess sync. */
size_t len; /**< Length of memory area covered by this memseg list. */
unsigned int external; /**< 1 if this list points to external memory */
diff --git a/lib/eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h
index 125241c538..bcd71e525e 100644
--- a/lib/eal/include/rte_memzone.h
+++ b/lib/eal/include/rte_memzone.h
@@ -59,7 +59,15 @@ struct __rte_packed_begin rte_memzone {
uint64_t hugepage_sz; /**< The page size of underlying memory */
- int32_t socket_id; /**< NUMA socket ID. */
+ union {
+ /** NUMA node ID. */
+ int32_t numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int32_t socket_id;
+ };
uint32_t flags; /**< Characteristics of this memzone. */
} __rte_packed_end;
diff --git a/lib/eal/include/rte_service_component.h b/lib/eal/include/rte_service_component.h
index acdf45cf60..596717e64c 100644
--- a/lib/eal/include/rte_service_component.h
+++ b/lib/eal/include/rte_service_component.h
@@ -10,6 +10,7 @@
* operate, and you wish to run the component using service cores
*/
+#include <rte_common.h>
#include <rte_service.h>
#ifdef __cplusplus
@@ -45,8 +46,15 @@ struct rte_service_spec {
* the public header file for values of RTE_SERVICE_CAP_*
*/
uint32_t capabilities;
- /** NUMA socket ID that this service is affinitized to */
- int socket_id;
+ union {
+ /** NUMA node ID that this service is bound to */
+ int numa_id;
+ /**
+ * Deprecated alias of numa_id.
+ */
+ __rte_deprecated_msg("use numa_id")
+ int socket_id;
+ };
};
/**
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 0d26c780f2..14dcdaed99 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -439,7 +439,7 @@ check_socket(const struct rte_memseg_list *msl, void *arg)
if (msl->external)
return 0;
- return *numa_id == msl->socket_id;
+ return *numa_id == msl->numa_id;
}
static void
diff --git a/lib/eal/linux/eal_memalloc.c b/lib/eal/linux/eal_memalloc.c
index 6003f04bd7..3d2842b6ef 100644
--- a/lib/eal/linux/eal_memalloc.c
+++ b/lib/eal/linux/eal_memalloc.c
@@ -646,7 +646,7 @@ alloc_seg(struct rte_memseg *ms, void *addr, int numa_id,
ms->nchannel = rte_memory_get_nchannel();
ms->nrank = rte_memory_get_nrank();
ms->iova = iova;
- ms->socket_id = numa_id;
+ ms->numa_id = numa_id;
ms->flags = dirty ? RTE_MEMSEG_FLAG_DIRTY : 0;
return 0;
@@ -779,7 +779,7 @@ alloc_seg_walk(const struct rte_memseg_list *msl, void *arg)
if (msl->page_sz != wa->page_sz)
return 0;
- if (msl->socket_id != wa->numa_id)
+ if (msl->numa_id != wa->numa_id)
return 0;
page_sz = (size_t)msl->page_sz;
@@ -1172,7 +1172,7 @@ sync_chunk(struct rte_memseg_list *primary_msl,
if (used) {
ret = alloc_seg(l_ms, p_ms->addr,
- p_ms->socket_id, hi,
+ p_ms->numa_id, hi,
msl_idx, seg_idx);
if (ret < 0)
return -1;
diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c
index 601173c188..cce48208f9 100644
--- a/lib/eal/linux/eal_memory.c
+++ b/lib/eal/linux/eal_memory.c
@@ -712,7 +712,7 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
if (msl->page_sz != page_sz)
continue;
- if (msl->socket_id != numa_id)
+ if (msl->numa_id != numa_id)
continue;
/* leave space for a hole if array is not empty */
@@ -813,7 +813,7 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
ms->hugepage_sz = page_sz;
ms->len = memseg_len;
ms->iova = hfile->physaddr;
- ms->socket_id = hfile->numa_id;
+ ms->numa_id = hfile->numa_id;
ms->nchannel = rte_memory_get_nchannel();
ms->nrank = rte_memory_get_nrank();
@@ -1948,7 +1948,7 @@ memseg_secondary_init_dynmem(void)
}
EAL_LOG(DEBUG, "Attaching segment list: n_segs:%u numa_id:%d hugepage_sz:%" PRIu64,
- msl->memseg_arr.len, msl->socket_id, msl->page_sz);
+ msl->memseg_arr.len, msl->numa_id, msl->page_sz);
}
return 0;
diff --git a/lib/eal/windows/eal_memalloc.c b/lib/eal/windows/eal_memalloc.c
index 2f956adc1a..a6ce85305d 100644
--- a/lib/eal/windows/eal_memalloc.c
+++ b/lib/eal/windows/eal_memalloc.c
@@ -46,7 +46,7 @@ alloc_seg(struct rte_memseg *ms, void *requested_addr, int numa_id,
if (ms->len > 0) {
/* If a segment is already allocated as needed, return it. */
if ((ms->addr == requested_addr) &&
- (ms->socket_id == numa_id) &&
+ (ms->numa_id == numa_id) &&
(ms->hugepage_sz == hi->hugepage_sz)) {
return 0;
}
@@ -54,7 +54,7 @@ alloc_seg(struct rte_memseg *ms, void *requested_addr, int numa_id,
/* Bugcheck, should not happen. */
EAL_LOG(DEBUG, "Attempted to reallocate segment %p "
"(size %zu) on NUMA node %d", ms->addr,
- ms->len, ms->socket_id);
+ ms->len, ms->numa_id);
return -1;
}
@@ -131,7 +131,7 @@ alloc_seg(struct rte_memseg *ms, void *requested_addr, int numa_id,
ms->nchannel = rte_memory_get_nchannel();
ms->nrank = rte_memory_get_nrank();
ms->iova = iova;
- ms->socket_id = numa_id;
+ ms->numa_id = numa_id;
return 0;
@@ -187,7 +187,7 @@ alloc_seg_walk(const struct rte_memseg_list *msl, void *arg)
if (msl->page_sz != wa->page_sz)
return 0;
- if (msl->socket_id != wa->numa_id)
+ if (msl->numa_id != wa->numa_id)
return 0;
page_sz = (size_t)msl->page_sz;
diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c
index 92310c94be..da98f53fda 100644
--- a/lib/ethdev/ethdev_driver.c
+++ b/lib/ethdev/ethdev_driver.c
@@ -757,7 +757,7 @@ rte_eth_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,
mz = rte_memzone_lookup(z_name);
if (mz) {
- if ((numa_id != RTE_NUMA_ID_ANY && numa_id != mz->socket_id) ||
+ if ((numa_id != RTE_NUMA_ID_ANY && numa_id != mz->numa_id) ||
size > mz->len ||
((uintptr_t)mz->addr & (align - 1)) != 0) {
RTE_ETHDEV_LOG_LINE(ERR,
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 83a4dfb337..ad9de5a662 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -2732,6 +2732,7 @@ int rte_eth_dev_numa_id(uint16_t port_id);
* - EINVAL is the port_id is invalid,
* - 0 is the socket could not be determined,
*/
+__rte_deprecated_msg("use the NUMA node API")
int rte_eth_dev_socket_id(uint16_t port_id);
/**
diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c
index a8e29f2b32..081c407368 100644
--- a/lib/eventdev/rte_event_crypto_adapter.c
+++ b/lib/eventdev/rte_event_crypto_adapter.c
@@ -920,7 +920,7 @@ eca_init_service(struct event_crypto_adapter *adapter, uint8_t id)
memset(&service, 0, sizeof(service));
snprintf(service.name, CRYPTO_ADAPTER_NAME_LEN,
"rte_event_crypto_adapter_%d", id);
- service.socket_id = adapter->numa_id;
+ service.numa_id = adapter->numa_id;
service.callback = eca_service_func;
service.callback_userdata = adapter;
/* Service function handles locking for queue add/del updates */
diff --git a/lib/eventdev/rte_event_dma_adapter.c b/lib/eventdev/rte_event_dma_adapter.c
index 1dc752141d..70480cbed6 100644
--- a/lib/eventdev/rte_event_dma_adapter.c
+++ b/lib/eventdev/rte_event_dma_adapter.c
@@ -867,7 +867,7 @@ edma_init_service(struct event_dma_adapter *adapter, uint8_t id)
memset(&service, 0, sizeof(service));
snprintf(service.name, DMA_ADAPTER_NAME_LEN, "rte_event_dma_adapter_%d", id);
- service.socket_id = adapter->numa_id;
+ service.numa_id = adapter->numa_id;
service.callback = edma_service_func;
service.callback_userdata = adapter;
diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
index e87a6eca78..41e66ba2d6 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -1922,7 +1922,7 @@ rxa_init_service(struct event_eth_rx_adapter *rx_adapter, uint8_t id)
memset(&service, 0, sizeof(service));
snprintf(service.name, ETH_RX_ADAPTER_SERVICE_NAME_LEN,
"rte_event_eth_rx_adapter_%d", id);
- service.socket_id = rx_adapter->numa_id;
+ service.numa_id = rx_adapter->numa_id;
service.callback = rxa_service_func;
service.callback_userdata = rx_adapter;
/* Service function handles locking for queue add/del updates */
diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
index c57d6b868c..071bf7b9ac 100644
--- a/lib/eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/eventdev/rte_event_eth_tx_adapter.c
@@ -456,7 +456,7 @@ txa_service_register(struct txa_service_data *txa)
memset(&service, 0, sizeof(service));
snprintf(service.name, TXA_SERVICE_NAME_LEN, "txa_%d", txa->id);
- service.socket_id = txa->numa_id;
+ service.numa_id = txa->numa_id;
service.callback = txa_service_func;
service.callback_userdata = txa;
service.capabilities = RTE_SERVICE_CAP_MT_SAFE;
diff --git a/lib/eventdev/rte_event_timer_adapter.c b/lib/eventdev/rte_event_timer_adapter.c
index de33fd9f95..9b69bc690e 100644
--- a/lib/eventdev/rte_event_timer_adapter.c
+++ b/lib/eventdev/rte_event_timer_adapter.c
@@ -995,7 +995,7 @@ swtim_init(struct rte_event_timer_adapter *adapter)
memset(&service, 0, sizeof(service));
snprintf(service.name, RTE_SERVICE_NAME_MAX,
"swtim_svc_%"PRIu8, adapter->data->id);
- service.socket_id = adapter->data->numa_id;
+ service.numa_id = adapter->data->numa_id;
service.callback = swtim_service_func;
service.callback_userdata = adapter;
service.capabilities &= ~(RTE_SERVICE_CAP_MT_SAFE);
diff --git a/lib/eventdev/rte_event_vector_adapter.c b/lib/eventdev/rte_event_vector_adapter.c
index 6222f1c907..67d0d10603 100644
--- a/lib/eventdev/rte_event_vector_adapter.c
+++ b/lib/eventdev/rte_event_vector_adapter.c
@@ -662,7 +662,7 @@ sw_vector_adapter_service_init(struct sw_vector_adapter_data *sw)
snprintf(service.name, RTE_SERVICE_NAME_MAX, "%s", SW_VECTOR_ADAPTER_SERVICE_FMT);
service.callback = sw_vector_adapter_service_func;
service.callback_userdata = service_data;
- service.socket_id = sw->adapter->data->numa_id;
+ service.numa_id = sw->adapter->data->numa_id;
ret = rte_service_component_register(&service, &service_data->service_id);
if (ret < 0) {
diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
index 1aaae6469b..4eefa8c14b 100644
--- a/lib/eventdev/rte_eventdev.h
+++ b/lib/eventdev/rte_eventdev.h
@@ -608,6 +608,7 @@ rte_event_dev_numa_id(uint8_t dev_id);
* correspond to any event device.
*/
int
+__rte_deprecated_msg("use the NUMA node API")
rte_event_dev_socket_id(uint8_t dev_id);
/**
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index 0e49cdfd1e..20e7590720 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -133,7 +133,7 @@ find_min_pagesz(const struct rte_memseg_list *msl, void *arg)
* as a NUMA node ID argument, we must only look at native memory and
* ignore any page sizes associated with external memory.
*/
- valid = msl->socket_id == wa->numa_id;
+ valid = msl->numa_id == wa->numa_id;
valid |= wa->numa_id == RTE_NUMA_ID_ANY && msl->external == 0;
if (valid && msl->page_sz < wa->min)
@@ -1655,7 +1655,7 @@ mempool_info_cb(struct rte_mempool *mp, void *arg)
rte_tel_data_add_dict_uint(info->d, "mz_len", mz->len);
rte_tel_data_add_dict_uint(info->d, "mz_hugepage_sz",
mz->hugepage_sz);
- rte_tel_data_add_dict_int(info->d, "mz_numa_id", mz->socket_id);
+ rte_tel_data_add_dict_int(info->d, "mz_numa_id", mz->numa_id);
rte_tel_data_add_dict_uint(info->d, "mz_flags", mz->flags);
}
diff --git a/lib/rawdev/rte_rawdev.h b/lib/rawdev/rte_rawdev.h
index 0ca7b5e111..a09732261c 100644
--- a/lib/rawdev/rte_rawdev.h
+++ b/lib/rawdev/rte_rawdev.h
@@ -73,6 +73,7 @@ rte_rawdev_numa_id(uint16_t dev_id);
* -(-EINVAL) dev_id value is out of range.
*/
int
+__rte_deprecated_msg("use the NUMA node API")
rte_rawdev_socket_id(uint16_t dev_id);
/**
diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c
index c566592027..c113717341 100644
--- a/lib/ring/rte_ring.c
+++ b/lib/ring/rte_ring.c
@@ -605,7 +605,7 @@ ring_info_cb(struct rte_ring *r, void *arg)
return;
rte_tel_data_add_dict_string(d, "name", r->name);
- rte_tel_data_add_dict_int(d, "numa_id", r->memzone->socket_id);
+ rte_tel_data_add_dict_int(d, "numa_id", r->memzone->numa_id);
rte_tel_data_add_dict_int(d, "flags", r->flags);
rte_tel_data_add_dict_string(d, "producer_type",
ring_prod_sync_type_to_name(r));
@@ -622,7 +622,7 @@ ring_info_cb(struct rte_ring *r, void *arg)
rte_tel_data_add_dict_string(d, "mz_name", mz->name);
rte_tel_data_add_dict_uint(d, "mz_len", mz->len);
rte_tel_data_add_dict_uint(d, "mz_hugepage_sz", mz->hugepage_sz);
- rte_tel_data_add_dict_int(d, "mz_numa_id", mz->socket_id);
+ rte_tel_data_add_dict_int(d, "mz_numa_id", mz->numa_id);
rte_tel_data_add_dict_uint_hex(d, "mz_flags", mz->flags, 0);
}
diff --git a/lib/table/rte_swx_table_wm.c b/lib/table/rte_swx_table_wm.c
index 4293e2fa6f..fbed791a55 100644
--- a/lib/table/rte_swx_table_wm.c
+++ b/lib/table/rte_swx_table_wm.c
@@ -308,7 +308,7 @@ acl_table_create(struct rte_swx_table_params *params,
/* ACL create. */
acl_params.name = name;
- acl_params.socket_id = numa_node;
+ acl_params.numa_id = numa_node;
acl_params.rule_size = RTE_ACL_RULE_SZ(acl_cfg.num_fields);
acl_params.max_rule_num = n_entries;
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 224/227] doc: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (222 preceding siblings ...)
2026-11-03 14:53 ` [PATCH 223/227] eal: deprecate legacy socket API aliases Chengwen Feng
@ 2026-11-03 14:53 ` Chengwen Feng
2026-11-03 14:53 ` [PATCH 225/227] test-dma-perf: " Chengwen Feng
` (3 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:53 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Update the programming guide examples to use the NUMA node
APIs and field names introduced by the terminology renames.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
doc/api/doxy-api.conf.in | 1 +
doc/guides/prog_guide/bbdev.rst | 14 +++++++-------
doc/guides/prog_guide/compressdev.rst | 4 ++--
.../prog_guide/eventdev/event_timer_adapter.rst | 2 +-
.../prog_guide/eventdev/event_vector_adapter.rst | 2 +-
doc/guides/prog_guide/eventdev/eventdev.rst | 2 +-
doc/guides/prog_guide/gpudev.rst | 2 +-
doc/guides/prog_guide/ptr_compress_lib.rst | 2 +-
8 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index 94096ee710..62e16cdc66 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -91,6 +91,7 @@ INPUT += @API_EXAMPLES@
FILE_PATTERNS = rte_*.h \
cmdline.h
PREDEFINED = __DOXYGEN__ \
+ __rte_deprecated_msg(x)= \
RTE_ATOMIC \
RTE_HAS_CPUSET \
__rte_lockable= \
diff --git a/doc/guides/prog_guide/bbdev.rst b/doc/guides/prog_guide/bbdev.rst
index aba10a7392..445574a62d 100644
--- a/doc/guides/prog_guide/bbdev.rst
+++ b/doc/guides/prog_guide/bbdev.rst
@@ -87,7 +87,7 @@ Configuration of a device has two different levels: configuration that applies
to the whole device, and configuration that applies to a single queue.
Device configuration is applied with
-``rte_bbdev_setup_queues(dev_id,num_queues,socket_id)``
+``rte_bbdev_setup_queues(dev_id,num_queues,numa_id)``
and queue configuration is applied with
``rte_bbdev_queue_configure(dev_id,queue_id,conf)``. Note that, although all
queues on a device support same capabilities, they can be configured differently
@@ -106,12 +106,12 @@ The ``rte_bbdev_setup_queues`` API is used to setup queues for a bbdev device.
.. code-block:: c
int rte_bbdev_setup_queues(uint16_t dev_id, uint16_t num_queues,
- int socket_id);
+ int numa_id);
- ``num_queues`` argument identifies the total number of queues to setup for
this device.
-- ``socket_id`` specifies which socket will be used to allocate the memory.
+- ``numa_id`` specifies which NUMA node will be used to allocate the memory.
The ``rte_bbdev_intr_enable`` API is used to enable interrupts for a bbdev
@@ -434,7 +434,7 @@ ranks for optimal processing.
struct rte_mempool *
rte_bbdev_op_pool_create(const char *name, enum rte_bbdev_op_type type,
unsigned int num_elements, unsigned int cache_size,
- int socket_id)
+ int numa_id)
``rte_bbdev_*_op_alloc_bulk()`` and ``rte_bbdev_*_op_free_bulk()`` are used to
allocate bbdev operations of a specific type from a given bbdev operation mempool.
@@ -1330,20 +1330,20 @@ buffers using (**sw_turbo**) bbdev PMD.
/* Create bbdev op pools */
bbdev_op_pool[RTE_BBDEV_OP_TURBO_ENC] =
rte_bbdev_op_pool_create("bbdev_op_pool_enc",
- RTE_BBDEV_OP_TURBO_ENC, NB_MBUF, 128, rte_socket_id());
+ RTE_BBDEV_OP_TURBO_ENC, NB_MBUF, 128, rte_numa_id());
/* Get information for this device */
rte_bbdev_info_get(dev_id, &info);
/* Setup BBDEV device queues */
- ret = rte_bbdev_setup_queues(dev_id, qs_nb, info.socket_id);
+ ret = rte_bbdev_setup_queues(dev_id, qs_nb, info.numa_id);
if (ret < 0)
rte_exit(EXIT_FAILURE,
"ERROR(%d): BBDEV %u not configured properly\n",
ret, dev_id);
/* setup device queues */
- qconf.socket = info.socket_id;
+ qconf.numa_id = info.numa_id;
qconf.queue_size = info.drv.queue_size_lim;
qconf.op_type = RTE_BBDEV_OP_TURBO_ENC;
diff --git a/doc/guides/prog_guide/compressdev.rst b/doc/guides/prog_guide/compressdev.rst
index 883d1369e9..1440f332fd 100644
--- a/doc/guides/prog_guide/compressdev.rst
+++ b/doc/guides/prog_guide/compressdev.rst
@@ -345,7 +345,7 @@ using priv_xform would look like:
rte_exit(EXIT_FAILURE, "Failed to configure compressdev %u", cdev_id);
if (rte_compressdev_queue_pair_setup(cdev_id, 0, NUM_MAX_INFLIGHT_OPS,
- socket_id()) < 0)
+ numa_id()) < 0)
rte_exit(EXIT_FAILURE, "Failed to setup queue pair\n");
if (rte_compressdev_start(cdev_id) < 0)
@@ -493,7 +493,7 @@ with each chunk size of CHUNK_LEN, would look like:
rte_exit(EXIT_FAILURE, "Failed to configure compressdev %u", cdev_id);
if (rte_compressdev_queue_pair_setup(cdev_id, 0, NUM_MAX_INFLIGHT_OPS,
- socket_id()) < 0)
+ numa_id()) < 0)
rte_exit(EXIT_FAILURE, "Failed to setup queue pair\n");
if (rte_compressdev_start(cdev_id) < 0)
diff --git a/doc/guides/prog_guide/eventdev/event_timer_adapter.rst b/doc/guides/prog_guide/eventdev/event_timer_adapter.rst
index ea777c13cf..6ae4e80cca 100644
--- a/doc/guides/prog_guide/eventdev/event_timer_adapter.rst
+++ b/doc/guides/prog_guide/eventdev/event_timer_adapter.rst
@@ -110,7 +110,7 @@ to ``rte_event_timer_adapter_create()``.
const struct rte_event_timer_adapter_conf adapter_config = {
.event_dev_id = event_dev_id,
.timer_adapter_id = 0,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.clk_src = RTE_EVENT_TIMER_ADAPTER_CPU_CLK,
.timer_tick_ns = NSECPERSEC / 10,
.max_tmo_ns = 180 * NSECPERSEC,
diff --git a/doc/guides/prog_guide/eventdev/event_vector_adapter.rst b/doc/guides/prog_guide/eventdev/event_vector_adapter.rst
index a732885697..c575187c62 100644
--- a/doc/guides/prog_guide/eventdev/event_vector_adapter.rst
+++ b/doc/guides/prog_guide/eventdev/event_vector_adapter.rst
@@ -79,7 +79,7 @@ and pass it to ``rte_event_vector_adapter_create()``.
const struct rte_event_vector_adapter_conf adapter_config = {
.event_dev_id = event_dev_id,
- .socket_id = rte_socket_id(),
+ .numa_id = rte_numa_id(),
.ev = {
.queue_id = event_queue_id,
.sched_type = RTE_SCHED_TYPE_ATOMIC,
diff --git a/doc/guides/prog_guide/eventdev/eventdev.rst b/doc/guides/prog_guide/eventdev/eventdev.rst
index ea34f74032..9f8fceb2ce 100644
--- a/doc/guides/prog_guide/eventdev/eventdev.rst
+++ b/doc/guides/prog_guide/eventdev/eventdev.rst
@@ -97,7 +97,7 @@ cache size, number of elements in each ``rte_event_vector`` and socket id.
.. code-block:: c
rte_event_vector_pool_create("vector_pool", nb_event_vectors, cache_sz,
- nb_elements_per_vector, socket_id);
+ nb_elements_per_vector, numa_id);
The function ``rte_event_vector_pool_create`` creates mempool with the best
platform mempool ops.
diff --git a/doc/guides/prog_guide/gpudev.rst b/doc/guides/prog_guide/gpudev.rst
index de246d2a4c..795a49a1f1 100644
--- a/doc/guides/prog_guide/gpudev.rst
+++ b/doc/guides/prog_guide/gpudev.rst
@@ -159,7 +159,7 @@ about how to use functions in this library in case of a CUDA application.
ext_mem.buf_ptr, ext_mem.buf_iova, ext_mem.buf_len);
mpool_payload = rte_pktmbuf_pool_create_extbuf("gpu_mempool", mbufs_num,
0, 0, ext_mem.elt_size,
- rte_socket_id(), &ext_mem, 1);
+ rte_numa_id(), &ext_mem, 1);
/*
* Create CPU - device communication flag.
diff --git a/doc/guides/prog_guide/ptr_compress_lib.rst b/doc/guides/prog_guide/ptr_compress_lib.rst
index d08c52a503..5c3ec02a28 100644
--- a/doc/guides/prog_guide/ptr_compress_lib.rst
+++ b/doc/guides/prog_guide/ptr_compress_lib.rst
@@ -142,7 +142,7 @@ While this is a realistic use case the code is simplified for demonstration purp
{
ring = rte_ring_create_elem(
"COMPR_PTRS", sizeof(uint32_t),
- 1024, rte_socket_id(),
+ 1024, rte_numa_id(),
RING_F_SP_ENQ | RING_F_SC_DEQ);
rte_eal_remote_launch(send_compressed, NULL, CORE_SEND);
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 225/227] test-dma-perf: use NUMA node terminology
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (223 preceding siblings ...)
2026-11-03 14:53 ` [PATCH 224/227] doc: use NUMA node terminology Chengwen Feng
@ 2026-11-03 14:53 ` Chengwen Feng
2026-11-03 14:53 ` [PATCH 226/227] test/memzone: fix NUMA node terminology rename Chengwen Feng
` (2 subsequent siblings)
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:53 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Use the NUMA node terminology in the dma-perf application.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test-dma-perf/benchmark.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/test-dma-perf/benchmark.c b/app/test-dma-perf/benchmark.c
index c0ffc859bd..686e241c18 100644
--- a/app/test-dma-perf/benchmark.c
+++ b/app/test-dma-perf/benchmark.c
@@ -550,13 +550,13 @@ setup_memory_env(struct test_configure *cfg, uint32_t nr_buf,
unsigned int cur_buf_size = cfg->buf_size.cur;
unsigned int buf_size = cur_buf_size + RTE_PKTMBUF_HEADROOM;
bool is_src_numa_incorrect, is_dst_numa_incorrect;
- unsigned int nr_sockets;
+ unsigned int nr_numas;
uintptr_t ops;
uint32_t i;
- nr_sockets = rte_socket_count();
- is_src_numa_incorrect = (cfg->src_numa_node >= nr_sockets);
- is_dst_numa_incorrect = (cfg->dst_numa_node >= nr_sockets);
+ nr_numas = rte_numa_count();
+ is_src_numa_incorrect = (cfg->src_numa_node >= nr_numas);
+ is_dst_numa_incorrect = (cfg->dst_numa_node >= nr_numas);
if (is_src_numa_incorrect || is_dst_numa_incorrect) {
PRINT_ERR("Error: Incorrect NUMA config for %s.\n",
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 226/227] test/memzone: fix NUMA node terminology rename
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (224 preceding siblings ...)
2026-11-03 14:53 ` [PATCH 225/227] test-dma-perf: " Chengwen Feng
@ 2026-11-03 14:53 ` Chengwen Feng
2026-11-03 14:53 ` [PATCH 227/227] examples: fix NUMA node terminology residue Chengwen Feng
2026-11-03 16:16 ` [PATCH 000/227] use NUMA node terminology across the tree Aaron Conole
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:53 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
One socket variable in the memzone tests was missed by the
terminology renames; rename it to numa_id.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test/test_memzone.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index 1ebbf6286b..b3e76b6e4f 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -576,7 +576,7 @@ test_memzone_reserve_max_aligned(void)
const unsigned int align = 1 << ((rte_rand() % 8) + 5); /* from 128 up to 4k alignment */
/* memzone size may be between size and size - align */
- minlen = find_max_block_free_size(align, socket);
+ minlen = find_max_block_free_size(align, numa_id);
maxlen = find_max_block_free_size(0, numa_id);
if (minlen == 0 || maxlen == 0) {
@@ -587,7 +587,7 @@ test_memzone_reserve_max_aligned(void)
mz = rte_memzone_reserve_aligned(
TEST_MEMZONE_NAME("max_zone_aligned"),
- 0, socket, 0, align);
+ 0, numa_id, 0, align);
if (mz == NULL) {
printf("Failed to reserve a big chunk of memory - %s\n",
rte_strerror(rte_errno));
@@ -1053,9 +1053,9 @@ test_memzone_basic(void)
memzone3->iova, memzone3->len))
return -1;
- printf("check socket ID\n");
+ printf("check numa_id ID\n");
- /* memzone2 must be on socket id 0 and memzone3 on socket 1 */
+ /* memzone2 must be on numa_id id 0 and memzone3 on numa_id 1 */
if (memzone2->numa_id != 0)
return -1;
if (memzone3 != NULL && memzone3->numa_id != 1)
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* [PATCH 227/227] examples: fix NUMA node terminology residue
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (225 preceding siblings ...)
2026-11-03 14:53 ` [PATCH 226/227] test/memzone: fix NUMA node terminology rename Chengwen Feng
@ 2026-11-03 14:53 ` Chengwen Feng
2026-11-03 16:16 ` [PATCH 000/227] use NUMA node terminology across the tree Aaron Conole
227 siblings, 0 replies; 229+ messages in thread
From: Chengwen Feng @ 2026-11-03 14:53 UTC (permalink / raw)
To: thomas, konstantin.v.ananyev; +Cc: dev, Chengwen Feng
From: Chengwen Feng <fengchengwen@huawei.com>
Migrate the socket terminology usages that were merged back
from the main tree during the rc1 to rc2 window.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
examples/ipsec-secgw/ipsec-secgw.h | 2 +-
examples/ipsec-secgw/ipsec.h | 2 +-
examples/l3fwd-graph/main.c | 10 +++++-----
examples/l3fwd-power/main.c | 14 +++++++-------
examples/l3fwd/l3fwd.h | 2 +-
examples/l3fwd/l3fwd_acl.c | 8 ++++----
examples/l3fwd/l3fwd_em.c | 4 ++--
examples/l3fwd/l3fwd_event.h | 2 +-
examples/l3fwd/l3fwd_fib.c | 4 ++--
examples/l3fwd/l3fwd_lpm.c | 4 ++--
examples/l3fwd/main.c | 8 ++++----
.../client_server_mp/mp_server/init.c | 2 +-
examples/vhost_crypto/main.c | 10 +++++-----
13 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/examples/ipsec-secgw/ipsec-secgw.h b/examples/ipsec-secgw/ipsec-secgw.h
index b4ef4b6d04..bdef95cb6d 100644
--- a/examples/ipsec-secgw/ipsec-secgw.h
+++ b/examples/ipsec-secgw/ipsec-secgw.h
@@ -9,7 +9,7 @@
#define MAX_RX_QUEUE_PER_LCORE 16
-#define NB_SOCKETS 4
+#define NB_NUMAS 4
#define MAX_PKT_BURST 32
#define MAX_PKT_BURST_VEC 256
diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index bdd607fbdd..59179e9591 100644
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -310,7 +310,7 @@ struct __rte_cache_aligned lcore_conf {
extern struct lcore_conf lcore_conf[RTE_MAX_LCORE];
/* Socket ctx */
-extern struct socket_ctx socket_ctx[NB_SOCKETS];
+extern struct socket_ctx socket_ctx[NB_NUMAS];
void
ipsec_poll_mode_worker(void);
diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c
index fc1603781c..b327216a95 100644
--- a/examples/l3fwd-graph/main.c
+++ b/examples/l3fwd-graph/main.c
@@ -55,7 +55,7 @@
#define MAX_LCORE_PARAMS 1024
-#define NB_SOCKETS 8
+#define NB_NUMAS 8
/* Graph module */
#define WORKER_MODEL_RTC "rtc"
@@ -139,7 +139,7 @@ static struct rte_eth_conf port_conf = {
static uint32_t max_pkt_len;
-static struct rte_mempool *pktmbuf_pool[RTE_MAX_ETHPORTS][NB_SOCKETS];
+static struct rte_mempool *pktmbuf_pool[RTE_MAX_ETHPORTS][NB_NUMAS];
static struct rte_node_ethdev_config ethdev_conf[RTE_MAX_ETHPORTS];
@@ -657,10 +657,10 @@ init_mem(uint16_t portid, uint32_t nb_mbuf)
else
socketid = 0;
- if (socketid >= NB_SOCKETS) {
+ if (socketid >= NB_NUMAS) {
rte_exit(EXIT_FAILURE,
"Socket %d of lcore %u is out of range %d\n",
- socketid, lcore_id, NB_SOCKETS);
+ socketid, lcore_id, NB_NUMAS);
}
if (pktmbuf_pool[portid][socketid] == NULL) {
@@ -1184,7 +1184,7 @@ main(int argc, char **argv)
else
ethdev_conf[nb_conf].mp = pktmbuf_pool[portid];
- ethdev_conf[nb_conf].mp_count = NB_SOCKETS;
+ ethdev_conf[nb_conf].mp_count = NB_NUMAS;
nb_conf++;
printf("\n");
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 4017722122..9e2689bcbf 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -114,7 +114,7 @@ RTE_LOG_REGISTER(l3fwd_power_logtype, l3fwd.power, INFO);
#define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
-#define NB_SOCKETS 8
+#define NB_NUMAS 8
/* Configure how many packets ahead to prefetch, when reading packets */
#define PREFETCH_OFFSET 3
@@ -271,7 +271,7 @@ static uint32_t scale_freq_max;
static int cpu_resume_latency = -1;
static int resume_latency_bk[RTE_MAX_LCORE];
-static struct rte_mempool * pktmbuf_pool[NB_SOCKETS];
+static struct rte_mempool *pktmbuf_pool[NB_NUMAS];
#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
@@ -330,8 +330,8 @@ static struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {
};
typedef struct rte_hash lookup_struct_t;
-static lookup_struct_t *ipv4_l3fwd_lookup_struct[NB_SOCKETS];
-static lookup_struct_t *ipv6_l3fwd_lookup_struct[NB_SOCKETS];
+static lookup_struct_t *ipv4_l3fwd_lookup_struct[NB_NUMAS];
+static lookup_struct_t *ipv6_l3fwd_lookup_struct[NB_NUMAS];
#define L3FWD_HASH_ENTRIES 1024
@@ -360,7 +360,7 @@ static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
#define IPV4_L3FWD_LPM_MAX_RULES 1024
typedef struct rte_lpm lookup_struct_t;
-static lookup_struct_t *ipv4_l3fwd_lookup_struct[NB_SOCKETS];
+static lookup_struct_t *ipv4_l3fwd_lookup_struct[NB_NUMAS];
#endif
struct __rte_cache_aligned lcore_conf {
@@ -2050,10 +2050,10 @@ init_mem(unsigned nb_mbuf)
else
socketid = 0;
- if (socketid >= NB_SOCKETS) {
+ if (socketid >= NB_NUMAS) {
rte_exit(EXIT_FAILURE, "Socket %d of lcore %u is "
"out of range %d\n", socketid,
- lcore_id, NB_SOCKETS);
+ lcore_id, NB_NUMAS);
}
if (pktmbuf_pool[socketid] == NULL) {
snprintf(s, sizeof(s), "mbuf_pool_%d", socketid);
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index 349fc37c79..10beefdd4b 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -33,7 +33,7 @@
#define VECTOR_SIZE_DEFAULT MAX_PKT_BURST
#define VECTOR_TMO_NS_DEFAULT 1E6 /* 1ms */
-#define NB_SOCKETS 8
+#define NB_NUMAS 8
/* Configure how many packets ahead to prefetch, when reading packets */
#define PREFETCH_OFFSET 3
diff --git a/examples/l3fwd/l3fwd_acl.c b/examples/l3fwd/l3fwd_acl.c
index 54aa3dc9ba..2518ba6a15 100644
--- a/examples/l3fwd/l3fwd_acl.c
+++ b/examples/l3fwd/l3fwd_acl.c
@@ -240,8 +240,8 @@ RTE_ACL_RULE_DEF(acl4_rule, RTE_DIM(ipv4_defs));
RTE_ACL_RULE_DEF(acl6_rule, RTE_DIM(ipv6_defs));
static struct {
- struct rte_acl_ctx *acx_ipv4[NB_SOCKETS];
- struct rte_acl_ctx *acx_ipv6[NB_SOCKETS];
+ struct rte_acl_ctx *acx_ipv4[NB_NUMAS];
+ struct rte_acl_ctx *acx_ipv6[NB_NUMAS];
#ifdef L3FWDACL_DEBUG
struct acl4_rule *rule_ipv4;
struct acl6_rule *rule_ipv6;
@@ -955,10 +955,10 @@ setup_acl(const int numa_id)
dump_ipv6_rules((struct acl6_rule *)acl_base_ipv6, acl_num_ipv6, 1);
/* Check sockets a context should be created on */
- if (numa_id >= NB_SOCKETS) {
+ if (numa_id >= NB_NUMAS) {
acl_log("Socket %d is out "
"of range %d\n",
- numa_id, NB_SOCKETS);
+ numa_id, NB_NUMAS);
acl_free_routes();
return;
}
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index 730ea29d96..2e20bc3078 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -132,8 +132,8 @@ const struct ipv6_l3fwd_em_route ipv6_l3fwd_em_route_array[] = {
{32, 1, 2, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 15},
};
-struct rte_hash *ipv4_l3fwd_em_lookup_struct[NB_SOCKETS];
-struct rte_hash *ipv6_l3fwd_em_lookup_struct[NB_SOCKETS];
+struct rte_hash *ipv4_l3fwd_em_lookup_struct[NB_NUMAS];
+struct rte_hash *ipv6_l3fwd_em_lookup_struct[NB_NUMAS];
static inline uint32_t
ipv4_hash_crc(const void *data, __rte_unused uint32_t data_len,
diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
index c6a4a89127..108cc86d9b 100644
--- a/examples/l3fwd/l3fwd_event.h
+++ b/examples/l3fwd/l3fwd_event.h
@@ -66,7 +66,7 @@ struct l3fwd_event_resources {
struct l3fwd_event_tx_adptr tx_adptr;
uint8_t disable_implicit_release;
struct l3fwd_event_setup_ops ops;
- struct rte_mempool * (*pkt_pool)[NB_SOCKETS];
+ struct rte_mempool * (*pkt_pool)[NB_NUMAS];
struct rte_mempool **vec_pool;
struct l3fwd_event_queues evq;
struct l3fwd_event_ports evp;
diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c
index 4fc6bf90d5..e937bf8fcd 100644
--- a/examples/l3fwd/l3fwd_fib.c
+++ b/examples/l3fwd/l3fwd_fib.c
@@ -39,8 +39,8 @@
#define FIB_SEND_MULTI
#endif
-static struct rte_fib *ipv4_l3fwd_fib_lookup_struct[NB_SOCKETS];
-static struct rte_fib6 *ipv6_l3fwd_fib_lookup_struct[NB_SOCKETS];
+static struct rte_fib *ipv4_l3fwd_fib_lookup_struct[NB_NUMAS];
+static struct rte_fib6 *ipv6_l3fwd_fib_lookup_struct[NB_NUMAS];
/* Parse packet type and ip address. */
static inline void
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 2d2651e750..74180f1810 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -38,8 +38,8 @@
#define IPV6_L3FWD_LPM_MAX_RULES 1024
#define IPV6_L3FWD_LPM_NUMBER_TBL8S (1 << 16)
-static struct rte_lpm *ipv4_l3fwd_lpm_lookup_struct[NB_SOCKETS];
-static struct rte_lpm6 *ipv6_l3fwd_lpm_lookup_struct[NB_SOCKETS];
+static struct rte_lpm *ipv4_l3fwd_lpm_lookup_struct[NB_NUMAS];
+static struct rte_lpm6 *ipv6_l3fwd_lpm_lookup_struct[NB_NUMAS];
/* Performing LPM-based lookups. 8< */
static inline uint16_t
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 1731aa51e2..9647f5bf74 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -143,8 +143,8 @@ uint32_t max_pkt_len;
#ifdef RTE_LIB_EVENTDEV
static struct rte_mempool *vector_pool[RTE_MAX_ETHPORTS];
#endif
-static struct rte_mempool *pktmbuf_pool[RTE_MAX_ETHPORTS][NB_SOCKETS];
-static uint8_t lkp_per_socket[NB_SOCKETS];
+static struct rte_mempool *pktmbuf_pool[RTE_MAX_ETHPORTS][NB_NUMAS];
+static uint8_t lkp_per_socket[NB_NUMAS];
struct l3fwd_lkp_mode {
void (*read_config_files)(void);
@@ -1137,10 +1137,10 @@ init_mem(uint16_t portid, unsigned int nb_mbuf)
else
socketid = 0;
- if (socketid >= NB_SOCKETS) {
+ if (socketid >= NB_NUMAS) {
rte_exit(EXIT_FAILURE,
"Socket %d of lcore %u is out of range %d\n",
- socketid, lcore_id, NB_SOCKETS);
+ socketid, lcore_id, NB_NUMAS);
}
if (pktmbuf_pool[portid][socketid] == NULL) {
diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index ed00540bdb..08816434f1 100644
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -160,7 +160,7 @@ static int
init_shm_rings(void)
{
unsigned i;
-unsigned int numa_id
+ unsigned int numa_id;
const char * q_name;
const unsigned ringsize = CLIENT_QUEUE_RINGSIZE;
diff --git a/examples/vhost_crypto/main.c b/examples/vhost_crypto/main.c
index 7f28d507f1..f4d6a67323 100644
--- a/examples/vhost_crypto/main.c
+++ b/examples/vhost_crypto/main.c
@@ -31,26 +31,26 @@
#define SESSION_MAP_ENTRIES (1024)
#define REFRESH_TIME_SEC (3)
-#define MAX_NB_SOCKETS (4)
+#define MAX_NB_NUMAS (4)
#define MAX_NB_WORKER_CORES (16)
struct lcore_option {
uint32_t lcore_id;
- char *socket_files[MAX_NB_SOCKETS];
+ char *socket_files[MAX_NB_NUMAS];
uint32_t nb_sockets;
uint8_t cid;
uint16_t qid;
};
struct __rte_cache_aligned vhost_crypto_info {
- int vids[MAX_NB_SOCKETS];
+ int vids[MAX_NB_NUMAS];
uint32_t nb_vids;
struct rte_mempool *sess_pool;
struct rte_mempool *cop_pool;
uint8_t cid;
uint32_t qid;
uint32_t nb_inflight_ops;
- volatile uint32_t initialized[MAX_NB_SOCKETS];
+ volatile uint32_t initialized[MAX_NB_NUMAS];
};
struct vhost_crypto_options {
@@ -123,7 +123,7 @@ parse_socket_arg(char *arg)
nb_sockets = lo->nb_sockets;
- if (nb_sockets >= MAX_NB_SOCKETS) {
+ if (nb_sockets >= MAX_NB_NUMAS) {
RTE_LOG(ERR, USER1, "Too many socket files!\n");
return -ENOMEM;
}
--
2.55.0
^ permalink raw reply related [flat|nested] 229+ messages in thread
* Re: [PATCH 000/227] use NUMA node terminology across the tree
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
` (226 preceding siblings ...)
2026-11-03 14:53 ` [PATCH 227/227] examples: fix NUMA node terminology residue Chengwen Feng
@ 2026-11-03 16:16 ` Aaron Conole
227 siblings, 0 replies; 229+ messages in thread
From: Aaron Conole @ 2026-11-03 16:16 UTC (permalink / raw)
To: Chengwen Feng; +Cc: thomas, konstantin.v.ananyev, dev, Chengwen Feng, ci
Chengwen Feng <chengwen.feng@linux.dev> writes:
> From: Chengwen Feng <fengchengwen@huawei.com>
>
> The DPDK tree conflates CPU sockets with NUMA memory nodes: public
> APIs, structure fields and macros are named after "socket" although
> they actually identify a NUMA node (e.g. rte_socket_id(), the
> socket_id field of rte_memzone, SOCKET_ID_ANY). This naming misleads
> application developers and pollutes vendor code that targets NUMA
> topologies.
>
> This series renames the terminology tree-wide:
Do not do this again.
I have set the robot from considering patches from you for the next 227
hours. One for each hour that a patch-by-patch test would take. Do not
repost this series again and expect the github robot to run for it.
Please work with existing maintainers to come up with a plan for each
area rename.
CI resources are shared, and in the case of the github robot, they are
shared among OVS, OVN, and DPDK. Additionally, a 227 patch series is
completely unreviewable, and completely inconsiderate of reviewers time.
Anything above 15 patches is, truly - who can keep that much details in
mind.
^ permalink raw reply [flat|nested] 229+ messages in thread
end of thread, other threads:[~2026-11-03 16:17 UTC | newest]
Thread overview: 229+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-03 14:49 [PATCH 000/227] use NUMA node terminology across the tree Chengwen Feng
2026-11-03 14:49 ` [PATCH 001/227] eal: add NUMA-aware APIs Chengwen Feng
2026-11-03 14:49 ` [PATCH 002/227] mempool: use NUMA node terminology Chengwen Feng
2026-11-03 14:49 ` [PATCH 003/227] ring: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 004/227] hash: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 005/227] member: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 006/227] ethdev: rename device socket API to NUMA node API Chengwen Feng
2026-11-03 14:49 ` [PATCH 007/227] cryptodev: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 008/227] compressdev: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 009/227] rawdev: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 010/227] mldev: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 011/227] bbdev: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 012/227] eventdev: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 013/227] acl: use NUMA node terminology Chengwen Feng
2026-11-03 14:49 ` [PATCH 014/227] ipsec: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 015/227] graph: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 016/227] gro: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 017/227] fib: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 018/227] rib: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 019/227] lpm: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 020/227] efd: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 021/227] ip_frag: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 022/227] node: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 023/227] distributor: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 024/227] reorder: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 025/227] stack: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 026/227] regexdev: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 027/227] metrics: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 028/227] mbuf: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 029/227] timer: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 030/227] table: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 031/227] rcu: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 032/227] pdump: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 033/227] pdcp: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 034/227] latencystats: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 035/227] gpudev: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 036/227] dmadev: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 037/227] dispatcher: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 038/227] vhost: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 039/227] baseband/acc: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 040/227] baseband/fpga_5gnr_fec: " Chengwen Feng
2026-11-03 14:49 ` [PATCH 041/227] baseband/fpga_lte_fec: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 042/227] baseband/null: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 043/227] baseband/turbo_sw: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 044/227] bus/auxiliary: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 045/227] bus/dpaa: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 046/227] bus/fslmc: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 047/227] bus/ifpga: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 048/227] bus/pci: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 049/227] bus/platform: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 050/227] bus/vdev: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 051/227] bus/vmbus: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 052/227] common/cnxk: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 053/227] common/nitrox: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 054/227] common/zsda: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 055/227] compress/isal: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 056/227] compress/mlx5: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 057/227] compress/nitrox: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 058/227] compress/octeontx: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 059/227] compress/uadk: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 060/227] compress/zlib: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 061/227] compress/zsda: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 062/227] crypto/armv8: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 063/227] crypto/bcmfs: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 064/227] crypto/caam_jr: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 065/227] crypto/ccp: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 066/227] crypto/cnxk: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 067/227] crypto/dpaa2_sec: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 068/227] crypto/dpaa_sec: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 069/227] crypto/ionic: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 070/227] crypto/ipsec_mb: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 071/227] crypto/mlx5: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 072/227] crypto/mvsam: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 073/227] crypto/nitrox: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 074/227] crypto/null: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 075/227] crypto/octeontx: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 076/227] crypto/openssl: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 077/227] crypto/scheduler: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 078/227] crypto/uadk: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 079/227] crypto/virtio: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 080/227] crypto/zsda: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 081/227] dma/ae4dma: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 082/227] dma/cnxk: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 083/227] dma/dpaa: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 084/227] dma/dpaa2: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 085/227] dma/hisi_acc: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 086/227] dma/idxd: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 087/227] dma/imx_edma5: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 088/227] dma/odm: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 089/227] dma/skeleton: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 090/227] event/cnxk: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 091/227] event/dlb2: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 092/227] event/dpaa: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 093/227] event/dpaa2: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 094/227] event/dsw: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 095/227] event/octeontx: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 096/227] event/opdl: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 097/227] event/skeleton: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 098/227] event/sw: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 099/227] mempool/bucket: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 100/227] mempool/cnxk: " Chengwen Feng
2026-11-03 14:50 ` [PATCH 101/227] ml/cnxk: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 102/227] net/af_packet: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 103/227] net/af_xdp: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 104/227] net/ark: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 105/227] net/atlantic: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 106/227] net/avp: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 107/227] net/axgbe: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 108/227] net/bnx2x: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 109/227] net/bnxt: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 110/227] net/bonding: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 111/227] net/cnxk: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 112/227] net/cxgbe: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 113/227] net/dpaa: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 114/227] net/dpaa2: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 115/227] net/ena: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 116/227] net/enetc: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 117/227] net/enetfec: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 118/227] net/enic: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 119/227] net/failsafe: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 120/227] net/gve: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 121/227] net/hinic: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 122/227] net/hinic3: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 123/227] net/hns3: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 124/227] net/intel: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 125/227] net/ionic: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 126/227] net/mana: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 127/227] net/memif: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 128/227] net/mlx4: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 129/227] net/mvneta: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 130/227] net/mvpp2: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 131/227] net/nbl: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 132/227] net/netvsc: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 133/227] net/nfb: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 134/227] net/nfp: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 135/227] net/ngbe: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 136/227] net/ntnic: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 137/227] net/null: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 138/227] net/octeon_ep: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 139/227] net/octeontx: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 140/227] net/pcap: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 141/227] net/pfe: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 142/227] net/qede: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 143/227] net/r8169: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 144/227] net/ring: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 145/227] net/rnp: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 146/227] net/sfc: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 147/227] net/softnic: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 148/227] net/sxe2: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 149/227] net/tap: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 150/227] net/thunderx: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 151/227] net/txgbe: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 152/227] net/vhost: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 153/227] net/virtio: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 154/227] net/vmxnet3: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 155/227] net/xsc: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 156/227] net/zxdh: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 157/227] raw/cnxk_bphy: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 158/227] raw/cnxk_gpio: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 159/227] raw/cnxk_rvu_lf: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 160/227] raw/dpaa2_cmdif: " Chengwen Feng
2026-11-03 14:51 ` [PATCH 161/227] raw/gdtc: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 162/227] raw/ifpga: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 163/227] raw/ntb: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 164/227] raw/skeleton: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 165/227] regex/cn9k: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 166/227] regex/mlx5: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 167/227] vdpa/mlx5: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 168/227] drivers: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 169/227] " Chengwen Feng
2026-11-03 14:52 ` [PATCH 170/227] test: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 171/227] app/testpmd: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 172/227] app/proc-info: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 173/227] app/graph: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 174/227] app/pdump: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 175/227] app/dumpcap: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 176/227] app/test-mldev: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 177/227] app/test-eventdev: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 178/227] app/test-compress-perf: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 179/227] app/test-crypto-perf: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 180/227] app/test-bbdev: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 181/227] app/test-security-perf: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 182/227] app/test-regex: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 183/227] app/test-flow-perf: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 184/227] examples/bbdev_app: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 185/227] examples/bond: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 186/227] examples/distributor: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 187/227] examples/dma: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 188/227] examples/ethtool: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 189/227] examples/eventdev_pipeline: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 190/227] examples/fips_validation: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 191/227] examples/flow_filtering: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 192/227] examples/ip_fragmentation: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 193/227] examples/ip_reassembly: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 194/227] examples/ipsec-secgw: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 195/227] examples/ipv4_multicast: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 196/227] examples/l2fwd: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 197/227] examples/l2fwd-cat: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 198/227] examples/l2fwd-crypto: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 199/227] examples/l2fwd-event: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 200/227] examples/l2fwd-jobstats: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 201/227] examples/l2fwd-keepalive: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 202/227] examples/l2fwd-macsec: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 203/227] examples/l3fwd: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 204/227] examples/l3fwd-graph: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 205/227] examples/l3fwd-power: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 206/227] examples/link_status_interrupt: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 207/227] examples/multi_process: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 208/227] examples/ntb: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 209/227] examples/packet_ordering: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 210/227] examples/pipeline: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 211/227] examples/ptpclient: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 212/227] examples/ptp_tap_relay_sw: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 213/227] examples/qos_meter: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 214/227] examples/qos_sched: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 215/227] examples/rxtx_callbacks: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 216/227] examples/server_node_efd: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 217/227] examples/skeleton: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 218/227] examples/vhost: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 219/227] examples/vhost_crypto: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 220/227] examples/vm_power_manager: " Chengwen Feng
2026-11-03 14:52 ` [PATCH 221/227] examples/vmdq: " Chengwen Feng
2026-11-03 14:53 ` [PATCH 222/227] examples/vmdq_dcb: " Chengwen Feng
2026-11-03 14:53 ` [PATCH 223/227] eal: deprecate legacy socket API aliases Chengwen Feng
2026-11-03 14:53 ` [PATCH 224/227] doc: use NUMA node terminology Chengwen Feng
2026-11-03 14:53 ` [PATCH 225/227] test-dma-perf: " Chengwen Feng
2026-11-03 14:53 ` [PATCH 226/227] test/memzone: fix NUMA node terminology rename Chengwen Feng
2026-11-03 14:53 ` [PATCH 227/227] examples: fix NUMA node terminology residue Chengwen Feng
2026-11-03 16:16 ` [PATCH 000/227] use NUMA node terminology across the tree Aaron Conole
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox