public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools/nolibc: move mmap() and friends to sys/mman.h

Browse source 
This is the location regular userspace expects these definitions.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250416-nolibc-split-sys-v1-5-a069a3f1d145@linutronix.de
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
This commit is contained in:
Thomas Weißschuh 2025-04-16 14:06:20 +02:00 • committed by Thomas Weißschuh
parent 9e67941dde
commit cce273161e
4 changed files with 65 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/include/nolibc/Makefile
View file

@ -45,6 +45,7 @@ all_files := \
string.h \
sys.h \
sys/auxv.h \
sys/mman.h \
time.h \
types.h \
unistd.h \

1
tools/include/nolibc/nolibc.h
View file

@ -97,6 +97,7 @@
#include "types.h"
#include "sys.h"
#include "sys/auxv.h"
#include "sys/mman.h"
#include "ctype.h"
#include "elf.h"
#include "signal.h"

48
tools/include/nolibc/sys.h
View file

@ -24,7 +24,6 @@
#include <linux/resource.h>
#include <linux/utsname.h>
#include "arch.h"
#include "errno.h"
#include "stdarg.h"
#include "types.h"
@ -697,53 +696,6 @@ int mknod(const char *path, mode_t mode, dev_t dev)
return __sysret(sys_mknod(path, mode, dev));
}
#ifndef sys_mmap
static __attribute__((unused))
void *sys_mmap(void *addr, size_t length, int prot, int flags, int fd,
off_t offset)
{
int n;
#if defined(__NR_mmap2)
n = __NR_mmap2;
offset >>= 12;
#else
n = __NR_mmap;
#endif
return (void *)my_syscall6(n, addr, length, prot, flags, fd, offset);
}
#endif
/* Note that on Linux, MAP_FAILED is -1 so we can use the generic __sysret()
* which returns -1 upon error and still satisfy user land that checks for
* MAP_FAILED.
*/
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)
{
return __sysret(sys_munmap(addr, length));
}
/*
* int mount(const char *source, const char *target,
* const char *fstype, unsigned long flags,

63
tools/include/nolibc/sys/mman.h Normal file
View file

@ -0,0 +1,63 @@
/* SPDX-License-Identifier: LGPL-2.1 OR MIT */
/*
* mm definition for NOLIBC
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
#ifndef _NOLIBC_SYS_MMAN_H
#define _NOLIBC_SYS_MMAN_H
#include "../arch.h"
#include "../sys.h"
#ifndef sys_mmap
static __attribute__((unused))
void *sys_mmap(void *addr, size_t length, int prot, int flags, int fd,
off_t offset)
{
int n;
#if defined(__NR_mmap2)
n = __NR_mmap2;
offset >>= 12;
#else
n = __NR_mmap;
#endif
return (void *)my_syscall6(n, addr, length, prot, flags, fd, offset);
}
#endif
/* Note that on Linux, MAP_FAILED is -1 so we can use the generic __sysret()
* which returns -1 upon error and still satisfy user land that checks for
* MAP_FAILED.
*/
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)
{
return __sysret(sys_munmap(addr, length));
}
/* make sure to include all global symbols */
#include "../nolibc.h"
#endif /* _NOLIBC_SYS_MMAN_H */