Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions libc/config/linux/aarch64/entrypoints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.sys.mman.munlock
libc.src.sys.mman.mlockall
libc.src.sys.mman.munlockall
libc.src.sys.mman.msync

# sys/random.h entrypoints
libc.src.sys.random.getrandom
Expand Down
1 change: 1 addition & 0 deletions libc/config/linux/riscv/entrypoints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.sys.mman.munlock
libc.src.sys.mman.mlockall
libc.src.sys.mman.munlockall
libc.src.sys.mman.msync

# sys/random.h entrypoints
libc.src.sys.random.getrandom
Expand Down
1 change: 1 addition & 0 deletions libc/config/linux/x86_64/entrypoints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.sys.mman.munlock
libc.src.sys.mman.mlockall
libc.src.sys.mman.munlockall
libc.src.sys.mman.msync

# sys/random.h entrypoints
libc.src.sys.random.getrandom
Expand Down
5 changes: 5 additions & 0 deletions libc/spec/posix.td
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,11 @@ def POSIX : StandardSpec<"POSIX"> {
RetValSpec<IntType>,
[ArgSpec<VoidType>]
>,
FunctionSpec<
"msync",
RetValSpec<IntType>,
[ArgSpec<VoidPtr>, ArgSpec<SizeTType>, ArgSpec<IntType>]
>,
]
>;

Expand Down
7 changes: 7 additions & 0 deletions libc/src/sys/mman/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,10 @@ add_entrypoint_object(
DEPENDS
.${LIBC_TARGET_OS}.munlockall
)

add_entrypoint_object(
msync
ALIAS
DEPENDS
.${LIBC_TARGET_OS}.msync
)
13 changes: 13 additions & 0 deletions libc/src/sys/mman/linux/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,16 @@ add_entrypoint_object(
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)

add_entrypoint_object(
msync
SRCS
msync.cpp
HDRS
../msync.h
DEPENDS
libc.include.sys_mman
libc.include.sys_syscall
libc.src.__support.OSUtil.osutil
libc.src.errno.errno
)
25 changes: 25 additions & 0 deletions libc/src/sys/mman/linux/msync.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//===---------- Linux implementation of the msync function ----------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#include "src/sys/mman/msync.h"

#include "src/__support/OSUtil/syscall.h" // For internal syscall function.

#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.

namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, msync, (void *addr, size_t len, int flags)) {
long ret = syscall_impl(SYS_msync, cpp::bit_cast<long>(addr), len, flags);
if (ret < 0) {
libc_errno = static_cast<int>(-ret);
return -1;
}
return 0;
}
} // namespace LIBC_NAMESPACE
21 changes: 21 additions & 0 deletions libc/src/sys/mman/msync.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//===-- Implementation header for msync function ----------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#ifndef LLVM_LIBC_SRC_SYS_MMAN_MSYNC_H
#define LLVM_LIBC_SRC_SYS_MMAN_MSYNC_H

#include <sys/mman.h>
#include <sys/syscall.h>

namespace LIBC_NAMESPACE {

int msync(void *addr, size_t len, int flags);

} // namespace LIBC_NAMESPACE

#endif // LLVM_LIBC_SRC_SYS_MMAN_MSYNC_H
20 changes: 20 additions & 0 deletions libc/test/src/sys/mman/linux/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,23 @@ add_libc_unittest(
libc.src.unistd.sysconf
libc.test.UnitTest.ErrnoSetterMatcher
)

add_libc_unittest(
msync_test
SUITE
libc_sys_mman_unittests
SRCS
msync_test.cpp
DEPENDS
libc.include.sys_mman
libc.include.unistd
libc.src.errno.errno
libc.src.sys.mman.mmap
libc.src.sys.mman.munmap
libc.src.sys.mman.msync
libc.src.sys.mman.mincore
libc.src.sys.mman.mlock
libc.src.sys.mman.munlock
libc.src.unistd.sysconf
libc.test.UnitTest.ErrnoSetterMatcher
)
69 changes: 69 additions & 0 deletions libc/test/src/sys/mman/linux/msync_test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
//===-- Unittests for msync -----------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#include "src/errno/libc_errno.h"
#include "src/sys/mman/mlock.h"
#include "src/sys/mman/mmap.h"
#include "src/sys/mman/msync.h"
#include "src/sys/mman/munlock.h"
#include "src/sys/mman/munmap.h"
#include "src/unistd/sysconf.h"
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/LibcTest.h"
#include "test/UnitTest/Test.h"

using namespace LIBC_NAMESPACE::testing::ErrnoSetterMatcher;

struct PageHolder {
size_t size;
void *addr;

PageHolder()
: size(LIBC_NAMESPACE::sysconf(_SC_PAGESIZE)),
addr(LIBC_NAMESPACE::mmap(nullptr, size, PROT_READ | PROT_WRITE,
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)) {}
~PageHolder() {
if (addr != MAP_FAILED)
LIBC_NAMESPACE::munmap(addr, size);
}

char &operator[](size_t i) { return reinterpret_cast<char *>(addr)[i]; }

bool is_valid() { return addr != MAP_FAILED; }
};

TEST(LlvmLibcMsyncTest, UnMappedMemory) {
EXPECT_THAT(LIBC_NAMESPACE::msync(nullptr, 1024, MS_SYNC), Fails(ENOMEM));
EXPECT_THAT(LIBC_NAMESPACE::msync(nullptr, 1024, MS_ASYNC), Fails(ENOMEM));
}

TEST(LlvmLibcMsyncTest, LockedPage) {
PageHolder page;
ASSERT_TRUE(page.is_valid());
ASSERT_THAT(LIBC_NAMESPACE::mlock(page.addr, page.size), Succeeds());
EXPECT_THAT(
LIBC_NAMESPACE::msync(page.addr, page.size, MS_SYNC | MS_INVALIDATE),
Fails(EBUSY));
ASSERT_THAT(LIBC_NAMESPACE::munlock(page.addr, page.size), Succeeds());
EXPECT_THAT(LIBC_NAMESPACE::msync(page.addr, page.size, MS_SYNC), Succeeds());
}

TEST(LlvmLibcMsyncTest, UnalignedAddress) {
PageHolder page;
ASSERT_TRUE(page.is_valid());
EXPECT_THAT(LIBC_NAMESPACE::msync(&page[1], page.size - 1, MS_SYNC),
Fails(EINVAL));
}

TEST(LlvmLibcMsyncTest, InvalidFlag) {
PageHolder page;
ASSERT_TRUE(page.is_valid());
EXPECT_THAT(LIBC_NAMESPACE::msync(page.addr, page.size, MS_SYNC | MS_ASYNC),
Fails(EINVAL));
EXPECT_THAT(LIBC_NAMESPACE::msync(page.addr, page.size, -1), Fails(EINVAL));
}