Commit 90895247 authored by Thomas Weißschuh's avatar Thomas Weißschuh
Browse files

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



This is the location regular userspace expects these definitions.

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

tools/include/nolibc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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 \

tools/include/nolibc/nolibc.h

+1 −0
Original line number Diff line number Diff line
@@ -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"

tools/include/nolibc/sys.h

+0 −38
Original line number Diff line number Diff line
@@ -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);

 */

tools/include/nolibc/sys/resource.h

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/* 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 */

tools/include/nolibc/types.h

+0 −1
Original line number Diff line number Diff line
@@ -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