[llvm-branch-commits] [libc] [llvm] [libc] Use a syscall wrapper for munlockall (PR #243786)

Connector Switch via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Wed Nov 18 02:26:55 PST 2026


https://github.com/c8ef created https://github.com/llvm/llvm-project/pull/243786

This PR move munlockall behind the centralized syscall wrappers, following libc/docs/dev/syscall_wrapper_refactor.md.


>From fa7e06433e1b6c6029441813442bda9e93e549b3 Mon Sep 17 00:00:00 2001
From: c8ef <c8ef at outlook.com>
Date: Wed, 18 Nov 2026 18:25:07 +0800
Subject: [PATCH] [libc] Use a syscall wrapper for munlockall

---
 .../linux/syscall_wrappers/CMakeLists.txt     | 12 +++++++
 .../linux/syscall_wrappers/munlockall.h       | 33 +++++++++++++++++++
 libc/src/sys/mman/linux/CMakeLists.txt        |  7 ++--
 libc/src/sys/mman/linux/munlockall.cpp        | 18 ++++++----
 .../OSUtil/linux/syscall_wrappers/BUILD.bazel | 15 +++++++++
 .../libc/src/sys/mman/BUILD.bazel             |  3 +-
 6 files changed, 76 insertions(+), 12 deletions(-)
 create mode 100644 libc/src/__support/OSUtil/linux/syscall_wrappers/munlockall.h

diff --git a/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt b/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt
index 425033759ae996..2a294803b998a7 100644
--- a/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt
+++ b/libc/src/__support/OSUtil/linux/syscall_wrappers/CMakeLists.txt
@@ -1163,6 +1163,18 @@ add_header_library(
     libc.src.__support.macros.config
 )
 
+add_header_library(
+  munlockall
+  HDRS
+    munlockall.h
+  DEPENDS
+    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(
   munmap
   HDRS
diff --git a/libc/src/__support/OSUtil/linux/syscall_wrappers/munlockall.h b/libc/src/__support/OSUtil/linux/syscall_wrappers/munlockall.h
new file mode 100644
index 00000000000000..9709fa8bfa7f5e
--- /dev/null
+++ b/libc/src/__support/OSUtil/linux/syscall_wrappers/munlockall.h
@@ -0,0 +1,33 @@
+//===----------------------------------------------------------------------===//
+//
+// 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 munlockall.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_OSUTIL_SYSCALL_WRAPPERS_MUNLOCKALL_H
+#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_SYSCALL_WRAPPERS_MUNLOCKALL_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> munlockall() {
+  return syscall_checked<int>(SYS_munlockall);
+}
+
+} // namespace linux_syscalls
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_SYSCALL_WRAPPERS_MUNLOCKALL_H
diff --git a/libc/src/sys/mman/linux/CMakeLists.txt b/libc/src/sys/mman/linux/CMakeLists.txt
index 38b3372b7c9513..dcb5755b09eca4 100644
--- a/libc/src/sys/mman/linux/CMakeLists.txt
+++ b/libc/src/sys/mman/linux/CMakeLists.txt
@@ -181,9 +181,10 @@ add_entrypoint_object(
   HDRS
     ../munlockall.h
   DEPENDS
-    libc.include.sys_mman
-    libc.include.sys_syscall
-    libc.src.__support.OSUtil.osutil
+    libc.src.__support.OSUtil.linux.syscall_wrappers.munlockall
+    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/munlockall.cpp b/libc/src/sys/mman/linux/munlockall.cpp
index f47eaece178e39..8a4ed8988030c9 100644
--- a/libc/src/sys/mman/linux/munlockall.cpp
+++ b/libc/src/sys/mman/linux/munlockall.cpp
@@ -1,25 +1,29 @@
-//===---------- Linux implementation of the munlockall 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 munlockall.
+///
+//===----------------------------------------------------------------------===//
 
 #include "src/sys/mman/munlockall.h"
 
-#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-
+#include "src/__support/OSUtil/linux/syscall_wrappers/munlockall.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, munlockall, (void)) {
-  long ret = syscall_impl(SYS_munlockall);
-  if (ret < 0) {
-    libc_errno = static_cast<int>(-ret);
+  auto result = linux_syscalls::munlockall();
+  if (!result) {
+    libc_errno = result.error();
     return -1;
   }
   return 0;
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 d32217d4a7d722..7c51d3fc8bd632 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
@@ -1642,6 +1642,21 @@ libc_support_library(
     ],
 )
 
+libc_support_library(
+    name = "munlockall",
+    hdrs = ["munlockall.h"],
+    target_compatible_with = select({
+        "@platforms//os:linux": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    deps = [
+        "//libc/src/__support:common",
+        "//libc/src/__support:error_or",
+        "//libc/src/__support/OSUtil:syscall",
+        "//libc/src/__support/macros:config",
+    ],
+)
+
 libc_support_library(
     name = "munmap",
     hdrs = ["munmap.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 94a84c167e757c..b5b70a6cd612e5 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
@@ -168,10 +168,9 @@ libc_function(
     srcs = ["linux/munlockall.cpp"],
     hdrs = ["munlockall.h"],
     deps = [
-        "//libc/hdr:sys_mman_macros",
         "//libc/src/__support:common",
         "//libc/src/__support:libc_errno",
-        "//libc/src/__support/OSUtil:syscall",
+        "//libc/src/__support/OSUtil/linux/syscall_wrappers:munlockall",
         "//libc/src/__support/macros:config",
         "//libc/src/errno",
     ],



More information about the llvm-branch-commits mailing list