The commit is pushed to "branch-rh9-5.14.vz9.1.x-ovz" and will appear at
https://src.openvz.org/scm/ovz/vzkernel.git
after ark-5.14
------>
commit 9d8d0447ecdad5711f9d6a8de1475955a942a798
Author: Kirill Tkhai <ktk...@virtuozzo.com>
Date: Fri Sep 24 14:49:27 2021 +0300
sched: Add ve name to sched_show_task()
Extracted from "ve: initial patch".
rcu_read_unlock() move by Andrey Ryabinin.
Signed-off-by: OpenVZ Team <de...@virtuozzo.com>
Signed-off-by: Andrey Ryabinin <aryabi...@virtuozzo.com>
Signed-off-by: Kirill Tkhai <ktk...@virtuozzo.com>
https://jira.sw.ru/browse/PSBM-133986
See also
cc172ff301 ("sched/debug: Fix the alignment of the show-state debug output")
(cherry picked from commit f9da5f1ecff2f4cd1aa1aa40ff2f830cd9f1d555)
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalit...@virtuozzo.com>
---
kernel/sched/core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index f3b27c6c5153..2a9ca0492df4 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -16,6 +16,7 @@
#include <linux/kcov.h>
#include <linux/scs.h>
+#include <linux/ve.h>
#include <asm/switch_to.h>
#include <asm/tlb.h>
@@ -8222,11 +8223,10 @@ void sched_show_task(struct task_struct *p)
rcu_read_lock();
if (pid_alive(p))
ppid = task_pid_nr(rcu_dereference(p->real_parent));
- rcu_read_unlock();
- pr_cont(" stack:%5lu pid:%5d ppid:%6d flags:0x%08lx\n",
- free, task_pid_nr(p), ppid,
+ pr_cont(" stack:%5lu pid:%5d ppid:%6d veid:%4s flags:0x%08lx\n",
+ free, task_pid_nr(p), ppid, task_ve_name(p),
(unsigned long)task_thread_info(p)->flags);
-
+ rcu_read_unlock();
print_worker_info(KERN_INFO, p);
print_stop_info(KERN_INFO, p);
show_stack(p, NULL, KERN_INFO);
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
