hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!3602 大页内存功能在centos7下自定义大页大小功能异常问题修复

Browse Source 
Merge pull request !3602 from zhangzhixian/hugepages_fix
This commit is contained in:
opengauss_bot
2023-06-29 06:35:46 +00:00
committed by Gitee
parent 4fa4e989c6 0150482d82
commit 179c3803bf
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/backend/port/sysv_shmem.cpp
View File

@ -95,10 +95,20 @@ static void GetHugepageSize(Size* hugepageSize, int* flag)
} }
int flagLocal = SHM_HUGETLB; int flagLocal = SHM_HUGETLB;
#if defined(MAP_HUGE_MASK) && defined(MAP_HUGE_SHIFT) /* hardcode in case of using huge page in os whose linux kernel version is before 3.8 */
int shift = pg_leftmost_one_pos64(sizeLocal - 1) + 1; #ifndef MAP_HUGE_MASK
flagLocal |= (shift & MAP_HUGE_MASK) << MAP_HUGE_SHIFT; int map_huge_mask = 0x3f;
#else
int map_huge_mask = MAP_HUGE_MASK;
#endif #endif
#ifndef MAP_HUGE_SHIFT
int map_huge_shift = 26;
#else
int map_huge_shift = MAP_HUGE_SHIFT;
#endif
int shift = pg_leftmost_one_pos64(sizeLocal - 1) + 1;
flagLocal |= (shift & map_huge_mask) << map_huge_shift;
*hugepageSize = sizeLocal; *hugepageSize = sizeLocal;
*flag = flagLocal; *flag = flagLocal;
@ -126,6 +136,9 @@ static void* InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
void* memAddress = NULL; void* memAddress = NULL;
if (g_instance.attr.attr_storage.enable_huge_pages) { if (g_instance.attr.attr_storage.enable_huge_pages) {
#ifndef SHM_HUGETLB
ereport(FATAL, (errmsg("Parameter enable_huge_pages cannot set to on since operating system doesn't support")));
#endif
Size hugepageSize; Size hugepageSize;
Size allocSize = size; Size allocSize = size;
int hugepageFlag; int hugepageFlag;