tor

commit 9cac0a85b4f62caf458bd44d5030ce6edfd12365
parent 4119a7f971e732a7b3a0fa2548e8c80e8a5bf080
Author: Micah Elizabeth Scott <beth@torproject.org>
Date:   Fri, 25 Aug 2023 10:08:41 -0700

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

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.

Diffstat:
M
src/ext/equix/hashx/src/virtual_memory.c
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ext/equix/hashx/src/virtual_memory.c b/src/ext/equix/hashx/src/virtual_memory.c
@@ -106,8 +106,8 @@ void* hashx_vm_alloc_huge(size_t bytes) {
 #elif defined(__FreeBSD__)
 	mem = mmap(NULL, bytes, PAGE_READWRITE, MAP_PRIVATE | MAP_ANONYMOUS
 		| MAP_ALIGNED_SUPER, -1, 0);
-#elif defined(__OpenBSD__)
-	mem = MAP_FAILED; // OpenBSD does not support huge pages
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
+	mem = MAP_FAILED; // OpenBSD and NetBSD do not support huge pages
 #else
 	mem = mmap(NULL, bytes, PAGE_READWRITE, MAP_PRIVATE | MAP_ANONYMOUS
 		| MAP_HUGETLB | MAP_POPULATE, -1, 0);