From: Serge Hallyn <serue@us.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: Hubertus Franke <frankeh@watson.ibm.com>,
Cedric Le Goater <clg@fr.ibm.com>,
Dave Hansen <haveblue@us.ibm.com>,
Serge E Hallyn <serue@us.ibm.com>
Subject: RFC [patch 16/34] PID Virtualization return virtual pids where required
Date: Tue, 17 Jan 2006 08:33:14 -0600 [thread overview]
Message-ID: <20060117143326.795416000@sergelap> (raw)
In-Reply-To: 20060117143258.150807000@sergelap
[-- Attachment #1: F3-replace-pid-kernel-access-with-virt-access.patch --]
[-- Type: text/plain, Size: 8651 bytes --]
In this patch we now identify where in the kernel code conceptually
a virtual pid(etc.) needs to be returned to userspace. This is at the
kernel/user interfaces. We need to identify all locations where
pids are returned, broadly they fall into 3 categories:
(a) syscall return parameter,
(b) syscall return code,
(c) through a datastructure filled in a syscall
The process_group virtualization will be done in the following patch.
Signed-off-by: Hubertus Franke <frankeh@watson.ibm.com>
---
arch/ia64/kernel/signal.c | 2 +-
fs/binfmt_elf.c | 8 ++++----
fs/proc/array.c | 12 ++++++------
fs/proc/base.c | 8 ++++----
kernel/exit.c | 4 ++--
kernel/fork.c | 4 ++--
kernel/sched.c | 2 +-
kernel/signal.c | 10 +++++-----
kernel/timer.c | 4 ++--
9 files changed, 27 insertions(+), 27 deletions(-)
Index: linux-2.6.15/arch/ia64/kernel/signal.c
===================================================================
--- linux-2.6.15.orig/arch/ia64/kernel/signal.c 2006-01-17 08:37:02.000000000 -0500
+++ linux-2.6.15/arch/ia64/kernel/signal.c 2006-01-17 08:37:04.000000000 -0500
@@ -270,7 +270,7 @@
si.si_signo = SIGSEGV;
si.si_errno = 0;
si.si_code = SI_KERNEL;
- si.si_pid = task_pid(current);
+ si.si_pid = task_vpid(current);
si.si_uid = current->uid;
si.si_addr = sc;
force_sig_info(SIGSEGV, &si, current);
Index: linux-2.6.15/fs/binfmt_elf.c
===================================================================
--- linux-2.6.15.orig/fs/binfmt_elf.c 2006-01-17 08:36:57.000000000 -0500
+++ linux-2.6.15/fs/binfmt_elf.c 2006-01-17 08:37:04.000000000 -0500
@@ -1270,8 +1270,8 @@
prstatus->pr_info.si_signo = prstatus->pr_cursig = signr;
prstatus->pr_sigpend = p->pending.signal.sig[0];
prstatus->pr_sighold = p->blocked.sig[0];
- prstatus->pr_pid = task_pid(p);
- prstatus->pr_ppid = task_pid(p->parent);
+ prstatus->pr_pid = task_vpid(p);
+ prstatus->pr_ppid = task_vppid(p);
prstatus->pr_pgrp = process_group(p);
prstatus->pr_sid = p->signal->session;
if (thread_group_leader(p)) {
@@ -1316,8 +1316,8 @@
psinfo->pr_psargs[i] = ' ';
psinfo->pr_psargs[len] = 0;
- psinfo->pr_pid = task_pid(p);
- psinfo->pr_ppid = task_pid(p->parent);
+ psinfo->pr_pid = task_vpid(p);
+ psinfo->pr_ppid = task_vppid(p);
psinfo->pr_pgrp = process_group(p);
psinfo->pr_sid = p->signal->session;
Index: linux-2.6.15/fs/proc/array.c
===================================================================
--- linux-2.6.15.orig/fs/proc/array.c 2006-01-17 08:36:57.000000000 -0500
+++ linux-2.6.15/fs/proc/array.c 2006-01-17 08:37:04.000000000 -0500
@@ -174,10 +174,10 @@
"Gid:\t%d\t%d\t%d\t%d\n",
get_task_state(p),
(p->sleep_avg/1024)*100/(1020000000/1024),
- task_tgid(p),
- task_pid(p), pid_alive(p) ?
- task_tgid(p->group_leader->real_parent) : 0,
- pid_alive(p) && p->ptrace ? task_pid(p->parent) : 0,
+ task_vtgid(p),
+ task_vpid(p), pid_alive(p) ?
+ task_vtgid(p->group_leader->real_parent) : 0,
+ pid_alive(p) && p->ptrace ? task_vpid(p->parent) : 0,
p->uid, p->euid, p->suid, p->fsuid,
p->gid, p->egid, p->sgid, p->fsgid);
read_unlock(&tasklist_lock);
@@ -390,7 +390,7 @@
it_real_value = task->signal->it_real_value;
}
ppid = pid_alive(task) ?
- task_tgid(task->group_leader->real_parent) : 0;
+ task_vtgid(task->group_leader->real_parent) : 0;
read_unlock(&tasklist_lock);
if (!whole || num_threads<2)
@@ -417,7 +417,7 @@
res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d %ld %llu %lu %ld %lu %lu %lu %lu %lu \
%lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu\n",
- task_pid(task),
+ task_vpid(task),
tcomm,
state,
ppid,
Index: linux-2.6.15/fs/proc/base.c
===================================================================
--- linux-2.6.15.orig/fs/proc/base.c 2006-01-17 08:36:57.000000000 -0500
+++ linux-2.6.15/fs/proc/base.c 2006-01-17 08:37:04.000000000 -0500
@@ -1878,14 +1878,14 @@
int buflen)
{
char tmp[30];
- sprintf(tmp, "%d", task_tgid(current));
+ sprintf(tmp, "%d", task_vtgid(current));
return vfs_readlink(dentry,buffer,buflen,tmp);
}
static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
{
char tmp[30];
- sprintf(tmp, "%d", task_tgid(current));
+ sprintf(tmp, "%d", task_vtgid(current));
return ERR_PTR(vfs_follow_link(nd,tmp));
}
@@ -2100,7 +2100,7 @@
p = next_task(&init_task);
for ( ; p != &init_task; p = next_task(p)) {
- int tgid = task_pid(p);
+ int tgid = task_vpid(p);
if (!pid_alive(p))
continue;
if (--index >= 0)
@@ -2133,7 +2133,7 @@
* via next_thread().
*/
if (pid_alive(task)) do {
- int tid = task_pid(task);
+ int tid = task_vpid(task);
if (--index >= 0)
continue;
Index: linux-2.6.15/kernel/exit.c
===================================================================
--- linux-2.6.15.orig/kernel/exit.c 2006-01-17 08:36:59.000000000 -0500
+++ linux-2.6.15/kernel/exit.c 2006-01-17 08:37:04.000000000 -0500
@@ -1143,7 +1143,7 @@
p->exit_state = EXIT_ZOMBIE;
return retval;
}
- retval = task_pid(p);
+ retval = task_vpid(p);
if (p->real_parent != p->parent) {
write_lock_irq(&tasklist_lock);
/* Double-check with lock held. */
@@ -1278,7 +1278,7 @@
if (!retval && infop)
retval = put_user(p->uid, &infop->si_uid);
if (!retval)
- retval = task_pid(p);
+ retval = task_vpid(p);
put_task_struct(p);
BUG_ON(!retval);
Index: linux-2.6.15/kernel/fork.c
===================================================================
--- linux-2.6.15.orig/kernel/fork.c 2006-01-17 08:36:59.000000000 -0500
+++ linux-2.6.15/kernel/fork.c 2006-01-17 08:37:04.000000000 -0500
@@ -848,7 +848,7 @@
{
current->clear_child_tid = tidptr;
- return task_pid(current);
+ return task_vpid(current);
}
/*
@@ -928,7 +928,7 @@
p->__pid = pid;
retval = -EFAULT;
if (clone_flags & CLONE_PARENT_SETTID)
- if (put_user(task_pid(p), parent_tidptr))
+ if (put_user(task_vpid(p), parent_tidptr))
goto bad_fork_cleanup;
p->proc_dentry = NULL;
Index: linux-2.6.15/kernel/sched.c
===================================================================
--- linux-2.6.15.orig/kernel/sched.c 2006-01-17 08:36:59.000000000 -0500
+++ linux-2.6.15/kernel/sched.c 2006-01-17 08:37:04.000000000 -0500
@@ -1653,7 +1653,7 @@
preempt_enable();
#endif
if (current->set_child_tid)
- put_user(task_pid(current), current->set_child_tid);
+ put_user(task_vpid(current), current->set_child_tid);
}
/*
Index: linux-2.6.15/kernel/signal.c
===================================================================
--- linux-2.6.15.orig/kernel/signal.c 2006-01-17 08:36:59.000000000 -0500
+++ linux-2.6.15/kernel/signal.c 2006-01-17 08:37:04.000000000 -0500
@@ -800,7 +800,7 @@
q->info.si_signo = sig;
q->info.si_errno = 0;
q->info.si_code = SI_USER;
- q->info.si_pid = task_pid(current);
+ q->info.si_pid = task_vpid(current);
q->info.si_uid = current->uid;
break;
case (unsigned long) SEND_SIG_PRIV:
@@ -1469,7 +1469,7 @@
info.si_signo = sig;
info.si_errno = 0;
- info.si_pid = task_pid(tsk);
+ info.si_pid = task_vpid(tsk);
info.si_uid = tsk->uid;
/* FIXME: find out whether or not this is supposed to be c*time. */
@@ -1534,7 +1534,7 @@
info.si_signo = SIGCHLD;
info.si_errno = 0;
- info.si_pid = task_pid(tsk);
+ info.si_pid = task_vpid(tsk);
info.si_uid = tsk->uid;
/* FIXME: find out whether or not this is supposed to be c*time. */
@@ -2245,7 +2245,7 @@
info.si_signo = sig;
info.si_errno = 0;
info.si_code = SI_USER;
- info.si_pid = task_tgid(current);
+ info.si_pid = task_vtgid(current);
info.si_uid = current->uid;
return kill_something_info(sig, &info, pid);
@@ -2261,7 +2261,7 @@
info.si_signo = sig;
info.si_errno = 0;
info.si_code = SI_TKILL;
- info.si_pid = task_tgid(current);
+ info.si_pid = task_vtgid(current);
info.si_uid = current->uid;
read_lock(&tasklist_lock);
Index: linux-2.6.15/kernel/timer.c
===================================================================
--- linux-2.6.15.orig/kernel/timer.c 2006-01-17 08:36:59.000000000 -0500
+++ linux-2.6.15/kernel/timer.c 2006-01-17 08:37:04.000000000 -0500
@@ -941,7 +941,7 @@
*/
asmlinkage long sys_getpid(void)
{
- return task_tgid(current);
+ return task_vtgid(current);
}
/*
@@ -1115,7 +1115,7 @@
/* Thread ID - the internal kernel "pid" */
asmlinkage long sys_gettid(void)
{
- return task_pid(current);
+ return task_vpid(current);
}
static long __sched nanosleep_restart(struct restart_block *restart)
--
next prev parent reply other threads:[~2006-01-17 14:58 UTC|newest]
Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-17 14:32 RFC [patch 00/34] PID Virtualization Overview Serge Hallyn
2006-01-17 14:32 ` RFC [patch 01/34] PID Virtualization Change pid accesses: drivers Serge Hallyn
2006-01-17 14:33 ` RFC [patch 02/34] PID Virtualization Change pid accesses: most archs Serge Hallyn
2006-01-17 14:33 ` RFC [patch 03/34] PID Virtualization Change pid accesses: filesystems Serge Hallyn
2006-01-17 14:33 ` RFC [patch 04/34] PID Virtualization Change pid accesses: include/ Serge Hallyn
2006-01-17 14:33 ` RFC [patch 05/34] PID Virtualization Change pid accesses: ipc Serge Hallyn
2006-01-17 14:33 ` RFC [patch 06/34] PID Virtualization Change pid accesses: kernel/ Serge Hallyn
2006-01-17 14:33 ` RFC [patch 07/34] PID Virtualization Change pid accesses: lib/ Serge Hallyn
2006-01-17 14:33 ` RFC [patch 08/34] PID Virtualization Change pid accesses: mm/ Serge Hallyn
2006-01-17 14:33 ` RFC [patch 09/34] PID Virtualization Change pid accesses: net/ Serge Hallyn
2006-01-17 14:33 ` RFC [patch 10/34] PID Virtualization Change pid accesses: security/ Serge Hallyn
2006-01-17 14:33 ` RFC [patch 11/34] PID Virtualization Change pid accesses: sound/ Serge Hallyn
2006-01-17 14:33 ` RFC [patch 12/34] PID Virtualization Change pid accesses: ia64 and mips Serge Hallyn
2006-01-17 14:33 ` RFC [patch 13/34] PID Virtualization Define new task_pid api Serge Hallyn
2006-01-17 15:32 ` Arjan van de Ven
2006-01-17 15:56 ` Serge E. Hallyn
2006-01-17 16:02 ` Arjan van de Ven
2006-01-17 16:03 ` Alan Cox
2006-01-17 17:16 ` Kyle Moffett
2006-01-17 17:25 ` Dave Hansen
2006-01-18 4:54 ` Greg KH
2006-01-18 4:55 ` Greg KH
2006-01-18 16:23 ` Dave Hansen
2006-01-20 17:00 ` Eric W. Biederman
2006-01-20 20:18 ` Hubertus Franke
2006-01-21 10:25 ` Eric W. Biederman
2006-01-23 18:38 ` Hubertus Franke
2006-01-23 18:48 ` Eric W. Biederman
2006-01-21 14:42 ` Eric W. Biederman
2006-01-22 6:43 ` Kyle Moffett
2006-01-22 15:48 ` Eric W. Biederman
2006-01-22 15:55 ` Arjan van de Ven
2006-01-22 16:24 ` Eric W. Biederman
2006-01-26 20:01 ` Herbert Poetzl
2006-01-27 9:04 ` Eric W. Biederman
2006-01-27 12:27 ` Kyle Moffett
2006-01-27 13:15 ` Eric W. Biederman
2006-01-23 18:50 ` Hubertus Franke
2006-01-23 19:28 ` Eric W. Biederman
2006-01-23 21:11 ` Alan Cox
2006-01-23 21:30 ` Eric W. Biederman
2006-01-23 22:15 ` Hubertus Franke
2006-01-24 6:56 ` Arjan van de Ven
2006-01-24 19:34 ` Eric W. Biederman
2006-01-24 21:09 ` Hubertus Franke
2006-01-24 0:22 ` Alan Cox
2006-01-24 19:26 ` Eric W. Biederman
2006-01-24 21:11 ` Alan Cox
2006-01-24 21:15 ` Arjan van de Ven
2006-01-25 9:58 ` Eric W. Biederman
2006-01-25 15:10 ` Trond Myklebust
2006-01-25 18:01 ` Eric W. Biederman
2006-01-25 19:30 ` Trond Myklebust
2006-01-25 21:59 ` Eric W. Biederman
2006-01-25 9:13 ` Eric W. Biederman
2006-01-25 9:51 ` Eric W. Biederman
2006-01-26 20:23 ` Herbert Poetzl
2006-01-27 8:28 ` Eric W. Biederman
[not found] ` <m1k6cqlmfe.fsf_-_@ebiederm.dsl.xmission.com>
2006-01-23 21:57 ` RFC: [PATCH] pids as weak references Dave Hansen
2006-01-31 21:02 ` RFC [patch 13/34] PID Virtualization Define new task_pid api Linus Torvalds
2006-02-01 0:01 ` Hubertus Franke
2006-02-01 4:18 ` Eric W. Biederman
2006-02-01 4:39 ` Linus Torvalds
2006-02-01 7:14 ` Eric W. Biederman
2006-02-01 16:41 ` Dave Hansen
2006-02-02 5:14 ` Herbert Poetzl
2006-02-01 16:29 ` Greg
2006-02-01 16:44 ` Eric W. Biederman
2006-02-02 13:50 ` Greg
2006-02-02 14:09 ` Eric W. Biederman
2006-02-02 14:48 ` Kirill Korotaev
2006-02-02 15:13 ` Eric W. Biederman
2006-02-02 15:26 ` Kirill Korotaev
2006-02-02 15:51 ` Eric W. Biederman
2006-02-02 16:05 ` Kirill Korotaev
2006-02-02 16:27 ` Eric W. Biederman
2006-02-02 21:32 ` Cedric Le Goater
2006-02-02 21:43 ` Hubertus Franke
2006-02-02 21:46 ` Eric W. Biederman
2006-02-03 10:07 ` Kirill Korotaev
2006-02-03 10:52 ` Kirill Korotaev
2006-02-03 11:09 ` Eric W. Biederman
2006-02-03 15:45 ` Dave Hansen
2006-02-03 16:35 ` Kirill Korotaev
2006-02-02 21:10 ` Cedric Le Goater
2006-02-02 21:24 ` Eric W. Biederman
2006-02-06 20:15 ` Pavel Machek
2006-02-06 20:34 ` Eric W. Biederman
2006-02-06 20:36 ` Kirill Korotaev
2006-02-06 20:40 ` Eric W. Biederman
2006-02-02 14:49 ` Kirill Korotaev
2006-01-17 14:33 ` RFC [patch 14/34] PID Virtualization const parameter for process group Serge Hallyn
2006-01-17 14:33 ` RFC [patch 15/34] PID Virtualization task virtual pid access functions Serge Hallyn
2006-01-17 14:33 ` Serge Hallyn [this message]
2006-01-17 14:33 ` RFC [patch 17/34] PID Virtualization return virtual process group ids Serge Hallyn
2006-01-17 14:33 ` RFC [patch 18/34] PID Virtualization code enhancements for virtual pids in /proc Serge Hallyn
2006-01-17 14:33 ` RFC [patch 19/34] PID Virtualization Define pid_to_vpid functions Serge Hallyn
2006-01-17 14:33 ` RFC [patch 20/34] PID Virtualization Use pid_to_vpid conversion functions Serge Hallyn
2006-01-17 14:33 ` RFC [patch 21/34] PID Virtualization file owner pid virtualization Serge Hallyn
2006-01-17 14:33 ` RFC [patch 22/34] PID Virtualization define vpid_to_pid functions Serge Hallyn
2006-01-17 14:33 ` RFC [patch 23/34] PID Virtualization Use " Serge Hallyn
2006-01-17 14:33 ` RFC [patch 24/34] PID Virtualization use vpgid_to_pgid function Serge Hallyn
2006-01-17 14:33 ` RFC [patch 25/34] PID Virtualization Context for pid_to_vpid conversition functions Serge Hallyn
2006-01-17 14:33 ` RFC [patch 26/34] PID Virtualization Documentation Serge Hallyn
2006-01-17 14:33 ` RFC [patch 27/34] PID Virtualization pidspace Serge Hallyn
2006-01-17 14:33 ` RFC [patch 28/34] PID Virtualization container object and functions Serge Hallyn
2006-01-17 14:33 ` RFC [patch 29/34] PID Virtualization container attach/detach calls Serge Hallyn
2006-01-17 14:33 ` RFC [patch 30/34] PID Virtualization /proc/container filesystem Serge Hallyn
2006-01-17 14:33 ` RFC [patch 31/34] PID Virtualization Implementation of low level virtualization functions Serge Hallyn
2006-01-17 14:33 ` RFC [patch 32/34] PID Virtualization Handle special case vpid return cases Serge Hallyn
2006-01-17 14:33 ` RFC [patch 33/34] PID Virtualization per container /proc filesystem Serge Hallyn
2006-01-17 14:33 ` RFC [patch 34/34] PID Virtualization pidspace parent : signal behavior Serge Hallyn
2006-01-17 16:19 ` RFC [patch 00/34] PID Virtualization Overview Suleiman Souhlal
2006-01-17 17:08 ` Dave Hansen
2006-01-17 18:09 ` Suleiman Souhlal
2006-01-17 18:12 ` Dave Hansen
2006-01-17 18:29 ` Alan Cox
2006-01-18 19:01 ` Dave Hansen
2006-01-18 19:28 ` Arjan van de Ven
2006-01-18 19:38 ` Dave Hansen
2006-01-18 19:50 ` Arjan van de Ven
2006-01-18 22:54 ` Alan Cox
2006-01-19 7:15 ` Arjan van de Ven
2006-01-20 5:11 ` Eric W. Biederman
2006-01-20 20:23 ` Serge E. Hallyn
2006-01-20 20:33 ` Hubertus Franke
2006-01-21 10:34 ` Eric W. Biederman
2006-01-20 19:53 ` RFC: Multiple instances of kernel namespaces Eric W. Biederman
2006-01-20 20:13 ` Serge E. Hallyn
2006-01-20 20:22 ` Hubertus Franke
[not found] ` <20060120203555.GC13265@sergelap.austin.ibm.com>
2006-01-20 21:47 ` Hubertus Franke
2006-01-21 10:04 ` Eric W. Biederman
2006-01-26 19:47 ` Herbert Poetzl
2006-01-26 20:13 ` Eric W. Biederman
2006-01-26 20:27 ` Herbert Poetzl
2006-01-21 10:31 ` RFC [patch 00/34] PID Virtualization Overview Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060117143326.795416000@sergelap \
--to=serue@us.ibm.com \
--cc=clg@fr.ibm.com \
--cc=frankeh@watson.ibm.com \
--cc=haveblue@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).