From d19ffac68a40d780fd1be85abd816c9a0d5f3d13 Mon Sep 17 00:00:00 2001 From: Ruihan Li Date: Tue, 16 Dec 2025 22:41:09 +0800 Subject: [PATCH] Drop `MAP_SYNC` support --- .../syscall-flag-coverage/memory-management/README.md | 1 - .../memory-management/mmap_and_munmap.scml | 3 +-- kernel/src/syscall/mmap.rs | 1 - test/src/apps/mmap/mmap_err.c | 3 +++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/book/src/kernel/linux-compatibility/syscall-flag-coverage/memory-management/README.md b/book/src/kernel/linux-compatibility/syscall-flag-coverage/memory-management/README.md index 256c4fb3e..bb7693a37 100644 --- a/book/src/kernel/linux-compatibility/syscall-flag-coverage/memory-management/README.md +++ b/book/src/kernel/linux-compatibility/syscall-flag-coverage/memory-management/README.md @@ -24,7 +24,6 @@ Silently-ignored flags: * `MAP_NONBLOCK` * `MAP_NORESERVE` * `MAP_POPULATE` -* `MAP_SYNC` Partially supported flags: * `MAP_FIXED_NOREPLACE` is treated as `MAP_FIXED` diff --git a/book/src/kernel/linux-compatibility/syscall-flag-coverage/memory-management/mmap_and_munmap.scml b/book/src/kernel/linux-compatibility/syscall-flag-coverage/memory-management/mmap_and_munmap.scml index 3408d9627..24a9dc867 100644 --- a/book/src/kernel/linux-compatibility/syscall-flag-coverage/memory-management/mmap_and_munmap.scml +++ b/book/src/kernel/linux-compatibility/syscall-flag-coverage/memory-management/mmap_and_munmap.scml @@ -11,8 +11,7 @@ opt_flags = MAP_LOCKED | MAP_NONBLOCK | MAP_NORESERVE | - MAP_POPULATE | - MAP_SYNC; + MAP_POPULATE; // Create a private memory mapping mmap( diff --git a/kernel/src/syscall/mmap.rs b/kernel/src/syscall/mmap.rs index edc723e4b..04e4ba2f6 100644 --- a/kernel/src/syscall/mmap.rs +++ b/kernel/src/syscall/mmap.rs @@ -215,7 +215,6 @@ bitflags! { const MAP_NONBLOCK = 0x10000; const MAP_STACK = 0x20000; const MAP_HUGETLB = 0x40000; - const MAP_SYNC = 0x80000; const MAP_FIXED_NOREPLACE = 0x100000; } } diff --git a/test/src/apps/mmap/mmap_err.c b/test/src/apps/mmap/mmap_err.c index 316b1bee3..8cc8e8843 100644 --- a/test/src/apps/mmap/mmap_err.c +++ b/test/src/apps/mmap/mmap_err.c @@ -118,6 +118,9 @@ FN_TEST(mmap_flags) TEST_SUCC(munmap(addr, PAGE_SIZE)); TEST_ERRNO(mmap(NULL, PAGE_SIZE, PROT_READ, MAP_SYNC, fd, 0), EINVAL); + TEST_ERRNO(mmap(NULL, PAGE_SIZE, PROT_READ, + MAP_SHARED_VALIDATE | MAP_SYNC, fd, 0), + EOPNOTSUPP); TEST_ERRNO(mmap(avail_addr, PAGE_SIZE, PROT_READ, MAP_SHARED_VALIDATE | MAP_FIXED_NOREPLACE, fd, 0), EOPNOTSUPP);