From 5a6c8096cb51065b056c927133781c9f2db9148d Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Thu, 21 Feb 2019 14:44:59 +0100 Subject: physmem: keep physmem VA in 39-bit address space on x86_64 Some x86 CPUs have IOMMU capable dealing only with 39-bit address space This patch also adds option to specify physmem base address from startup.conf Change-Id: I9e8abd26efb60e9c4ad54c035fb1751a4a61f4dc Signed-off-by: Damjan Marion --- src/vppinfra/pmalloc.c | 12 +++++++++--- src/vppinfra/pmalloc.h | 2 +- src/vppinfra/test_pmalloc.c | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'src/vppinfra') diff --git a/src/vppinfra/pmalloc.c b/src/vppinfra/pmalloc.c index 5662a36939e..dd772f34381 100644 --- a/src/vppinfra/pmalloc.c +++ b/src/vppinfra/pmalloc.c @@ -59,10 +59,11 @@ pmalloc_validate_numa_node (u32 * numa_node) } int -clib_pmalloc_init (clib_pmalloc_main_t * pm, uword size) +clib_pmalloc_init (clib_pmalloc_main_t * pm, uword base_addr, uword size) { uword off, pagesize; u64 *pt = 0; + int mmap_flags; ASSERT (pm->error == 0); @@ -82,8 +83,13 @@ clib_pmalloc_init (clib_pmalloc_main_t * pm, uword size) pm->max_pages = size >> pm->def_log2_page_sz; /* reserve VA space for future growth */ - pm->base = mmap (0, size + pagesize, PROT_NONE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS; + + if (base_addr) + mmap_flags |= MAP_FIXED; + + pm->base = mmap (uword_to_pointer (base_addr, void *), size + pagesize, + PROT_NONE, mmap_flags, -1, 0); if (pm->base == MAP_FAILED) { diff --git a/src/vppinfra/pmalloc.h b/src/vppinfra/pmalloc.h index 25c46783f8c..2a3bde2acc4 100644 --- a/src/vppinfra/pmalloc.h +++ b/src/vppinfra/pmalloc.h @@ -103,7 +103,7 @@ typedef struct } clib_pmalloc_main_t; -int clib_pmalloc_init (clib_pmalloc_main_t * pm, uword size); +int clib_pmalloc_init (clib_pmalloc_main_t * pm, uword base_addr, uword size); void *clib_pmalloc_alloc_aligned_on_numa (clib_pmalloc_main_t * pm, uword size, uword align, u32 numa_node); diff --git a/src/vppinfra/test_pmalloc.c b/src/vppinfra/test_pmalloc.c index 90b1775bb4f..a59ff32db05 100644 --- a/src/vppinfra/test_pmalloc.c +++ b/src/vppinfra/test_pmalloc.c @@ -44,7 +44,7 @@ test_palloc (test_main_t * tm) int i; uword *va; - if (clib_pmalloc_init (pm, 0) != 0) + if (clib_pmalloc_init (pm, 0, 0) != 0) return clib_error_return (0, "pmalloc init failure"); fformat (stdout, "Allocate %d items...\n", tm->nitems); -- cgit 1.2.3-korg