Disabled due to https://github.com/dynup/kpatch/issues/940 --- diff --git a/fs/proc/array.c b/fs/proc/array.c index 0ceb3b6..1b44c7f 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -370,12 +370,19 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p) seq_putc(m, '\n'); } +#include static inline void task_context_switch_counts(struct seq_file *m, struct task_struct *p) { + int *newpid; + seq_put_decimal_ull(m, "voluntary_ctxt_switches:\t", p->nvcsw); seq_put_decimal_ull(m, "\nnonvoluntary_ctxt_switches:\t", p->nivcsw); seq_putc(m, '\n'); + + newpid = klp_shadow_get(p, 0); + if (newpid) + seq_printf(m, "newpid:\t%d\n", *newpid); } static void task_cpus_allowed(struct seq_file *m, struct task_struct *task) diff --git a/kernel/exit.c b/kernel/exit.c index deaa53a..01f5776 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -760,6 +760,7 @@ static void check_stack_usage(void) static inline void check_stack_usage(void) {} #endif +#include void __noreturn do_exit(long code) { struct task_struct *tsk = current; @@ -865,6 +866,8 @@ void __noreturn do_exit(long code) exit_task_work(tsk); exit_thread(tsk); + klp_shadow_free(tsk, 0, NULL); + /* * Flush inherited counters to the parent - before the parent * gets woken up by child-exit notifications. diff --git a/kernel/fork.c b/kernel/fork.c index 3311231..2c12c1a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -2093,6 +2093,7 @@ struct task_struct *fork_idle(int cpu) * It copies the process, and if successful kick-starts * it and waits for it to finish using the VM if required. */ +#include long _do_fork(unsigned long clone_flags, unsigned long stack_start, unsigned long stack_size, @@ -2105,6 +2106,8 @@ long _do_fork(unsigned long clone_flags, struct task_struct *p; int trace = 0; long nr; + int *newpid; + static int ctr = 0; /* * Determine whether and which event to report to ptracer. When @@ -2131,6 +2134,11 @@ long _do_fork(unsigned long clone_flags, if (IS_ERR(p)) return PTR_ERR(p); + newpid = klp_shadow_get_or_alloc(p, 0, sizeof(*newpid), GFP_KERNEL, + NULL, NULL); + if (newpid) + *newpid = ctr++; + /* * Do this prior waking up the new thread - the thread pointer * might get invalid after that point, if the thread exits quickly.