[llvm-branch-commits] [libc] [llvm] [libc] Use a syscall wrapper for mlock (PR #243412)
Connector Switch via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Tue Nov 17 02:24:34 PST 2026
https://github.com/c8ef created https://github.com/llvm/llvm-project/pull/243412
This PR move mlock behind the centralized syscall wrappers, following libc/docs/dev/syscall_wrapper_refactor.md.
>From c54094e9c5c7b78b283c4ab60d927fb5a95d99ec Mon Sep 17 00:00:00 2001
From: c8ef <c8ef at outlook.com>
Date: Tue, 17 Nov 2026 18:22:51 +0800
Subject: [PATCH] [libc] Use a syscall wrapper for mlock
---
.../linux/syscall_wrappers/CMakeLists.txt | 13 +++++++
.../OSUtil/linux/syscall_wrappers/mlock.h | 34 +++++++++++++++++++
libc/src/sys/mman/linux/CMakeLists.txt | 8 +++--
libc/src/sys/mman/linux/mlock.cpp | 19 +++++++----
.../OSUtil/linux/syscall_wrappers/BUILD.bazel | 16 +++++++++
.../libc/src/sys/mman/BUILD.bazel | 3 +-
6 files changed, 81 insertions(+), 12 deletions(-)
create mode 100644 libc/src/__support/OSUtil/linux/syscall_wrappers/mlock.h
diff --git a/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt b/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt
index 7319e68a1c1f63..0b2191bd49dae9 100644
--- a/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt
+++ b/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt
@@ -1072,6 +1072,19 @@ add_header_library(
libc.src.__support.macros.config
)
+add_header_library(
+ mlock
+ HDRS
+ mlock.h
+ DEPENDS
+ libc.hdr.types.size_t
+ libc.include.sys_syscall
+ libc.src.__support.OSUtil.osutil
+ libc.src.__support.common
+ libc.src.__support.error_or
+ libc.src.__support.macros.config
+)
+
add_header_library(
mmap
HDRS
diff --git a/libc/src/__support/OSUtil/linux/syscall_wrappers/mlock.h b/libc/src/__support/OSUtil/linux/syscall_wrappers/mlock.h
new file mode 100644
index 00000000000000..baff95bdc5ecae
--- /dev/null
+++ b/libc/src/__support/OSUtil/linux/syscall_wrappers/mlock.h
@@ -0,0 +1,34 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// Syscall wrapper for mlock.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_OSUTIL_SYSCALL_WRAPPERS_MLOCK_H
+#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_SYSCALL_WRAPPERS_MLOCK_H
+
+#include "hdr/types/size_t.h"
+#include "src/__support/OSUtil/linux/syscall.h" // syscall_checked
+#include "src/__support/common.h"
+#include "src/__support/error_or.h"
+#include "src/__support/macros/config.h"
+#include <sys/syscall.h> // For syscall numbers.
+
+namespace LIBC_NAMESPACE_DECL {
+namespace linux_syscalls {
+
+LIBC_INLINE ErrorOr<int> mlock(const void *addr, size_t len) {
+ return syscall_checked<int>(SYS_mlock, addr, len);
+}
+
+} // namespace linux_syscalls
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_SYSCALL_WRAPPERS_MLOCK_H
diff --git a/libc/src/sys/mman/linux/CMakeLists.txt b/libc/src/sys/mman/linux/CMakeLists.txt
index 04d8bc3bdc5178..11c2a9e581545d 100644
--- a/libc/src/sys/mman/linux/CMakeLists.txt
+++ b/libc/src/sys/mman/linux/CMakeLists.txt
@@ -121,9 +121,11 @@ add_entrypoint_object(
HDRS
../mlock.h
DEPENDS
- libc.include.sys_mman
- libc.include.sys_syscall
- libc.src.__support.OSUtil.osutil
+ libc.hdr.types.size_t
+ libc.src.__support.OSUtil.linux.syscall_wrappers.mlock
+ libc.src.__support.common
+ libc.src.__support.libc_errno
+ libc.src.__support.macros.config
libc.src.errno.errno
)
diff --git a/libc/src/sys/mman/linux/mlock.cpp b/libc/src/sys/mman/linux/mlock.cpp
index 8582eb7c006324..e6d33b8a99425f 100644
--- a/libc/src/sys/mman/linux/mlock.cpp
+++ b/libc/src/sys/mman/linux/mlock.cpp
@@ -1,27 +1,32 @@
-//===---------- Linux implementation of the mlock 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
//
//===----------------------------------------------------------------------===//
+///
+/// \file
+/// Linux implementation of mlock.
+///
+//===----------------------------------------------------------------------===//
#include "src/sys/mman/mlock.h"
-#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-
+#include "src/__support/OSUtil/linux/syscall_wrappers/mlock.h"
+#include "src/__support/common.h"
#include "src/__support/libc_errno.h"
#include "src/__support/macros/config.h"
-#include <sys/syscall.h> // For syscall numbers.
namespace LIBC_NAMESPACE_DECL {
LLVM_LIBC_FUNCTION(int, mlock, (const void *addr, size_t len)) {
- long ret = syscall_impl(SYS_mlock, cpp::bit_cast<long>(addr), len);
- if (ret < 0) {
- libc_errno = static_cast<int>(-ret);
+ auto result = linux_syscalls::mlock(addr, len);
+ if (!result) {
+ libc_errno = result.error();
return -1;
}
return 0;
}
+
} // namespace LIBC_NAMESPACE_DECL
diff --git a/utils/bazel/llvm-project-overlay/libc/src/__support/OSUtil/linux/syscall_wrappers/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/src/__support/OSUtil/linux/syscall_wrappers/BUILD.bazel
index 78236305f78fe8..b3051452c2878f 100644
--- a/utils/bazel/llvm-project-overlay/libc/src/__support/OSUtil/linux/syscall_wrappers/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/src/__support/OSUtil/linux/syscall_wrappers/BUILD.bazel
@@ -1515,6 +1515,22 @@ libc_support_library(
],
)
+libc_support_library(
+ name = "mlock",
+ hdrs = ["mlock.h"],
+ target_compatible_with = select({
+ "@platforms//os:linux": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
+ deps = [
+ "//libc/hdr/types:size_t",
+ "//libc/src/__support:common",
+ "//libc/src/__support:error_or",
+ "//libc/src/__support/OSUtil:syscall",
+ "//libc/src/__support/macros:config",
+ ],
+)
+
libc_support_library(
name = "mmap",
hdrs = ["mmap.h"],
diff --git a/utils/bazel/llvm-project-overlay/libc/src/sys/mman/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/src/sys/mman/BUILD.bazel
index e898004918b037..50def90a41d9df 100644
--- a/utils/bazel/llvm-project-overlay/libc/src/sys/mman/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/src/sys/mman/BUILD.bazel
@@ -50,11 +50,10 @@ libc_function(
srcs = ["linux/mlock.cpp"],
hdrs = ["mlock.h"],
deps = [
- "//libc/hdr:sys_mman_macros",
"//libc/hdr/types:size_t",
"//libc/src/__support:common",
"//libc/src/__support:libc_errno",
- "//libc/src/__support/OSUtil:syscall",
+ "//libc/src/__support/OSUtil/linux/syscall_wrappers:mlock",
"//libc/src/__support/macros:config",
"//libc/src/errno",
],
More information about the llvm-branch-commits
mailing list