tools/nolibc: move getrlimit() and friends to sys/resource.h

This is the location regular userspace expects these definitions.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250515-nolibc-sys-v1-5-74f82eea3b59@weissschuh.net

diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index 99fc7930430a724e51bd02abd0afd20d8d1f98ec..c2bb65b1f3095274bcabedd05168964a2237fa69 100644 (file)
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -55,6 +55,7 @@ all_files := \
                sys/prctl.h \
                sys/random.h \
                sys/reboot.h \
+               sys/resource.h \
                sys/stat.h \
                sys/syscall.h \
                sys/time.h \

diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h
index 36ea7a02c7434cc006a7b12d413add04a2f85565..7d151776e47a30080dc3d961bcdeacd6ab558629 100644 (file)
--- a/tools/include/nolibc/nolibc.h
+++ b/tools/include/nolibc/nolibc.h
@@ -103,6 +103,7 @@
 #include "sys/prctl.h"
 #include "sys/random.h"
 #include "sys/reboot.h"
+#include "sys/resource.h"
 #include "sys/stat.h"
 #include "sys/syscall.h"
 #include "sys/time.h"

diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h
index 6c89dd0316dd0ebf03ebde6fa5c14273df6a0c62..282909b1992d17d5292917fbabb0bd2a2dbfce88 100644 (file)
--- a/tools/include/nolibc/sys.h
+++ b/tools/include/nolibc/sys.h
@@ -23,7 +23,6 @@
 #include <linux/auxvec.h>
 #include <linux/fcntl.h> /* for O_* and AT_* */
 #include <linux/stat.h>  /* for statx() */
-#include <linux/resource.h>
 #include <linux/utsname.h>
 
 #include "errno.h"
@@ -730,43 +729,6 @@ ssize_t read(int fd, void *buf, size_t count)
 }
 
 
-/*
- * int getrlimit(int resource, struct rlimit *rlim);
- * int setrlimit(int resource, const struct rlimit *rlim);
- */
-
-static __attribute__((unused))
-int sys_prlimit64(pid_t pid, int resource,
-                 const struct rlimit64 *new_limit, struct rlimit64 *old_limit)
-{
-       return my_syscall4(__NR_prlimit64, pid, resource, new_limit, old_limit);
-}
-
-static __attribute__((unused))
-int getrlimit(int resource, struct rlimit *rlim)
-{
-       struct rlimit64 rlim64;
-       int ret;
-
-       ret = __sysret(sys_prlimit64(0, resource, NULL, &rlim64));
-       rlim->rlim_cur = rlim64.rlim_cur;
-       rlim->rlim_max = rlim64.rlim_max;
-
-       return ret;
-}
-
-static __attribute__((unused))
-int setrlimit(int resource, const struct rlimit *rlim)
-{
-       struct rlimit64 rlim64 = {
-               .rlim_cur = rlim->rlim_cur,
-               .rlim_max = rlim->rlim_max,
-       };
-
-       return __sysret(sys_prlimit64(0, resource, &rlim64, NULL));
-}
-
-
 /*
  * int sched_yield(void);
  */

diff --git a/tools/include/nolibc/sys/resource.h b/tools/include/nolibc/sys/resource.h
new file mode 100644 (file)
index 0000000..b990f91
--- /dev/null
+++ b/tools/include/nolibc/sys/resource.h
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: LGPL-2.1 OR MIT */
+/*
+ * Resource definitions for NOLIBC
+ * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
+ */
+
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
+#ifndef _NOLIBC_SYS_RESOURCE_H
+#define _NOLIBC_SYS_RESOURCE_H
+
+#include "../sys.h"
+
+#include <linux/resource.h>
+
+/*
+ * int getrlimit(int resource, struct rlimit *rlim);
+ * int setrlimit(int resource, const struct rlimit *rlim);
+ */
+
+static __attribute__((unused))
+int sys_prlimit64(pid_t pid, int resource,
+                 const struct rlimit64 *new_limit, struct rlimit64 *old_limit)
+{
+       return my_syscall4(__NR_prlimit64, pid, resource, new_limit, old_limit);
+}
+
+static __attribute__((unused))
+int getrlimit(int resource, struct rlimit *rlim)
+{
+       struct rlimit64 rlim64;
+       int ret;
+
+       ret = __sysret(sys_prlimit64(0, resource, NULL, &rlim64));
+       rlim->rlim_cur = rlim64.rlim_cur;
+       rlim->rlim_max = rlim64.rlim_max;
+
+       return ret;
+}
+
+static __attribute__((unused))
+int setrlimit(int resource, const struct rlimit *rlim)
+{
+       struct rlimit64 rlim64 = {
+               .rlim_cur = rlim->rlim_cur,
+               .rlim_max = rlim->rlim_max,
+       };
+
+       return __sysret(sys_prlimit64(0, resource, &rlim64, NULL));
+}
+
+#endif /* _NOLIBC_SYS_RESOURCE_H */

diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h
index 74c7694b2d5e54f7a86854697ac32a2ea2b62e86..2225c9388a46480a18e9ce603b08d846e5276bab 100644 (file)
--- a/tools/include/nolibc/types.h
+++ b/tools/include/nolibc/types.h
@@ -15,7 +15,6 @@
 #include <linux/stat.h>
 #include <linux/time.h>
 #include <linux/wait.h>
-#include <linux/resource.h>
 
 
 /* Only the generic macros and types may be defined here. The arch-specific