[PATCH 009/227] rawdev: rename device socket API to NUMA node API

[Chengwen Feng <chengwen.feng@linux.dev>]

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