Re: [ovs-dev] [PATCH v7 5/6] netdev-dpdk: Reword mp_size as n_mbufs.

[Kevin Traynor]

On 10/18/2017 05:01 PM, antonio.fische...@intel.com wrote:
> For code readability purposes mp_size is renamed as n_mbufs
> in dpdk_mp structure.
> This parameter is passed to rte mempool creation functions
> and is meant to contain the number of elements inside
> the requested mempool.
> 
> CC: Ciara Loftus 
> CC: Kevin Traynor 
> CC: Aaron Conole 
> Acked-by: Mark Kavanagh 
> Signed-off-by: Antonio Fischetti 
> ---

LGTM.
Acked-by: Kevin Traynor 

>  lib/netdev-dpdk.c | 20 ++--
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
> index a3b4638..0057e6b 100644
> --- a/lib/netdev-dpdk.c
> +++ b/lib/netdev-dpdk.c
> @@ -308,7 +308,7 @@ struct dpdk_mp {
>  int mtu;
>  int socket_id;
>  char if_name[IFNAMSIZ];
> -unsigned mp_size;
> +unsigned n_mbufs;   /* Number of mbufs inside the mempool. */
>  struct ovs_list list_node OVS_GUARDED_BY(dpdk_mp_mutex);
>  };
>  
> @@ -500,11 +500,11 @@ dpdk_mp_name(struct dpdk_mp *dmp)
>  uint32_t h = hash_string(dmp->if_name, 0);
>  char *mp_name = xcalloc(RTE_MEMPOOL_NAMESIZE, sizeof *mp_name);
>  int ret = snprintf(mp_name, RTE_MEMPOOL_NAMESIZE, "ovs_%x_%d_%d_%u",
> -   h, dmp->socket_id, dmp->mtu, dmp->mp_size);
> +   h, dmp->socket_id, dmp->mtu, dmp->n_mbufs);
>  if (ret < 0 || ret >= RTE_MEMPOOL_NAMESIZE) {
>  VLOG_DBG("Failed to generate a mempool name for \"%s\". "
>  "Hash:0x%x, mtu:%d, mbufs:%u, %s",
> -dmp->if_name, h, dmp->mtu, dmp->mp_size, ovs_strerror(ret));
> +dmp->if_name, h, dmp->mtu, dmp->n_mbufs, ovs_strerror(ret));
>  return NULL;
>  }
>  return mp_name;
> @@ -523,13 +523,13 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu, bool 
> *mp_exists)
>  ovs_strzcpy(dmp->if_name, dev->up.name, IFNAMSIZ);
>  
>  /*
> - * XXX: rough estimation of memory required for port:
> + * XXX: rough estimation of number of mbufs required for this port:
>   * 
>   * + 
>   * + 
>   * + 
>   */
> -dmp->mp_size = dev->requested_n_rxq * dev->requested_rxq_size
> +dmp->n_mbufs = dev->requested_n_rxq * dev->requested_rxq_size
>  + dev->requested_n_txq * dev->requested_txq_size
>  + MIN(RTE_MAX_LCORE, dev->requested_n_rxq) * NETDEV_MAX_BURST
>  + MIN_NB_MBUF;
> @@ -543,11 +543,11 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu, bool 
> *mp_exists)
>  
>  VLOG_DBG("Requesting a mempool of %u mbufs for netdev %s "
>   "with %d Rx and %d Tx queues, socket id:%d.",
> - dmp->mp_size, dev->up.name,
> + dmp->n_mbufs, dev->up.name,
>   dev->requested_n_rxq, dev->requested_n_txq,
>   dev->requested_socket_id);
>  
> -dmp->mp = rte_pktmbuf_pool_create(mp_name, dmp->mp_size,
> +dmp->mp = rte_pktmbuf_pool_create(mp_name, dmp->n_mbufs,
>MP_CACHE_SZ,
>sizeof (struct dp_packet)
>   - sizeof (struct rte_mbuf),
> @@ -556,7 +556,7 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu, bool 
> *mp_exists)
>dmp->socket_id);
>  if (dmp->mp) {
>  VLOG_DBG("Allocated \"%s\" mempool with %u mbufs", mp_name,
> - dmp->mp_size);
> + dmp->n_mbufs);
>  /* rte_pktmbuf_pool_create has done some initialization of the
>   * rte_mbuf part of each dp_packet. Some OvS specific fields
>   * of the packet still need to be initialized by
> @@ -574,14 +574,14 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu, bool 
> *mp_exists)
>  *mp_exists = true;
>  } else {
>  VLOG_ERR("Failed mempool \"%s\" create request of %u mbufs",
> - mp_name, dmp->mp_size);
> + mp_name, dmp->n_mbufs);
>  }
>  free(mp_name);
>  if (dmp->mp) {
>  return dmp;
>  }
>  } while (!(*mp_exists) &&
> -(rte_errno == ENOMEM && (dmp->mp_size /= 2) >= MIN_NB_MBUF));
> +(rte_errno == ENOMEM && (dmp->n_mbufs /= 2) >= MIN_NB_MBUF));
>  
>  rte_free(dmp);
>  return NULL;
> 

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

[ovs-dev] [PATCH v7 5/6] netdev-dpdk: Reword mp_size as n_mbufs.

[antonio . fischetti]

For code readability purposes mp_size is renamed as n_mbufs
in dpdk_mp structure.
This parameter is passed to rte mempool creation functions
and is meant to contain the number of elements inside
the requested mempool.

CC: Ciara Loftus 
CC: Kevin Traynor 
CC: Aaron Conole 
Acked-by: Mark Kavanagh 
Signed-off-by: Antonio Fischetti 
---
 lib/netdev-dpdk.c | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
index a3b4638..0057e6b 100644
--- a/lib/netdev-dpdk.c
+++ b/lib/netdev-dpdk.c
@@ -308,7 +308,7 @@ struct dpdk_mp {
 int mtu;
 int socket_id;
 char if_name[IFNAMSIZ];
-unsigned mp_size;
+unsigned n_mbufs;   /* Number of mbufs inside the mempool. */
 struct ovs_list list_node OVS_GUARDED_BY(dpdk_mp_mutex);
 };
 
