diff options
| author |   Damjan Marion <damarion@cisco.com> | 2019-02-21 14:44:59 +0100 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2019-02-21 17:35:35 +0000 |
| commit | 5a6c8096cb51065b056c927133781c9f2db9148d (patch) | |
| tree | 7eabb5921aeebf1d1eebc9f892aae6b0d1a989f0 /src/vppinfra/pmalloc.c | |
| parent | 30307af14583f6955eacafe73c3001164ee58a07 (diff) | |
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 <damarion@cisco.com>
Diffstat (limited to 'src/vppinfra/pmalloc.c')
| -rw-r--r-- | src/vppinfra/pmalloc.c | 12 |
1 files changed, 9 insertions, 3 deletions
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) { |