From: Konstantin Khorenko <khore...@virtuozzo.com>
The patch is based on following vz7 commits:
f997bf6c613a ("ve: initial patch")
75fc174adc36 ("sched: Port cpustat related patches")
09e1cb4a7d4d ("ve/proc: restricted proc-entries scope")
a58fb58bff1c ("Use ve init task's css instead of opening cgroup via vfs")
Signed-off-by: Konstantin Khorenko <khore...@virtuozzo.com>
Reviewed-by: Andrey Ryabinin <aryabi...@virtuozzo.com>
+++
ve/time: Move ve_get_uptime() to header
Will be used in ve.h in another function.
Signed-off-by: Konstantin Khorenko <khore...@virtuozzo.com>
Reviewed-by: Valeriy Vdovin <valeriy.vdo...@virtuozzo.com>
Cherry-picked from vz8 commit 62a8581106ed ("ve/vestat: Introduce
/proc/vz/vestat"))
Signed-off-by: Nikita Yushchenko <nikita.yushche...@virtuozzo.com>
---
kernel/ve/vecalls.c | 93 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 93 insertions(+)
diff --git a/kernel/ve/vecalls.c b/kernel/ve/vecalls.c
index e5ec7609d192..d4ae92505bc1 100644
--- a/kernel/ve/vecalls.c
+++ b/kernel/ve/vecalls.c
@@ -40,6 +40,74 @@
**********************************************************************
**********************************************************************/
#ifdef CONFIG_PROC_FS
+#if BITS_PER_LONG == 32
+#define VESTAT_LINE_WIDTH (6 * 11 + 6 * 21)
+#define VESTAT_LINE_FMT "%10s %10lu %10lu %10lu %10Lu %20Lu %20Lu %20Lu %20Lu
%20Lu %20Lu %10lu\n"
+#define VESTAT_HEAD_FMT "%10s %10s %10s %10s %10s %20s %20s %20s %20s %20s
%20s %10s\n"
+#else
+#define VESTAT_LINE_WIDTH (12 * 21)
+#define VESTAT_LINE_FMT "%20s %20lu %20lu %20lu %20Lu %20Lu %20Lu %20Lu %20Lu
%20Lu %20Lu %20lu\n"
+#define VESTAT_HEAD_FMT "%20s %20s %20s %20s %20s %20s %20s %20s %20s %20s
%20s %20s\n"
+#endif
+
+static int vestat_seq_show(struct seq_file *m, void *v)
+{
+ struct list_head *entry;
+ struct ve_struct *ve;
+ struct ve_struct *curve;
+ int ret;
+ unsigned long user_ve, nice_ve, system_ve;
+ unsigned long long uptime;
+ u64 uptime_cycles, idle_time, strv_time, used;
+ struct kernel_cpustat kstat;
+
+ entry = (struct list_head *)v;
+ ve = list_entry(entry, struct ve_struct, ve_list);
+
+ curve = get_exec_env();
+ if (entry == ve_list_head.next ||
+ (!ve_is_super(curve) && ve == curve)) {
+ /* print header */
+ seq_printf(m, "%-*s\n",
+ VESTAT_LINE_WIDTH - 1,
+ "Version: 2.2");
+ seq_printf(m, VESTAT_HEAD_FMT, "VEID",
+ "user", "nice", "system",
+ "uptime", "idle",
+ "strv", "uptime", "used",
+ "maxlat", "totlat", "numsched");
+ }
+
+ if (ve == get_ve0())
+ return 0;
+
+ ret = ve_get_cpu_stat(ve, &kstat);
+ if (ret)
+ return ret;
+
+ strv_time = 0;
+ user_ve = nsecs_to_jiffies(kstat.cpustat[CPUTIME_USER]);
+ nice_ve = nsecs_to_jiffies(kstat.cpustat[CPUTIME_NICE]);
+ system_ve = nsecs_to_jiffies(kstat.cpustat[CPUTIME_SYSTEM]);
+ used = kstat.cpustat[CPUTIME_USED];
+ idle_time = kstat.cpustat[CPUTIME_IDLE];
+
+ uptime_cycles = ve_get_uptime(ve);
+ uptime = get_jiffies_64() - ve->start_jiffies;
+
+ seq_printf(m, VESTAT_LINE_FMT, ve_name(ve),
+ user_ve, nice_ve, system_ve,
+ (unsigned long long)uptime,
+ (unsigned long long)idle_time,
+ (unsigned long long)strv_time,
+ (unsigned long long)uptime_cycles,
+ (unsigned long long)used,
+ (unsigned long long)ve->sched_lat_ve.last.maxlat,
+ (unsigned long long)ve->sched_lat_ve.last.totlat,
+ ve->sched_lat_ve.last.count);
+ return 0;
+}
+
static void *ve_seq_start(struct seq_file *m, loff_t *pos)
{
struct ve_struct *curve;
@@ -69,6 +137,25 @@ static void ve_seq_stop(struct seq_file *m, void *v)
mutex_unlock(&ve_list_lock);
}
+static struct seq_operations vestat_seq_op = {
+ .start = ve_seq_start,
+ .next = ve_seq_next,
+ .stop = ve_seq_stop,
+ .show = vestat_seq_show
+};
+
+static int vestat_open(struct inode *inode, struct file *file)
+{
+ return seq_open(file, &vestat_seq_op);
+}
+
+static struct proc_ops proc_vestat_operations = {
+ .proc_open = vestat_open,
+ .proc_read = seq_read,
+ .proc_lseek = seq_lseek,
+ .proc_release = seq_release
+};
+
static int devperms_seq_show(struct seq_file *m, void *v)
{
struct ve_struct *ve = list_entry(v, struct ve_struct, ve_list);
@@ -184,6 +271,11 @@ static int __init init_vecalls_proc(void)
{
struct proc_dir_entry *de;
+ de = proc_create("vestat", S_IFREG | S_IRUSR | S_ISVTX, proc_vz_dir,
+ &proc_vestat_operations);
+ if (!de)
+ printk(KERN_WARNING "VZMON: can't make vestat proc entry\n");
+
de = proc_create("devperms", S_IFREG | S_IRUSR, proc_vz_dir,
&proc_devperms_ops);
if (!de)
@@ -206,6 +298,7 @@ static void __exit fini_vecalls_proc(void)
{
remove_proc_entry("devperms", proc_vz_dir);
remove_proc_entry("version", proc_vz_dir);
+ remove_proc_entry("vestat", proc_vz_dir);
remove_proc_entry("veinfo", proc_vz_dir);
}
#else
--
2.30.2
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
