Skip to content

llama-map to support hugepage feature of pagesize 2M or 1G which can … #12552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

llama-map to support hugepage feature of pagesize 2M or 1G which can … #12552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e78084
llama-map to support hugepage feature of pagesize 2M or 1G which can …
nickhuang99 Mar 23, 2025
543cc6b
Merge branch 'master' into hugepage-size
nickhuang99 Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,13 @@ if (BUILD_SHARED_LIBS)
target_compile_definitions(llama PRIVATE LLAMA_BUILD)
target_compile_definitions(llama PUBLIC LLAMA_SHARED)
endif()


if (GGML_USING_HUGE_PAGE_2M)
message(STATUS " GGML_USING_HUGE_PAGE_2M is set in cmake")
target_compile_definitions(llama PRIVATE GGML_USING_HUGE_PAGE_2M=1)
endif()
if (GGML_USING_HUGE_PAGE_1G)
message(STATUS " GGML_USING_HUGE_PAGE_1G is set in cmake")
target_compile_definitions(llama PRIVATE GGML_USING_HUGE_PAGE_1G=1)
endif()
30 changes: 25 additions & 5 deletions src/llama-mmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ static std::string llama_format_win_err(DWORD err) {
}
#endif

// llama_mmap supports for hugepagesz=2M and 1G
#ifdef GGML_USING_HUGE_PAGE_2M
#define HUGE_PAGE_SIZE 2097152
#endif
#ifdef GGML_USING_HUGE_PAGE_1G
#define HUGE_PAGE_SIZE 1073741824
#endif


// llama_file

struct llama_file::impl {
Expand Down Expand Up @@ -274,9 +283,16 @@ struct llama_mmap::impl {
std::vector<std::pair<size_t, size_t>> mapped_fragments;

impl(struct llama_file * file, size_t prefetch, bool numa) {
size = file->size();
int fd = file->file_id();
int flags = MAP_SHARED;
#if defined(GGML_USING_HUGE_PAGE_2M) || defined(GGML_USING_HUGE_PAGE_1G)
// hugepage support requires mmap size to be aligned with pagesize
// and this is even true for normal 4K page in mmap, only some OS relaxes
size = (file->size() + HUGE_PAGE_SIZE - 1) / HUGE_PAGE_SIZE * HUGE_PAGE_SIZE;
flags |= MAP_HUGETLB;
#else
size = file->size();
#endif
if (numa) { prefetch = 0; }
#ifdef __linux__
if (posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL)) {
Expand All @@ -285,25 +301,25 @@ struct llama_mmap::impl {
}
if (prefetch) { flags |= MAP_POPULATE; }
#endif
addr = mmap(NULL, file->size(), PROT_READ, flags, fd, 0);
addr = mmap(NULL, size, PROT_READ, flags, fd, 0);
if (addr == MAP_FAILED) {
throw std::runtime_error(format("mmap failed: %s", strerror(errno)));
}

if (prefetch > 0) {
if (posix_madvise(addr, std::min(file->size(), prefetch), POSIX_MADV_WILLNEED)) {
if (posix_madvise(addr, std::min(size, prefetch), POSIX_MADV_WILLNEED)) {
LLAMA_LOG_WARN("warning: posix_madvise(.., POSIX_MADV_WILLNEED) failed: %s\n",
strerror(errno));
}
}
if (numa) {
if (posix_madvise(addr, file->size(), POSIX_MADV_RANDOM)) {
if (posix_madvise(addr, size, POSIX_MADV_RANDOM)) {
LLAMA_LOG_WARN("warning: posix_madvise(.., POSIX_MADV_RANDOM) failed: %s\n",
strerror(errno));
}
}

mapped_fragments.emplace_back(0, file->size());
mapped_fragments.emplace_back(0, size);
}

static void align_range(size_t * first, size_t * last, size_t page_size) {
Expand All @@ -319,7 +335,11 @@ struct llama_mmap::impl {
}

void unmap_fragment(size_t first, size_t last) {
#if defined(GGML_USING_HUGE_PAGE_2M) || defined(GGML_USING_HUGE_PAGE_1G)
int page_size = HUGE_PAGE_SIZE;
#else
int page_size = sysconf(_SC_PAGESIZE);
#endif
align_range(&first, &last, page_size);
size_t len = last - first;

Expand Down