[ovs-dev] [PATCH v4 6/6] netdev-dpdk: Rename dpdk_mp_put as dpdk_mp_free.
antonio.fischetti at intel.com
antonio.fischetti at intel.com
Fri Oct 6 16:45:07 UTC 2017
Rename dpdk_mp_put as dpdk_mp_free, add other comments
to mempool functions.
CC: Ciara Loftus <ciara.loftus at intel.com>
CC: Kevin Traynor <ktraynor at redhat.com>
CC: Aaron Conole <aconole at redhat.com>
Signed-off-by: Antonio Fischetti <antonio.fischetti at intel.com>
---
lib/netdev-dpdk.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
index 04dda47..572987c 100644
--- a/lib/netdev-dpdk.c
+++ b/lib/netdev-dpdk.c
@@ -577,6 +577,9 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu, bool *mp_exists)
return NULL;
}
+/* Returns a valid pointer when either of the two cases occur:
+ * a new mempool was just created or the requested mempool is already
+ * existing. */
static struct dpdk_mp *
dpdk_mp_get(struct netdev_dpdk *dev, int mtu, bool *mp_exists)
{
@@ -589,8 +592,9 @@ dpdk_mp_get(struct netdev_dpdk *dev, int mtu, bool *mp_exists)
return dmp;
}
+/* Release an existing mempool. */
static void
-dpdk_mp_put(struct dpdk_mp *dmp)
+dpdk_mp_free(struct dpdk_mp *dmp)
{
char *mp_name;
@@ -607,8 +611,8 @@ dpdk_mp_put(struct dpdk_mp *dmp)
ovs_mutex_unlock(&dpdk_mp_mutex);
}
-/* Tries to allocate new mempool on requested_socket_id with
- * mbuf size corresponding to requested_mtu.
+/* Tries to allocate a new mempool on requested_socket_id with a size
+ * determined by requested_mtu and requested Rx/Tx queues.
* On success new configuration will be applied.
* On error, device will be left unchanged. */
static int
@@ -629,7 +633,8 @@ netdev_dpdk_mempool_configure(struct netdev_dpdk *dev)
} else if (mp_exists) {
return EEXIST;
} else {
- dpdk_mp_put(dev->dpdk_mp);
+ /* A new mempool was created, release the previous one. */
+ dpdk_mp_free(dev->dpdk_mp);
dev->dpdk_mp = mp;
dev->mtu = dev->requested_mtu;
dev->socket_id = dev->requested_socket_id;
@@ -1074,7 +1079,7 @@ common_destruct(struct netdev_dpdk *dev)
OVS_EXCLUDED(dev->mutex)
{
rte_free(dev->tx_q);
- dpdk_mp_put(dev->dpdk_mp);
+ dpdk_mp_free(dev->dpdk_mp);
ovs_list_remove(&dev->list_node);
free(ovsrcu_get_protected(struct ingress_policer *,
--
2.4.11
More information about the dev
mailing list