Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Edward Chron <echron@arista.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Michal Hocko <mhocko@suse.com>, Roman Gushchin <guro@fb.com>,
        Johannes Weiner <hannes@cmpxchg.org>,
        David Rientjes <rientjes@google.com>,
        Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>,
        Shakeel Butt <shakeelb@google.com>, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, colona@arista.com,
        Edward Chron <echron@arista.com>
Subject: [PATCH 02/10] mm/oom_debug: Add System State Summary
Date:   Mon, 26 Aug 2019 12:36:30 -0700
Message-Id: <20190826193638.6638-3-echron@arista.com>
In-Reply-To: <20190826193638.6638-1-echron@arista.com>
References: <20190826193638.6638-1-echron@arista.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

When selected, prints the number of CPUs online at the time of the OOM
event. Also prints nodename, domainname, machine type, kernel release
and version, system uptime, total memory and swap size. Produces a
single line of output holding this information.

This information is useful to help determine the state the system was
in when the event was triggered which is helpful for debugging,
performance measurements and security issues.

Configuring this Debug Option (DEBUG_OOM_SYSTEM_STATE)
------------------------------------------------------
To enable the option it needs to be configured in the OOM Debugging
configure menu. The kernel configuration entry can be found in the
config at: Kernel hacking, Memory Debugging, OOM Debugging the
DEBUG_OOM_SYSTEM_STATE config entry.

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 is: system_state_summary_
and the file for this option is the enable file.

This option may be disabled or re-enabled using the debugfs enable file
for this OOM debug option. The debugfs file to enable this entry is found
at: /sys/kernel/debug/oom/system_state_summary_enabled where the enabled
file's value determines whether the facility is enabled or disabled.
A value of 1 is enabled and a value of 0 is disabled.
When configured the default setting is set to enabled.

Content and format of System State Summary Output
-------------------------------------------------
  One line of output that includes:
  - Uptime (days, hour, minutes, seconds)
  - Number CPUs
  - Machine Type
  - Node name
  - Domain name
  - Kernel Release
  - Kernel Version

Sample Output:
-------------
Sample System State Summary message:

Jul 27 10:56:46 yoursystem kernel: System Uptime:0 days 00:17:27
 CPUs:4 Machine:x86_64 Node:yoursystem Domain:localdomain
 Kernel Release:5.3.0-rc2+ Version: #49 SMP Mon Jul 27 10:35:32 PDT 2019


Signed-off-by: Edward Chron <echron@arista.com>
---
 mm/Kconfig.debug    | 15 +++++++++
 mm/oom_kill_debug.c | 81 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index 5610da5fa614..dbe599b67a3b 100644
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -132,3 +132,18 @@ config DEBUG_OOM
 	  option is a prerequisite for selecting any OOM debugging options.
 
 	  If unsure, say N
+
+config DEBUG_OOM_SYSTEM_STATE
+	bool "Debug OOM System State"
+	depends on DEBUG_OOM
+	help
+	  When enabled, provides one line of output on an oom event to
+	  document the state of the system when the oom event occurred.
+	  Prints: uptime, # threads, # processes, system memory size in KiB
+	  and swap space size in KiB, nodename, domainname, machine type,
+	  kernel release and version. If configured it is enabled/disabled
+	  by setting the enabled file entry in the debugfs OOM interface
+	  at: /sys/kernel/debug/oom/system_state_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 af07e662c808..6eeaad86fca8 100644
--- a/mm/oom_kill_debug.c
+++ b/mm/oom_kill_debug.c
@@ -144,6 +144,14 @@
 #include <linux/sysfs.h>
 #include "oom_kill_debug.h"
 
+#ifdef CONFIG_DEBUG_OOM_SYSTEM_STATE
+#include <linux/cpumask.h>
+#include <linux/mm.h>
+#include <linux/swap.h>
+#include <linux/utsname.h>
+#include <linux/sched/stat.h>
+#endif
+
 #define OOMD_MAX_FNAME 48
 #define OOMD_MAX_OPTNAME 32
 
@@ -169,11 +177,20 @@ struct oom_debug_option {
 
 /* Table of oom debug options, new options need to be added here */
 static struct oom_debug_option oom_debug_options_table[] = {
+#ifdef CONFIG_DEBUG_OOM_SYSTEM_STATE
+	{
+		.option_name	= "system_state_summary_",
+		.support_tpercent = false,
+	},
+#endif
 	{}
 };
 
 /* Option index by name for order one-lookup, add new options entry here */
 enum oom_debug_options_index {
+#ifdef CONFIG_DEBUG_OOM_SYSTEM_STATE
+	SYSTEM_STATE,
+#endif
 	OUT_OF_BOUNDS
 };
 
@@ -244,10 +261,74 @@ u32 oom_kill_debug_oom_event(void)
 	return oom_kill_debug_oom_events;
 }
 
+#ifdef CONFIG_DEBUG_OOM_SYSTEM_STATE
+/*
+ * oom_kill_debug_system_summary_prt - provides one line of output to document
+ *                      some of the system state at the time of an oom event.
+ *                      Output line includes: uptime, # threads, # processes,
+ *                      system memory size in KiB and swap space size in KiB,
+ *                      nodename, domainname, machine type, kernel release
+ *                      and version.
+ */
+static void oom_kill_debug_system_summary_prt(void)
+{
+	struct new_utsname *p_uts;
+	char domainname[256];
+	unsigned long upsecs;
+	unsigned short hours;
+	struct timespec64 tp;
+	unsigned short days;
+	unsigned short mins;
+	unsigned short secs;
+	char nodename[256];
+	size_t nodesize;
+	char *p_wend;
+	long uptime;
+	int procs;
+
+	p_uts = utsname();
+
+	memset(nodename, 0, sizeof(nodename));
+	memset(domainname, 0, sizeof(domainname));
+
+	p_wend = strchr(p_uts->nodename, '.');
+	if (p_wend != NULL) {
+		nodesize = p_wend - p_uts->nodename;
+		++p_wend;
+		strncpy(nodename, p_uts->nodename, nodesize);
+		strcpy(domainname, p_wend);
+	} else {
+		strcpy(nodename, p_uts->nodename);
+		strcpy(domainname, "(none)");
+	}
+
+	procs = nr_processes();
+
+	ktime_get_boottime_ts64(&tp);
+	uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
+
+	days = uptime / 86400;
+	upsecs = uptime - (days * 86400);
+	hours = upsecs / 3600;
+	upsecs = upsecs - (hours * 3600);
+	mins = upsecs / 60;
+	secs = upsecs - (mins * 60);
+
+	pr_info("System Uptime:%hu days %02hu:%02hu:%02hu CPUs:%u Machine:%s Node:%s Domain:%s Kernel Release:%s Version:%s\n",
+		days, hours, mins, secs, num_online_cpus(), p_uts->machine,
+		nodename, domainname, p_uts->release, p_uts->version);
+}
+#endif /* CONFIG_DEBUG_OOM_SYSTEM_STATE */
+
 u32 oom_kill_debug_oom_event_is(void)
 {
 	++oom_kill_debug_oom_events;
 
+#ifdef CONFIG_DEBUG_OOM_SYSTEM_STATE
+	if (oom_kill_debug_enabled(SYSTEM_STATE))
+		oom_kill_debug_system_summary_prt();
+#endif
+
 	return oom_kill_debug_oom_events;
 }
 
-- 
2.20.1