diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2023-01-18 13:40:21 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2023-01-18 13:40:21 +0100 |
| commit | 804916daa91834a4740edba96a43c7f0a43744b3 (patch) | |
| tree | f08b201823b5b55b6a30c2c98ec2660aa33d2bd0 | |
| parent | 6bb992cb04926895be57dc97e7d569ea15a07db1 (diff) | |
Alloc: Minor cleanups
- Fix THP disable on old systems
- Failed syscalls should use die() instead of bug()
- Our printf uses %ld for s64 instead of long
| -rw-r--r-- | sysdep/unix/alloc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c index d625cd38..c8f1c83f 100644 --- a/sysdep/unix/alloc.c +++ b/sysdep/unix/alloc.c @@ -21,6 +21,9 @@ #ifdef CONFIG_DISABLE_THP #include <sys/prctl.h> +#ifndef PR_SET_THP_DISABLE +#define PR_SET_THP_DISABLE 41 +#endif #endif long page_size = 0; @@ -78,7 +81,7 @@ alloc_sys_page(void) void *ptr = mmap(NULL, page_size, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (ptr == MAP_FAILED) - bug("mmap(%lu) failed: %m", page_size); + die("mmap(%ld) failed: %m", (s64) page_size); return ptr; } @@ -99,7 +102,7 @@ alloc_page(void) int err = posix_memalign(&ptr, page_size, page_size); if (err || !ptr) - bug("posix_memalign(%lu) failed", (long unsigned int) page_size); + die("posix_memalign(%ld) failed", (s64) page_size); return ptr; } @@ -229,7 +232,7 @@ resource_sys_init(void) #ifdef CONFIG_DISABLE_THP /* Disable transparent huge pages, they do not work properly with madvice(MADV_DONTNEED) */ if (prctl(PR_SET_THP_DISABLE, (unsigned long) 1, (unsigned long) 0, (unsigned long) 0, (unsigned long) 0) < 0) - die("prctl(PR_SET_THP_DISABLE) failed: %m"); + log(L_WARN "Cannot disable transparent huge pages: prctl(PR_SET_THP_DISABLE) failed: %m"); #endif #ifdef HAVE_MMAP |