On Fri, 30 Mar 2018 17:30:31 -0400
Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
> I'll take a look at si_mem_available() that Joel suggested and see if
> we can make that work.
Wow, this appears to work great! Joel and Zhaoyang, can you test this?
-- Steve
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index a2fd3893cc02..32a803626ee2 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1164,6 +1164,11 @@ static int __rb_allocate_pages(long nr_pages, struct list_head *pages, int cpu)
struct buffer_page *bpage, *tmp;
long i;
+ /* Check if the available memory is there first */
+ i = si_mem_available();
+ if (i < nr_pages)
+ return -ENOMEM;
+
for (i = 0; i < nr_pages; i++) {
struct page *page;
/*
