Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement process resource limits

Browse Source
This commit is contained in:
EnderIce2 2024-04-02 05:52:43 +03:00
parent e09d93e2bb
commit daccdaeeae
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/syscall/linux/defs.hpp
View File

@ -247,13 +247,6 @@ struct rusage
long ru_nivcsw; long ru_nivcsw;
}; };
typedef unsigned long rlim_t;
struct rlimit
{
rlim_t rlim_cur; /* Soft limit */
rlim_t rlim_max; /* Hard limit (ceiling for rlim_cur) */
};
struct linux_dirent struct linux_dirent
{ {
unsigned long d_ino; /* Inode number */ unsigned long d_ino; /* Inode number */

15
include/task.hpp
View File

@ -33,6 +33,15 @@
#include <abi.h> #include <abi.h>
#include <list> #include <list>
#define RLIM_INFINITY (~0ULL)
typedef unsigned long long rlim_t;
struct rlimit
{
rlim_t rlim_cur;
rlim_t rlim_max;
};
namespace Tasking namespace Tasking
{ {
using vfs::FileDescriptorTable; using vfs::FileDescriptorTable;
@ -445,6 +454,12 @@ namespace Tasking
pid_t ProcessGroupID = 0; pid_t ProcessGroupID = 0;
pid_t SessionID = 0; pid_t SessionID = 0;
} Security{}; } Security{};
struct
{
rlim_t OpenFiles = 4096;
rlim_t Threads = 1024;
rlim_t Memory = 8589934592; /* 8 GiB */
} Limits{};
TaskInfo Info{}; TaskInfo Info{};
ThreadLocalStorage TLS{}; ThreadLocalStorage TLS{};

25
syscalls/linux.cpp
View File

@ -26,6 +26,7 @@
#include <rand.hpp> #include <rand.hpp>
#include <limits.h> #include <limits.h>
#include <exec.hpp> #include <exec.hpp>
#include <task.hpp>
#include <debug.h> #include <debug.h>
#include <cpu.hpp> #include <cpu.hpp>
#include <time.h> #include <time.h>
@ -2702,12 +2703,14 @@ static int linux_prlimit64(SysFrm *, pid_t pid, int resource,
if (new_limit) if (new_limit)
{ {
debug("new limit: rlim_cur:%#lx rlim_max:%#lx", pNewLimit->rlim_cur, pNewLimit->rlim_max); debug("new limit: rlim_cur:%lld rlim_max:%lld",
pNewLimit->rlim_cur, pNewLimit->rlim_max);
} }
if (old_limit) if (old_limit)
{ {
debug("old limit: rlim_cur:%#lx rlim_max:%#lx", pOldLimit->rlim_cur, pOldLimit->rlim_max); debug("old limit: rlim_cur:%lld rlim_max:%lld",
pOldLimit->rlim_cur, pOldLimit->rlim_max);
} }
switch (resource) switch (resource)
@ -2718,10 +2721,27 @@ static int linux_prlimit64(SysFrm *, pid_t pid, int resource,
case RLIMIT_STACK: case RLIMIT_STACK:
case RLIMIT_CORE: case RLIMIT_CORE:
case RLIMIT_RSS: case RLIMIT_RSS:
goto __stub;
case RLIMIT_NPROC: case RLIMIT_NPROC:
{
if (new_limit)
pcb->Limits.Threads = pNewLimit->rlim_max;
return 0;
}
case RLIMIT_NOFILE: case RLIMIT_NOFILE:
{
if (new_limit)
pcb->Limits.OpenFiles = pNewLimit->rlim_max;
return 0;
}
case RLIMIT_MEMLOCK: case RLIMIT_MEMLOCK:
goto __stub;
case RLIMIT_AS: case RLIMIT_AS:
{
if (new_limit)
pcb->Limits.Memory = pNewLimit->rlim_max;
return 0;
}
case RLIMIT_LOCKS: case RLIMIT_LOCKS:
case RLIMIT_SIGPENDING: case RLIMIT_SIGPENDING:
case RLIMIT_MSGQUEUE: case RLIMIT_MSGQUEUE:
@ -2729,6 +2749,7 @@ static int linux_prlimit64(SysFrm *, pid_t pid, int resource,
case RLIMIT_RTPRIO: case RLIMIT_RTPRIO:
case RLIMIT_RTTIME: case RLIMIT_RTTIME:
case RLIMIT_NLIMITS: case RLIMIT_NLIMITS:
__stub:
{ {
fixme("resource %s(%d) is stub", rlimitStr[resource], resource); fixme("resource %s(%d) is stub", rlimitStr[resource], resource);
return 0; /* just return 0 */ return 0; /* just return 0 */