From: Jiri Kosina <[email protected]> Instead of flooding dmesg with data about tasks which haven't yet been migrated to the "new universe", create a 'kgr_in_progress' in /proc/<pid>/ so that it's possible to easily script the checks/actions in userspace.
Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> [simplification] Cc: Steven Rostedt <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> --- fs/proc/base.c | 10 ++++++++++ kernel/kgr.c | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 2d696b0c93bf..70cba8b21c3f 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2106,6 +2106,13 @@ static const struct file_operations proc_timers_operations = { }; #endif /* CONFIG_CHECKPOINT_RESTORE */ +#ifdef CONFIG_KGR +static int proc_pid_kgr_in_progress(struct task_struct *task, char *buffer) +{ + return sprintf(buffer, "%d\n", task_thread_info(task)->kgr_in_progress); +} +#endif /* CONFIG_KGR */ + static int proc_pident_instantiate(struct inode *dir, struct dentry *dentry, struct task_struct *task, const void *ptr) { @@ -2638,6 +2645,9 @@ static const struct pid_entry tgid_base_stuff[] = { #ifdef CONFIG_CHECKPOINT_RESTORE REG("timers", S_IRUGO, proc_timers_operations), #endif +#ifdef CONFIG_KGR + INF("kgr_in_progress", S_IRUSR, proc_pid_kgr_in_progress), +#endif }; static int proc_tgid_base_readdir(struct file *file, struct dir_context *ctx) diff --git a/kernel/kgr.c b/kernel/kgr.c index ff5afaf6f0e7..1fadde396021 100644 --- a/kernel/kgr.c +++ b/kernel/kgr.c @@ -45,9 +45,8 @@ static bool kgr_still_patching(void) read_lock(&tasklist_lock); for_each_process(p) { if (task_thread_info(p)->kgr_in_progress) { - pr_info("pid %d (%s) still in kernel after timeout\n", - p->pid, p->comm); failed = true; + break; } } read_unlock(&tasklist_lock); -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
