[PATCH 130/227] net/mvpp2: use NUMA node terminology
Chengwen Feng
chengwen.feng at linux.dev
Tue Nov 3 15:51:28 CET 2026
From: Chengwen Feng <fengchengwen at 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 at 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
More information about the dev
mailing list