nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

equix: Add NetBSD to "huge pages not supported" path

Browse Source 
As suggested by @wiz on #40843, let's add an explicit check to
hashx_vm_alloc_huge() that avoids using a Linux-style default
on NetBSD targets.

This doesn't change the questionable Linux-style default,
but a future patch will disable this code by default so it's not a
portability liability.

(This code is in hashx's VM layer but it's actually only relevant to
equix.)

This addresses bug #40843. Another patch will disable huge pages
by default entirely, but this patch is sufficient to fix the NetBSD
build.
This commit is contained in:
Micah Elizabeth Scott 2023-08-25 10:08:41 -07:00
parent 4119a7f971
commit 9cac0a85b4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ext/equix/hashx/src/virtual_memory.c
View File

@ -106,8 +106,8 @@ void* hashx_vm_alloc_huge(size_t bytes) {
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
mem = mmap(NULL, bytes, PAGE_READWRITE, MAP_PRIVATE | MAP_ANONYMOUS mem = mmap(NULL, bytes, PAGE_READWRITE, MAP_PRIVATE | MAP_ANONYMOUS
| MAP_ALIGNED_SUPER, -1, 0); | MAP_ALIGNED_SUPER, -1, 0);
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__) || defined(__NetBSD__)
mem = MAP_FAILED; // OpenBSD does not support huge pages mem = MAP_FAILED; // OpenBSD and NetBSD do not support huge pages
#else #else
mem = mmap(NULL, bytes, PAGE_READWRITE, MAP_PRIVATE | MAP_ANONYMOUS mem = mmap(NULL, bytes, PAGE_READWRITE, MAP_PRIVATE | MAP_ANONYMOUS
| MAP_HUGETLB | MAP_POPULATE, -1, 0); | MAP_HUGETLB | MAP_POPULATE, -1, 0);