* [PATCH 04/10] mm/oom_debug: Add ARP and ND Table Summary usage
[not found] <20190826193638.6638-1-echron@arista.com>
@ 2019-08-26 19:36 ` Edward Chron
2019-08-26 19:36 ` [PATCH 10/10] mm/oom_debug: Add Enhanced Process Print Information Edward Chron
1 sibling, 0 replies; 3+ messages in thread
From: Edward Chron @ 2019-08-26 19:36 UTC (permalink / raw)
To: Andrew Morton
Cc: Michal Hocko, Roman Gushchin, Johannes Weiner, David Rientjes,
Tetsuo Handa, Shakeel Butt, linux-mm, linux-kernel, colona,
Edward Chron, David S. Miller, netdev
Adds config options and code to support printing ARP Table usage and or
Neighbour Discovery Table usage when an OOM event occurs. This summarized
information provides the memory usage for each table when configured.
Configuring these two OOM Debug Options
---------------------------------------
Two OOM debug options: CONFIG_DEBUG_OOM_ARP_TBL, CONFIG_DEBUG_OOM_ND_TBL
To get the output for both tables they both must be configured.
The ARP Table uses the CONFIG_DEBUG_OOM_ARP_TBL kernel config option
and the ND Table uses the CONFIG_DEBUG_OOM_ND_TBL kernel config option
both of which are found in the kernel config under the entries:
Kernel hacking, Memory Debugging, OOM Debugging entry. The ARP Table and
ND Table are configured there with the options: DEBUG_OOM_ARP_TBL and
DEBUG_OOM_ND_TBL respectively.
Dynamic disable or re-enable this OOM Debug option
--------------------------------------------------
The oom debugfs base directory is found at: /sys/kernel/debug/oom.
The oom debugfs for this option are: arp_table_summary_ and
nd_table_summary_ and there is just one enable file for each.
Either option may be disabled or re-enabled using the debugfs entry for
the OOM debug option. The debugfs file to enable the ARP Table option
is found at: /sys/kernel/debug/oom/arp_table_summary_enabled
Similarly, the debugfs file to enable the ND Table option is found at:
/sys/kernel/debug/oom/nd_table_summary_enabled
For either option their enabled file's value determines whether the
facility is enabled or disabled for that option. A value of 1 is enabled
(default) and a value of 0 is disabled. When configured the default
setting is set to enabled. Each option will produce 1 line of output.
Content and format of ARP and Neighbour Discovery Tables Summary Output
-----------------------------------------------------------------------
One line of output each for ARP and ND that includes:
- Table name
- Table size (max # entries)
- Key Length
- Entry Size
- Number of Entries
- Last Flush (in seconds)
- hash grows
- entry allocations
- entry destroys
- Number lookups
- Number of lookup hits
- Resolution failures
- Garbage Collection Forced Runs
- Table Full
- Proxy Queue Length
Sample Output:
-------------
Here is sample output for both the ARP table and ND table:
Jul 23 23:26:34 yuorsystem kernel: neighbour: Table: arp_tbl size: 256
keyLen: 4 entrySize: 360 entries: 9 lastFlush: 1721s
hGrows: 1 allocs: 9 destroys: 0 lookups: 204 hits: 199
resFailed: 38 gcRuns/Forced: 111 / 0 tblFull: 0 proxyQlen: 0
Jul 23 23:26:34 yuorsystem kernel: neighbour: Table: nd_tbl size: 128
keyLen: 16 entrySize: 368 entries: 6 lastFlush: 1720s
hGrows: 0 allocs: 7 destroys: 1 lookups: 0 hits: 0
resFailed: 0 gcRuns/Forced: 110 / 0 tblFull: 0 proxyQlen: 0
Signed-off-by: Edward Chron <echron@arista.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
---
include/net/neighbour.h | 12 +++++++
mm/Kconfig.debug | 26 ++++++++++++++
mm/oom_kill_debug.c | 38 ++++++++++++++++++++
net/core/neighbour.c | 78 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 154 insertions(+)
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 50a67bd6a434..35fdecff2724 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -569,4 +569,16 @@ static inline void neigh_update_is_router(struct neighbour *neigh, u32 flags,
*notify = 1;
}
}
+
+#if defined(CONFIG_DEBUG_OOM_ARP_TBL) || defined(CONFIG_DEBUG_OOM_ND_TBL)
+/**
+ * Routine used to print arp table and neighbour table statistics.
+ * Output goes to dmesg along with all the other OOM related messages
+ * when the config options DEBUG_OOM_ARP_TBL and DEBUG_ND_TBL are set to
+ * yes, for the ARP table and Neighbour discovery table respectively.
+ */
+extern void neightbl_print_stats(const char * const tblname,
+ struct neigh_table * const neightable);
+#endif /* CONFIG_DEBUG_OOM_ARP_TBL || CONFIG_DEBUG_OOM_ND_TBL */
+
#endif
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index fcbc5f9aa146..fe4bb5ce0a6d 100644
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -163,3 +163,29 @@ config DEBUG_OOM_TASKS_SUMMARY
A value of 1 is enabled (default) and a value of 0 is disabled.
If unsure, say N.
+
+config DEBUG_OOM_ARP_TBL
+ bool "Debug OOM ARP Table"
+ depends on DEBUG_OOM
+ help
+ When enabled, documents kernel memory usage by the ARP Table
+ entries at the time of an OOM event. Output is one line of
+ summarzied ARP Table usage. If configured it is enabled/disabled
+ by setting the enabled file entry in the debugfs OOM interface
+ at: /sys/kernel/debug/oom/arp_table_summary_enabled
+ A value of 1 is enabled (default) and a value of 0 is disabled.
+
+ If unsure, say N.
+
+config DEBUG_OOM_ND_TBL
+ bool "Debug OOM ND Table"
+ depends on DEBUG_OOM
+ help
+ When enabled, documents kernel memory usage by the ND Table
+ entries at the time of an OOM event. Output is one line of
+ summarzied ND Table usage. If configured it is enabled/disabled
+ by setting the enabled file entry in the debugfs OOM interface
+ at: /sys/kernel/debug/oom/nd_table_summary_enabled
+ A value of 1 is enabled (default) and a value of 0 is disabled.
+
+ If unsure, say N.
diff --git a/mm/oom_kill_debug.c b/mm/oom_kill_debug.c
index 395b3307f822..c4a9117633fd 100644
--- a/mm/oom_kill_debug.c
+++ b/mm/oom_kill_debug.c
@@ -156,6 +156,16 @@
#include <linux/sched/stat.h>
#endif
+#if defined(CONFIG_INET) && defined(CONFIG_DEBUG_OOM_ARP_TBL)
+#include <net/arp.h>
+#endif
+#if defined(CONFIG_IPV6) && defined(CONFIG_DEBUG_OOM_ND_TBL)
+#include <net/ndisc.h>
+#endif
+#if defined(CONFIG_DEBUG_OOM_ARP_TBL) || defined(CONFIG_DEBUG_OOM_ND_TBL)
+#include <net/neighbour.h>
+#endif
+
#define OOMD_MAX_FNAME 48
#define OOMD_MAX_OPTNAME 32
@@ -192,6 +202,18 @@ static struct oom_debug_option oom_debug_options_table[] = {
.option_name = "tasks_summary_",
.support_tpercent = false,
},
+#endif
+#ifdef CONFIG_DEBUG_OOM_ARP_TBL
+ {
+ .option_name = "arp_table_summary_",
+ .support_tpercent = false,
+ },
+#endif
+#ifdef CONFIG_DEBUG_OOM_ND_TBL
+ {
+ .option_name = "nd_table_summary_",
+ .support_tpercent = false,
+ },
#endif
{}
};
@@ -203,6 +225,12 @@ enum oom_debug_options_index {
#endif
#ifdef CONFIG_DEBUG_OOM_TASKS_SUMMARY
TASKS_STATE,
+#endif
+#ifdef CONFIG_DEBUG_OOM_ARP_TBL
+ ARP_STATE,
+#endif
+#ifdef CONFIG_DEBUG_OOM_ND_TBL
+ ND_STATE,
#endif
OUT_OF_BOUNDS
};
@@ -351,6 +379,16 @@ u32 oom_kill_debug_oom_event_is(void)
oom_kill_debug_system_summary_prt();
#endif
+#if defined(CONFIG_INET) && defined(CONFIG_DEBUG_OOM_ARP_TBL)
+ if (oom_kill_debug_enabled(ARP_STATE))
+ neightbl_print_stats("arp_tbl", &arp_tbl);
+#endif
+
+#if defined(CONFIG_IPV6) && defined(CONFIG_DEBUG_OOM_ND_TBL)
+ if (oom_kill_debug_enabled(ND_STATE))
+ neightbl_print_stats("nd_tbl", &nd_tbl);
+#endif
+
#ifdef CONFIG_DEBUG_OOM_TASKS_SUMMARY
if (oom_kill_debug_enabled(TASKS_STATE))
oom_kill_debug_tasks_summary_print();
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index f79e61c570ea..9f5a579542a9 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -3735,3 +3735,81 @@ static int __init neigh_init(void)
}
subsys_initcall(neigh_init);
+
+#if defined(CONFIG_DEBUG_OOM_ARP_TBL) || defined(CONFIG_DEBUG_OOM_ND_TBL)
+void neightbl_print_stats(const char * const tblname,
+ struct neigh_table * const tbl)
+{
+ struct neigh_hash_table *nht;
+ struct ndt_stats ndst;
+ u32 now;
+ u32 flush_delta;
+ u32 tblsize;
+ u16 key_len;
+ u16 entry_size;
+ u32 entries;
+ u32 last_flush; /* delta to now in msecs */
+ u32 hash_shift;
+ u32 proxy_qlen;
+ int cpu;
+
+ read_lock_bh(&tbl->lock);
+ now = jiffies;
+ flush_delta = now - tbl->last_flush;
+
+ key_len = tbl->key_len;
+ if (tbl->entry_size)
+ entry_size = tbl->entry_size;
+ else
+ entry_size = ALIGN(offsetof(struct neighbour, primary_key) +
+ key_len, NEIGH_PRIV_ALIGN);
+
+ entries = atomic_read(&tbl->entries);
+ if (entries == 0)
+ goto out_tbl_unlock;
+
+ /* last flush was last_flush seconds ago */
+ last_flush = jiffies_to_msecs(flush_delta) / 1000;
+ proxy_qlen = tbl->proxy_queue.qlen;
+
+ rcu_read_lock_bh();
+ nht = rcu_dereference_bh(tbl->nht);
+ if (nht)
+ hash_shift = nht->hash_shift + 1;
+ rcu_read_unlock_bh();
+ if (!nht)
+ goto out_tbl_unlock;
+
+ memset(&ndst, 0, sizeof(ndst));
+ for_each_possible_cpu(cpu) {
+ struct neigh_statistics *st;
+
+ st = per_cpu_ptr(tbl->stats, cpu);
+ ndst.ndts_allocs += st->allocs;
+ ndst.ndts_destroys += st->destroys;
+ ndst.ndts_hash_grows += st->hash_grows;
+ ndst.ndts_res_failed += st->res_failed;
+ ndst.ndts_lookups += st->lookups;
+ ndst.ndts_hits += st->hits;
+ ndst.ndts_periodic_gc_runs += st->periodic_gc_runs;
+ ndst.ndts_forced_gc_runs += st->forced_gc_runs;
+ ndst.ndts_table_fulls += st->table_fulls;
+ }
+
+ read_unlock_bh(&tbl->lock);
+ tblsize = (1 << hash_shift) * sizeof(struct neighbour *);
+ if (tblsize > PAGE_SIZE)
+ tblsize = get_order(tblsize);
+
+ pr_info("Table:%7s size:%5u keyLen:%2hu entrySize:%3hu entries:%5u lastFlush:%5us hGrows:%5llu allocs:%5llu destroys:%5llu lookups:%5llu hits:%5llu resFailed:%5llu gcRuns/Forced:%3llu / %2llu tblFull:%2llu proxyQlen:%2u\n",
+ tblname, tblsize, key_len, entry_size, entries, last_flush,
+ ndst.ndts_hash_grows, ndst.ndts_allocs, ndst.ndts_destroys,
+ ndst.ndts_lookups, ndst.ndts_hits, ndst.ndts_res_failed,
+ ndst.ndts_periodic_gc_runs, ndst.ndts_forced_gc_runs,
+ ndst.ndts_table_fulls, proxy_qlen);
+ return;
+
+out_tbl_unlock:
+ read_unlock_bh(&tbl->lock);
+}
+#endif /* CONFIG_DEBUG_OOM_ARP_TBL || CONFIG_DEBUG_OOM_ND_TBL */
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 10/10] mm/oom_debug: Add Enhanced Process Print Information
[not found] <20190826193638.6638-1-echron@arista.com>
2019-08-26 19:36 ` [PATCH 04/10] mm/oom_debug: Add ARP and ND Table Summary usage Edward Chron
@ 2019-08-26 19:36 ` Edward Chron
2019-08-28 0:21 ` kbuild test robot
1 sibling, 1 reply; 3+ messages in thread
From: Edward Chron @ 2019-08-26 19:36 UTC (permalink / raw)
To: Andrew Morton
Cc: Michal Hocko, Roman Gushchin, Johannes Weiner, David Rientjes,
Tetsuo Handa, Shakeel Butt, linux-mm, linux-kernel, colona,
Edward Chron, David S. Miller, netdev
Add OOM Debug code that prints additional detailed information about
users processes that were considered for OOM killing for any print
selected processes. The information is displayed for each user process
that OOM prints in the output.
This supplemental per user process information is very helpful for
determing how process memory is used to allow OOM event root cause
identifcation that might not otherwise be possible.
Configuring Enhanced Process Print Information
----------------------------------------------
The DEBUG_OOM_ENHANCED_PROCESS_PRINT is the config entry defined for
this OOM Debug option. This option is dependent on the OOM Debug
option DEBUG_OOM_SELECT_PROCESS which adds code to allow processes
that are considered for OOM kill to be selectively printed, only
printing processes that use a specified minimum amount of memory.
The kernel configuration entry for this option can be found in the
config file at: Kernel hacking, Memory Debugging, Debug OOM,
Debug OOM Process Selection, Debug OOM Enhanced Process Print.
Both Debug OOM Process Selection and Debug OOM Enhanced Process Print
entries must be selected.
Dynamic disable or re-enable this OOM Debug option
--------------------------------------------------
This option may be disabled or re-enabled using the debugfs entry for
this OOM debug option. The debugfs file to enable this entry is found at:
/sys/kernel/debug/oom/process_enhanced_print_enabled where the enabled
file's value determines whether the facility is enabled or disabled.
A value of 1 is enabled (default) and a value of 0 is disabled.
Content and format of process record and Task state headers
-----------------------------------------------------------
Each OOM process entry printed include memory information about the
process. Memory usage is specified in KiB for memory values instead of
pages. Each entry includes the following fields:
pid, ppid, ruid, euid, tgid, State (S), the oom_score_adjust (Adjust),
task comm value (name), and also memory values (all in KB): VmemKiB,
MaxRssKiB, CurRssKiB, PteKiB, SwapKiB, socket pages (SockKiB), LibKiB,
TextPgKiB, HeapPgKiB, StackKiB, FileKiB and shared memory (ShmemKiB).
Counts of page reads (ReadPgs) and page faults (FaultPgs) are included.
Sample Output
-------------
OOM Process select print headers and line of process enhanced output:
Aug 6 09:37:21 egc103 kernel: Tasks state (memory values in KiB):
Aug 6 09:37:21 egc103 kernel: [ pid ] ppid ruid euid
tgid S utimeSec stimeSec VmemKiB MaxRssKiB CurRssKiB
PteKiB SwapKiB SockKiB LibKiB TextKiB HeapKiB
StackKiB FileKiB ShmemKiB ReadPgs FaultPgs LockKiB
PinnedKiB Adjust name
Aug 6 09:37:21 egc103 kernel: [ 7707] 7553 10383 10383
7707 S 0.132 0.350 1056804 1054040 1052796
2092 0 0 1944 684 1052860
136 4 0 0 0 0
0 1000 oomprocs
Signed-off-by: Edward Chron <echron@arista.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
---
mm/Kconfig.debug | 23 +++++
mm/oom_kill.c | 23 ++++-
mm/oom_kill_debug.c | 236 ++++++++++++++++++++++++++++++++++++++++++++
mm/oom_kill_debug.h | 5 +
4 files changed, 285 insertions(+), 2 deletions(-)
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index 4414e46f72c6..2bc843727968 100644
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -320,3 +320,26 @@ config DEBUG_OOM_PROCESS_SELECT_PRINT
print limit value of 10 or 1% of memory.
If unsure, say N.
+
+config DEBUG_OOM_ENHANCED_PROCESS_PRINT
+ bool "Debug OOM Enhanced Process Print"
+ depends on DEBUG_OOM_PROCESS_SELECT_PRINT
+ help
+ Each OOM process entry printed include memory information about
+ the process. Memory usage is specified in KiB (KB) for memory
+ values, not pages. Each entry includes the following fields:
+ pid, ppid, ruid, euid, tgid, State (S), utime in seconds,
+ stime in seconds, the number of read pages (ReadPgs), number of
+ page faults (FaultPgs), the number of lock pages (LockPgs), the
+ oom_score_adjust value (Adjust), memory percentage used (MemPct),
+ oom_score (Score), task comm value (name), and also memory values
+ (all in KB): VmemKiB, MaxRssKiB, CurRssKiB, PteKiB, SwapKiB,
+ socket pages (SockKiB), LibKiB, TextPgKiB, HeapPgKiB, StackKiB,
+ FileKiB and shared memory pages (ShmemKiB).
+
+ If the option is configured it is enabled/disabled by setting
+ the value of the file entry in the debugfs OOM interface at:
+ /sys/kernel/debug/oom/process_enhanced_print_enabled
+ A value of 1 is enabled (default) and a value of 0 is disabled.
+
+ If unsure, say N.
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index cbea289c6345..cf37caea9c5c 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -417,6 +417,13 @@ static int dump_task(struct task_struct *p, void *arg)
}
#endif
+#ifdef CONFIG_DEBUG_OOM_ENHANCED_PROCESS_PRINT
+ if (oom_kill_debug_enhanced_process_print_enabled()) {
+ dump_task_prt(task, rsspgs, swappgs, pgtbl);
+ task_unlock(task);
+ return 1;
+ }
+#endif
pr_info("[%7d] %5d %5d %8lu %8lu %8ld %8lu %5hd %s\n",
task->pid, from_kuid(&init_user_ns, task_uid(task)),
task->tgid, task->mm->total_vm, rsspgs, pgtbl, swappgs,
@@ -426,6 +433,19 @@ static int dump_task(struct task_struct *p, void *arg)
return 1;
}
+static void dump_tasks_headers(void)
+{
+#ifdef CONFIG_DEBUG_OOM_ENHANCED_PROCESS_PRINT
+ if (oom_kill_debug_enhanced_process_print_enabled()) {
+ pr_info("Tasks state (memory values in KiB):\n");
+ pr_info("[ pid ] ppid ruid euid tgid S utimeSec stimeSec VmemKiB MaxRssKiB CurRssKiB PteKiB SwapKiB SockKiB LibKiB TextKiB HeapKiB StackKiB FileKiB ShmemKiB ReadPgs FaultPgs LockKiB PinnedKiB Adjust name\n");
+ return;
+ }
+#endif
+ pr_info("Tasks state (memory values in pages):\n");
+ pr_info("[ pid ] uid tgid total_vm rss pgtables_bytes swapents oom_score_adj name\n");
+}
+
#define K(x) ((x) << (PAGE_SHIFT-10))
/**
@@ -443,8 +463,7 @@ static void dump_tasks(struct oom_control *oc)
u32 total = 0;
u32 prted = 0;
- pr_info("Tasks state (memory values in pages):\n");
- pr_info("[ pid ] uid tgid total_vm rss pgtables_bytes swapents oom_score_adj name\n");
+ dump_tasks_headers();
#ifdef CONFIG_DEBUG_OOM_PROCESS_SELECT_PRINT
oc->minpgs = oom_kill_debug_min_task_pages(oc->totalpages);
diff --git a/mm/oom_kill_debug.c b/mm/oom_kill_debug.c
index ad937b3d59f3..467f7add4397 100644
--- a/mm/oom_kill_debug.c
+++ b/mm/oom_kill_debug.c
@@ -171,6 +171,12 @@
#ifdef CONFIG_DEBUG_OOM_VMALLOC_SELECT_PRINT
#include <linux/vmalloc.h>
#endif
+#ifdef CONFIG_DEBUG_OOM_ENHANCED_PROCESS_PRINT
+#include <linux/fdtable.h>
+#include <linux/net.h>
+#include <net/sock.h>
+#include <linux/sched/cputime.h>
+#endif
#define OOMD_MAX_FNAME 48
#define OOMD_MAX_OPTNAME 32
@@ -250,6 +256,12 @@ static struct oom_debug_option oom_debug_options_table[] = {
.option_name = "slab_enhanced_print_",
.support_tpercent = false,
},
+#endif
+#ifdef CONFIG_DEBUG_OOM_ENHANCED_PROCESS_PRINT
+ {
+ .option_name = "process_enhanced_print_",
+ .support_tpercent = false,
+ },
#endif
{}
};
@@ -282,6 +294,9 @@ enum oom_debug_options_index {
#endif
#ifdef CONFIG_DEBUG_OOM_ENHANCED_SLAB_PRINT
ENHANCED_SLAB_STATE,
+#endif
+#ifdef CONFIG_DEBUG_OOM_ENHANCED_PROCESS_PRINT
+ ENHANCED_PROCESS_STATE,
#endif
OUT_OF_BOUNDS
};
@@ -365,6 +380,12 @@ bool oom_kill_debug_enhanced_slab_print_information_enabled(void)
return oom_kill_debug_enabled(ENHANCED_SLAB_STATE);
}
#endif
+#ifdef CONFIG_DEBUG_OOM_ENHANCED_PROCESS_PRINT
+bool oom_kill_debug_enhanced_process_print_enabled(void)
+{
+ return oom_kill_debug_enabled(ENHANCED_PROCESS_STATE);
+}
+#endif
#ifdef CONFIG_DEBUG_OOM_SYSTEM_STATE
/*
@@ -513,6 +534,221 @@ u32 oom_kill_debug_oom_event_is(void)
return oom_kill_debug_oom_events;
}
+#ifdef CONFIG_DEBUG_OOM_ENHANCED_PROCESS_PRINT
+/*
+ * Account for socket(s) buffer memory in use by a task.
+ * A task may have one or more sockets consuming socket buffer space.
+ * Account for how much socket space each task has in use.
+ */
+static unsigned long account_for_socket_buffers(struct task_struct *task,
+ char *incomplete)
+{
+ unsigned long sockpgs = 0;
+ struct files_struct *files = task->files;
+ struct fdtable *fdt;
+ struct file **fds;
+ int openfilecount;
+ struct inode *inode;
+ struct socket *sock;
+ struct sock *sk;
+ unsigned long bytes;
+ int fdtsize;
+ int i;
+
+ /* Just to make sure the fds don't get closed */
+ atomic_inc(&files->count);
+ /* Make a best effort, but no reason to get hung up here */
+ if (!spin_trylock(&files->file_lock)) {
+ *incomplete = '*';
+ atomic_dec(&files->count);
+ return 0;
+ }
+
+ rcu_read_lock();
+ fdt = files_fdtable(files);
+ fdtsize = fdt->max_fds;
+ /* Determine how many words we need to check for open files */
+ for (i = fdtsize / BITS_PER_LONG; i > 0; ) {
+ if (fdt->open_fds[--i])
+ break;
+ }
+ openfilecount = (i + 1) * BITS_PER_LONG; // Check each fd in the word
+ fds = fdt->fd;
+ for (i = openfilecount; i != 0; i--) {
+ struct file *fp = *fds++;
+
+ if (fp) {
+ /* Any continue case doesn't need to be counted */
+ if (fp->f_path.dentry == NULL)
+ continue;
+ inode = fp->f_path.dentry->d_inode;
+ if (inode == NULL || !S_ISSOCK(inode->i_mode))
+ continue;
+ sock = fp->private_data;
+ if (sock == NULL)
+ continue;
+ sk = sock->sk;
+ if (sk == NULL)
+ continue;
+ bytes = roundup(sk->sk_rcvbuf, PAGE_SIZE);
+ sockpgs = bytes / PAGE_SIZE;
+ bytes = roundup(sk->sk_sndbuf, PAGE_SIZE);
+ sockpgs += bytes / PAGE_SIZE;
+ }
+ }
+ rcu_read_unlock();
+
+ spin_unlock(&files->file_lock);
+ /* We're done looking at the fds */
+ atomic_dec(&files->count);
+
+ return sockpgs;
+}
+
+static u64 power10(u32 index)
+{
+ static u64 pwr10[11] = {1, 10, 100, 1000, 10000, 100000, 1000000,
+ 10000000, 100000000, 1000000000,
+ 10000000000};
+
+ return pwr10[index];
+}
+
+static u32 num_digits(u64 num)
+{
+ u32 i;
+
+ for (i = 1; i < 11; ++i) {
+ if (power10(i) > num)
+ return i;
+ }
+ return i;
+}
+
+static void digits_and_fraction(u64 num, u32 *p_digits, u32 *p_frac, u32 chars)
+{
+ *p_digits = num_digits(num);
+ // Allow for decimal place for fractional output
+ if (chars - 1 > *p_digits)
+ *p_frac = chars - 1 - *p_digits;
+ else
+ *p_frac = 0;
+}
+
+#define MAX_NUM_FIELD_SIZE 10
+/*
+ * Format timespec into seconds and possibly fraction, must fit in 9 bytes.
+ * Linux kernel doesn't support floating point so format as best we can.
+ * With 9 digits in seconds convers 31.7 years and where we can we provide
+ * fractions of a second up to miliseconds.
+ */
+static void timespec_format(u64 nsecs_time, char *p_time, size_t time_size)
+{
+ struct timespec64 tspec = ns_to_timespec64(nsecs_time);
+ u32 digits, fracs, bytes, min;
+ u64 fraction;
+
+ digits_and_fraction(tspec.tv_sec, &digits, &fracs, time_size);
+
+ bytes = sprintf(p_time, "%llu", tspec.tv_sec);
+
+ if (fracs > 0) {
+ u32 frsize = num_digits(tspec.tv_nsec);
+
+ p_time += bytes;
+ if (frsize >= 3) {
+ if (fracs >= 3)
+ min = frsize - 3;
+ else if (fracs >= 2)
+ min = frsize - 2;
+ else
+ min = frsize - 1;
+ } else if (frsize >= 2) {
+ if (fracs >= 2)
+ min = frsize - 2;
+ else
+ min = frsize - 1;
+ } else {
+ min = frsize - 1;
+ }
+ fraction = tspec.tv_nsec / power10(min);
+ sprintf(p_time, ".%llu", fraction);
+ }
+}
+
+/*
+ * Format utime, stime in seconds and possibly fractions, must fit in 9 bytes.
+ */
+static void time_format(struct task_struct *task, char *p_utime, char *p_stime)
+{
+ size_t num_size = MAX_NUM_FIELD_SIZE;
+ u64 utime, stime;
+
+ task_cputime_adjusted(task, &utime, &stime);
+ memset(p_utime, 0, num_size);
+ timespec_format(utime, p_utime, num_size - 1);
+ memset(p_stime, 0, num_size);
+ timespec_format(stime, p_stime, num_size - 1);
+}
+
+/* task_index_to_char kernel function is missing options so use this */
+#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKWP"
+static const char task_to_char[] = TASK_STATE_TO_CHAR_STR;
+static const char get_task_state(struct task_struct *p_task, ulong state)
+{
+ int bit = state ? __ffs(state) + 1 : 0;
+
+ if (p_task->tgid == 0)
+ return 'I';
+ return bit < sizeof(task_to_char) - 1 ? task_to_char[bit] : '?';
+}
+
+/*
+ * Code that prints the information about the specified task.
+ * Assumes task lock is held at entry.
+ */
+void dump_task_prt(struct task_struct *task,
+ unsigned long rsspg, unsigned long swappg,
+ unsigned long pgtbl)
+{
+ char c_utime[MAX_NUM_FIELD_SIZE], c_stime[MAX_NUM_FIELD_SIZE];
+ unsigned long vmkb, sockkb, text, maxrsspg, pgtblpg;
+ unsigned long libkb, textkb, pgtblkb;
+ struct mm_struct *mm;
+ char incomp = ' ';
+ kuid_t ruid, euid;
+ char tstate;
+
+ mm = task->mm;
+ maxrsspg = rsspg;
+ pgtblpg = pgtbl >> PAGE_SHIFT;
+ ruid = __task_cred(task)->uid;
+ euid = __task_cred(task)->euid;
+ vmkb = K(mm->total_vm);
+ if (maxrsspg < mm->hiwater_rss)
+ maxrsspg = mm->hiwater_rss;
+ sockkb = K(account_for_socket_buffers(task, &incomp));
+ text = (PAGE_ALIGN(mm->end_code) -
+ (mm->start_code & PAGE_MASK));
+ text = min(text, mm->exec_vm << PAGE_SHIFT);
+ textkb = text >> 10;
+ libkb = ((mm->exec_vm << PAGE_SHIFT) - text) >> 10;
+ pgtblkb = pgtbl >> 10;
+ tstate = get_task_state(task, task->state);
+ time_format(task, c_utime, c_stime);
+
+ pr_info("[%7d] %7d %7d %7d %7d %c %9s %9s %9lu %9lu %9lu %9lu %9ld %9lu%c %9lu %9lu %9lu %9lu %9lu %9lu %11lu %11lu %9lu %9llu %5hd %s\n",
+ task->pid, task_ppid_nr(task), ruid.val, euid.val, task->tgid,
+ tstate, c_utime, c_stime, vmkb, K(maxrsspg), K(rsspg), pgtblkb,
+ K(swappg), sockkb, incomp, libkb, textkb, K(mm->data_vm),
+ K(mm->stack_vm), K(get_mm_counter(mm, MM_FILEPAGES)),
+ K(get_mm_counter(mm, MM_SHMEMPAGES)), task->signal->cmaj_flt,
+ task->signal->cmin_flt,
+ K(mm->locked_vm), K((u64)atomic64_read(&mm->pinned_vm)),
+ task->signal->oom_score_adj, task->comm);
+}
+#endif /* CONFIG_DEBUG_OOM_ENHANCED_PROCESS_PRINT */
+
static void __init oom_debug_init(void)
{
/* Ensure we have a debugfs oom root directory */
diff --git a/mm/oom_kill_debug.h b/mm/oom_kill_debug.h
index a39bc275980e..faebb4c6097c 100644
--- a/mm/oom_kill_debug.h
+++ b/mm/oom_kill_debug.h
@@ -9,6 +9,11 @@
#ifndef __MM_OOM_KILL_DEBUG_H__
#define __MM_OOM_KILL_DEBUG_H__
+#ifdef CONFIG_DEBUG_OOM_ENHANCED_PROCESS_PRINT
+extern bool oom_kill_debug_enhanced_process_print_enabled(void);
+extern void dump_task_prt(struct task_struct *task, unsigned long rsspg,
+ unsigned long swappg, unsigned long pgtbl);
+#endif
#ifdef CONFIG_DEBUG_OOM_PROCESS_SELECT_PRINT
extern unsigned long oom_kill_debug_min_task_pages(unsigned long totalpages);
#endif
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread