diff mbox series

[v1,1/1] bug_3478 linux-gen: _ishm: proper alignment for current page size

Message ID 1514044808-4009-2-git-send-email-odpbot@yandex.ru
State New
Headers show
Series [v1,1/1] bug_3478 linux-gen: _ishm: proper alignment for current page size | expand

Commit Message

Github ODP bot Dec. 23, 2017, 4 p.m. UTC 
From: Ilias Apalodimas <ilias.apalodimas@linaro.org>


fixes https://bugs.linaro.org/show_bug.cgi?id=3478
on systems compiled without hugetlb odp_init_global() failed
on systems with hugetlb alignment was superfluous

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

---
/** Email created from pull request 366 (apalos:bug_3478_2)
 ** https://github.com/Linaro/odp/pull/366
 ** Patch: https://github.com/Linaro/odp/pull/366.patch
 ** Base sha: 260ca880b76151b66919cf0f3c149c2ba9ede24e
 ** Merge commit sha: f0393505ec2694de4673892f137aeaa657d4c389
 **/
 platform/linux-generic/_ishm.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c
index 82465bc54..bce4e402c 100644
--- a/platform/linux-generic/_ishm.c
+++ b/platform/linux-generic/_ishm.c
@@ -864,8 +864,8 @@  int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
 		 * the same address every where, otherwise alignment may be
 		 * be wrong for some process */
 		hp_align = align;
-		if (hp_align <= odp_sys_huge_page_size())
-			hp_align = odp_sys_huge_page_size();
+		if (hp_align <= page_hp_size)
+			hp_align = page_hp_size;
 		else
 			flags |= _ODP_ISHM_SINGLE_VA;
 
@@ -1441,6 +1441,8 @@  int _odp_ishm_init_global(void)
 	void *spce_addr;
 	int i;
 	uid_t uid;
+	char *hp_dir = odp_global_data.hugepage_info.default_huge_page_dir;
+	uint64_t align;
 
 	odp_global_data.main_pid = getpid();
 	odp_global_data.shm_dir = getenv("ODP_SHM_DIR");
@@ -1466,13 +1468,13 @@  int _odp_ishm_init_global(void)
 		return -1;
 	}
 
-	if (!odp_global_data.hugepage_info.default_huge_page_dir)
+	if (!hp_dir) {
 		ODP_DBG("NOTE: No support for huge pages\n");
-	else {
-		ODP_DBG("Huge pages mount point is: %s\n",
-			odp_global_data.hugepage_info.default_huge_page_dir);
-		_odp_ishm_cleanup_files(
-			odp_global_data.hugepage_info.default_huge_page_dir);
+		align = odp_sys_page_size();
+	} else {
+		ODP_DBG("Huge pages mount point is: %s\n", hp_dir);
+		_odp_ishm_cleanup_files(hp_dir);
+		align = odp_sys_huge_page_size();
 	}
 
 	_odp_ishm_cleanup_files(odp_global_data.shm_dir);
@@ -1504,8 +1506,7 @@  int _odp_ishm_init_global(void)
 	 *reserve the address space for _ODP_ISHM_SINGLE_VA reserved blocks,
 	 * only address space!
 	 */
-	spce_addr = _odp_ishmphy_book_va(ODP_CONFIG_ISHM_VA_PREALLOC_SZ,
-					 odp_sys_huge_page_size());
+	spce_addr = _odp_ishmphy_book_va(ODP_CONFIG_ISHM_VA_PREALLOC_SZ, align);
 	if (!spce_addr) {
 		ODP_ERR("unable to reserve virtual space\n.");
 		goto init_glob_err3;