mm, oom: move task_will_free_mem up in the file to be used in process_mrelease
Subsystems (18)
PATCH v2 1/3 mm, oom: move task_will_free_mem up in the file to be used in process_mrelease
process_mrelease needs to be added in the CONFIG_MMU-dependent block which comes before __task_will_free_mem and task_will_free_mem. Move these functions before this block so that new process_mrelease syscall can use them.
---
changes in v2:
- Fixed build error when CONFIG_MMU=n, reported by kernel test robot. This required moving task_will_free_mem implemented in the first patch
- Renamed process_reap to process_mrelease, per majority of votes
- Replaced "dying process" with "process which was sent a SIGKILL signal" in the manual page text, per Florian Weimer
- Added ERRORS section in the manual page text
- Resolved conflicts in syscall numbers caused by the new memfd_secret syscall
- Separated boilerplate code wiring-up the new syscall into a separate patch to facilitate the review process
mm/oom_kill.c | 150 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 75 deletions(-)
mm/oom_kill.c +75 -75
@@ -501,6 +501,81 @@ bool process_shares_mm(struct task_struct *p, struct mm_struct *mm)return false; } +static inline bool __task_will_free_mem (struct task_struct *task) +{ +struct signal_struct *sig = task->signal; + +/* +* A coredumping process may sleep for an extended period in exit_mm(), +* so the oom killer cannot assume that the process will promptly exit +* and release memory. +*/ +if (sig->flags &SIGNAL_GROUP_COREDUMP ) +return false; + +if (sig->flags &SIGNAL_GROUP_EXIT ) +return true; + +if (thread_group_empty (task) && (task->flags &PF_EXITING )) +return true; + +return false; +} + +/* +* Checks whether the given task is dying or exiting and likely to +* release its address space. This means that all threads and processes +* sharing the same mm have to be killed or exiting. +* Caller has to make sure that task->mm is stable (hold task_lock or +* it operates on the current). +*/ +static bool task_will_free_mem (struct task_struct *task) +{ +struct mm_struct *mm = task->mm; +struct task_struct *p; +bool ret = true; + +/* +* Skip tasks without mm because it might have passed its exit_mm and +* exit_oom_victim. oom_reaper could have rescued that but do not rely +* on that for now. We can consider find_lock_task_mm in future. +*/ +if (!mm) +return false; + +if (!__task_will_free_mem (task)) +return false; + +/* +* This task has already been drained by the oom reaper so there are +* only small chances it will free some more +*/ +if (test_bit (MMF_OOM_SKIP , &mm->flags)) +return false; + +if (atomic_read (&mm->mm_users) <=1 ) +return true; + +/* +* Make sure that all tasks which share the mm with the given tasks +* are dying as well to make sure that a) nobody pins its mm and +* b) the task is also reapable by the oom reaper. +*/ +rcu_read_lock (); +for_each_process (p) { +if (!process_shares_mm (p, mm)) +continue ; +if (same_thread_group (task, p)) +continue ; + ret =__task_will_free_mem (p); +if (!ret) +break ; + } +rcu_read_unlock (); + +return ret; +} +#ifdef CONFIG_MMU /* * OOM Reaper kernel thread which tries to reap the memory used by the OOM
@@ -781,81 +856,6 @@ bool oom_killer_disable(signed long timeout)return true; } -static inline bool __task_will_free_mem (struct task_struct *task) -{ -struct signal_struct *sig = task->signal; - -/* -* A coredumping process may sleep for an extended period in exit_mm(), -* so the oom killer cannot assume that the process will promptly exit -* and release memory. -*/ -if (sig->flags &SIGNAL_GROUP_COREDUMP ) -return false; - -if (sig->flags &SIGNAL_GROUP_EXIT ) -return true; - -if (thread_group_empty (task) && (task->flags &PF_EXITING )) -return true; - -return false; -} - -/* -* Checks whether the given task is dying or exiting and likely to -* release its address space. This means that all threads and processes -* sharing the same mm have to be killed or exiting. -* Caller has to make sure that task->mm is stable (hold task_lock or -* it operates on the current). -*/ -static bool task_will_free_mem (struct task_struct *task) -{ -struct mm_struct *mm = task->mm; -struct task_struct *p; -bool ret = true; - -/* -* Skip tasks without mm because it might have passed its exit_mm and -* exit_oom_victim. oom_reaper could have rescued that but do not rely -* on that for now. We can consider find_lock_task_mm in future. -*/ -if (!mm) -return false; - -if (!__task_will_free_mem (task)) -return false; - -/* -* This task has already been drained by the oom reaper so there are -* only small chances it will free some more -*/ -if (test_bit (MMF_OOM_SKIP , &mm->flags)) -return false; - -if (atomic_read (&mm->mm_users) <=1 ) -return true; - -/* -* Make sure that all tasks which share the mm with the given tasks -* are dying as well to make sure that a) nobody pins its mm and -* b) the task is also reapable by the oom reaper. -*/ -rcu_read_lock (); -for_each_process (p) { -if (!process_shares_mm (p, mm)) -continue ; -if (same_thread_group (task, p)) -continue ; - ret =__task_will_free_mem (p); -if (!ret) -break ; - } -rcu_read_unlock (); - -return ret; -} -static void __oom_kill_process (struct task_struct *victim,const char *message) {struct task_struct *p;
Signature · 1 line
2.32.0.402.g57bb445576-goog
PATCH v2 2/3 mm: introduce process_mrelease system call
In modern systems it's not unusual to have a system component monitoring memory conditions of the system and tasked with keeping system memory pressure under control. One way to accomplish that is to kill non-essential processes to free up memory for more important ones. Examples of this are Facebook's OOM killer daemon called oomd and Android's low memory killer daemon called lmkd.
For such system component it's important to be able to free memory quickly and efficiently. Unfortunately the time process takes to free up its memory after receiving a SIGKILL might vary based on the state of the process (uninterruptible sleep), size and OPP level of the core the process is running. A mechanism to free resources of the target process in a more predictable way would improve system's ability to control its memory pressure.
Introduce process_mrelease system call that releases memory of a dying process from the context of the caller. This way the memory is freed in a more controllable way with CPU affinity and priority of the caller. The workload of freeing the memory will also be charged to the caller. The operation is allowed only on a dying process.
Previously I proposed a number of alternatives to accomplish this:
- https://lore.kernel.org/patchwork/patch/1060407 extending pidfd_send_signal to allow memory reaping using oom_reaper thread;
- https://lore.kernel.org/patchwork/patch/1338196 extending pidfd_send_signal to reap memory of the target process synchronously from the context of the caller;
- https://lore.kernel.org/patchwork/patch/1344419/ to add MADV_DONTNEED support for process_madvise implementing synchronous memory reaping.
The end of the last discussion culminated with suggestion to introduce a dedicated system call (https://lore.kernel.org/patchwork/patch/1344418/#1553875)
The reasoning was that the new variant of process_madvise
a) does not work on an address range
b) is destructive
c) doesn't share much code at all with the rest of process_madvise
From the userspace point of view it was awkward and inconvenient to provide memory range for this operation that operates on the entire address space. Using special flags or address values to specify the entire address space was too hacky.
The API is as follows,
int process_mrelease(int pidfd, unsigned int flags);
DESCRIPTION
The process_mrelease() system call is used to free the memory of a process which was sent a SIGKILL signal.
The pidfd selects the process referred to by the PID file descriptor.
(See pidofd_open(2) for further information)
The flags argument is reserved for future use; currently, this argument must be specified as 0.
RETURN VALUE
On success, process_mrelease() returns 0. On error, -1 is returned and errno is set to indicate the error.
ERRORS
EBADF pidfd is not a valid PID file descriptor.
EAGAIN Failed to release part of the address space.
EINVAL flags is not 0.
EINVAL The task does not have a pending SIGKILL or its memory is
shared with another process with no pending SIGKILL.
ENOSYS This system call is not supported by kernels built with no
MMU support (CONFIG_MMU=n).
ESRCH The target process does not exist (i.e., it has terminated
and been waited on).
--- mm/oom_kill.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)
mm/oom_kill.c +55 -0
@@ -28,6 +28,7 @@#include <linux/sched/task.h> #include <linux/sched/debug.h> #include <linux/swap.h> +#include <linux/syscalls.h> #include <linux/timex.h> #include <linux/jiffies.h> #include <linux/cpuset.h>
@@ -755,10 +756,64 @@ static int __init oom_init(void)return 0 ; }subsys_initcall (oom_init) + +SYSCALL_DEFINE2 (process_mrelease ,int ,pidfd ,unsigned int ,flags ) +{ +struct pid *pid; +struct task_struct *task; +struct mm_struct *mm =NULL ; +unsigned int f_flags; +long ret =0 ; + +if (flags !=0 ) +return -EINVAL ; + + pid =pidfd_get_pid (pidfd, &f_flags); +if (IS_ERR (pid)) +return PTR_ERR (pid); + + task =get_pid_task (pid,PIDTYPE_PID ); +if (!task) { + ret = -ESRCH ; + goto put_pid; + } + +/* +* If the task is dying and in the process of releasing its memory +* then get its mm. +*/ +task_lock (task); +if (task_will_free_mem (task) && (task->flags &PF_KTHREAD ) ==0 ) { + mm = task->mm; +mmget (mm); + } +task_unlock (task); +if (!mm) { + ret = -EINVAL ; + goto put_task; + } + +mmap_read_lock (mm); +if (!__oom_reap_task_mm (mm)) + ret = -EAGAIN ; +mmap_read_unlock (mm); + +mmput (mm); +put_task: +put_task_struct (task); +put_pid: +put_pid (pid); +return ret; +}#else static inline void wake_oom_reaper (struct task_struct *tsk) { } + +SYSCALL_DEFINE2(process_mrelease, int, pidfd, unsigned int, flags) +{ +return -ENOSYS ; +}#endif /* CONFIG_MMU */ /**
Signature · 1 line
2.32.0.402.g57bb445576-goog
Re: [PATCH v2 2/3] mm: introduce process_mrelease system call
Quoted 19 lines · Suren Baghdasaryan
In modern systems it's not unusual to have a system component monitoring memory conditions of the system and tasked with keeping system memory pressure under control. One way to accomplish that is to kill non-essential processes to free up memory for more important ones. Examples of this are Facebook's OOM killer daemon called oomd and Android's low memory killer daemon called lmkd.
For such system component it's important to be able to free memory quickly and efficiently. Unfortunately the time process takes to free up its memory after receiving a SIGKILL might vary based on the state of the process (uninterruptible sleep), size and OPP level of the core the process is running. A mechanism to free resources of the target process in a more predictable way would improve system's ability to control its memory pressure.
Introduceprocess_mreleasesystem call that releases memory of a dying process from the context of the caller. This way the memory is freed in a more controllable way with CPU affinity and priority of the caller. The workload of freeing the memory will also be charged to the caller. The operation is allowed only on a dying process.
Quoted 8 lines
Previously I proposed a number of alternatives to accomplish this:
- https://lore.kernel.org/patchwork/patch/1060407 extendingpidfd_send_signalto allow memory reaping usingoom_reaperthread;
- https://lore.kernel.org/patchwork/patch/1338196 extendingpidfd_send_signalto reap memory of the target process synchronously from the context of the caller;
- https://lore.kernel.org/patchwork/patch/1344419/ to addMADV_DONTNEEDsupport forprocess_madviseimplementing synchronous memory reaping.
To me, this looks a lot cleaner. Although I do wonder why we need two separate mechanisms to achieve the end goal
1. send sigkill
2. process_mrelease
As 2. doesn't make sense without 1. it somehow feels like it would be optimal to achieve both steps in a single syscall. But I remember there were discussions around that.
Quoted 66 lines
The end of the last discussion culminated with suggestion to introduce a dedicated system call (https://lore.kernel.org/patchwork/patch/1344418/#1553875)
The reasoning was that the new variant ofprocess_madvise
a) does not work on an address range
b) is destructive
c) doesn't share much code at all with the rest ofprocess_madvise
From the userspace point of view it was awkward and inconvenient to provide
memory range for this operation that operates on the entire address space. Using special flags or address values to specify the entire address space was too hacky.The API is as follows,
int
process_mrelease(int pidfd, unsigned int flags);DESCRIPTION
Theprocess_mrelease()system call is used to free the memory of a process which was sent a SIGKILL signal.The pidfd selects the process referred to by the PID file descriptor.
(Seepidofd_open(2)for further information)The flags argument is reserved for future use; currently, this argument must be specified as 0.
RETURN VALUE
On success,process_mrelease()returns 0. On error, -1 is returned and errno is set to indicate the error.ERRORS
EBADF pidfd is not a valid PID file descriptor.EAGAIN Failed to release part of the address space.
EINVAL flags is not 0.
EINVAL The task does not have a pending SIGKILL or its memory is
shared with another process with no pending SIGKILL.ENOSYS This system call is not supported by kernels built with no
MMU support (CONFIG_MMU=n).ESRCH The target process does not exist (i.e., it has terminated
and been waited on).Signed-off-by Suren Baghdasaryan <[email protected]>--- mm/oom_kill.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)mm/oom_kill.c +1
-0@@ -28,6 +28,7 @@#include <linux/sched/task.h> #include <linux/sched/debug.h> #include <linux/swap.h> +#include <linux/syscalls.h> #include <linux/timex.h> #include <linux/jiffies.h> #include <linux/cpuset.h> @@ -755,10 +756,64 @@ static int __init oom_init(void)return 0 ;
mm/oom_kill.c static int __init oom_init(void) · line 766
Quoted 10 lines
mm/oom_kill.c +8
-0}subsys_initcall (oom_init) + +SYSCALL_DEFINE2 (process_mrelease ,int ,pidfd ,unsigned int ,flags ) +{ +struct pid *pid; +struct task_struct *task; +struct mm_struct *mm =NULL ; +unsigned int f_flags; +long ret =0 ;
Nit: reverse Christmas tree.
Quoted 13 lines
mm/oom_kill.c +13
-0+ +if (flags !=0 ) +return -EINVAL ; + + pid =pidfd_get_pid (pidfd, &f_flags); +if (IS_ERR (pid)) +return PTR_ERR (pid); + + task =get_pid_task (pid,PIDTYPE_PID ); +if (!task) { + ret = -ESRCH ; + goto put_pid; + }
mm/oom_kill.c static int __init oom_init(void) · line 789
Quoted 10 lines
mm/oom_kill.c +10
-0+ +/* +* If the task is dying and in the process of releasing its memory +* then get its mm. +*/ +task_lock (task); +if (task_will_free_mem (task) && (task->flags &PF_KTHREAD ) ==0 ) { + mm = task->mm; +mmget (mm); + }
AFAIU, while holding the task_lock, task->mm won't change and we cannot see a concurrent exit_mm()->mmput(). So the mm structure and the VMAs won't go away while holding the task_lock(). I do wonder if we need the mmget() at all here.
Also, I wonder if it would be worth dropping the task_lock() while reaping - to unblock anybody else wanting to lock the task. Getting a hold of the mm and locking the mmap_lock would be sufficient I guess.
In general, looks quite good to me.
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v2 2/3] mm: introduce process_mrelease system call
Quoted 33 lines · David Hildenbrand
Quoted 19 lines · Suren Baghdasaryan
In modern systems it's not unusual to have a system component monitoring memory conditions of the system and tasked with keeping system memory pressure under control. One way to accomplish that is to kill non-essential processes to free up memory for more important ones. Examples of this are Facebook's OOM killer daemon called oomd and Android's low memory killer daemon called lmkd.
For such system component it's important to be able to free memory quickly and efficiently. Unfortunately the time process takes to free up its memory after receiving a SIGKILL might vary based on the state of the process (uninterruptible sleep), size and OPP level of the core the process is running. A mechanism to free resources of the target process in a more predictable way would improve system's ability to control its memory pressure.
Introduceprocess_mreleasesystem call that releases memory of a dying process from the context of the caller. This way the memory is freed in a more controllable way with CPU affinity and priority of the caller. The workload of freeing the memory will also be charged to the caller. The operation is allowed only on a dying process.Quoted 8 lines
Previously I proposed a number of alternatives to accomplish this:
- https://lore.kernel.org/patchwork/patch/1060407 extendingpidfd_send_signalto allow memory reaping usingoom_reaperthread;
- https://lore.kernel.org/patchwork/patch/1338196 extendingpidfd_send_signalto reap memory of the target process synchronously from the context of the caller;
- https://lore.kernel.org/patchwork/patch/1344419/ to addMADV_DONTNEEDsupport forprocess_madviseimplementing synchronous memory reaping.To me, this looks a lot cleaner. Although I do wonder why we need two separate mechanisms to achieve the end goal
Quoted 6 lines
1. send sigkill
2.process_mreleaseAs 2. doesn't make sense without 1. it somehow feels like it would be optimal to achieve both steps in a single syscall. But I remember there were discussions around that.
Yep, we recently discussed the approach in this thread:
https://lore.kernel.org/patchwork/patch/1450952/#1652452
Quoted 71 lines
Quoted 71 lines
The end of the last discussion culminated with suggestion to introduce a dedicated system call (https://lore.kernel.org/patchwork/patch/1344418/#1553875)
The reasoning was that the new variant ofprocess_madvise
a) does not work on an address range
b) is destructive
c) doesn't share much code at all with the rest ofprocess_madvise
From the userspace point of view it was awkward and inconvenient to provide
memory range for this operation that operates on the entire address space. Using special flags or address values to specify the entire address space was too hacky.The API is as follows,
int
process_mrelease(int pidfd, unsigned int flags);DESCRIPTION
Theprocess_mrelease()system call is used to free the memory of a process which was sent a SIGKILL signal.The pidfd selects the process referred to by the PID file descriptor.
(Seepidofd_open(2)for further information)The flags argument is reserved for future use; currently, this argument must be specified as 0.
RETURN VALUE
On success,process_mrelease()returns 0. On error, -1 is returned and errno is set to indicate the error.ERRORS
EBADF pidfd is not a valid PID file descriptor.EAGAIN Failed to release part of the address space.
EINVAL flags is not 0.
EINVAL The task does not have a pending SIGKILL or its memory is
shared with another process with no pending SIGKILL.ENOSYS This system call is not supported by kernels built with no
MMU support (CONFIG_MMU=n).ESRCH The target process does not exist (i.e., it has terminated
and been waited on).Signed-off-by Suren Baghdasaryan <[email protected]>--- mm/oom_kill.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)mm/oom_kill.c +3
-0@@ -28,6 +28,7 @@#include <linux/sched/task.h> #include <linux/sched/debug.h> #include <linux/swap.h> +#include <linux/syscalls.h> #include <linux/timex.h> #include <linux/jiffies.h> #include <linux/cpuset.h> @@ -755,10 +756,64 @@ static int __init oom_init(void)return 0 ; }subsys_initcall (oom_init) + +SYSCALL_DEFINE2 (process_mrelease,int , pidfd,unsigned int , flags)
Quoted 8 lines
mm/oom_kill.c static int __init oom_init(void) · line 766
Quoted 6 lines
mm/oom_kill.c +6
-0+{ +struct pid *pid; +struct task_struct *task; +struct mm_struct *mm =NULL ; +unsigned int f_flags; +long ret =0 ;Nit: reverse Christmas tree.
Ack. Will reorder like this:
struct mm_struct *mm = NULL;
struct task_struct *task;
unsigned int f_flags;
struct pid *pid;
long ret = 0;
Quoted 30 lines
Quoted 14 lines
mm/oom_kill.c +13
-0+ +if (flags !=0 ) +return -EINVAL ; + + pid =pidfd_get_pid (pidfd, &f_flags); +if (IS_ERR (pid)) +return PTR_ERR (pid); + + task =get_pid_task (pid,PIDTYPE_PID ); +if (!task) { + ret = -ESRCH ; + goto put_pid; + }mm/oom_kill.c static int __init oom_init(void) · line 789
Quoted 10 lines
mm/oom_kill.c +10
-0+ +/* +* If the task is dying and in the process of releasing its memory +* then get its mm. +*/ +task_lock (task); +if (task_will_free_mem (task) && (task->flags &PF_KTHREAD ) ==0 ) { + mm = task->mm; +mmget (mm); + }AFAIU, while holding the
task_lock,task->mmwon't change and we cannot see a concurrent exit_mm()->mmput(). So the mm structure and the VMAs won't go away while holding thetask_lock(). I do wonder if we need themmget()at all here.
Quoted 3 lines
Also, I wonder if it would be worth dropping the
task_lock()while reaping - to unblock anybody else wanting to lock the task. Getting a hold of the mm and locking themmap_lockwould be sufficient I guess.
Let me take a closer look at the locking sequence here and will follow up afterwards.
Thanks for the review!
Quoted 9 lines
In general, looks quite good to me.
--
Thanks,David / dhildenb
Re: [PATCH v2 2/3] mm: introduce process_mrelease system call
Quoted 125 lines · Suren Baghdasaryan
Quoted 33 lines · David Hildenbrand
Quoted 19 lines · Suren Baghdasaryan
In modern systems it's not unusual to have a system component monitoring memory conditions of the system and tasked with keeping system memory pressure under control. One way to accomplish that is to kill non-essential processes to free up memory for more important ones. Examples of this are Facebook's OOM killer daemon called oomd and Android's low memory killer daemon called lmkd.
For such system component it's important to be able to free memory quickly and efficiently. Unfortunately the time process takes to free up its memory after receiving a SIGKILL might vary based on the state of the process (uninterruptible sleep), size and OPP level of the core the process is running. A mechanism to free resources of the target process in a more predictable way would improve system's ability to control its memory pressure.
Introduceprocess_mreleasesystem call that releases memory of a dying process from the context of the caller. This way the memory is freed in a more controllable way with CPU affinity and priority of the caller. The workload of freeing the memory will also be charged to the caller. The operation is allowed only on a dying process.Quoted 8 lines
Previously I proposed a number of alternatives to accomplish this:
- https://lore.kernel.org/patchwork/patch/1060407 extendingpidfd_send_signalto allow memory reaping usingoom_reaperthread;
- https://lore.kernel.org/patchwork/patch/1338196 extendingpidfd_send_signalto reap memory of the target process synchronously from the context of the caller;
- https://lore.kernel.org/patchwork/patch/1344419/ to addMADV_DONTNEEDsupport forprocess_madviseimplementing synchronous memory reaping.To me, this looks a lot cleaner. Although I do wonder why we need two separate mechanisms to achieve the end goal
Quoted 6 lines
1. send sigkill
2.process_mreleaseAs 2. doesn't make sense without 1. it somehow feels like it would be optimal to achieve both steps in a single syscall. But I remember there were discussions around that.
Yep, we recently discussed the approach in this thread:
https://lore.kernel.org/patchwork/patch/1450952/#1652452Quoted 71 lines
Quoted 71 lines
The end of the last discussion culminated with suggestion to introduce a dedicated system call (https://lore.kernel.org/patchwork/patch/1344418/#1553875)
The reasoning was that the new variant ofprocess_madvise
a) does not work on an address range
b) is destructive
c) doesn't share much code at all with the rest ofprocess_madvise
From the userspace point of view it was awkward and inconvenient to provide
memory range for this operation that operates on the entire address space. Using special flags or address values to specify the entire address space was too hacky.The API is as follows,
int
process_mrelease(int pidfd, unsigned int flags);DESCRIPTION
Theprocess_mrelease()system call is used to free the memory of a process which was sent a SIGKILL signal.The pidfd selects the process referred to by the PID file descriptor.
(Seepidofd_open(2)for further information)The flags argument is reserved for future use; currently, this argument must be specified as 0.
RETURN VALUE
On success,process_mrelease()returns 0. On error, -1 is returned and errno is set to indicate the error.ERRORS
EBADF pidfd is not a valid PID file descriptor.EAGAIN Failed to release part of the address space.
EINVAL flags is not 0.
EINVAL The task does not have a pending SIGKILL or its memory is
shared with another process with no pending SIGKILL.ENOSYS This system call is not supported by kernels built with no
MMU support (CONFIG_MMU=n).ESRCH The target process does not exist (i.e., it has terminated
and been waited on).Signed-off-by Suren Baghdasaryan <[email protected]>--- mm/oom_kill.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)mm/oom_kill.c +3
-0@@ -28,6 +28,7 @@#include <linux/sched/task.h> #include <linux/sched/debug.h> #include <linux/swap.h> +#include <linux/syscalls.h> #include <linux/timex.h> #include <linux/jiffies.h> #include <linux/cpuset.h> @@ -755,10 +756,64 @@ static int __init oom_init(void)return 0 ; }subsys_initcall (oom_init) + +SYSCALL_DEFINE2 (process_mrelease,int , pidfd,unsigned int , flags)Quoted 8 lines
mm/oom_kill.c static int __init oom_init(void) · line 766
Quoted 6 lines
mm/oom_kill.c +6
-0+{ +struct pid *pid; +struct task_struct *task; +struct mm_struct *mm =NULL ; +unsigned int f_flags; +long ret =0 ;Nit: reverse Christmas tree.
Quoted 37 lines
Ack. Will reorder like this:
struct
mm_struct*mm = NULL;
structtask_struct*task;
unsigned intf_flags;
struct pid *pid;
long ret = 0;Quoted 29 lines
Quoted 14 lines
mm/oom_kill.c +13
-0+ +if (flags !=0 ) +return -EINVAL ; + + pid =pidfd_get_pid (pidfd, &f_flags); +if (IS_ERR (pid)) +return PTR_ERR (pid); + + task =get_pid_task (pid,PIDTYPE_PID ); +if (!task) { + ret = -ESRCH ; + goto put_pid; + }mm/oom_kill.c static int __init oom_init(void) · line 789
Quoted 10 lines
mm/oom_kill.c +10
-0+ +/* +* If the task is dying and in the process of releasing its memory +* then get its mm. +*/ +task_lock (task); +if (task_will_free_mem (task) && (task->flags &PF_KTHREAD ) ==0 ) { + mm = task->mm; +mmget (mm); + }AFAIU, while holding the
task_lock,task->mmwon't change and we cannot see a concurrent exit_mm()->mmput(). So the mm structure and the VMAs won't go away while holding thetask_lock(). I do wonder if we need themmget()at all here.
We do mmget() here to ensure mm is stable when it is passed later to __oom_reap_task_mm(mm)/mmap_read_lock(mm)/mmap_read_unlock(mm). Note that during those calls we do not hold task_lock anymore.
Quoted 3 lines
Quoted 3 lines
Also, I wonder if it would be worth dropping the
task_lock()while reaping - to unblock anybody else wanting to lock the task.
As I mentioned above, we do not hold task_lock during reaping. We release it right after we call task_will_free_mem(), which checks that the task is exiting. task_lock is held during the call to task_will_free_mem() to satisfy the requirement listed in that function's comment: "Caller has to make sure that task->mm is stable (hold task_lock or it operates on the current)".
Quoted 1 line
Quoted 1 line
Getting a hold of the mm and locking the
mmap_lockwould be sufficient I guess.
That's exactly what I do here. The simplified sequence is:
task_lock
if (task_will_free_mem())
mm=mmget()
task_unlock
if (!mm) return;
mmap_read_lock(mm)
__oom_reap_task_mm(mm)
mmap_read_unlock(mm)
mmput(mm)Or did I misunderstand your comments?
Quoted 14 lines
Let me take a closer look at the locking sequence here and will follow up afterwards.
Thanks for the review!Quoted 9 lines
In general, looks quite good to me.
--
Thanks,David / dhildenb
Re: [PATCH v2 2/3] mm: introduce process_mrelease system call
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Getting a hold of the mm and locking the
mmap_lockwould be sufficient I guess.That's exactly what I do here. The simplified sequence is:
task_lock if (task_will_free_mem()) mm=mmget() task_unlock if (!mm) return; mmap_read_lock(mm) __oom_reap_task_mm(mm) mmap_read_unlock(mm) mmput(mm)
Quoted 1 line
Or did I misunderstand your comments?
Oh, sorry, my tired eyes confused "put_task_struct()" with "task_unlock()" and even "mmget()" with "mmgrab()" ...
So this is essentially get_task_mm() with an additional task_will_free_mem() check.
LGHTM!
:)
Signature · 3 lines
Thanks, David / dhildenb
PATCH v2 3/3 mm: wire up syscall process_mrelease
In reply to Suren BaghdasaryanSplit off from prev patch in the series that implements the syscall.
--- arch/alpha/kernel/syscalls/syscall.tbl | 2 ++ arch/arm/tools/syscall.tbl | 2 ++ arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 2 ++ arch/ia64/kernel/syscalls/syscall.tbl | 2 ++ arch/m68k/kernel/syscalls/syscall.tbl | 2 ++ arch/microblaze/kernel/syscalls/syscall.tbl | 2 ++ arch/mips/kernel/syscalls/syscall_n32.tbl | 2 ++ arch/mips/kernel/syscalls/syscall_n64.tbl | 2 ++ arch/mips/kernel/syscalls/syscall_o32.tbl | 2 ++ arch/parisc/kernel/syscalls/syscall.tbl | 2 ++ arch/powerpc/kernel/syscalls/syscall.tbl | 2 ++ arch/s390/kernel/syscalls/syscall.tbl | 2 ++ arch/sh/kernel/syscalls/syscall.tbl | 2 ++ arch/sparc/kernel/syscalls/syscall.tbl | 2 ++ arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + arch/xtensa/kernel/syscalls/syscall.tbl | 2 ++ include/linux/syscalls.h | 1 + include/uapi/asm-generic/unistd.h | 4 +++- kernel/sys_ni.c | 1 + 21 files changed, 38 insertions(+), 2 deletions(-)
arch/alpha/kernel/syscalls/syscall.tbl +2 -0
@@ -486,3 +486,5 @@ 554 common landlock_create_ruleset sys_landlock_create_ruleset 555 common landlock_add_rule sys_landlock_add_rule 556 common landlock_restrict_self sys_landlock_restrict_self +# 557 reserved for memfd_secret +558 common process_mrelease sys_process_mrelease
arch/arm/tools/syscall.tbl +2 -0
@@ -460,3 +460,5 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 common process_mrelease sys_process_mrelease
arch/arm64/include/asm/unistd.h +1 -1
@@ -38,7 +38,7 @@#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5)#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800) -#define __NR_compat_syscalls 447 +#define __NR_compat_syscalls 449#endif #define __ARCH_WANT_SYS_CLONE
arch/arm64/include/asm/unistd32.h +2 -0
@@ -901,6 +901,8 @@ __SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset) __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule)#define __NR_landlock_restrict_self 446 __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self) +#define __NR_process_mrelease 448 +__SYSCALL (__NR_process_mrelease, sys_process_mrelease)/* * Please add new compat syscalls above this comment and update
arch/ia64/kernel/syscalls/syscall.tbl +2 -0
@@ -367,3 +367,5 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 common process_mrelease sys_process_mrelease
arch/m68k/kernel/syscalls/syscall.tbl +2 -0
@@ -446,3 +446,5 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 common process_mrelease sys_process_mrelease
arch/microblaze/kernel/syscalls/syscall.tbl +2 -0
@@ -452,3 +452,5 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 common process_mrelease sys_process_mrelease
arch/mips/kernel/syscalls/syscall_n32.tbl +2 -0
@@ -385,3 +385,5 @@ 444 n32 landlock_create_ruleset sys_landlock_create_ruleset 445 n32 landlock_add_rule sys_landlock_add_rule 446 n32 landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 n32 process_mrelease sys_process_mrelease
arch/mips/kernel/syscalls/syscall_n64.tbl +2 -0
@@ -361,3 +361,5 @@ 444 n64 landlock_create_ruleset sys_landlock_create_ruleset 445 n64 landlock_add_rule sys_landlock_add_rule 446 n64 landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 n64 process_mrelease sys_process_mrelease
arch/mips/kernel/syscalls/syscall_o32.tbl +2 -0
@@ -434,3 +434,5 @@ 444 o32 landlock_create_ruleset sys_landlock_create_ruleset 445 o32 landlock_add_rule sys_landlock_add_rule 446 o32 landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 o32 process_mrelease sys_process_mrelease
arch/parisc/kernel/syscalls/syscall.tbl +2 -0
@@ -444,3 +444,5 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 common process_mrelease sys_process_mrelease
arch/powerpc/kernel/syscalls/syscall.tbl +2 -0
@@ -526,3 +526,5 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 common process_mrelease sys_process_mrelease
arch/s390/kernel/syscalls/syscall.tbl +2 -0
@@ -449,3 +449,5 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 common process_mrelease sys_process_mrelease sys_process_mrelease
arch/sh/kernel/syscalls/syscall.tbl +2 -0
@@ -449,3 +449,5 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 common process_mrelease sys_process_mrelease
arch/sparc/kernel/syscalls/syscall.tbl +2 -0
@@ -492,3 +492,5 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 common process_mrelease sys_process_mrelease
arch/x86/entry/syscalls/syscall_32.tbl +1 -0
@@ -452,3 +452,4 @@ 445 i386 landlock_add_rule sys_landlock_add_rule 446 i386 landlock_restrict_self sys_landlock_restrict_self 447 i386 memfd_secret sys_memfd_secret +448 i386 process_mrelease sys_process_mrelease
arch/x86/entry/syscalls/syscall_64.tbl +1 -0
@@ -369,6 +369,7 @@ 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self 447 common memfd_secret sys_memfd_secret +448 common process_mrelease sys_process_mrelease # # Due to a historical design error, certain syscalls are numbered differently
arch/xtensa/kernel/syscalls/syscall.tbl +2 -0
@@ -417,3 +417,5 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self +# 447 reserved for memfd_secret +448 common process_mrelease sys_process_mrelease
include/linux/syscalls.h +1 -0
@@ -915,6 +915,7 @@ asmlinkage long sys_mincore(unsigned long start, size_t len,asmlinkage long sys_madvise (unsigned long start,size_t len,int behavior);asmlinkage long sys_process_madvise (int pidfd,const struct iovec __user *vec,size_t vlen,int behavior,unsigned int flags); +asmlinkage long sys_process_mrelease (int pidfd,unsigned int flags);asmlinkage long sys_remap_file_pages (unsigned long start,unsigned long size,unsigned long prot,unsigned long pgoff,unsigned long flags);
include/uapi/asm-generic/unistd.h +3 -1
@@ -877,9 +877,11 @@ __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)#define __NR_memfd_secret 447 __SYSCALL(__NR_memfd_secret, sys_memfd_secret)#endif +#define __NR_process_mrelease 448 +__SYSCALL(__NR_process_mrelease, sys_process_mrelease)#undef __NR_syscalls -#define __NR_syscalls 448 +#define __NR_syscalls 449/* * 32 bit systems traditionally used different
kernel/sys_ni.c +1 -0
@@ -289,6 +289,7 @@ COND_SYSCALL(munlockall);COND_SYSCALL (mincore);COND_SYSCALL (madvise);COND_SYSCALL (process_madvise); +COND_SYSCALL (process_mrelease);COND_SYSCALL (remap_file_pages);COND_SYSCALL (mbind);COND_SYSCALL_COMPAT (mbind);
Signature · 1 line
2.32.0.402.g57bb445576-goog
Quoted 18 lines · Suren Baghdasaryan
process_mreleaseneeds to be added in the CONFIG_MMU-dependent block which comes before__task_will_free_memandtask_will_free_mem. Move these functions before this block so that newprocess_mreleasesyscall can use them.Signed-off-by Suren Baghdasaryan <[email protected]>---
changes in v2:
- Fixed build error whenCONFIG_MMU=n, reported by kernel test robot. This required movingtask_will_free_memimplemented in the first patch
- Renamedprocess_reaptoprocess_mrelease, per majority of votes
- Replaced "dying process" with "process which was sent a SIGKILL signal" in the manual page text, per Florian Weimer
- Added ERRORS section in the manual page text
- Resolved conflicts in syscall numbers caused by the newmemfd_secretsyscall
- Separated boilerplate code wiring-up the new syscall into a separate patch to facilitate the review process
Quoted 2 lines
mm/oom_kill.c | 150 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 75 deletions(-)
TBH, I really dislike this move as it makes git blame a lot harder with any real benefit.
Can't you just use prototypes to avoid the move for now in patch #2?
static bool task_will_free_mem(struct task_struct *task);
Signature · 3 lines
Thanks, David / dhildenb
Quoted 23 lines · David Hildenbrand
Quoted 18 lines · Suren Baghdasaryan
process_mreleaseneeds to be added in the CONFIG_MMU-dependent block which comes before__task_will_free_memandtask_will_free_mem. Move these functions before this block so that newprocess_mreleasesyscall can use them.Signed-off-by Suren Baghdasaryan <[email protected]>---
changes in v2:
- Fixed build error whenCONFIG_MMU=n, reported by kernel test robot. This required movingtask_will_free_memimplemented in the first patch
- Renamedprocess_reaptoprocess_mrelease, per majority of votes
- Replaced "dying process" with "process which was sent a SIGKILL signal" in the manual page text, per Florian Weimer
- Added ERRORS section in the manual page text
- Resolved conflicts in syscall numbers caused by the newmemfd_secretsyscall
- Separated boilerplate code wiring-up the new syscall into a separate patch to facilitate the review processQuoted 2 lines
mm/oom_kill.c | 150 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 75 deletions(-)
Quoted 6 lines
TBH, I really dislike this move as it makes git blame a lot harder with any real benefit.
Can't you just use prototypes to avoid the move for now in patch #2?
static bool
task_will_free_mem(struct task_struct *task);
Sure, I can use a forward-declaration. Just thought this would be cleaner. Will change in the next rev. Thanks!
Quoted 7 lines
--
Thanks,David / dhildenb
Andrew Morton
maintainerQuoted 22 lines · On Tue, 20 Jul 2021 14:43:52 +0200 David Hildenbrand <[email protected]> wrote:
Quoted 18 lines · Suren Baghdasaryan
process_mreleaseneeds to be added in the CONFIG_MMU-dependent block which comes before__task_will_free_memandtask_will_free_mem. Move these functions before this block so that newprocess_mreleasesyscall can use them.Signed-off-by Suren Baghdasaryan <[email protected]>---
changes in v2:
- Fixed build error whenCONFIG_MMU=n, reported by kernel test robot. This required movingtask_will_free_memimplemented in the first patch
- Renamedprocess_reaptoprocess_mrelease, per majority of votes
- Replaced "dying process" with "process which was sent a SIGKILL signal" in the manual page text, per Florian Weimer
- Added ERRORS section in the manual page text
- Resolved conflicts in syscall numbers caused by the newmemfd_secretsyscall
- Separated boilerplate code wiring-up the new syscall into a separate patch to facilitate the review processQuoted 2 lines
mm/oom_kill.c | 150 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 75 deletions(-)
Quoted 6 lines
TBH, I really dislike this move as it makes git blame a lot harder with any real benefit.
Can't you just use prototypes to avoid the move for now in patch #2?
static bool
task_will_free_mem(struct task_struct *task);
This change makes the code better - it's silly to be adding forward declarations just because the functions are in the wrong place.
If that messes up git-blame then let's come up with better tooling rather than suffering poorer kernel code because the tools aren't doing what we want of them. Surely?
Quoted 27 lines · Andrew Morton
Quoted 25 lines · On Tue, 20 Jul 2021 14:43:52 +0200 David Hildenbrand <[email protected]> wrote:
Quoted 18 lines · Suren Baghdasaryan
process_mreleaseneeds to be added in the CONFIG_MMU-dependent block which comes before__task_will_free_memandtask_will_free_mem. Move these functions before this block so that newprocess_mreleasesyscall can use them.Signed-off-by Suren Baghdasaryan <[email protected]>---
changes in v2:
- Fixed build error whenCONFIG_MMU=n, reported by kernel test robot. This required movingtask_will_free_memimplemented in the first patch
- Renamedprocess_reaptoprocess_mrelease, per majority of votes
- Replaced "dying process" with "process which was sent a SIGKILL signal" in the manual page text, per Florian Weimer
- Added ERRORS section in the manual page text
- Resolved conflicts in syscall numbers caused by the newmemfd_secretsyscall
- Separated boilerplate code wiring-up the new syscall into a separate patch to facilitate the review processQuoted 2 lines
mm/oom_kill.c | 150 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 75 deletions(-)TBH, I really dislike this move as it makes git blame a lot harder with any real benefit.
Quoted 6 lines
Quoted 3 lines
Can't you just use prototypes to avoid the move for now in patch #2?
static bool
task_will_free_mem(struct task_struct *task);This change makes the code better - it's silly to be adding forward declarations just because the functions are in the wrong place.
I'd really love to learn what "better" here means and if it's rather subjective. When it comes to navigating the code, we do have established tools for that (ctags), and personally I couldn't care less where exactly in a file the code is located.
Sure, ending up with a forward-declaration for every function might not be what we want ;)
Quoted 4 lines
If that messes up git-blame then let's come up with better tooling rather than suffering poorer kernel code because the tools aren't doing what we want of them. Surely?
I don't agree that what we get is "poorer kernel code" in this very instance; I can understand that we avoid forward-declarations when moving smallish functions. But moving two functions with 75 LOC is a bit too much for my taste at least -- speaking as someone who cares about easy backports and git-blame.
Anyhow, just my 2 cents.
Signature · 3 lines
Thanks, David / dhildenb
Quoted 49 lines · David Hildenbrand
Quoted 27 lines · Andrew Morton
Quoted 25 lines · On Tue, 20 Jul 2021 14:43:52 +0200 David Hildenbrand <[email protected]> wrote:
Quoted 18 lines · Suren Baghdasaryan
process_mreleaseneeds to be added in the CONFIG_MMU-dependent block which comes before__task_will_free_memandtask_will_free_mem. Move these functions before this block so that newprocess_mreleasesyscall can use them.Signed-off-by Suren Baghdasaryan <[email protected]>---
changes in v2:
- Fixed build error whenCONFIG_MMU=n, reported by kernel test robot. This required movingtask_will_free_memimplemented in the first patch
- Renamedprocess_reaptoprocess_mrelease, per majority of votes
- Replaced "dying process" with "process which was sent a SIGKILL signal" in the manual page text, per Florian Weimer
- Added ERRORS section in the manual page text
- Resolved conflicts in syscall numbers caused by the newmemfd_secretsyscall
- Separated boilerplate code wiring-up the new syscall into a separate patch to facilitate the review processQuoted 2 lines
mm/oom_kill.c | 150 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 75 deletions(-)TBH, I really dislike this move as it makes git blame a lot harder with any real benefit.
Quoted 6 lines
Quoted 3 lines
Can't you just use prototypes to avoid the move for now in patch #2?
static bool
task_will_free_mem(struct task_struct *task);This change makes the code better - it's silly to be adding forward declarations just because the functions are in the wrong place.
I'd really love to learn what "better" here means and if it's rather subjective. When it comes to navigating the code, we do have established tools for that (ctags), and personally I couldn't care less where exactly in a file the code is located.
Sure, ending up with a forward-declaration for every function might not be what we want ;)
Quoted 4 lines
If that messes up git-blame then let's come up with better tooling rather than suffering poorer kernel code because the tools aren't doing what we want of them. Surely?
Quoted 5 lines
I don't agree that what we get is "poorer kernel code" in this very instance; I can understand that we avoid forward-declarations when moving smallish functions. But moving two functions with 75 LOC is a bit too much for my taste at least -- speaking as someone who cares about easy backports and git-blame.
There is a third alternative here to have process_mrelease() at the end of the file with its own #ifdef CONFIG_MMU block, maybe even embedded in the function like this:
int process_mrelease(int pidfd, unsigned int flags)
{
#ifdef CONFIG_MMU
...
#else
return ENOSYS;#endif
}
This would not require moving other functions.
Would that be better than the current approach or the forward declaration?
Quoted 11 lines
Anyhow, just my 2 cents.
--
Thanks,David / dhildenb
--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
Quoted 66 lines · Suren Baghdasaryan
Quoted 49 lines · David Hildenbrand
Quoted 27 lines · Andrew Morton
Quoted 25 lines · On Tue, 20 Jul 2021 14:43:52 +0200 David Hildenbrand <[email protected]> wrote:
Quoted 18 lines · Suren Baghdasaryan
process_mreleaseneeds to be added in the CONFIG_MMU-dependent block which comes before__task_will_free_memandtask_will_free_mem. Move these functions before this block so that newprocess_mreleasesyscall can use them.Signed-off-by Suren Baghdasaryan <[email protected]>---
changes in v2:
- Fixed build error whenCONFIG_MMU=n, reported by kernel test robot. This required movingtask_will_free_memimplemented in the first patch
- Renamedprocess_reaptoprocess_mrelease, per majority of votes
- Replaced "dying process" with "process which was sent a SIGKILL signal" in the manual page text, per Florian Weimer
- Added ERRORS section in the manual page text
- Resolved conflicts in syscall numbers caused by the newmemfd_secretsyscall
- Separated boilerplate code wiring-up the new syscall into a separate patch to facilitate the review processQuoted 2 lines
mm/oom_kill.c | 150 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 75 deletions(-)TBH, I really dislike this move as it makes git blame a lot harder with any real benefit.
Quoted 6 lines
Quoted 3 lines
Can't you just use prototypes to avoid the move for now in patch #2?
static bool
task_will_free_mem(struct task_struct *task);This change makes the code better - it's silly to be adding forward declarations just because the functions are in the wrong place.
I'd really love to learn what "better" here means and if it's rather subjective. When it comes to navigating the code, we do have established tools for that (ctags), and personally I couldn't care less where exactly in a file the code is located.
Sure, ending up with a forward-declaration for every function might not be what we want ;)
Quoted 4 lines
If that messes up git-blame then let's come up with better tooling rather than suffering poorer kernel code because the tools aren't doing what we want of them. Surely?
Quoted 5 lines
I don't agree that what we get is "poorer kernel code" in this very instance; I can understand that we avoid forward-declarations when moving smallish functions. But moving two functions with 75 LOC is a bit too much for my taste at least -- speaking as someone who cares about easy backports and git-blame.
There is a third alternative here to have
process_mrelease()at the end of the file with its own #ifdefCONFIG_MMUblock, maybe even embedded in the function like this:int
process_mrelease(int pidfd, unsigned int flags)
{#ifdef CONFIG_MMU ... #else return ENOSYS;
Quoted 5 lines
#endif
}This would not require moving other functions.
Would that be better than the current approach or the forward declaration?
IMHO that could be an easy, possible alternative.
Signature · 3 lines
Thanks, David / dhildenb
Quoted 71 lines · David Hildenbrand
Quoted 69 lines · Suren Baghdasaryan
Quoted 49 lines · David Hildenbrand
Quoted 27 lines · Andrew Morton
Quoted 25 lines · On Tue, 20 Jul 2021 14:43:52 +0200 David Hildenbrand <[email protected]> wrote:
Quoted 18 lines · Suren Baghdasaryan
process_mreleaseneeds to be added in the CONFIG_MMU-dependent block which comes before__task_will_free_memandtask_will_free_mem. Move these functions before this block so that newprocess_mreleasesyscall can use them.Signed-off-by Suren Baghdasaryan <[email protected]>---
changes in v2:
- Fixed build error whenCONFIG_MMU=n, reported by kernel test robot. This required movingtask_will_free_memimplemented in the first patch
- Renamedprocess_reaptoprocess_mrelease, per majority of votes
- Replaced "dying process" with "process which was sent a SIGKILL signal" in the manual page text, per Florian Weimer
- Added ERRORS section in the manual page text
- Resolved conflicts in syscall numbers caused by the newmemfd_secretsyscall
- Separated boilerplate code wiring-up the new syscall into a separate patch to facilitate the review processQuoted 2 lines
mm/oom_kill.c | 150 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 75 deletions(-)TBH, I really dislike this move as it makes git blame a lot harder with any real benefit.
Quoted 6 lines
Quoted 3 lines
Can't you just use prototypes to avoid the move for now in patch #2?
static bool
task_will_free_mem(struct task_struct *task);This change makes the code better - it's silly to be adding forward declarations just because the functions are in the wrong place.
I'd really love to learn what "better" here means and if it's rather subjective. When it comes to navigating the code, we do have established tools for that (ctags), and personally I couldn't care less where exactly in a file the code is located.
Sure, ending up with a forward-declaration for every function might not be what we want ;)
Quoted 4 lines
If that messes up git-blame then let's come up with better tooling rather than suffering poorer kernel code because the tools aren't doing what we want of them. Surely?
Quoted 5 lines
I don't agree that what we get is "poorer kernel code" in this very instance; I can understand that we avoid forward-declarations when moving smallish functions. But moving two functions with 75 LOC is a bit too much for my taste at least -- speaking as someone who cares about easy backports and git-blame.
There is a third alternative here to have
process_mrelease()at the end of the file with its own #ifdefCONFIG_MMUblock, maybe even embedded in the function like this:int
process_mrelease(int pidfd, unsigned int flags)
{#ifdef CONFIG_MMU ... #else return ENOSYS;#endif
}
Quoted 4 lines
Quoted 2 lines
This would not require moving other functions.
Would that be better than the current approach or the forward declaration?IMHO that could be an easy, possible alternative.
Andrew, others? Should I follow this path instead?
Quoted 9 lines
--
Thanks,David / dhildenb
--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
Andrew Morton
maintainerQuoted 6 lines · On Wed, 21 Jul 2021 13:19:35 -0700 Suren Baghdasaryan <[email protected]> wrote:
Quoted 4 lines
Quoted 2 lines
This would not require moving other functions.
Would that be better than the current approach or the forward declaration?IMHO that could be an easy, possible alternative.
Andrew, others? Should I follow this path instead?
Whatever you prefer ;)
Quoted 11 lines · Andrew Morton
Quoted 6 lines · On Wed, 21 Jul 2021 13:19:35 -0700 Suren Baghdasaryan <[email protected]> wrote:
Quoted 4 lines
Quoted 2 lines
This would not require moving other functions.
Would that be better than the current approach or the forward declaration?IMHO that could be an easy, possible alternative.
Andrew, others? Should I follow this path instead?
Whatever you prefer ;)
I understand David's concern too well to ignore it, so I prefer to follow this middle-ground approach if you don't mind :)
Quoted 8 lines · Suren Baghdasaryan
Quoted 6 lines · Andrew Morton
Quoted 3 lines · On Wed, 21 Jul 2021 13:19:35 -0700 Suren Baghdasaryan <[email protected]> wrote:
Quoted 3 lines
Quoted 2 lines
This would not require moving other functions.
Would that be better than the current approach or the forward declaration?
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
IMHO that could be an easy, possible alternative.
Andrew, others? Should I follow this path instead?
Whatever you prefer ;)
I understand David's concern too well to ignore it, so I prefer to follow this middle-ground approach if you don't mind :)
v3 with the refactoring is posted at
https://lore.kernel.org/patchwork/project/lkml/list/?series=509230