diff options
| author |   Dave Barach <dave@barachs.net> | 2020-06-11 08:57:52 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2020-06-12 12:06:29 +0000 |
| commit | 01a2a10715551ccbad760cec641786aa079c373a (patch) | |
| tree | bd9180e1456d2f0110ab6751a458ec4c4f7cd8b2 /src/vnet/ip/ip4_mtrie.c | |
| parent | 4cb21c8e5d70d20df94f5d892471a11488547881 (diff) | |
ip: allocate ip4 mtrie pages in htlb memory
No change in default behavior. To use htlb pages for the ip4 mtrie,
use the "ip" command-line option "mtrie-hugetlb".
Type: improvement
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I5497e426a47200edff2c7e15563ed6a42af12e7f
Diffstat (limited to 'src/vnet/ip/ip4_mtrie.c')
| -rw-r--r-- | src/vnet/ip/ip4_mtrie.c | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/src/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c index 258a0f76bdc..b5d0a890a7c 100644 --- a/src/vnet/ip/ip4_mtrie.c +++ b/src/vnet/ip/ip4_mtrie.c @@ -790,6 +790,9 @@ format_ip4_fib_mtrie (u8 * s, va_list * va) /** Default heap size for the IPv4 mtries */ #define IP4_FIB_DEFAULT_MTRIE_HEAP_SIZE (32<<20) +#ifndef MAP_HUGE_SHIFT +#define MAP_HUGE_SHIFT 26 +#endif static clib_error_t * ip4_mtrie_module_init (vlib_main_t * vm) @@ -799,9 +802,46 @@ ip4_mtrie_module_init (vlib_main_t * vm) clib_error_t *error = NULL; uword *old_heap; - if (0 == im->mtrie_heap_size) + if (im->mtrie_heap_size == 0) im->mtrie_heap_size = IP4_FIB_DEFAULT_MTRIE_HEAP_SIZE; - im->mtrie_mheap = create_mspace (im->mtrie_heap_size, 1 /* locked */ ); + +again: + if (im->mtrie_hugetlb) + { + void *rv; + int mmap_flags, mmap_flags_huge; + uword htlb_pagesize = clib_mem_get_default_hugepage_size (); + if (htlb_pagesize == 0) + { + clib_warning ("WARNING: htlb pagesize == 0"); + im->mtrie_hugetlb = 0; + goto again; + } + /* Round the allocation request to an even number of huge pages */ + im->mtrie_heap_size = (im->mtrie_heap_size + (htlb_pagesize - 1)) & + ~(htlb_pagesize - 1); + mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS; + mmap_flags_huge = (mmap_flags | MAP_HUGETLB | MAP_LOCKED | + min_log2 (htlb_pagesize) << MAP_HUGE_SHIFT); + rv = mmap (0, im->mtrie_heap_size, + PROT_READ | PROT_WRITE, mmap_flags_huge, -1, 0); + if (rv == MAP_FAILED) + { + /* Failure when running as root should be logged... */ + if (geteuid () == 0) + clib_warning ("ip4 mtrie htlb map failed: not enough pages?"); + im->mtrie_hugetlb = 0; + goto again; + } + if (mlock (rv, im->mtrie_heap_size)) + clib_warning ("WARNING: couldn't lock mtrie heap at %llx", rv); + im->mtrie_mheap = create_mspace_with_base (rv, im->mtrie_heap_size, + 1 /* locked */ ); + } + else + { + im->mtrie_mheap = create_mspace (im->mtrie_heap_size, 1 /* locked */ ); + } /* Burn one ply so index 0 is taken */ old_heap = clib_mem_set_heap (ip4_main.mtrie_mheap); |