diff options
author | notaz | 2012-08-19 22:39:49 +0300 |
---|---|---|
committer | notaz | 2012-10-12 00:05:08 +0300 |
commit | 9ee0fd5b333039b1140d90f935aa9299825f1e42 (patch) | |
tree | 5fa0d39647613e0e5b4ea3d582b91ecbc3e1ae91 /frontend/linux | |
parent | 50f9355a2338111d940ed408f52fe1defe4df23e (diff) | |
download | pcsx_rearmed-9ee0fd5b333039b1140d90f935aa9299825f1e42.tar.gz pcsx_rearmed-9ee0fd5b333039b1140d90f935aa9299825f1e42.tar.bz2 pcsx_rearmed-9ee0fd5b333039b1140d90f935aa9299825f1e42.zip |
start mmap'ing vram, with hugetlb if possible
Diffstat (limited to 'frontend/linux')
-rw-r--r-- | frontend/linux/plat.c | 47 |
1 files changed, 42 insertions, 5 deletions
diff --git a/frontend/linux/plat.c b/frontend/linux/plat.c index b7152b5..044084e 100644 --- a/frontend/linux/plat.c +++ b/frontend/linux/plat.c @@ -17,9 +17,17 @@ #include <time.h> #include <unistd.h> #include <sys/mman.h> +#include <errno.h> #include "../common/plat.h" +/* XXX: maybe unhardcode pagesize? */ +#define HUGETLB_PAGESIZE (2 * 1024 * 1024) +#define HUGETLB_THRESHOLD (HUGETLB_PAGESIZE / 2) +#ifndef MAP_HUGETLB +#define MAP_HUGETLB 0x40000 /* arch specific */ +#endif + int plat_is_dir(const char *path) { @@ -126,16 +134,34 @@ int plat_wait_event(int *fds_hnds, int count, int timeout_ms) return ret; } -void *plat_mmap(unsigned long addr, size_t size) +void *plat_mmap(unsigned long addr, size_t size, int need_exec) { + static int hugetlb_disabled; + int prot = PROT_READ | PROT_WRITE; + int flags = MAP_PRIVATE | MAP_ANONYMOUS; void *req, *ret; req = (void *)addr; - ret = mmap(req, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); + if (need_exec) + prot |= PROT_EXEC; + if (size >= HUGETLB_THRESHOLD && !hugetlb_disabled) + flags |= MAP_HUGETLB; + + ret = mmap(req, size, prot, flags, -1, 0); + if (ret == MAP_FAILED && (flags & MAP_HUGETLB)) { + fprintf(stderr, + "warning: failed to do hugetlb mmap (%p, %zu): %d\n", + req, size, errno); + hugetlb_disabled = 1; + flags &= ~MAP_HUGETLB; + ret = mmap(req, size, prot, flags, -1, 0); + } if (ret == MAP_FAILED) return NULL; - if (ret != req) - printf("warning: mmaped to %p, requested %p\n", ret, req); + + if (req != NULL && ret != req) + fprintf(stderr, + "warning: mmaped to %p, requested %p\n", ret, req); return ret; } @@ -155,7 +181,18 @@ void *plat_mremap(void *ptr, size_t oldsize, size_t newsize) void plat_munmap(void *ptr, size_t size) { - munmap(ptr, size); + int ret; + + ret = munmap(ptr, size); + if (ret != 0 && (size & (HUGETLB_PAGESIZE - 1))) { + // prehaps an autorounded hugetlb mapping? + size = (size + HUGETLB_PAGESIZE - 1) & ~(HUGETLB_PAGESIZE - 1); + ret = munmap(ptr, size); + } + if (ret != 0) { + fprintf(stderr, + "munmap(%p, %zu) failed: %d\n", ptr, size, errno); + } } /* lprintf */ |