From 68b4da67deb2e8ca224bb5abaeb9dbc7ae8e378c Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Sun, 30 Sep 2018 18:26:20 +0200 Subject: Numa-aware, growable physical memory allocator (pmalloc) Change-Id: Ic4c46bc733afae8bf0d8146623ed15633928de30 Signed-off-by: Damjan Marion --- src/plugins/dpdk/buffer.c | 34 +++++++++++++++------------------- src/plugins/dpdk/device/dpdk.h | 3 +-- src/plugins/dpdk/ipsec/ipsec.c | 21 +++++++++------------ 3 files changed, 25 insertions(+), 33 deletions(-) (limited to 'src/plugins/dpdk') diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c index f7ed932e35f..770e76d398e 100644 --- a/src/plugins/dpdk/buffer.c +++ b/src/plugins/dpdk/buffer.c @@ -393,12 +393,12 @@ dpdk_packet_template_init (vlib_main_t * vm, clib_error_t * dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size, u32 num_elts, u32 pool_priv_size, u16 cache_size, u8 numa, - struct rte_mempool **_mp, vlib_physmem_region_index_t * pri) + struct rte_mempool **_mp, u32 * map_index) { struct rte_mempool *mp; enum rte_iova_mode iova_mode; - vlib_physmem_region_t *pr; dpdk_mempool_private_t priv; + vlib_physmem_map_t *pm; clib_error_t *error = 0; size_t min_chunk_size, align; int map_dma = 1; @@ -406,7 +406,6 @@ dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size, i32 ret; uword i; - mp = rte_mempool_create_empty ((char *) pool_name, num_elts, elt_size, 512, pool_priv_size, numa, 0); if (!mp) @@ -417,16 +416,13 @@ dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size, size = rte_mempool_op_calc_mem_size_default (mp, num_elts, 21, &min_chunk_size, &align); - error = vlib_physmem_region_alloc (vm, (char *) pool_name, size, numa, - VLIB_PHYSMEM_F_HUGETLB | - VLIB_PHYSMEM_F_SHARED, pri); - if (error) + if ((error = vlib_physmem_shared_map_create (vm, (char *) pool_name, size, + numa, map_index))) { rte_mempool_free (mp); return error; } - - pr = vlib_physmem_get_region (vm, pri[0]); + pm = vlib_physmem_get_map (vm, *map_index); /* Call the mempool priv initializer */ priv.mbp_priv.mbuf_data_room_size = VLIB_BUFFER_PRE_DATA_SIZE + @@ -438,12 +434,12 @@ dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size, map_dma = 0; iova_mode = rte_eal_iova_mode (); - for (i = 0; i < pr->n_pages; i++) + for (i = 0; i < pm->n_pages; i++) { - size_t page_sz = 1ull << pr->log2_page_size; - char *va = ((char *) pr->mem) + i * page_sz; + size_t page_sz = 1ULL << pm->log2_page_size; + char *va = ((char *) pm->base) + i * page_sz; uword pa = iova_mode == RTE_IOVA_VA ? - pointer_to_uword (va) : pr->page_table[i]; + pointer_to_uword (va) : pm->page_table[i]; ret = rte_mempool_populate_iova (mp, va, pa, page_sz, 0, 0); if (ret < 0) { @@ -467,10 +463,10 @@ dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, { dpdk_main_t *dm = &dpdk_main; struct rte_mempool *rmp; - vlib_physmem_region_index_t pri; clib_error_t *error = 0; u8 *pool_name; u32 elt_size, i; + u32 map_index; vec_validate_aligned (dm->pktmbuf_pools, socket_id, CLIB_CACHE_LINE_BYTES); @@ -484,10 +480,9 @@ dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, VLIB_BUFFER_HDR_SIZE /* priv size */ + VLIB_BUFFER_PRE_DATA_SIZE + VLIB_BUFFER_DATA_SIZE; /*data room size */ - error = - dpdk_pool_create (vm, pool_name, elt_size, num_mbufs, - sizeof (dpdk_mempool_private_t), 512, socket_id, - &rmp, &pri); + error = dpdk_pool_create (vm, pool_name, elt_size, num_mbufs, + sizeof (dpdk_mempool_private_t), 512, socket_id, + &rmp, &map_index); vec_free (pool_name); @@ -497,7 +492,8 @@ dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, rte_mempool_obj_iter (rmp, rte_pktmbuf_init, 0); dpdk_mempool_private_t *privp = rte_mempool_get_priv (rmp); - privp->buffer_pool_index = vlib_buffer_pool_create (vm, pri, 0); + privp->buffer_pool_index = + vlib_buffer_register_physmem_map (vm, map_index); dm->pktmbuf_pools[socket_id] = rmp; diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index c4f908ea408..46d53f1d895 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -527,8 +527,7 @@ clib_error_t *unformat_hqos (unformat_input_t * input, clib_error_t *dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size, u32 num_elts, u32 pool_priv_size, u16 cache_size, u8 numa, - struct rte_mempool **_mp, - vlib_physmem_region_index_t * pri); + struct rte_mempool **_mp, u32 * map_index); clib_error_t *dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, unsigned socket_id); diff --git a/src/plugins/dpdk/ipsec/ipsec.c b/src/plugins/dpdk/ipsec/ipsec.c index ded8912e943..bcc4b62ad76 100644 --- a/src/plugins/dpdk/ipsec/ipsec.c +++ b/src/plugins/dpdk/ipsec/ipsec.c @@ -827,7 +827,7 @@ crypto_create_crypto_op_pool (vlib_main_t * vm, u8 numa) struct rte_crypto_op_pool_private *priv; struct rte_mempool *mp; clib_error_t *error = NULL; - vlib_physmem_region_index_t pri; + u32 map_index; data = vec_elt_at_index (dcm->data, numa); @@ -837,9 +837,8 @@ crypto_create_crypto_op_pool (vlib_main_t * vm, u8 numa) pool_name = format (0, "crypto_pool_numa%u%c", numa, 0); - error = - dpdk_pool_create (vm, pool_name, crypto_op_len (), conf->num_mbufs, - pool_priv_size, 512, numa, &mp, &pri); + error = dpdk_pool_create (vm, pool_name, crypto_op_len (), conf->num_mbufs, + pool_priv_size, 512, numa, &mp, &map_index); vec_free (pool_name); @@ -867,8 +866,8 @@ crypto_create_session_h_pool (vlib_main_t * vm, u8 numa) u8 *pool_name; struct rte_mempool *mp; clib_error_t *error = NULL; - vlib_physmem_region_index_t pri; u32 elt_size; + u32 map_index; data = vec_elt_at_index (dcm->data, numa); @@ -880,9 +879,8 @@ crypto_create_session_h_pool (vlib_main_t * vm, u8 numa) elt_size = rte_cryptodev_sym_get_header_session_size (); - error = - dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS, - 0, 512, numa, &mp, &pri); + error = dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS, + 0, 512, numa, &mp, &map_index); vec_free (pool_name); @@ -902,9 +900,9 @@ crypto_create_session_drv_pool (vlib_main_t * vm, crypto_dev_t * dev) u8 *pool_name; struct rte_mempool *mp; clib_error_t *error = NULL; - vlib_physmem_region_index_t pri; u32 elt_size; u8 numa = dev->numa; + u32 map_index; data = vec_elt_at_index (dcm->data, numa); @@ -920,9 +918,8 @@ crypto_create_session_drv_pool (vlib_main_t * vm, crypto_dev_t * dev) elt_size = rte_cryptodev_sym_get_private_session_size (dev->id); - error = - dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS, - 0, 512, numa, &mp, &pri); + error = dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS, + 0, 512, numa, &mp, &map_index); vec_free (pool_name); -- cgit 1.2.3-korg