From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753235Ab2A3OTF (ORCPT ); Mon, 30 Jan 2012 09:19:05 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:48973 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752937Ab2A3OS7 (ORCPT ); Mon, 30 Jan 2012 09:18:59 -0500 Message-Id: <20120130141852.377457689@openvz.org> User-Agent: quilt/0.48-1 Date: Mon, 30 Jan 2012 18:09:08 +0400 From: Cyrill Gorcunov To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Pavel Emelyanov , Serge Hallyn , KAMEZAWA Hiroyuki , Kees Cook , Tejun Heo , Andrew Vagin , "Eric W. Biederman" , Alexey Dobriyan , Andi Kleen , Cyrill Gorcunov , Vasiliy Kulikov Subject: [patch cr 3/4] c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat References: <20120130140905.441199885@openvz.org> Content-Disposition: inline; filename=fs-proc-extend-state-2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We would like to have an ability to restore command line arguments and envirion pointers so the task being restored would print appropriate values in /proc/pid/cmdline and /proc/pid/envirion. The exit_code is needed to restore zombie tasks. Signed-off-by: Cyrill Gorcunov Reviewed-by: Kees Cook Cc: Pavel Emelyanov Cc: Serge Hallyn Cc: KAMEZAWA Hiroyuki Cc: Alexey Dobriyan Cc: Tejun Heo Cc: Andrew Vagin Cc: Vasiliy Kulikov Cc: Alexey Dobriyan Cc: "Eric W. Biederman" --- Documentation/filesystems/proc.txt | 5 +++++ fs/proc/array.c | 25 ++++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) Index: linux-2.6.git/Documentation/filesystems/proc.txt =================================================================== --- linux-2.6.git.orig/Documentation/filesystems/proc.txt +++ linux-2.6.git/Documentation/filesystems/proc.txt @@ -311,6 +311,11 @@ Table 1-4: Contents of the stat files (a start_data address above which program data+bss is placed end_data address below which program data+bss is placed start_brk address above which program heap can be expanded with brk() + arg_start address above which program command line is placed + arg_end address below which program command line is placed + env_start address above which program environment is placed + env_end address below which program environment is placed + exit_code the thread's exit_code in the form reported by the waitpid system call .............................................................................. The /proc/PID/maps file containing the currently mapped memory regions and Index: linux-2.6.git/fs/proc/array.c =================================================================== --- linux-2.6.git.orig/fs/proc/array.c +++ linux-2.6.git/fs/proc/array.c @@ -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 %lu %lu %lu\n", +%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld ", pid_nr_ns(pid, ns), tcomm, state, @@ -511,10 +511,25 @@ 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), - (mm && permitted) ? mm->start_data : 0, - (mm && permitted) ? mm->end_data : 0, - (mm && permitted) ? mm->start_brk : 0); + cputime_to_clock_t(cgtime)); + + if (mm && permitted) { + seq_printf(m, "%lu %lu %lu %lu %lu %lu %lu ", + mm->start_data, + mm->end_data, + mm->start_brk, + mm->arg_start, + mm->arg_end, + mm->env_start, + mm->env_end); + } else + seq_printf(m, "0 0 0 0 0 0 0 "); + + if (permitted) + seq_printf(m, "%d\n", task->exit_code); + else + seq_printf(m, "0\n"); + if (mm) mmput(mm); return 0;