From: Ammar Faizi <[email protected]>
To: Willy Tarreau <[email protected]>
Cc: Ammar Faizi <[email protected]>,
Alviro Iskandar Setiawan <[email protected]>,
Nugraha <[email protected]>,
"Paul E. McKenney" <[email protected]>,
Linux Kernel Mailing List <[email protected]>,
GNU/Weeb Mailing List <[email protected]>
Subject: [PATCH v2 5/9] tools/nolibc/sys: Implement `mmap()` and `munmap()`
Date: Tue, 29 Mar 2022 17:17:33 +0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
Implement mmap() and munmap(). Currently, they are only available for
architecures that have my_syscall6 macro. For architectures that don't
have, this function will return -1 with errno set to ENOSYS (Function
not implemented).
This has been tested on x86 and i386.
Notes for i386:
1) The common mmap() syscall implementation uses __NR_mmap2 instead
of __NR_mmap.
2) The offset must be shifted-right by 12-bit.
Signed-off-by: Ammar Faizi <[email protected]>
===
@@ Changelog:
Link v1: https://lore.gnuweeb.org/gwml/[email protected]
v1 -> v2:
* No changes *
Link RFC v2: https://lore.kernel.org/lkml/[email protected]
RFC v2 -> v1:
* No changes *
Link RFC v1: https://lore.kernel.org/lkml/[email protected]
RFC v1 -> RFC v2:
* No changes *
---
tools/include/nolibc/sys.h | 62 ++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h
index 4d4308d5d111..08491070387b 100644
--- a/tools/include/nolibc/sys.h
+++ b/tools/include/nolibc/sys.h
@@ -14,6 +14,7 @@
#include <asm/unistd.h>
#include <asm/signal.h> // for SIGCHLD
#include <asm/ioctls.h>
+#include <asm/mman.h>
#include <linux/fs.h>
#include <linux/loop.h>
#include <linux/time.h>
@@ -675,6 +676,67 @@ int mknod(const char *path, mode_t mode, dev_t dev)
return ret;
}
+#ifndef MAP_SHARED
+#define MAP_SHARED 0x01 /* Share changes */
+#define MAP_PRIVATE 0x02 /* Changes are private */
+#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */
+#endif
+
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
+
+static __attribute__((unused))
+void *sys_mmap(void *addr, size_t length, int prot, int flags, int fd,
+ off_t offset)
+{
+#ifndef my_syscall6
+ /* Function not implemented. */
+ return -ENOSYS;
+#else
+
+ int n;
+
+#if defined(__i386__)
+ n = __NR_mmap2;
+ offset >>= 12;
+#else
+ n = __NR_mmap;
+#endif
+
+ return (void *)my_syscall6(n, addr, length, prot, flags, fd, offset);
+#endif
+}
+
+static __attribute__((unused))
+void *mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
+{
+ void *ret = sys_mmap(addr, length, prot, flags, fd, offset);
+
+ if ((unsigned long)ret >= -4095UL) {
+ SET_ERRNO(-(long)ret);
+ ret = MAP_FAILED;
+ }
+ return ret;
+}
+
+static __attribute__((unused))
+int sys_munmap(void *addr, size_t length)
+{
+ return my_syscall2(__NR_munmap, addr, length);
+}
+
+static __attribute__((unused))
+int munmap(void *addr, size_t length)
+{
+ int ret = sys_munmap(addr, length);
+
+ if (ret < 0) {
+ SET_ERRNO(-ret);
+ ret = -1;
+ }
+ return ret;
+}
/*
* int mount(const char *source, const char *target,
--
Ammar Faizi
next prev parent reply other threads:[~2022-03-29 10:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 10:17 [PATCH v2 0/9] Add dynamic memory allocator support for nolibc Ammar Faizi
2022-03-29 10:17 ` [PATCH v2 1/9] tools/nolibc: x86-64: Update System V ABI document link Ammar Faizi
2022-03-29 10:17 ` [PATCH v2 2/9] tools/nolibc: Replace `asm` with `__asm__` Ammar Faizi
2022-03-29 10:17 ` [PATCH v2 3/9] tools/nolibc: Remove .global _start from the entry point code Ammar Faizi
2022-03-29 10:17 ` [PATCH v2 4/9] tools/nolibc: i386: Implement syscall with 6 arguments Ammar Faizi
2022-03-29 10:17 ` Ammar Faizi [this message]
2022-03-29 10:17 ` [PATCH v2 6/9] tools/nolibc/types: Implement `offsetof()` and `container_of()` macro Ammar Faizi
2022-03-29 10:17 ` [PATCH v2 7/9] tools/nolibc/stdlib: Implement `malloc()`, `calloc()`, `realloc()` and `free()` Ammar Faizi
2022-03-29 10:17 ` [PATCH v2 8/9] tools/nolibc/string: Implement `strnlen()` Ammar Faizi
2022-03-29 10:17 ` [PATCH v2 9/9] tools/include/string: Implement `strdup()` and `strndup()` Ammar Faizi
2022-03-29 10:20 ` [PATCH v2 0/9] Add dynamic memory allocator support for nolibc Ammar Faizi
2022-03-30 2:41 ` Willy Tarreau
2022-03-30 18:51 ` Paul E. McKenney
2022-03-31 6:34 ` Willy Tarreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox