linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm: Always print RLIMIT_DATA warning
@ 2018-02-06 16:45 David Woodhouse
  2018-02-06 17:27 ` Cyrill Gorcunov
  2018-02-06 17:48 ` Konstantin Khlebnikov
  0 siblings, 2 replies; 5+ messages in thread
From: David Woodhouse @ 2018-02-06 16:45 UTC (permalink / raw)
  To: Konstantin Khlebnikov, Andrew Morton, Cyrill Gorcunov,
	Linus Torvalds, Vegard Nossum, Peter Zijlstra, Vladimir Davydov,
	Andy Lutomirski, Quentin Casasnovas, Kees Cook, Willy Tarreau,
	Pavel Emelyanov, Laura Abbott, linux-kernel, linux-mm

The documentation for ignore_rlimit_data says that it will print a warning
at first misuse. Yet it doesn't seem to do that. Fix the code to print
the warning even when we allow the process to continue.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
We should probably also do what Linus suggested in 
https://lkml.org/lkml/2016/9/16/585

 mm/mmap.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 9efdc021..dd76ea3 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3184,13 +3184,15 @@ bool may_expand_vm(struct mm_struct *mm, vm_flags_t flags, unsigned long npages)
 		if (rlimit(RLIMIT_DATA) == 0 &&
 		    mm->data_vm + npages <= rlimit_max(RLIMIT_DATA) >> PAGE_SHIFT)
 			return true;
-		if (!ignore_rlimit_data) {
-			pr_warn_once("%s (%d): VmData %lu exceed data ulimit %lu. Update limits or use boot option ignore_rlimit_data.\n",
-				     current->comm, current->pid,
-				     (mm->data_vm + npages) << PAGE_SHIFT,
-				     rlimit(RLIMIT_DATA));
+
+		pr_warn_once("%s (%d): VmData %lu exceed data ulimit %lu. Update limits%s.\n",
+			     current->comm, current->pid,
+			     (mm->data_vm + npages) << PAGE_SHIFT,
+			     rlimit(RLIMIT_DATA),
+			     ignore_rlimit_data ? "" : " or use boot option ignore_rlimit_data");
+
+		if (!ignore_rlimit_data)
 			return false;
-		}
 	}
 
 	return true;
-- 
2.7.4

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2018-02-07 13:03 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-06 16:45 [PATCH] mm: Always print RLIMIT_DATA warning David Woodhouse
2018-02-06 17:27 ` Cyrill Gorcunov
2018-02-06 17:30   ` David Woodhouse
2018-02-06 17:48 ` Konstantin Khlebnikov
2018-02-07 13:03   ` David Woodhouse

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).