| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 11 Apr 2016 16:35:51 -0700
From: Andrey Vagin <avagin@...nvz.org>
To: linux-kernel@...r.kernel.org
Cc: Andrey Vagin <avagin@...nvz.org>, Oleg Nesterov <oleg@...hat.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Cyrill Gorcunov <gorcunov@...nvz.org>,
Pavel Emelyanov <xemul@...allels.com>,
Roger Luethi <rl@...lgate.ch>, Arnd Bergmann <arnd@...db.de>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
David Ahern <dsahern@...il.com>,
Andy Lutomirski <luto@...capital.net>,
Pavel Odintsov <pavel.odintsov@...il.com>
Subject: [PATCH 11/15] task_diag: add a new group to get memory usage
Signed-off-by: Andrey Vagin <avagin@...nvz.org>
---
fs/proc/task_diag.c | 79 ++++++++++++++++++++++++++++++++++++++++++
include/uapi/linux/task_diag.h | 21 +++++++++++
2 files changed, 100 insertions(+)
diff --git a/fs/proc/task_diag.c b/fs/proc/task_diag.c
index c8499f2..3dc3617 100644
--- a/fs/proc/task_diag.c
+++ b/fs/proc/task_diag.c
@@ -468,6 +468,77 @@ static int fill_task_stat(struct task_struct *task, struct sk_buff *skb, int who
return 0;
}
+static int fill_task_statm(struct task_struct *task, struct sk_buff *skb, int whole)
+{
+ struct task_diag_statm *st;
+ struct nlattr *attr;
+
+ unsigned long text, lib, swap, ptes, pmds, anon, file, shmem;
+ unsigned long hiwater_vm, total_vm, hiwater_rss, total_rss;
+ unsigned long stack_vm, data_vm, locked_vm, pinned_vm;
+ struct mm_struct *mm;
+
+ mm = get_task_mm(task);
+ if (!mm)
+ return 0;
+
+ anon = get_mm_counter(mm, MM_ANONPAGES);
+ file = get_mm_counter(mm, MM_FILEPAGES);
+ shmem = get_mm_counter(mm, MM_SHMEMPAGES);
+
+ /*
+ * Note: to minimize their overhead, mm maintains hiwater_vm and
+ * hiwater_rss only when about to *lower* total_vm or rss. Any
+ * collector of these hiwater stats must therefore get total_vm
+ * and rss too, which will usually be the higher. Barriers? not
+ * worth the effort, such snapshots can always be inconsistent.
+ */
+ hiwater_vm = total_vm = mm->total_vm;
+ if (hiwater_vm < mm->hiwater_vm)
+ hiwater_vm = mm->hiwater_vm;
+ hiwater_rss = total_rss = anon + file + shmem;
+ if (hiwater_rss < mm->hiwater_rss)
+ hiwater_rss = mm->hiwater_rss;
+
+ text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK)) >> PAGE_SHIFT;
+ lib = mm->exec_vm - text;
+ swap = get_mm_counter(mm, MM_SWAPENTS);
+ ptes = PTRS_PER_PTE * sizeof(pte_t) * atomic_long_read(&mm->nr_ptes);
+ pmds = PTRS_PER_PMD * sizeof(pmd_t) * mm_nr_pmds(mm);
+
+ data_vm = mm->data_vm;
+ stack_vm = mm->stack_vm;
+ locked_vm = mm->locked_vm;
+ pinned_vm = mm->pinned_vm;
+
+ mmput(mm);
+
+ attr = nla_reserve(skb, TASK_DIAG_STATM, sizeof(*st));
+ if (!attr)
+ return -EMSGSIZE;
+
+ st = nla_data(attr);
+
+ st->anon = anon;
+ st->file = file;
+ st->shmem = shmem;
+ st->hiwater_vm = hiwater_vm;
+ st->hiwater_rss = hiwater_rss;
+ st->text = text;
+ st->lib = lib;
+ st->swap = swap;
+ st->ptes = ptes;
+ st->pmds = pmds;
+ st->total_rss = total_rss;
+ st->total_vm = total_vm;
+ st->data_vm = data_vm;
+ st->stack_vm = stack_vm;
+ st->locked_vm = locked_vm;
+ st->pinned_vm = pinned_vm;
+
+ return 0;
+}
+
static int task_diag_fill(struct task_struct *tsk, struct sk_buff *skb,
struct task_diag_pid *req,
struct task_diag_cb *cb, struct pid_namespace *pidns,
@@ -543,6 +614,14 @@ static int task_diag_fill(struct task_struct *tsk, struct sk_buff *skb,
i++;
}
+ if (show_flags & TASK_DIAG_SHOW_STATM) {
+ if (i >= n)
+ err = fill_task_statm(tsk, skb, 1);
+ if (err)
+ goto err;
+ i++;
+ }
+
msg->flags &= ~TASK_DIAG_FLAG_CONT;
nlmsg_end(skb, nlh);
diff --git a/include/uapi/linux/task_diag.h b/include/uapi/linux/task_diag.h
index 551d4fa..9ab96f1 100644
--- a/include/uapi/linux/task_diag.h
+++ b/include/uapi/linux/task_diag.h
@@ -21,6 +21,7 @@ enum {
TASK_DIAG_VMA,
TASK_DIAG_VMA_STAT,
TASK_DIAG_STAT,
+ TASK_DIAG_STATM,
__TASK_DIAG_ATTR_MAX
#define TASK_DIAG_ATTR_MAX (__TASK_DIAG_ATTR_MAX - 1)
@@ -31,6 +32,7 @@ enum {
#define TASK_DIAG_SHOW_VMA (1ULL << TASK_DIAG_VMA)
#define TASK_DIAG_SHOW_VMA_STAT (1ULL << TASK_DIAG_VMA_STAT)
#define TASK_DIAG_SHOW_STAT (1ULL << TASK_DIAG_STAT)
+#define TASK_DIAG_SHOW_STATM (1ULL << TASK_DIAG_STATM)
enum {
TASK_DIAG_RUNNING,
@@ -168,6 +170,25 @@ struct task_diag_stat {
__u32 threads;
};
+struct task_diag_statm {
+ __u64 anon;
+ __u64 file;
+ __u64 shmem;
+ __u64 total_vm;
+ __u64 total_rss;
+ __u64 hiwater_vm;
+ __u64 hiwater_rss;
+ __u64 text;
+ __u64 lib;
+ __u64 swap;
+ __u64 ptes;
+ __u64 pmds;
+ __u64 locked_vm;
+ __u64 pinned_vm;
+ __u64 data_vm;
+ __u64 stack_vm;
+};
+
#define TASK_DIAG_DUMP_ALL 0
#define TASK_DIAG_DUMP_ONE 1
#define TASK_DIAG_DUMP_ALL_THREAD 2
--
2.5.5
Powered by blists - more mailing lists