mbuf: introduce a new helper to create a pool

[dpdk.git] / lib / librte_mbuf / rte_mbuf.c

diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index 231cfb8..26b6f12 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -119,16 +119,19 @@ rte_pktmbuf_init(struct rte_mempool *mp,
                 __attribute__((unused)) unsigned i)
 {
        struct rte_mbuf *m = _m;
-       uint32_t buf_len = mp->elt_size - sizeof(struct rte_mbuf);
+       uint32_t mbuf_size, buf_len;
 
-       RTE_MBUF_ASSERT(mp->elt_size >= sizeof(struct rte_mbuf));
+       mbuf_size = sizeof(struct rte_mbuf) + rte_pktmbuf_priv_size(mp);
+       buf_len = rte_pktmbuf_data_room_size(mp);
+
+       RTE_MBUF_ASSERT(mp->elt_size >= mbuf_size);
+       RTE_MBUF_ASSERT(buf_len <= UINT16_MAX);
 
        memset(m, 0, mp->elt_size);
 
        /* start of buffer is just after mbuf structure */
-       m->buf_addr = (char *)m + sizeof(struct rte_mbuf);
-       m->buf_physaddr = rte_mempool_virt2phy(mp, m) +
-                       sizeof(struct rte_mbuf);
+       m->buf_addr = (char *)m + mbuf_size;
+       m->buf_physaddr = rte_mempool_virt2phy(mp, m) + mbuf_size;
        m->buf_len = (uint16_t)buf_len;
 
        /* keep some headroom between start of buffer and data */
@@ -140,6 +143,27 @@ rte_pktmbuf_init(struct rte_mempool *mp,
        m->port = 0xff;
 }
 
+/* helper to create a mbuf pool */
+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)
+{
+       struct rte_pktmbuf_pool_private mbp_priv;
+       unsigned elt_size;
+
+
+       elt_size = sizeof(struct rte_mbuf) + (unsigned)priv_size +
+               (unsigned)data_room_size;
+       mbp_priv.mbuf_data_room_size = data_room_size;
+       mbp_priv.mbuf_priv_size = priv_size;
+
+       return rte_mempool_create(name, n, elt_size,
+               cache_size, sizeof(struct rte_pktmbuf_pool_private),
+               rte_pktmbuf_pool_init, &mbp_priv, rte_pktmbuf_init, NULL,
+               socket_id, 0);
+}
+
 /* do some sanity checks on a mbuf: panic if it fails */
 void
 rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)