Some of the migitation actions of PR_SET_MEMCONTROL give no visible
signal that some actions are being done inside the kernel. To make it
more visble, a new PR_MEMFLAG_LOG flag is added to enable the logging
of the migitation action done in the kernel ring buffer.
The logging is done once when the mitigation action starts through the
setting of an internal PR_MEMFLAG_LOGGED flag. This flag will be cleared
when it is detected that the memory limit no longer exceeds memory.high.
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
---
include/uapi/linux/prctl.h | 1 +
mm/memcontrol.c | 34 +++++++++++++++++++++++++++++++++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h
index 7ba40e10737d..faa7a51fc52a 100644
--- a/include/uapi/linux/prctl.h
+++ b/include/uapi/linux/prctl.h
@@ -266,6 +266,7 @@ struct prctl_mm_map {
/* Flags for PR_SET_MEMCONTROL */
# define PR_MEMFLAG_SIGCONT (1UL << 0) /* Continuous signal delivery */
# define PR_MEMFLAG_DIRECT (1UL << 1) /* Direct memory limit */
+# define PR_MEMFLAG_LOG (1UL << 2) /* Log action done */
# define PR_MEMFLAG_RSS_ANON (1UL << 8) /* Check anonymous pages */
# define PR_MEMFLAG_RSS_FILE (1UL << 9) /* Check file pages */
# define PR_MEMFLAG_RSS_SHMEM (1UL << 10) /* Check shmem pages */
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index bddf3e659469..5bda2dd755fc 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2640,6 +2640,7 @@ get_rss_counter(struct mm_struct *mm, int mm_bit, u16 flags, int rss_bit)
* Return true if an action has been taken or further check is not needed,
* false otherwise.
*/
+#define PR_MEMFLAG_LOGGED (1UL << 7) /* A log message printed */
static bool __mem_cgroup_over_high_action(struct mem_cgroup *memcg, u8 action,
u16 flags)
{
@@ -2714,6 +2715,32 @@ static bool __mem_cgroup_over_high_action(struct mem_cgroup *memcg, u8 action,
break;
}
+ if ((flags & (PR_MEMFLAG_LOG|PR_MEMFLAG_LOGGED)) == PR_MEMFLAG_LOG) {
+ char name[80];
+ static const char * const acts[] = {
+ [PR_MEMACT_ENOMEM] = "Action: return ENOMEM on some syscalls",
+ [PR_MEMACT_SLOWDOWN] = "Action: slow down process",
+ [PR_MEMACT_SIGNAL] = "Action: send signal",
+ [PR_MEMACT_KILL] = "Action: kill the process",
+ };
+
+ name[0] = '\0';
+ if (memcg)
+ cgroup_name(memcg->css.cgroup, name, sizeof(name));
+ else
+ strcpy(name, "N/A");
+
+ /*
+ * Use printk_deferred() to minimize delay in the memory
+ * allocation path.
+ */
+ printk_deferred(KERN_INFO
+ "Cgroup: %s, Comm: %s, Pid: %d, Mem: %ld pages, %s\n",
+ name, current->comm, current->pid, mem, acts[action]);
+ WRITE_ONCE(current->memcg_over_high_flags,
+ flags | PR_MEMFLAG_LOGGED);
+ }
+
out:
mmput(mm);
/*
@@ -2740,8 +2767,13 @@ static inline bool mem_cgroup_over_high_action(struct mem_cgroup *memcg,
if (flags & PR_MEMFLAG_DIRECT)
memcg = NULL; /* Direct per-task memory limit checking */
- else if (!mem_high)
+ else if (!mem_high) {
+ /* Clear the PR_MEMFLAG_LOGGED flag, if set */
+ if (flags & PR_MEMFLAG_LOGGED)
+ WRITE_ONCE(current->memcg_over_high_flags,
+ flags & ~PR_MEMFLAG_LOGGED);
return false;
+ }
return __mem_cgroup_over_high_action(memcg, action, flags);
}
--
2.18.1
