A small bundle in a sake of checkpoint/restore
cover A small bundle in a sake of checkpoint/restore
Hi,
this series introduce a few changes we need for checkpoint, restore procedures. Mostly harmless I think, but complains and comments are really appreciated. My main concern is new prctl codes.
Thanks,
Cyrill
RFC 1/3 fs, proc: Add start_data, end_data, start_brk members to /proc/$pid/stat
It helps to dump and restore this mm_struct members.
--- fs/proc/array.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/proc/array.c +5 -2
@@ -464,7 +464,7 @@ static int do_task_stat(struct seq_file seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \ %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \ -%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n", +%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld %lu %lu %lu\n", pid_nr_ns(pid, ns), tcomm, state,
@@ -511,7 +511,10 @@ static int do_task_stat(struct seq_file task->policy, (unsigned long long )delayacct_blkio_ticks (task),cputime_to_clock_t (gtime), - cputime_to_clock_t(cgtime)); +cputime_to_clock_t (cgtime), + mm ? (permitted ? mm->start_data :1 ) :0 , + mm ? (permitted ? mm->end_data :1 ) :0 , + mm ? (permitted ? mm->start_brk : 1) : 0);if (mm)mmput (mm);return 0 ;
Re: [rfc 1/3] fs, proc: Add start_data, end_data, start_brk members to /proc/$pid/stat
Quoted 22 lines · Cyrill Gorcunov
It helps to dump and restore this
mm_structmembers.Signed-off-by Cyrill Gorcunov <[email protected]>--- fs/proc/array.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)Index:
linux-2.6.git/fs/proc/array.c
===================================================================fs/proc/array.c +1
-1@@ -464,7 +464,7 @@ static int do_task_stat(struct seq_file seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \ %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \ -%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n", +%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld %lu %lu %lu\n", pid_nr_ns(pid, ns), tcomm, state,@@ -511,7 +511,10 @@ static int do_task_stat(struct seq_file task->policy,
fs/proc/array.c static int do_task_stat(struct seq_file · line 520
Quoted 10 lines
fs/proc/array.c +4
-1(unsigned long long )delayacct_blkio_ticks (task),cputime_to_clock_t (gtime), - cputime_to_clock_t(cgtime)); +cputime_to_clock_t (cgtime), + mm ? (permitted ? mm->start_data :1 ) :0 , + mm ? (permitted ? mm->end_data :1 ) :0 , + mm ? (permitted ? mm->start_brk : 1) : 0);if (mm)mmput (mm);return 0 ;
Thanks for using "permitted" here. :)
Signature · 1 line
Kees Cook
Re: [rfc 1/3] fs, proc: Add start_data, end_data, start_brk members to /proc/$pid/stat
Quoted 27 lines · Kees Cook
Quoted 26 lines · Cyrill Gorcunov
It helps to dump and restore this
mm_structmembers.Signed-off-by Cyrill Gorcunov <[email protected]>--- fs/proc/array.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)Index:
linux-2.6.git/fs/proc/array.c
===================================================================fs/proc/array.c +2
-2@@ -464,7 +464,7 @@ static int do_task_stat(struct seq_file seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \ %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \ -%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n", +%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld %lu %lu %lu\n", pid_nr_ns(pid, ns), tcomm, state,@@ -511,7 +511,10 @@ static int do_task_stat(struct seq_file task->policy, (unsigned long long )delayacct_blkio_ticks (task),cputime_to_clock_t (gtime), - cputime_to_clock_t(cgtime)); + cputime_to_clock_t(cgtime),
Quoted 8 lines
fs/proc/array.c static int do_task_stat(struct seq_file · line 520
Quoted 6 lines
fs/proc/array.c +3
-0+ mm ? (permitted ? mm->start_data :1 ) :0 , + mm ? (permitted ? mm->end_data :1 ) :0 , + mm ? (permitted ? mm->start_brk : 1) : 0);if (mm)mmput (mm);return 0 ;Thanks for using "permitted" here. :)
And these are new fields, so "1" hack is unnecessary.
Re: [rfc 1/3] fs, proc: Add start_data, end_data, start_brk members to /proc/$pid/stat
Quoted 10 lines · Alexey Dobriyan
Quoted 9 lines
fs/proc/array.c static int do_task_stat(struct seq_file · line 520
Quoted 7 lines
fs/proc/array.c +4
-0+cputime_to_clock_t (cgtime), + mm ? (permitted ? mm->start_data :1 ) :0 , + mm ? (permitted ? mm->end_data :1 ) :0 , + mm ? (permitted ? mm->start_brk : 1) : 0);if (mm)mmput (mm);return 0 ;Thanks for using "permitted" here. :)
Quoted 2 lines
And these are new fields, so "1" hack is unnecessary.
I perhaps miss some history here, you mean just print 0 instead of 1, right?
Cyrill
Re: [rfc 1/3] fs, proc: Add start_data, end_data, start_brk members to /proc/$pid/stat
Quoted 9 lines · Cyrill Gorcunov
Quoted 8 lines · Alexey Dobriyan
Quoted 8 lines
Quoted 7 lines
+
cputime_to_clock_t(cgtime),
+ mm ? (permitted ?mm->start_data: 1) : 0,
+ mm ? (permitted ?mm->end_data: 1) : 0,
+ mm ? (permitted ?mm->start_brk: 1) : 0); if (mm)
mmput(mm);
return 0;
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Thanks for using "permitted" here. :)
And these are new fields, so "1" hack is unnecessary.
I perhaps miss some history here, you mean just print 0 instead of 1, right?
The history is that when "0" is seen for start_code, tools like "ps" assumed the process was a kernel thread, so "1" was used as a hack to not break userspace reporting. So yeah, since this is a new field, it's fine to just do:
+ (mm && permitted) ? mm->start_data : 0, + (mm && permitted) ? mm->end_data : 0, + (mm && permitted) ? mm->start_brk : 0,
-Kees
Signature · 2 lines
Kees Cook ChromeOS Security
Re: [rfc 1/3] fs, proc: Add start_data, end_data, start_brk members to /proc/$pid/stat
Review
Quoted 13 lines · Kees Cook
Quoted 3 lines
I perhaps miss some history here, you mean just print 0 instead of 1, right?
The history is that when "0" is seen for
start_code, tools like "ps" assumed the process was a kernel thread, so "1" was used as a hack to not break userspace reporting. So yeah, since this is a new field, it's fine to just do:(quoted diff) +3
-0+ (mm && permitted) ? mm->start_data : 0, + (mm && permitted) ? mm->end_data : 0, + (mm && permitted) ? mm->start_brk : 0,
Yup, thanks a lot Kees, I'll update.
Cyrill
Re: [rfc 1/3] fs, proc: Add start_data, end_data, start_brk members to /proc/$pid/stat
In reply to Cyrill GorcunovQuoted 3 lines · Cyrill Gorcunov
It helps to dump and restore this
mm_structmembers.Signed-off-by Cyrill Gorcunov<[email protected]>
Quoted 30 lines
--- fs/proc/array.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)Index:
linux-2.6.git/fs/proc/array.c
===================================================================fs/proc/array.c +5
-2@@ -464,7 +464,7 @@ static int do_task_stat(struct seq_file seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \ %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \ -%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n", +%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld %lu %lu %lu\n", pid_nr_ns(pid, ns), tcomm, state,@@ -511,7 +511,10 @@ static int do_task_stat(struct seq_file task->policy, (unsigned long long )delayacct_blkio_ticks (task),cputime_to_clock_t (gtime), - cputime_to_clock_t(cgtime)); +cputime_to_clock_t (cgtime), + mm ? (permitted ? mm->start_data :1 ) :0 , + mm ? (permitted ? mm->end_data :1 ) :0 , + mm ? (permitted ? mm->start_brk : 1) : 0);if (mm)mmput (mm);return 0 ;
Re: [rfc 1/3] fs, proc: Add start_data, end_data, start_brk members to /proc/$pid/stat
In reply to Cyrill GorcunovQuoted 3 lines · On Tue, 29 Nov 2011 23:12:53 +0400 Cyrill Gorcunov <[email protected]> wrote:
It helps to dump and restore this
mm_structmembers.Signed-off-by Cyrill Gorcunov <[email protected]>
RFC 2/3 fs, proc: Introduce the Children: line in /proc/<pid>/status
In reply to Cyrill GorcunovFrom: Pavel Emelyanov <[email protected]>
There is no easy way to make a reverse parent->children chain from the task status, in turn children->parent provided with "PPid" field.
So instead of walking over all pids in system to figure out what children the task have -- we add explicit "Children" member to /proc/<pid>/status since kernel already knows this kind of information but it was not yet exported.
--- fs/proc/array.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
fs/proc/array.c +14 -0
@@ -158,6 +158,18 @@ static inline const char *get_task_state(struct task_struct *tsk)return *p; } +static void task_children (struct seq_file *m,struct task_struct *p,struct pid_namespace *ns) +{ +struct task_struct *c; + +seq_printf (m,"Children:" ); +read_lock (&tasklist_lock); +list_for_each_entry (c, &p->children, sibling) +seq_printf (m," %d" ,pid_nr_ns (task_pid (c), ns)); +read_unlock (&tasklist_lock); +seq_putc (m,'\n' ); +} +static inline void task_state (struct seq_file *m,struct pid_namespace *ns,struct pid *pid,struct task_struct *p) {
@@ -192,6 +204,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, cred->uid, cred->euid, cred->suid, cred->fsuid, cred->gid, cred->egid, cred->sgid, cred->fsgid); +task_children (m, p, ns); +task_lock (p);if (p->files) fdt =files_fdtable (p->files);
Signature · 1 line
1.7.7.3
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 6 lines · On Tue, 29 Nov 2011 23:12:54 +0400 Cyrill Gorcunov <[email protected]> wrote:
From: Pavel Emelyanov <[email protected]>
There is no easy way to make a reverse
parent->childrenchain from the task status, in turnchildren->parentprovided with "PPid" field.
Quoted 8 lines
So instead of walking over all pids in system to figure out what children the task have -- we add explicit "Children" member to /proc/<pid>/status since kernel already knows this kind of information but it was not yet exported.
Signed-off-by Pavel Emelyanov <[email protected]>Acked-by Serge Hallyn <[email protected]>Signed-off-by Cyrill Gorcunov <[email protected]>
I may be too pessimistic but what amount of overhead will this add to ps -elf/ top ? Assuming an environment 'ps -elf' is called once per a sec, if there are 2000 processes, task_list lock is taken 2000 times by this patch.
Isn't it better to add /proc/<pid>/children file or dir (as task)?
Thanks,
-Kame
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 14 lines · KAMEZAWA Hiroyuki
Quoted 11 lines · On Tue, 29 Nov 2011 23:12:54 +0400 Cyrill Gorcunov <[email protected]> wrote:
From: Pavel Emelyanov <[email protected]>
There is no easy way to make a reverse
parent->childrenchain from the task status, in turnchildren->parentprovided with "PPid" field.So instead of walking over all pids in system to figure out what children the task have -- we add explicit "Children" member to /proc/<pid>/status since kernel already knows this kind of information but it was not yet exported.
Quoted 8 lines
Quoted 3 lines
Signed-off-by Pavel Emelyanov <[email protected]>Acked-by Serge Hallyn <[email protected]>Signed-off-by Cyrill Gorcunov <[email protected]>I may be too pessimistic but what amount of overhead will this add to ps -elf/ top ? Assuming an environment 'ps -elf' is called once per a sec, if there are 2000 processes,
task_listlock is taken 2000 times by this patch.
Hi Kame, good point! Yes, it introduces latency on high loaded systems. I must admit I tested this patch on a regular system, where not that much processes were launched but technically I think more correct would be to switch to children file. I'll tune up the patch. Thanks!
Quoted 5 lines
Isn't it better to add /proc/<pid>/children file or dir (as task)?
Thanks,
-Kame
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 24 lines · Cyrill Gorcunov
Quoted 14 lines · KAMEZAWA Hiroyuki
Quoted 11 lines · On Tue, 29 Nov 2011 23:12:54 +0400 Cyrill Gorcunov <[email protected]> wrote:
From: Pavel Emelyanov <[email protected]>
There is no easy way to make a reverse
parent->childrenchain from the task status, in turnchildren->parentprovided with "PPid" field.So instead of walking over all pids in system to figure out what children the task have -- we add explicit "Children" member to /proc/<pid>/status since kernel already knows this kind of information but it was not yet exported.
Quoted 8 lines
Quoted 3 lines
Signed-off-by Pavel Emelyanov <[email protected]>Acked-by Serge Hallyn <[email protected]>Signed-off-by Cyrill Gorcunov <[email protected]>I may be too pessimistic but what amount of overhead will this add to ps -elf/ top ? Assuming an environment 'ps -elf' is called once per a sec, if there are 2000 processes,
task_listlock is taken 2000 times by this patch.
Quoted 10 lines
Hi Kame, good point! Yes, it introduces latency on high loaded systems. I must admit I tested this patch on a regular system, where not that much processes were launched but technically I think more correct would be to switch to children file. I'll tune up the patch. Thanks!
Quoted 5 lines
Isn't it better to add /proc/<pid>/children file or dir (as task)?
Thanks,
-Kame
What about this one?
---
fs, proc: Introduce the /proc/<pid>/children entry
There is no easy way to make a reverse parent->children chain from the task status, in turn children->parent provided with "PPid" field.
So instead of walking over all pids in system to figure out what children the task have -- we add explicit /proc/<pid>/children entry, since kernel already knows this kind of information but it was not yet exported.
--- fs/proc/array.c | 14 ++++++++++++++ fs/proc/base.c | 1 + fs/proc/internal.h | 3 +++ 3 files changed, 18 insertions(+)
fs/proc/array.c +14 -0
@@ -547,3 +547,17 @@ int proc_pid_statm(struct seq_file *m, sreturn 0 ; } + +int proc_pid_children (struct seq_file *m,struct pid_namespace *ns, +struct pid *pid,struct task_struct *task) +{ +struct task_struct *c; + +read_lock (&tasklist_lock); +list_for_each_entry (c, &task->children, sibling) +seq_printf (m," %d" ,pid_nr_ns (task_pid (c), ns)); +read_unlock (&tasklist_lock); +seq_putc (m,'\n' ); + +return 0 ; +}
fs/proc/base.c +1 -0
@@ -3204,6 +3204,7 @@ static const struct pid_entry tgid_base_INF ("cmdline" ,S_IRUGO , proc_pid_cmdline),ONE ("stat" ,S_IRUGO , proc_tgid_stat),ONE ("statm" ,S_IRUGO , proc_pid_statm), +ONE ("children" ,S_IRUGO , proc_pid_children),REG ("maps" ,S_IRUGO , proc_maps_operations), #ifdef CONFIG_NUMA REG("numa_maps", S_IRUGO, proc_numa_maps_operations),
fs/proc/internal.h +3 -0
@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi struct pid *pid, struct task_struct *task);extern int proc_pid_statm (struct seq_file *m,struct pid_namespace *ns,struct pid *pid,struct task_struct *task); +extern int proc_pid_children (struct seq_file *m,struct pid_namespace *ns, +struct pid *pid,struct task_struct *task); +extern loff_t mem_lseek (struct file *file,loff_t offset,int orig);extern const struct file_operations proc_maps_operations;
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Hello, Cyrill.
Quoted 12 lines · Cyrill Gorcunov
Index:
linux-2.6.git/fs/proc/array.c
===================================================================fs/proc/array.c +4
-0@@ -547,3 +547,17 @@ int proc_pid_statm(struct seq_file *m, sreturn 0 ; } + +int proc_pid_children (struct seq_file *m,struct pid_namespace *ns, +struct pid *pid,struct task_struct *task) +{
fs/proc/array.c int proc_pid_statm(struct seq_file *m, s · line 563
Quoted 10 lines
fs/proc/array.c +10
-0+struct task_struct *c; + +read_lock (&tasklist_lock); +list_for_each_entry (c, &task->children, sibling) +seq_printf (m," %d" ,pid_nr_ns (task_pid (c), ns)); +read_unlock (&tasklist_lock); +seq_putc (m,'\n' ); + +return 0 ; +}
I don't think using non-seekable single seqfile is a good idea here. It works if the whole list fits in PAGE_SIZE but assuming five digit pid, that's only ~680 pids.
Thanks.
Signature · 1 line
tejun
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 10 lines · Tejun Heo
Quoted 10 lines
fs/proc/array.c +10
-0+ +int proc_pid_children (struct seq_file *m,struct pid_namespace *ns, +struct pid *pid,struct task_struct *task) +{ +struct task_struct *c; + +read_lock (&tasklist_lock); +list_for_each_entry (c, &task->children, sibling) +seq_printf (m," %d" ,pid_nr_ns (task_pid (c), ns)); +read_unlock (&tasklist_lock);
Quoted 9 lines
fs/proc/array.c int proc_pid_statm(struct seq_file *m, s · line 563
Quoted 4 lines
fs/proc/array.c +4
-0+seq_putc (m,'\n' ); + +return 0 ; +}I don't think using non-seekable single seqfile is a good idea here. It works if the whole list fits in
PAGE_SIZEbut assuming five digit pid, that's only ~680 pids.
Hi Tejun, indeed this is not pleasant limit, thanks for the point, I'll update! But other than this technical detail, I assume there is no objection from introducing such feature?
Cyrill
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Hello,
Quoted 3 lines · Cyrill Gorcunov
Hi Tejun, indeed this is not pleasant limit, thanks for the point, I'll update! But other than this technical detail, I assume there is no objection from introducing such feature?
Nope, I don't have any objection. Thanks.
Signature · 1 line
tejun
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
In reply to Cyrill Gorcunovfs/proc/array.c int proc_pid_statm(struct seq_file *m, s · line 563
Quoted 13 lines · On Thu, 1 Dec 2011 13:54:34 +0400 Cyrill Gorcunov <[email protected]> wrote:
fs/proc/array.c +13
-0+int proc_pid_children (struct seq_file *m,struct pid_namespace *ns, +struct pid *pid,struct task_struct *task) +{ +struct task_struct *c; + +read_lock (&tasklist_lock); +list_for_each_entry (c, &task->children, sibling) +seq_printf (m," %d" ,pid_nr_ns (task_pid (c), ns)); +read_unlock (&tasklist_lock); +seq_putc (m,'\n' ); + +return 0 ; +}
That's a potentially very long hold time for tasklist_lock, and userspace can invoke this at a high frequency. Not good.
I think this can all be done under rcu_read_lock() with list_for_each_entry_rcu().
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 7 lines · Andrew Morton
That's a potentially very long hold time for
tasklist_lock, and userspace can invoke this at a high frequency. Not good.I think this can all be done under
rcu_read_lock()withlist_for_each_entry_rcu().
Yeah, good point, thanks Andrew!
Cyrill
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
In reply to Cyrill GorcunovQuoted 49 lines · On Thu, 1 Dec 2011 13:54:34 +0400 Cyrill Gorcunov <[email protected]> wrote:
Quoted 24 lines · Cyrill Gorcunov
Quoted 14 lines · KAMEZAWA Hiroyuki
Quoted 11 lines · On Tue, 29 Nov 2011 23:12:54 +0400 Cyrill Gorcunov <[email protected]> wrote:
From: Pavel Emelyanov <[email protected]>
There is no easy way to make a reverse
parent->childrenchain from the task status, in turnchildren->parentprovided with "PPid" field.So instead of walking over all pids in system to figure out what children the task have -- we add explicit "Children" member to /proc/<pid>/status since kernel already knows this kind of information but it was not yet exported.
Quoted 8 lines
Quoted 3 lines
Signed-off-by Pavel Emelyanov <[email protected]>Acked-by Serge Hallyn <[email protected]>Signed-off-by Cyrill Gorcunov <[email protected]>I may be too pessimistic but what amount of overhead will this add to ps -elf/ top ? Assuming an environment 'ps -elf' is called once per a sec, if there are 2000 processes,
task_listlock is taken 2000 times by this patch.Quoted 10 lines
Hi Kame, good point! Yes, it introduces latency on high loaded systems. I must admit I tested this patch on a regular system, where not that much processes were launched but technically I think more correct would be to switch to children file. I'll tune up the patch. Thanks!
Quoted 5 lines
Isn't it better to add /proc/<pid>/children file or dir (as task)?
Thanks,
-KameWhat about this one?
---
fs, proc: Introduce the /proc/<pid>/children entryThere is no easy way to make a reverse
parent->childrenchain from the task status, in turnchildren->parentprovided with "PPid" field.So instead of walking over all pids in system to figure out what children the task have -- we add explicit /proc/<pid>/children entry, since kernel already knows this kind of information but it was not yet exported.
Quoted 4 lines
Signed-off-by Cyrill Gorcunov <[email protected]>Cc Pavel Emelyanov <[email protected]>Cc Serge Hallyn <[email protected]>Cc KAMEZAWA Hiroyuki <[email protected]>
Yes, I like /children file. other points seems to be pointed out by other reviewers.
Thanks,
-Kame
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 13 lines · KAMEZAWA Hiroyuki
Quoted 13 lines
What about this one?
---
fs, proc: Introduce the /proc/<pid>/children entryThere is no easy way to make a reverse
parent->childrenchain from the task status, in turnchildren->parentprovided with "PPid" field.So instead of walking over all pids in system to figure out what children the task have -- we add explicit /proc/<pid>/children entry, since kernel already knows this kind of information but it was not yet exported.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Cyrill Gorcunov <[email protected]>Cc Pavel Emelyanov <[email protected]>Cc Serge Hallyn <[email protected]>Cc KAMEZAWA Hiroyuki <[email protected]>Yes, I like /children file. other points seems to be pointed out by other reviewers.
Any reason this is a file instead of a directory like /proc/PID/task/ ?
$ sudo ls /proc/8167/task/ 8167 854 855 856 857 858 859 $ sudo ls /proc/8167/task/855/ attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscall
Much easier to follow the chain from the command line this way.
Signature · 1 line
Pedro Alves
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 24 lines · Pedro Alves
Quoted 13 lines · KAMEZAWA Hiroyuki
Quoted 13 lines
What about this one?
---
fs, proc: Introduce the /proc/<pid>/children entryThere is no easy way to make a reverse
parent->childrenchain from the task status, in turnchildren->parentprovided with "PPid" field.So instead of walking over all pids in system to figure out what children the task have -- we add explicit /proc/<pid>/children entry, since kernel already knows this kind of information but it was not yet exported.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Cyrill Gorcunov <[email protected]>Cc Pavel Emelyanov <[email protected]>Cc Serge Hallyn <[email protected]>Cc KAMEZAWA Hiroyuki <[email protected]>Yes, I like /children file. other points seems to be pointed out by other reviewers.
Any reason this is a file instead of a directory like
/proc/PID/task/?
Quoted 8 lines
$ sudo ls /proc/8167/task/ 8167 854 855 856 857 858 859 $ sudo ls /proc/8167/task/855/ attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscallMuch easier to follow the chain from the command line this way.
What do you propose to put into these directories? Another directories named with children pid-s?
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
On Fri, Dec 02, 2011 at 04:43:10PM +0400, Pavel Emelyanov wrote:
...
Quoted 13 lines
Quoted 13 lines
Quoted 3 lines
Yes, I like /children file. other points seems to be pointed out by other reviewers.
Any reason this is a file instead of a directory like
/proc/PID/task/?$ sudo ls /proc/8167/task/ 8167 854 855 856 857 858 859 $ sudo ls /proc/8167/task/855/ attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscall
Quoted 5 lines
Quoted 1 line
Much easier to follow the chain from the command line this way.
What do you propose to put into these directories? Another directories named with children pid-s?
Yes, I suppose additional directory/links and whatever would be just noneeded overhead.
Cyrill
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 15 lines · Cyrill Gorcunov
On Fri, Dec 02, 2011 at 04:43:10PM +0400, Pavel Emelyanov wrote:
...Quoted 13 lines
Quoted 13 lines
Quoted 3 lines
Yes, I like /children file. other points seems to be pointed out by other reviewers.
Any reason this is a file instead of a directory like
/proc/PID/task/?$ sudo ls /proc/8167/task/ 8167 854 855 856 857 858 859 $ sudo ls /proc/8167/task/855/ attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscall
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Much easier to follow the chain from the command line this way.
What do you propose to put into these directories? Another directories named with children pid-s?
Yes, I suppose additional directory/links and whatever would be just noneeded overhead.
/proc/8167/task/ being a directory could also be claimed "noneeded overhead", yet it exists, and is very useful (I use it a lot). Why diverge instead of being consistent?
(Note that listing /proc only shows thread group ids, but you can still open /proc/THREAD-ID/, so a /proc/PID/task file with lists of pids would have been "good enough".)
Signature · 1 line
Pedro Alves
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 22 lines · Pedro Alves
Quoted 21 lines · Cyrill Gorcunov
On Fri, Dec 02, 2011 at 04:43:10PM +0400, Pavel Emelyanov wrote:
...Quoted 18 lines
Quoted 6 lines
Quoted 3 lines
Yes, I like /children file. other points seems to be pointed out by other reviewers.
Any reason this is a file instead of a directory like
/proc/PID/task/?Quoted 8 lines
$ sudo ls /proc/8167/task/ 8167 854 855 856 857 858 859 $ sudo ls /proc/8167/task/855/ attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscallMuch easier to follow the chain from the command line this way.
What do you propose to put into these directories? Another directories named with children pid-s?
Quoted 6 lines
Quoted 2 lines
Yes, I suppose additional directory/links and whatever would be just noneeded overhead.
/proc/8167/task/being a directory could also be claimed "noneeded overhead", yet it exists, and is very useful (I use it a lot). Why diverge instead of being consistent?
Guess I should give an example. Here's one. While debugging gdb stuff, I often do:
$ cat /proc/8167/task/*/status | grep State State: S (sleeping) State: S (sleeping) State: S (sleeping) State: S (sleeping) State: S (sleeping) State: S (sleeping) State: S (sleeping)
If children were a directory (or "child", for consistency with singular "task"), you could do child things in the same natural way, like for instance:
$ ls -als /proc/8167/child/*/exe
It's like interactive pstree...
Quoted 3 lines
(Note that listing /proc only shows thread group ids, but you can still open
/proc/THREAD-ID/, so a/proc/PID/taskfile with lists of pids would have been "good enough".)
Signature · 1 line
Pedro Alves
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
In reply to Pavel EmelyanovQuoted 12 lines · Pavel Emelyanov
Quoted 12 lines
Quoted 2 lines
Yes, I like /children file. other points seems to be pointed out by other reviewers.
Any reason this is a file instead of a directory like
/proc/PID/task/?$ sudo ls /proc/8167/task/ 8167 854 855 856 857 858 859 $ sudo ls /proc/8167/task/855/ attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscall
Quoted 4 lines
Quoted 1 line
Much easier to follow the chain from the command line this way.
What do you propose to put into these directories? Another directories named with children pid-s?
Yes, just like the task/ dir gives you directories named with the processes's thread ids. Opening /proc/PID/children/PID-CHILD1/ would get you the same as opening /proc/PID-CHILD1/. Just like
opening /proc/PID/task/PID-CHILD1/ gets you (almost) the same as opening /proc/PID-CHILD1/.
Signature · 1 line
Pedro Alves
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 16 lines · Pedro Alves
Quoted 14 lines · Pavel Emelyanov
Quoted 13 lines
Quoted 2 lines
Yes, I like /children file. other points seems to be pointed out by other reviewers.
Any reason this is a file instead of a directory like
/proc/PID/task/?$ sudo ls /proc/8167/task/ 8167 854 855 856 857 858 859 $ sudo ls /proc/8167/task/855/ attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscallMuch easier to follow the chain from the command line this way.
Quoted 8 lines
Quoted 2 lines
What do you propose to put into these directories? Another directories named with children pid-s?
Yes, just like the task/ dir gives you directories named with the processes's thread ids. Opening
/proc/PID/children/PID-CHILD1/would get you the same as opening/proc/PID-CHILD1/. Just like
opening/proc/PID/task/PID-CHILD1/gets you (almost) the same as opening/proc/PID-CHILD1/.
You cannot make the dentry named /proc/<pid1>/children/<pid2> be a hardlink on the /proc/<pid2>. Thus you have to make arbitrary amount of inodes to point to a single task. This brings unnecessary complexity and memory usage (by dentries and proc inodes).
I'd accept the symbolic links, but how would they look like? Like this:
# ls -l /proc/123/children
234 -> ../../234
?Thanks,
Pavel
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 26 lines · Pavel Emelyanov
Quoted 16 lines · Pedro Alves
Quoted 14 lines · Pavel Emelyanov
Quoted 13 lines
Quoted 2 lines
Yes, I like /children file. other points seems to be pointed out by other reviewers.
Any reason this is a file instead of a directory like
/proc/PID/task/?$ sudo ls /proc/8167/task/ 8167 854 855 856 857 858 859 $ sudo ls /proc/8167/task/855/ attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscallMuch easier to follow the chain from the command line this way.
Quoted 8 lines
Quoted 2 lines
What do you propose to put into these directories? Another directories named with children pid-s?
Yes, just like the task/ dir gives you directories named with the processes's thread ids. Opening
/proc/PID/children/PID-CHILD1/would get you the same as opening/proc/PID-CHILD1/. Just like
opening/proc/PID/task/PID-CHILD1/gets you (almost) the same as opening/proc/PID-CHILD1/.
Quoted 4 lines
You cannot make the dentry named /proc/<pid1>/children/<pid2> be a hardlink on the /proc/<pid2>. Thus you have to make arbitrary amount of inodes to point to a single task. This brings unnecessary complexity and memory usage (by dentries and proc inodes).
How is this different from the _already existing_ /proc/<pid1>/task/ directory? I can imagine that 98% of the code would be shared even? It's "just" a matter of listing thread group children (child/), instead of clone children (task/), isn't it?
They are not symbolic links under task/. /proc/<pid1>/task/<pid2>/ does not have a task/ subdir, only /proc/<pid1>/ does, I guess to avoid the memory usage issue you raise.
Quoted 4 lines
I'd accept the symbolic links, but how would they look like? Like this:
# ls -l /proc/123/children 234 -> ../../234 ?
That'd work for me... but really, why not reuse tasks/'s code and behave the same?
Signature · 1 line
Pedro Alves
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 27 lines · Pedro Alves
Quoted 26 lines · Pavel Emelyanov
Quoted 24 lines · Pedro Alves
Quoted 12 lines · Pavel Emelyanov
Quoted 12 lines
Quoted 2 lines
Yes, I like /children file. other points seems to be pointed out by other reviewers.
Any reason this is a file instead of a directory like
/proc/PID/task/?$ sudo ls /proc/8167/task/ 8167 854 855 856 857 858 859 $ sudo ls /proc/8167/task/855/ attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscallQuoted 4 lines
Quoted 1 line
Much easier to follow the chain from the command line this way.
What do you propose to put into these directories? Another directories named with children pid-s?
Yes, just like the task/ dir gives you directories named with the processes's thread ids. Opening
/proc/PID/children/PID-CHILD1/would get you the same as opening/proc/PID-CHILD1/. Just like
opening/proc/PID/task/PID-CHILD1/gets you (almost) the same as opening/proc/PID-CHILD1/.
Quoted 6 lines
Quoted 4 lines
You cannot make the dentry named /proc/<pid1>/children/<pid2> be a hardlink on the /proc/<pid2>. Thus you have to make arbitrary amount of inodes to point to a single task. This brings unnecessary complexity and memory usage (by dentries and proc inodes).
How is this different from the
_alreadyexisting_/proc/<pid1>/task/ directory?
Those living in /proc/<pid1>/task do not live in /proc. At all. This explains everything below.
Quoted 8 lines
I can imagine that 98% of the code would be shared even? It's "just" a matter of listing thread group children (child/), instead of clone children (task/), isn't it?
They are not symbolic links under task/. /proc/<pid1>/task/<pid2>/ does not have a task/ subdir, only /proc/<pid1>/ does, I guess to avoid the memory usage issue you raise.
Quoted 7 lines
Quoted 4 lines
I'd accept the symbolic links, but how would they look like? Like this:
# ls -l /proc/123/children 234 -> ../../234 ?That'd work for me... but really, why not reuse tasks/'s code and behave the same?
Why wouldn't /proc/<pid>/children work for you? This is as simple as
# ls -l $(cat /proc/<pid>/children)
:)
Thanks,
Pavel
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 33 lines · Pavel Emelyanov
Quoted 32 lines · Pedro Alves
Quoted 30 lines · Pavel Emelyanov
Quoted 16 lines · Pedro Alves
Quoted 14 lines · Pavel Emelyanov
Quoted 13 lines
Quoted 2 lines
Yes, I like /children file. other points seems to be pointed out by other reviewers.
Any reason this is a file instead of a directory like
/proc/PID/task/?$ sudo ls /proc/8167/task/ 8167 854 855 856 857 858 859 $ sudo ls /proc/8167/task/855/ attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscallMuch easier to follow the chain from the command line this way.
Quoted 8 lines
Quoted 2 lines
What do you propose to put into these directories? Another directories named with children pid-s?
Yes, just like the task/ dir gives you directories named with the processes's thread ids. Opening
/proc/PID/children/PID-CHILD1/would get you the same as opening/proc/PID-CHILD1/. Just like
opening/proc/PID/task/PID-CHILD1/gets you (almost) the same as opening/proc/PID-CHILD1/.You cannot make the dentry named /proc/<pid1>/children/<pid2> be a hardlink on the /proc/<pid2>. Thus you have to make arbitrary amount of inodes to point to a single task. This brings unnecessary complexity and memory usage (by dentries and proc inodes).
Quoted 4 lines
Quoted 1 line
How is this different from the
_alreadyexisting_/proc/<pid1>/task/ directory?Those living in /proc/<pid1>/task do not live in /proc. At all. This explains everything below.
Well, except they do, and it doesn't. The're not visible when listing /proc/, but they're there. Try it.
$ls /proc/ | grep 854
(empty)
$ ls /proc/8167/task/854 attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscall
$ls /proc/854/
attr cgroup comm cwd fd latency maps mounts numa_maps oom_score_adj root sessionid stat syscall autogroup clear_refs coredump_filter environ fdinfo limits mem mountstats oom_adj pagemap sched smaps statm task auxv cmdline cpuset exe io loginuid mountinfo net oom_score personality schedstat stack status wchan
Signature · 1 line
Pedro Alves
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 28 lines
Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 5 lines
Yes, just like the task/ dir gives you directories named with the processes's thread ids. Opening
/proc/PID/children/PID-CHILD1/would get you the same as opening/proc/PID-CHILD1/. Just like
opening/proc/PID/task/PID-CHILD1/gets you (almost) the same as opening/proc/PID-CHILD1/.You cannot make the dentry named /proc/<pid1>/children/<pid2> be a hardlink on the /proc/<pid2>. Thus you have to make arbitrary amount of inodes to point to a single task. This brings unnecessary complexity and memory usage (by dentries and proc inodes).
Quoted 4 lines
Quoted 1 line
How is this different from the
_alreadyexisting_/proc/<pid1>/task/ directory?Those living in /proc/<pid1>/task do not live in /proc. At all. This explains everything below.
Well, except they do, and it doesn't. The're not visible when listing
/proc/, but they're there. Try it.$ls
/proc/| grep 854(empty)
$ ls /proc/8167/task/854 attr clear_refs cpuset exe io loginuid mountinfo oom_adj pagemap sched smaps statm wchan auxv cmdline cwd fd latency maps mounts oom_score personality schedstat stack status cgroup comm environ fdinfo limits mem numa_maps oom_score_adj root sessionid stat syscall
Quoted 5 lines
$ls
/proc/854/attr cgroup comm cwd fd latency maps mounts numa_maps oom_score_adj root sessionid stat syscall autogroup clear_refs coredump_filter environ fdinfo limits mem mountstats oom_adj pagemap sched smaps statm task auxv cmdline cpuset exe io loginuid mountinfo net oom_score personality schedstat stack status wchan
O_O OK, I was wrong, they do live there. But I consider this as bug.
Anyway -- my concern about unneeded memory overhead still stands. Even a simple find /proc will result in smth like
/proc/1/proc/1/children/2/proc/1/children/2/children/4/proc/1/children/3/proc/1/children/3/children/5/proc/2/proc/2/children/4/proc/3/proc/3/children/5/proc/4/proc/5
Instead of
/proc/1/proc/2/proc/3/proc/4/proc/5
I.e. each task will be shown multiple times, which is not very fun, but memory exhaustive from my POV.
Thanks,
Pavel
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 1 line · Pavel Emelyanov
O_OOK, I was wrong, they do live there. But I consider this as bug.
You can't change that. It'd break current gdb at least.
Quoted 18 lines
Anyway -- my concern about unneeded memory overhead still stands. Even a simple find /proc will result in smth like
/proc/1/proc/1/children/2/proc/1/children/2/children/4/proc/1/children/2/children/4/proc/1/children/3/proc/1/children/3/children/5/proc/2/proc/2/children/4/proc/3/proc/3/children/5/proc/4/proc/5Instead of
Quoted 7 lines
/proc/1/proc/2/proc/3/proc/4/proc/5I.e. each task will be shown multiple times, which is not very fun, but memory exhaustive from my POV.
Now that is a good argument against hard linking. But not if you make the entries under children/ symlinks. Then find doesn't recurse. And then
$ find -L /proc/PID/
does recurse and give you the whole tree. Which I'd say is actually useful...
Signature · 1 line
Pedro Alves
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 5 lines · Pedro Alves
Quoted 1 line · Pavel Emelyanov
O_OOK, I was wrong, they do live there. But I consider this as bug.You can't change that. It'd break current gdb at least.
OMG!
Quoted 10 lines
Quoted 1 line
I.e. each task will be shown multiple times, which is not very fun, but memory exhaustive from my POV.
Now that is a good argument against hard linking. But not if you make the entries under children/ symlinks. Then find doesn't recurse. And then
$ find -L /proc/PID/does recurse and give you the whole tree. Which I'd say is actually useful...
It is useful, but the /proc/pid/children file solves the same problem in a much more simple way. The memory usage by proc (one file vs one dir and a set of files) is less and time to lookup a child is also less (read + lookup vs readdir + lookup (symlink itself) + lookup (symlink resolve)).
Yes, it doesn't allow you to have fun with find, but frankly, do you really need this? Even if we're talking about gdb -- reading /proc/pid/children is not harder and not easier than readdir-ing it.
IOW - what's the real benefit of a directory with symlinks against a file except for a fun?
Thanks,
Pavel
Re: [rfc 2/3] fs, proc: Introduce the Children: line in /proc/<pid>/status
Quoted 8 lines · Pavel Emelyanov
Quoted 5 lines · Pedro Alves
Quoted 1 line · Pavel Emelyanov
O_OOK, I was wrong, they do live there. But I consider this as bug.You can't change that. It'd break current gdb at least.
OMG!
You know, NPTL didn't exist on earlier kernels. This preserved backwards compatibility.
Quoted 16 lines
Quoted 10 lines
Quoted 1 line
I.e. each task will be shown multiple times, which is not very fun, but memory exhaustive from my POV.
Now that is a good argument against hard linking. But not if you make the entries under children/ symlinks. Then find doesn't recurse. And then
$ find -L /proc/PID/does recurse and give you the whole tree. Which I'd say is actually useful...
It is useful, but the
/proc/pid/childrenfile solves the same problem in a much more simple way. The memory usage by proc (one file vs one dir and a set of files) is less and time to lookup a child is also less (read + lookup vs readdir + lookup (symlink itself) + lookup (symlink resolve)).
Quoted 6 lines
Yes, it doesn't allow you to have fun with find, but frankly, do you really need this? Even if we're talking about gdb -- reading
/proc/pid/childrenis not harder and not easier than readdir-ing it.IOW - what's the real benefit of a directory with symlinks against a file except for a fun?
As I said on the first message, it's easier on the command line, likely for quick scripting too. And for consistency. gdb or whatever other software can of course do whatever programatically. But if I can't persuade you guys that's a good thing, fine.
Signature · 1 line
Pedro Alves
RFC 3/3 prctl: Add PR_SET_MM codes to tune up mm_struct entires
In reply to Cyrill GorcunovA few members of mm_struct such as start_code, end_code, start_data, end_data, start_stack, start_brk, brk provided by the kernel via /proc/$pid/stat and we use it at checkpoint time.
At restore time we need a mechanism to restore those values back and for this sake PR_SET_MM prctl code is introduced.
Note at moment this inteface is allowed for CAP_SYS_ADMIN only.
---
Actually I'm not sure if CAP_SYS_ADMIN restriction is really needed here. Opinions?
include/linux/prctl.h | 12 +++++++++++ kernel/sys.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+)
include/linux/prctl.h +12 -0
@@ -102,4 +102,16 @@#define PR_MCE_KILL_GET 34 +/* +* Tune up process memory map specifics. +*/ +#define PR_SET_MM 35 +# define PR_SET_MM_START_CODE 1 +# define PR_SET_MM_END_CODE 2 +# define PR_SET_MM_START_DATA 3 +# define PR_SET_MM_END_DATA 4 +# define PR_SET_MM_START_STACK 5 +# define PR_SET_MM_START_BRK 6 +# define PR_SET_MM_BRK 7 +#endif /* _LINUX_PRCTL_H */
kernel/sys.c +52 -0
58 lines not on this page · raw message
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
Quoted 5 lines · Cyrill Gorcunov
At restore time we need a mechanism to restore those values back and for this sake
PR_SET_MMprctl code is introduced.Note at moment this inteface is allowed for
CAP_SYS_ADMINonly.
NAK from me; this needs more bounds checking. Though, yes, it absolutely must be a privileged action since this is potentially very dangerous. Can we invent something stronger than CAP_SYS_ADMIN? ;)
Quoted 13 lines
kernel/sys.c +9
-0@@ -1841,6 +1841,58 @@ SYSCALL_DEFINE5(prctl, int, option, unsielse error =PR_MCE_KILL_DEFAULT ;break ; +case PR_SET_MM : { +struct mm_struct *mm; +struct vm_area_struct *vma; + +if (arg4 | arg5) +return -EINVAL ; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ;
kernel/sys.c SYSCALL_DEFINE5(prctl, int, option, unsi · line 1862
Quoted 10 lines
kernel/sys.c +10
-0+ + error = -ENOENT ; + mm =get_task_mm (current); +if (!mm) +return error; + +down_read (&mm->mmap_sem); + vma =find_vma (mm, arg3); +if (!vma) + goto out;
arg3 needs to be significantly more carefully validated. find_vma() doesn't say that vm_start <= addr, only that vm_end > addr. This effectively bypasses all the vma checks (mmap_min_addr, max process size, etc), with some pretty crazy side-effects, I think.
-Kees
Signature · 1 line
Kees Cook
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
Quoted 10 lines · Kees Cook
Quoted 5 lines · Cyrill Gorcunov
At restore time we need a mechanism to restore those values back and for this sake
PR_SET_MMprctl code is introduced.Note at moment this inteface is allowed for
CAP_SYS_ADMINonly.NAK from me; this needs more bounds checking. Though, yes, it absolutely must be a privileged action since this is potentially very dangerous. Can we invent something stronger than
CAP_SYS_ADMIN? ;)
Heh.
Quoted 21 lines
Quoted 21 lines
kernel/sys.c +16
-0@@ -1841,6 +1841,58 @@ SYSCALL_DEFINE5(prctl, int, option, unsielse error =PR_MCE_KILL_DEFAULT ;break ; +case PR_SET_MM : { +struct mm_struct *mm; +struct vm_area_struct *vma; + +if (arg4 | arg5) +return -EINVAL ; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + + error = -ENOENT ; + mm =get_task_mm (current); +if (!mm) +return error; + +down_read (&mm->mmap_sem);
Quoted 9 lines
kernel/sys.c SYSCALL_DEFINE5(prctl, int, option, unsi · line 1862
Quoted 3 lines
kernel/sys.c +3
-0+ vma =find_vma (mm, arg3); +if (!vma) + goto out;arg3 needs to be significantly more carefully validated.
find_vma()doesn't say thatvm_start<= addr, only thatvm_end> addr. This effectively bypasses all the vma checks (mmap_min_addr, max process size, etc), with some pretty crazy side-effects, I think.
Yes, I know it needs some more testing, but apart from vma bounds (yup, good point with find_vma, I'll fix) I thought about what else should be checked? I think VMA prototype should be checked to fit "code", "data" templates, ie code should be at least readable and execytable, but what about data and stack and brk, should stack be executable? That is the point where I've got a bit confused and though putting RFC out might be a good idea to collect opinions.
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
On Wed, Nov 30, 2011 at 12:29:51AM +0400, Cyrill Gorcunov wrote:
...
Quoted 7 lines
Quoted 6 lines
arg3 needs to be significantly more carefully validated.
find_vma()doesn't say thatvm_start<= addr, only thatvm_end> addr. This effectively bypasses all the vma checks (mmap_min_addr, max process size, etc), with some pretty crazy side-effects, I think.
Quoted 7 lines
Yes, I know it needs some more testing, but apart from vma bounds (yup, good point with
find_vma, I'll fix) I thought about what else should be checked? I think VMA prototype should be checked to fit "code", "data" templates, ie code should be at least readable and execytable, but what about data and stack and brk, should stack be executable? That is the point where I've got a bit confused and though putting RFC out might be a good idea to collect opinions.
On the other hands these fields are set up by elf hanlder code, which does mmap these areas, so we have to check that particular member belongs to existing VMA and never cross user-space area, and together with root-only approach would not it be enough? I'm sure missing something that is why I'm asking.
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
Quoted 17 lines · Cyrill Gorcunov
On Wed, Nov 30, 2011 at 12:29:51AM +0400, Cyrill Gorcunov wrote:
...Quoted 7 lines
Quoted 6 lines
arg3 needs to be significantly more carefully validated.
find_vma()doesn't say thatvm_start<= addr, only thatvm_end> addr. This effectively bypasses all the vma checks (mmap_min_addr, max process size, etc), with some pretty crazy side-effects, I think.Quoted 7 lines
Yes, I know it needs some more testing, but apart from vma bounds (yup, good point with
find_vma, I'll fix) I thought about what else should be checked? I think VMA prototype should be checked to fit "code", "data" templates, ie code should be at least readable and execytable, but what about data and stack and brk, should stack be executable? That is the point where I've got a bit confused and though putting RFC out might be a good idea to collect opinions.
Quoted 5 lines
On the other hands these fields are set up by elf hanlder code, which does mmap these areas, so we have to check that particular member belongs to existing VMA and never cross user-space area, and together with root-only approach would not it be enough? I'm sure missing something that is why I'm asking.
Right, if you verify that the addresses are actually inside valid userspace vmas, that is likely to be right, though there are probably other things I haven't thought of. The trouble is avoiding vdso, stack guard page, vsyscall, and anything else that isn't meant for the mm to have direct access to.
Signature · 2 lines
Kees Cook ChromeOS Security
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
Quoted 6 lines · Kees Cook
Right, if you verify that the addresses are actually inside valid userspace vmas, that is likely to be right, though there are probably other things I haven't thought of. The trouble is avoiding vdso, stack guard page, vsyscall, and anything else that isn't meant for the mm to have direct access to.
Yeah, these service area should not be messed up, I'll add such tests. Thanks a lot for comments, Kees!
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
In reply to Kees CookQuoted 7 lines · Kees Cook
Quoted 6 lines
On the other hands these fields are set up by elf hanlder code, which does mmap these areas, so we have to check that particular member belongs to existing VMA and never cross user-space area, and together with root-only approach would not it be enough? I'm sure missing something that is why I'm asking.
Quoted 6 lines
Right, if you verify that the addresses are actually inside valid userspace vmas, that is likely to be right, though there are probably other things I haven't thought of. The trouble is avoiding vdso, stack guard page, vsyscall, and anything else that isn't meant for the mm to have direct access to.
Hi Kees,
what about this one? Note that these mm_struct members don't affect kernel much (at least as far as I see, except maybe brk,start_brk and start_stack values), so I've added some sanity checks here, hope they would fit. Still main protection is root-only access only. The kernel itself uses vma_area::start/end members for overlows tests internally so I think even passing crazy data here won't crash the kernel itself. What do you think?
Cyrill
---
prctl: Add PR_SET_MM codes to tune up mm_struct entires v2
A few members of mm_struct such as start_code, end_code, start_data, end_data, start_stack, start_brk, brk provided by the kernel via /proc/$pid/stat and we use it at checkpoint time.
At restore time we need a mechanism to restore those values back and for this sake PR_SET_MM prctl code is introduced.
Note because of being a dangerous operation this inteface is allowed for CAP_SYS_ADMIN only.
v2:
- Add a check for vma start address, testing for vma ending address is not enough. From Kees Cook.
- Add some sanity tests for assigned addresses.
--- include/linux/prctl.h | 12 +++++ kernel/sys.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+)
include/linux/prctl.h +12 -0
@@ -102,4 +102,16 @@#define PR_MCE_KILL_GET 34 +/* +* Tune up process memory map specifics. +*/ +#define PR_SET_MM 35 +# define PR_SET_MM_START_CODE 1 +# define PR_SET_MM_END_CODE 2 +# define PR_SET_MM_START_DATA 3 +# define PR_SET_MM_END_DATA 4 +# define PR_SET_MM_START_STACK 5 +# define PR_SET_MM_START_BRK 6 +# define PR_SET_MM_BRK 7 +#endif /* _LINUX_PRCTL_H */
kernel/sys.c +118 -0
130 lines not on this page · raw message
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
Quoted 15 lines · Cyrill Gorcunov
Quoted 7 lines · Kees Cook
Quoted 6 lines
On the other hands these fields are set up by elf hanlder code, which does mmap these areas, so we have to check that particular member belongs to existing VMA and never cross user-space area, and together with root-only approach would not it be enough? I'm sure missing something that is why I'm asking.
Quoted 6 lines
Right, if you verify that the addresses are actually inside valid userspace vmas, that is likely to be right, though there are probably other things I haven't thought of. The trouble is avoiding vdso, stack guard page, vsyscall, and anything else that isn't meant for the mm to have direct access to.
Quoted 8 lines
Hi Kees,
what about this one? Note that these
mm_structmembers don't affect kernel much (at least as far as I see, except maybe brk,start_brk andstart_stackvalues), so I've added some sanity checks here, hope they would fit. Still main protection is root-only access only. The kernel itself uses vma_area::start/end members for overlows tests internally so I think even passing crazy data here won't crash the kernel itself.
Right, though besides just crashing the kernel, I'm trying to look at this from the perspective of a paranoid admin that doesn't even trust the root user. Is there some way this new interface could be used to provide the building blocks for gaining kernel execute control? (Imagine a system running with modules disabled, STRICT_DEVMEM enabled, etc.)
Quoted 1 line
What do you think?
This looks way better, yes. I have this feeling like these validations should be more centralized or tied to the mm code more directly to avoid drift, but I don't have any constructive suggestions unfortunately. Maybe other folks do?
kernel/sys.c SYSCALL_DEFINE1(umask, int, mask) · line 1734
Quoted 10 lines
+ switch (opt) {
+ casePR_SET_MM_START_CODE:
+ casePR_SET_MM_END_CODE:kernel/sys.c +7
-0+ + vm_req_flags = VM_READ | VM_EXEC; + vm_bad_flags = VM_WRITE | VM_MAYSHARE; + + if ((vma->vm_flags & vm_req_flags) != vm_req_flags || + (vma->vm_flags & vm_bad_flags)) + goto out;
Another random thought: given this very regular set of checks you're doing, perhaps the flags should be part of a data structure instead, just to reduce the size of this routine?
struct mm_flags {
int req_flags;
int bad_flags;
};
struct mm_flags opt_flags[] = {
...
{ VM_READ | VM_EXEC, VM_WRITE | VM_MAYSHARE }, /* PR_SET_MM_START_CODE */
{ VM_READ | VM_EXEC, VM_WRITE | VM_MAYSHARE }, /* PR_SET_MM_END_CODE */...
then do validation before the switch statement all in one place, and leave the switch for more programmatic checks?
-Kees
Signature · 2 lines
Kees Cook ChromeOS Security
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
On Wed, Nov 30, 2011 at 10:10:35AM -0800, Kees Cook wrote:
...
Quoted 10 lines
Quoted 9 lines
Hi Kees,
what about this one? Note that these
mm_structmembers don't affect kernel much (at least as far as I see, except maybe brk,start_brk andstart_stackvalues), so I've added some sanity checks here, hope they would fit. Still main protection is root-only access only. The kernel itself uses vma_area::start/end members for overlows tests internally so I think even passing crazy data here won't crash the kernel itself.
Quoted 7 lines
Right, though besides just crashing the kernel, I'm trying to look at this from the perspective of a paranoid admin that doesn't even trust the root user. Is there some way this new interface could be used to provide the building blocks for gaining kernel execute control? (Imagine a system running with modules disabled,
STRICT_DEVMEM
enabled, etc.)
Well, I don't see a way to use it for gaining some control execution at the moment but (!) kernel evolves and I fear one might forget about this new interface when he will be doing some tossing over this mm_struct members.
I though about adding some kind of mark to kernel log on first usage of this prctl codes (so if some crash happened for any reason, the log would point someone used this interface).
Quoted 7 lines
Quoted 1 line
What do you think?
This looks way better, yes. I have this feeling like these validations should be more centralized or tied to the mm code more directly to avoid drift, but I don't have any constructive suggestions unfortunately. Maybe other folks do?
Yeah, good point, but on the other hands have these tests in one place is easier to read I think.
Quoted 22 lines
kernel/sys.c SYSCALL_DEFINE1(umask, int, mask) · line 1734
Quoted 10 lines
+ switch (opt) {
+ casePR_SET_MM_START_CODE:
+ casePR_SET_MM_END_CODE:kernel/sys.c +7
-0+ + vm_req_flags = VM_READ | VM_EXEC; + vm_bad_flags = VM_WRITE | VM_MAYSHARE; + + if ((vma->vm_flags & vm_req_flags) != vm_req_flags || + (vma->vm_flags & vm_bad_flags)) + goto out;Another random thought: given this very regular set of checks you're doing, perhaps the flags should be part of a data structure instead, just to reduce the size of this routine?
struct
mm_flags{
intreq_flags;
intbad_flags;
};struct
mm_flagsopt_flags[] = {
...
Quoted 9 lines
{ VM_READ | VM_EXEC, VM_WRITE | VM_MAYSHARE }, /* PR_SET_MM_START_CODE */ { VM_READ | VM_EXEC, VM_WRITE | VM_MAYSHARE }, /* PR_SET_MM_END_CODE */...
then do validation before the switch statement all in one place, and leave the switch for more programmatic checks?
-Kees
Nod! I'll update, thanks!
Cyrill
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
On Wed, Nov 30, 2011 at 10:23:10PM +0400, Cyrill Gorcunov wrote:
...
Quoted 27 lines
Quoted 27 lines
kernel/sys.c SYSCALL_DEFINE1(umask, int, mask) · line 1734
Quoted 11 lines
+ switch (opt) {
+ casePR_SET_MM_START_CODE:
+ casePR_SET_MM_END_CODE:kernel/sys.c +7
-0+ + vm_req_flags = VM_READ | VM_EXEC; + vm_bad_flags = VM_WRITE | VM_MAYSHARE; + + if ((vma->vm_flags & vm_req_flags) != vm_req_flags || + (vma->vm_flags & vm_bad_flags)) + goto out;Another random thought: given this very regular set of checks you're doing, perhaps the flags should be part of a data structure instead, just to reduce the size of this routine?
struct
mm_flags{
intreq_flags;
intbad_flags;
};struct
mm_flagsopt_flags[] = {
...{ VM_READ | VM_EXEC, VM_WRITE | VM_MAYSHARE }, /* PR_SET_MM_START_CODE */ { VM_READ | VM_EXEC, VM_WRITE | VM_MAYSHARE }, /* PR_SET_MM_END_CODE */...
Quoted 8 lines
Quoted 5 lines
then do validation before the switch statement all in one place, and leave the switch for more programmatic checks?
-Kees
Nod! I'll update, thanks!
You know Kees, I tried it, and finally I think it's overheaded, so I prefer to stick with original version (no need to duplicate same data in two differen memory places as it'll be in case of arrays, and since the VM_ flags are constant the former code bloats kernel lesser. Thanks anyway!
Cyrill
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
On Thu, Dec 01, 2011 at 01:06:22AM +0400, Cyrill Gorcunov wrote:
...
Quoted 6 lines
You know Kees, I tried it, and finally I think it's overheaded, so I prefer to stick with original version (no need to duplicate same data in two differen memory places as it'll be in case of arrays, and since the
VM_flags are constant the former code bloats kernel lesser. Thanks anyway!
Ping. Kees, Andrew, are there some other objections I'm not yet addressed? I've updated changelog a bit more. Please review.
(Kame CC'ed)
Cyrill
---
From: Cyrill Gorcunov <[email protected]>
Subject: [PATCH] prctl: Add PR_SET_MM codes to tune up mm_struct entires v2
At process of task restoration we need a way to tune up a few members of mm_struct structure such as start_code, end_code, start_data, end_data, start_stack, start_brk, brk.
While most of them have a statistical nature (their values are involved into calculation of /proc/<pid>/statm output) the start_brk and brk values are used to compute an allowed size of program data segment expansion. Which means an arbitrary changes of this value might be a bit dangerous operation.
To restrict access to this facility the following requirements applied to prctl users:
- The process has to have CAP_SYS_ADMIN capability granted.
- For all opcodes except start_brk/brk members an appropriate VMA area must be existing and should fit certain VMA flags, such as:
- code segment must be executable but not writable;
- data segment must not be executable.
start_brk/brk values must not intersect with data segment and must not exceed RLIMIT_DATA resource limit.
Still the main guard is CAP_SYS_ADMIN capability check.
v2:
- Add a check for vma start address, testing for vma ending address is not enough. From Kees Cook.
- Add some sanity tests for assigned addresses.
--- include/linux/prctl.h | 12 +++++ kernel/sys.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+)
include/linux/prctl.h +12 -0
@@ -102,4 +102,16 @@#define PR_MCE_KILL_GET 34 +/* +* Tune up process memory map specifics. +*/ +#define PR_SET_MM 35 +# define PR_SET_MM_START_CODE 1 +# define PR_SET_MM_END_CODE 2 +# define PR_SET_MM_START_DATA 3 +# define PR_SET_MM_END_DATA 4 +# define PR_SET_MM_START_STACK 5 +# define PR_SET_MM_START_BRK 6 +# define PR_SET_MM_BRK 7 +#endif /* _LINUX_PRCTL_H */
kernel/sys.c +118 -0
130 lines not on this page · raw message
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
Quoted 3 lines · On Wed, 7 Dec 2011 16:27:18 +0400 Cyrill Gorcunov <[email protected]> wrote:
At process of task restoration we need a way to tune up a few members of
mm_structstructure such asstart_code,end_code,start_data,end_data,start_stack,start_brk, brk.
I don't really know what "tune up" means in this context. Can we please be more specific and detailed here? It appears that the patch permits userspace to directly modify these fields.
Quoted 19 lines
While most of them have a statistical nature (their values are involved into calculation of /proc/<pid>/statm output) the
start_brkand brk values are used to compute an allowed size of program data segment expansion. Which means an arbitrary changes of this value might be a bit dangerous operation.To restrict access to this facility the following requirements applied to prctl users:
- The process has to have
CAP_SYS_ADMINcapability granted.
- For all opcodes except start_brk/brk members an appropriate VMA area must be existing and should fit certain VMA flags, such as:
- code segment must be executable but not writable;
- data segment must not be executable.start_brk/brk values must not intersect with data segment and must not exceed
RLIMIT_DATAresource limit.
Quoted 6 lines
Still the main guard is
CAP_SYS_ADMINcapability check....
include/linux/prctl.h | 12 +++++ kernel/sys.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++
The prctl(2) manpage will need to be updated. Please Cc Michael on all such changes.
Quoted 36 lines
Index:
linux-2.6.git/include/linux/prctl.h
===================================================================include/linux/prctl.h +12
-0@@ -102,4 +102,16 @@#define PR_MCE_KILL_GET 34 +/* +* Tune up process memory map specifics. +*/ +#define PR_SET_MM 35 +# define PR_SET_MM_START_CODE 1 +# define PR_SET_MM_END_CODE 2 +# define PR_SET_MM_START_DATA 3 +# define PR_SET_MM_END_DATA 4 +# define PR_SET_MM_START_STACK 5 +# define PR_SET_MM_START_BRK 6 +# define PR_SET_MM_BRK 7 +#endif /* _LINUX_PRCTL_H */ Index:
linux-2.6.git/kernel/sys.c
===================================================================kernel/sys.c +6
-0@@ -1692,6 +1692,118 @@ SYSCALL_DEFINE1(umask, int, mask)return mask; } +static int prctl_set_mm (int opt,unsigned long addr) +{ +unsigned long rlim =rlimit (RLIMIT_DATA ); +unsigned long vm_req_flags; +unsigned long vm_bad_flags; +struct vm_area_struct *vma;
kernel/sys.c SYSCALL_DEFINE1(umask, int, mask) · line 1710
Quoted 10 lines
kernel/sys.c +10
-0+struct mm_struct *mm; +int error =0 ; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + +if (addr >=TASK_SIZE ) +return -EINVAL ; + + mm =get_task_mm (current);
Is it necessaary to run the expensive get_task_mm() for current'? current' is known to be running and you have control of it here - nobody will be taking our mm away. Simply use current->mm? The function actually uses current->mm later on in several places.
kernel/sys.c SYSCALL_DEFINE1(umask, int, mask) · line 1718
Quoted 8 lines
kernel/sys.c +8
-0+if (!mm) +return -ENOENT ; + +down_read (&mm->mmap_sem); + vma =find_vma (mm, addr); + +if (opt !=PR_SET_MM_START_BRK && + opt !=PR_SET_MM_BRK ) {
80 columns, not 40 :)
kernel/sys.c SYSCALL_DEFINE1(umask, int, mask) · line 1728
Quoted 10 lines
kernel/sys.c +10
-0+/* It must be existing VMA */ +if (!vma || vma->vm_start > addr) + goto out; + } + + error = -EINVAL ; +switch (opt) { +case PR_SET_MM_START_CODE : +case PR_SET_MM_END_CODE : +
You're adding unneeded and unconventional newlines after the `case' statements.
Quoted 67 lines
kernel/sys.c +67
-0+ vm_req_flags =VM_READ |VM_EXEC ; + vm_bad_flags =VM_WRITE |VM_MAYSHARE ; + +if ((vma->vm_flags & vm_req_flags) != vm_req_flags || + (vma->vm_flags & vm_bad_flags)) + goto out; + +if (opt ==PR_SET_MM_START_CODE ) + current->mm->start_code = addr; +else + current->mm->end_code = addr; +break ; + +case PR_SET_MM_START_DATA : +case PR_SET_MM_END_DATA : + + vm_req_flags =VM_READ |VM_WRITE ; + vm_bad_flags =VM_EXEC |VM_MAYSHARE ; + +if ((vma->vm_flags & vm_req_flags) != vm_req_flags || + (vma->vm_flags & vm_bad_flags)) + goto out; + +if (opt ==PR_SET_MM_START_DATA ) + current->mm->start_data = addr; +else + current->mm->end_data = addr; +break ; + +case PR_SET_MM_START_STACK : + +#ifdef CONFIG_STACK_GROWSUP + vm_req_flags =VM_READ |VM_WRITE |VM_GROWSUP ; +#else + vm_req_flags =VM_READ |VM_WRITE |VM_GROWSDOWN ; +#endif +if ((vma->vm_flags & vm_req_flags) != vm_req_flags) + goto out; + + current->mm->start_stack = addr; +break ; + +case PR_SET_MM_START_BRK : +if (addr <= mm->end_data) + goto out; + +if (rlim <RLIM_INFINITY && + (mm->brk - addr) + (mm->end_data - mm->start_data) > rlim) + goto out; + + current->mm->start_brk = addr; +break ; + +case PR_SET_MM_BRK : +if (addr <= mm->end_data) + goto out; + +if (rlim <RLIM_INFINITY && + (addr - mm->start_brk) + (mm->end_data - mm->start_data) > rlim) + goto out; + + current->mm->brk = addr; +break ; + +default : + error = -EINVAL ; + goto out;
kernel/sys.c SYSCALL_DEFINE1(umask, int, mask) · line 1805
Quoted 10 lines
kernel/sys.c +10
-0+ } + + error =0 ; + +out: +up_read (&mm->mmap_sem); +mmput (mm); + +return error; +}
This is starting to add a non-trivial amount of code. Perhaps we need to introduce a Kconfig variable to control such things as this, to prevent bloating up kernels which aren't require to support c/r?
Quoted 3 lines
...
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
Quoted 11 lines · Andrew Morton
Quoted 3 lines · On Wed, 7 Dec 2011 16:27:18 +0400 Cyrill Gorcunov <[email protected]> wrote:
At process of task restoration we need a way to tune up a few members of
mm_structstructure such asstart_code,end_code,start_data,end_data,start_stack,start_brk, brk.I don't really know what "tune up" means in this context. Can we please be more specific and detailed here? It appears that the patch permits userspace to directly modify these fields.
ok
Quoted 4 lines
The prctl(2) manpage will need to be updated. Please Cc Michael on all such changes.
you mean -- Michael Kerrisk, mtk AT man7.org, right?
...
Quoted 7 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + mm = get_task_mm(current);Is it necessaary to run the expensive
get_task_mm()forcurrent'?current' is known to be running and you have control of it here - nobody will be taking our mm away. Simply usecurrent->mm? The function actually usescurrent->mmlater on in several places.
hmm, indeed, i'll update, thanks!
Quoted 12 lines
kernel/sys.c SYSCALL_DEFINE1(umask, int, mask) · line 1718
Quoted 9 lines
kernel/sys.c +8
-0+if (!mm) +return -ENOENT ; + +down_read (&mm->mmap_sem); + vma =find_vma (mm, addr); + +if (opt !=PR_SET_MM_START_BRK && + opt !=PR_SET_MM_BRK ) {80 columns, not 40 :)
Quoted 14 lines
kernel/sys.c SYSCALL_DEFINE1(umask, int, mask) · line 1728
Quoted 10 lines
kernel/sys.c +10
-0+/* It must be existing VMA */ +if (!vma || vma->vm_start > addr) + goto out; + } + + error = -EINVAL ; +switch (opt) { +case PR_SET_MM_START_CODE : +case PR_SET_MM_END_CODE : +You're adding unneeded and unconventional newlines after the `case' statements.
no, I added them by a purpose -- it's a way easier to read these assignments, but fine -- I'll drop this nits.
Quoted 5 lines
This is starting to add a non-trivial amount of code. Perhaps we need to introduce a
Kconfigvariable to control such things as this, to prevent bloating up kernels which aren't require to support c/r?
Dunno, Andrew. Actually I agreed that these snippets are mostly needed for c/r only, but the initial idea over all changes was to add levers into kernel which might be helpful not only for c/r but for someone else as well.
Cyrill
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
Quoted 6 lines · On Thu, 8 Dec 2011 11:07:24 +0400 Cyrill Gorcunov <[email protected]> wrote:
Quoted 4 lines
The prctl(2) manpage will need to be updated. Please Cc Michael on all such changes.
you mean -- Michael Kerrisk, mtk AT man7.org, right?
That isn't what ./MAINTAINERS says?
Quoted 10 lines
Quoted 5 lines
This is starting to add a non-trivial amount of code. Perhaps we need to introduce a
Kconfigvariable to control such things as this, to prevent bloating up kernels which aren't require to support c/r?Dunno, Andrew. Actually I agreed that these snippets are mostly needed for c/r only, but the initial idea over all changes was to add levers into kernel which might be helpful not only for c/r but for someone else as well.
In each instance, a case would need to be made for that. Plus if people later come along who want access to these things for other purposes, they can send a patch!
There will always be people who would *prefer* that this material not be present in their vmlinux. For those people, this patch is a regression!
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
Quoted 11 lines · Andrew Morton
Quoted 6 lines · On Thu, 8 Dec 2011 11:07:24 +0400 Cyrill Gorcunov <[email protected]> wrote:
Quoted 4 lines
The prctl(2) manpage will need to be updated. Please Cc Michael on all such changes.
you mean -- Michael Kerrisk, mtk AT man7.org, right?
That isn't what ./MAINTAINERS says?
OK, I've just found him in MAINTAINERS.
Quoted 11 lines
Quoted 10 lines
Quoted 5 lines
This is starting to add a non-trivial amount of code. Perhaps we need to introduce a
Kconfigvariable to control such things as this, to prevent bloating up kernels which aren't require to support c/r?Dunno, Andrew. Actually I agreed that these snippets are mostly needed for c/r only, but the initial idea over all changes was to add levers into kernel which might be helpful not only for c/r but for someone else as well.
Quoted 8 lines
In each instance, a case would need to be made for that. Plus if people later come along who want access to these things for other purposes, they can send a patch!
There will always be people who would *prefer* that this material not be present in their vmlinux. For those people, this patch is a regression!
OK, I'll add some Kconfing variable for that. Lets see how it goes.
Cyrill
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
In reply to Cyrill GorcunovQuoted 10 lines · Cyrill Gorcunov
Quoted 8 lines · Kees Cook
Quoted 2 lines · Cyrill Gorcunov
At restore time we need a mechanism to restore those values back and for this sake
PR_SET_MMprctl code is introduced.arg3 needs to be significantly more carefully validated.
find_vma()doesn't say thatvm_start<= addr, only thatvm_end> addr. This effectively bypasses all the vma checks (mmap_min_addr, max process size, etc), with some pretty crazy side-effects, I think.
Quoted 7 lines
Yes, I know it needs some more testing, but apart from vma bounds (yup, good point with
find_vma, I'll fix) I thought about what else should be checked? I think VMA prototype should be checked to fit "code", "data" templates, ie code should be at least readable and execytable, but what about data and stack and brk, should stack be executable? That is the point where I've got a bit confused and though putting RFC out might be a good idea to collect opinions.
In the most basic sense, it shouldn't be possible to create an mm state that can't be reached through the normal ELF loader, calls to mmap(), mprotect(), stack growth, etc. I think it might be worth examining those paths to see how they're being bounds-checked. (And note the especially scary handling of the hidden stack guard page.)
-Kees
Signature · 2 lines
Kees Cook ChromeOS Security
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
In reply to Cyrill GorcunovQuoted 45 lines · Cyrill Gorcunov
Quoted 10 lines · Kees Cook
Quoted 5 lines · Cyrill Gorcunov
At restore time we need a mechanism to restore those values back and for this sake
PR_SET_MMprctl code is introduced.Note at moment this inteface is allowed for
CAP_SYS_ADMINonly.NAK from me; this needs more bounds checking. Though, yes, it absolutely must be a privileged action since this is potentially very dangerous. Can we invent something stronger than
CAP_SYS_ADMIN? ;)Heh.
Quoted 21 lines
Quoted 21 lines
kernel/sys.c +16
-0@@ -1841,6 +1841,58 @@ SYSCALL_DEFINE5(prctl, int, option, unsielse error =PR_MCE_KILL_DEFAULT ;break ; +case PR_SET_MM : { +struct mm_struct *mm; +struct vm_area_struct *vma; + +if (arg4 | arg5) +return -EINVAL ; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + + error = -ENOENT ; + mm =get_task_mm (current); +if (!mm) +return error; + +down_read (&mm->mmap_sem);Quoted 9 lines
kernel/sys.c SYSCALL_DEFINE5(prctl, int, option, unsi · line 1862
Quoted 3 lines
kernel/sys.c +3
-0+ vma =find_vma (mm, arg3); +if (!vma) + goto out;arg3 needs to be significantly more carefully validated.
find_vma()doesn't say that vm_start<= addr, only thatvm_end> addr. This effectively bypasses all the vma checks (mmap_min_addr, max process size, etc), with some pretty crazy side-effects, I think.
Quoted 7 lines
Yes, I know it needs some more testing, but apart from vma bounds (yup, good point with
find_vma, I'll fix) I thought about what else should be checked? I think VMA prototype should be checked to fit "code", "data" templates, ie code should be at least readable and execytable, but what about data and stack and brk, should stack be executable? That is the point where I've got a bit confused and though putting RFC out might be a good idea to collect opinions.
My memory is a bit hazy here, but cryo (http://git.sr71.net/?p=cryo-forhallyn.git;a=summary) did also do this from userspace. As I recall the one problem we had was ... that we couldn't lower the mm_start of the first segment? I think. But I bring it up only because the advantage of doing it this way was that all of the ptrace protections automatically applied.
-serge
Re: [rfc 3/3] prctl: Add PR_SET_MM codes to tune up mm_struct entires
Quoted 8 lines · Serge Hallyn
My memory is a bit hazy here, but cryo
(http://git.sr71.net/?p=cryo-forhallyn.git;a=summary) did also do this from userspace. As I recall the one problem we had was ... that we couldn't lower themm_startof the first segment? I think. But I bring it up only because the advantage of doing it this way was that all of the ptrace protections automatically applied.
Thanks for the link Serge, I'll take a look. I think for start_code we might stick for exactly Elf path -- ie it should be vma with at least "r-xp" prototipe as mapped by elf path (and restrictions from Kees's mail should be applied on it as well). Other members are not that clear for me.