Skip to content

Commit 8486188

Browse files
Joel Fernandesrostedt
authored andcommitted
tracing/ring_buffer: Try harder to allocate
ftrace can fail to allocate per-CPU ring buffer on systems with a large number of CPUs coupled while large amounts of cache happening in the page cache. Currently the ring buffer allocation doesn't retry in the VM implementation even if direct-reclaim made some progress but still wasn't able to find a free page. On retrying I see that the allocations almost always succeed. The retry doesn't happen because __GFP_NORETRY is used in the tracer to prevent the case where we might OOM, however if we drop __GFP_NORETRY, we risk destabilizing the system if OOM killer is triggered. To prevent this situation, use the __GFP_RETRY_MAYFAIL flag introduced recently [1]. Tested the following still succeeds without destabilizing a system with 1GB memory. echo 300000 > /sys/kernel/debug/tracing/buffer_size_kb [1] https://marc.info/?l=linux-mm&m=149820805124906&w=2 Link: http://lkml.kernel.org/r/[email protected] Cc: Tim Murray <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Andrew Morton <[email protected]> Acked-by: Vlastimil Babka <[email protected]> Acked-by: Johannes Weiner <[email protected]> Acked-by: Michal Hocko <[email protected]> Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent 5771a8c commit 8486188

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

kernel/trace/ring_buffer.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,20 +1136,20 @@ static int __rb_allocate_pages(long nr_pages, struct list_head *pages, int cpu)
11361136
for (i = 0; i < nr_pages; i++) {
11371137
struct page *page;
11381138
/*
1139-
* __GFP_NORETRY flag makes sure that the allocation fails
1140-
* gracefully without invoking oom-killer and the system is
1141-
* not destabilized.
1139+
* __GFP_RETRY_MAYFAIL flag makes sure that the allocation fails
1140+
* gracefully without invoking oom-killer and the system is not
1141+
* destabilized.
11421142
*/
11431143
bpage = kzalloc_node(ALIGN(sizeof(*bpage), cache_line_size()),
1144-
GFP_KERNEL | __GFP_NORETRY,
1144+
GFP_KERNEL | __GFP_RETRY_MAYFAIL,
11451145
cpu_to_node(cpu));
11461146
if (!bpage)
11471147
goto free_pages;
11481148

11491149
list_add(&bpage->list, pages);
11501150

11511151
page = alloc_pages_node(cpu_to_node(cpu),
1152-
GFP_KERNEL | __GFP_NORETRY, 0);
1152+
GFP_KERNEL | __GFP_RETRY_MAYFAIL, 0);
11531153
if (!page)
11541154
goto free_pages;
11551155
bpage->page = page_address(page);

0 commit comments

Comments
 (0)