linux-gen: ishm: use pre-reserved single va memory

Reserve single VA memory in global init instead of only allocating the address space. Allocating only the address space doesn't work if shm blocks are reserved after ODP process has been forked. Signed-off-by: Matias Elo <matias.elo@nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
OpenDataPlane · Nov 23, 2018 · f913948 · f913948
1 parent f703d49
commit f913948
Show file tree

Hide file tree

Showing 8 changed files with 381 additions and 281 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -215,7 +215,7 @@ jobs:
                           - true
                   script:
                           - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
-                          - docker run  -i -t -v `pwd`:/odp
+                          - docker run -i -t -v `pwd`:/odp --shm-size 8g
                               -e CC="${CC}"
                               ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
                 - stage: "build only"
@@ -224,7 +224,7 @@ jobs:
                           - true
                   script:
                           - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
-                          - docker run  -i -t -v `pwd`:/odp
+                          - docker run -i -t -v `pwd`:/odp --shm-size 8g
                               -e CC="${CC}"
                               ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
                 - stage: "build only"
@@ -233,7 +233,7 @@ jobs:
                           - true
                   script:
                           - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
-                          - docker run  -i -t -v `pwd`:/odp
+                          - docker run -i -t -v `pwd`:/odp
                               -e CC="${CC}"
                               ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
                 - stage: "build only"
@@ -242,7 +242,7 @@ jobs:
                           - true
                   script:
                           - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
-                          - docker run  -i -t -v `pwd`:/odp
+                          - docker run -i -t -v `pwd`:/odp --shm-size 8g
                               -e CC="${CC}"
                               ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
                 - stage: test

diff --git a/platform/linux-generic/include/odp_ishmphy_internal.h b/platform/linux-generic/include/odp_ishmphy_internal.h
@@ -13,9 +13,9 @@ extern "C" {
 
 #include <stdint.h>
 
-void *_odp_ishmphy_book_va(uintptr_t len, intptr_t align);
-int   _odp_ishmphy_unbook_va(void);
-void *_odp_ishmphy_map(int fd, void *start, uint64_t size, int flags);
+void *_odp_ishmphy_reserve_single_va(uint64_t len, int fd);
+int   _odp_ishmphy_free_single_va(void);
+void *_odp_ishmphy_map(int fd, uint64_t size, uint64_t offset, int flags);
 int   _odp_ishmphy_unmap(void *start, uint64_t len, int flags);
 
 #ifdef __cplusplus

diff --git a/platform/linux-generic/include/odp_shm_internal.h b/platform/linux-generic/include/odp_shm_internal.h
@@ -38,7 +38,7 @@ odp_shm_t _odp_shm_reserve(const char *name, uint64_t size, uint32_t align,
 			   uint32_t flags, uint32_t extra_flags);
 
 int   _odp_ishm_reserve(const char *name, uint64_t size, int fd, uint32_t align,
-			uint32_t flags, uint32_t user_flags);
+			uint64_t offset, uint32_t flags, uint32_t user_flags);
 int   _odp_ishm_free_by_index(int block_index);
 int   _odp_ishm_lookup_by_name(const char *name);
 int   _odp_ishm_find_exported(const char *remote_name,