@@ -500,11 +500,11 @@ dpdk_mp_name(struct dpdk_mp *dmp)
 uint32_t h = hash_string(dmp->if_name, 0);
 char *mp_name = xcalloc(RTE_MEMPOOL_NAMESIZE, sizeof *mp_name);
 int ret = snprintf(mp_name, RTE_MEMPOOL_NAMESIZE, "ovs_%x_%d_%d_%u",
-   h, dmp->socket_id, dmp->mtu, dmp->mp_size);
+   h, dmp->socket_id, dmp->mtu, dmp->n_mbufs);
 if (ret < 0 || ret >= RTE_MEMPOOL_NAMESIZE) {
 VLOG_DBG("Failed to generate a mempool name for \"%s\". "
 "Hash:0x%x, mtu:%d, mbufs:%u, %s",
-dmp->if_name, h, dmp->mtu, dmp->mp_size, ovs_strerror(ret));
+dmp->if_name, h, dmp->mtu, dmp->n_mbufs, ovs_strerror(ret));
 return NULL;
 }
 return mp_name;
@@ -523,13 +523,13 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu, bool 
*mp_exists)
 ovs_strzcpy(dmp->if_name, dev->up.name, IFNAMSIZ);
 
 /*
- * XXX: rough estimation of memory required for port:
+ * XXX: rough estimation of number of mbufs required for this port:
  * 
  * + 
  * + 
  * + 
  */
-dmp->mp_size = dev->requested_n_rxq * dev->requested_rxq_size
+dmp->n_mbufs = dev->requested_n_rxq * dev->requested_rxq_size
 + dev->requested_n_txq * dev->requested_txq_size
 + MIN(RTE_MAX_LCORE, dev->requested_n_rxq) * NETDEV_MAX_BURST
 + MIN_NB_MBUF;
@@ -543,11 +543,11 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu, bool 
*mp_exists)
 
 VLOG_DBG("Requesting a mempool of %u mbufs for netdev %s "
  "with %d Rx and %d Tx queues, socket id:%d.",
- dmp->mp_size, dev->up.name,
+ dmp->n_mbufs, dev->up.name,
  dev->requested_n_rxq, dev->requested_n_txq,
  dev->requested_socket_id);
 
-dmp->mp = rte_pktmbuf_pool_create(mp_name, dmp->mp_size,
+dmp->mp = rte_pktmbuf_pool_create(mp_name, dmp->n_mbufs,
   MP_CACHE_SZ,
   sizeof (struct dp_packet)
  - sizeof (struct rte_mbuf),
@@ -556,7 +556,7 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu, bool 
*mp_exists)
   dmp->socket_id);
 if (dmp->mp) {
 VLOG_DBG("Allocated \"%s\" mempool with %u mbufs", mp_name,
- dmp->mp_size);
+ dmp->n_mbufs);
 /* rte_pktmbuf_pool_create has done some initialization of the
  * rte_mbuf part of each dp_packet. Some OvS specific fields
  * of the packet still need to be initialized by
@@ -574,14 +574,14 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu, bool 
*mp_exists)
 *mp_exists = true;
 } else {
 VLOG_ERR("Failed mempool \"%s\" create request of %u mbufs",
- mp_name, dmp->mp_size);
+ mp_name, dmp->n_mbufs);
 }
 free(mp_name);
 if (dmp->mp) {
 return dmp;
 }
 } while (!(*mp_exists) &&
-(rte_errno == ENOMEM && (dmp->mp_size /= 2) >= MIN_NB_MBUF));
+(rte_errno == ENOMEM && (dmp->n_mbufs /= 2) >= MIN_NB_MBUF));
 
 rte_free(dmp);
 return NULL;
-- 
2.4.11

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev