fixup! - Create remap_file_pages wrapper for the linux sys call. - Add UnitTest for remap_file_pages - Add function to libc/spec/linux.td - Add Function spec to mman.yaml

Author: AlyElashram

libc/newhdrgen/yaml/sys/mman.yaml

@@ -100,7 +100,7 @@ functions:
       - type: int
   - name: remap_file_pages
     standards:
-      - LINUX
+      - Linux
     return_type: int
     arguments:
       - type: void *

libc/src/sys/mman/linux/remap_file_pages.cpp

@@ -1,36 +1,32 @@
-//===----- Linux implementation of the POSIX remap_file_pages function ----===//
+//===------- Linux implementation of the remap_file_pages 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/remap_file_pages.h>
+#include "src/sys/mman/remap_file_pages.h"
 
 #include "src/__support/OSUtil/syscall.h" // For internal syscall function.
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/errno/libc_errno.h"
-#include <sys/syscall.h>          // For syscall numbers.
+#include <sys/syscall.h> // For syscall numbers.
 
 namespace LIBC_NAMESPACE_DECL {
 
-// This function is currently linux only. It has to be refactored suitably if
-// remap_file_pages is to be supported on non-linux operating systems also.
 LLVM_LIBC_FUNCTION(int, remap_file_pages,
-                   (void *addr, size_t size, int prot, size_t pgoff, int flags))
-                    {
+                   (void *addr, size_t size, int prot, size_t pgoff,
+                    int flags)) {
 #ifdef SYS_remap_file_pages
-  long syscall_number = SYS_remap_file_pages;
+  int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_remap_file_pages,
+                                              reinterpret_cast<long>(addr),
+                                              size, prot, pgoff, flags);
 #else
 #error "remap_file_pages syscall is not available."
 #endif
 
-
-  int ret = LIBC_NAMESPACE::syscall_impl<int>(
-  syscall_number, reinterpret_cast<long>(addr), size, prot, pgoff, flags);
-
   // A negative return value indicates an error with the magnitude of the
   // value being the error code.
   if (ret < 0) {
@@ -41,4 +37,4 @@ LLVM_LIBC_FUNCTION(int, remap_file_pages,
   return 0;
 }
 
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE_DECL

libc/src/sys/mman/remap_file_pages.h

@@ -10,12 +10,13 @@
 #define LLVM_LIBC_SRC_SYS_MMAN_REMAP_FILE_PAGES_H
 
 #include "src/__support/macros/config.h"
-#include <sys/mman.h>
+#include <stddef.h>
 
 namespace LIBC_NAMESPACE_DECL {
 
-int remap_file_pages(void *addr, size_t size, int prot, size_t pgoff, int flags);
+int remap_file_pages(void *addr, size_t size, int prot, size_t pgoff,
+                     int flags);
 
 } // namespace LIBC_NAMESPACE_DECL
 
-#endif //LLVM_LIBC_SRC_SYS_MMAN_REMAP_FILE_PAGES_H
+#endif // LLVM_LIBC_SRC_SYS_MMAN_REMAP_FILE_PAGES_H

libc/test/src/sys/mman/linux/remap_file_pages_test.cpp

@@ -10,13 +10,12 @@
 #include "src/sys/mman/mmap.h"
 #include "src/sys/mman/munmap.h"
 #include "src/sys/mman/remap_file_pages.h"
+#include "src/unistd/sysconf.h"
 #include "test/UnitTest/ErrnoSetterMatcher.h"
 #include "test/UnitTest/Test.h"
-#include "src/unistd/sysconf.h"
 
 #include <sys/mman.h>
 
-
 using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
 using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
 
@@ -36,7 +35,8 @@ TEST(LlvmLibcRemapFilePagesTest, NoError) {
   LIBC_NAMESPACE::libc_errno = 0;
 
   // Now try to remap the pages
-  EXPECT_THAT(LIBC_NAMESPACE::remap_file_pages(addr, page_size, PROT_READ, page_size, 0),
+  EXPECT_THAT(LIBC_NAMESPACE::remap_file_pages(addr, page_size, PROT_READ,
+                                               page_size, 0),
               Succeeds());
 
   // Reset error number for the new function
@@ -55,7 +55,8 @@ TEST(LlvmLibcRemapFilePagesTest, ErrorInvalidFlags) {
   ASSERT_NE(addr, MAP_FAILED);
 
   // Try to remap pages with an invalid flag MAP_PRIVATE
-  EXPECT_THAT(LIBC_NAMESPACE::remap_file_pages(addr, page_size, PROT_READ, 0, MAP_PRIVATE),
+  EXPECT_THAT(LIBC_NAMESPACE::remap_file_pages(addr, page_size, PROT_READ, 0,
+                                               MAP_PRIVATE),
               Fails(EINVAL));
 
   // Clean up
@@ -67,8 +68,9 @@ TEST(LlvmLibcRemapFilePagesTest, ErrorInvalidAddress) {
   ASSERT_GT(page_size, size_t(0));
 
   // Use an address that we haven't mapped
-  void *invalid_addr = reinterpret_cast<void*>(0x12345000);
+  void *invalid_addr = reinterpret_cast<void *>(0x12345000);
 
-  EXPECT_THAT(LIBC_NAMESPACE::remap_file_pages(invalid_addr, page_size, PROT_READ, 0, 0),
+  EXPECT_THAT(LIBC_NAMESPACE::remap_file_pages(invalid_addr, page_size,
+                                               PROT_READ, 0, 0),
               Fails(EINVAL));
-}
+}