|
@@ -3055,6 +3055,26 @@ void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...)
|
|
|
warn_alloc_show_mem(gfp_mask, nm);
|
|
|
}
|
|
|
|
|
|
+static inline struct page *
|
|
|
+__alloc_pages_cpuset_fallback(gfp_t gfp_mask, unsigned int order,
|
|
|
+ unsigned int alloc_flags,
|
|
|
+ const struct alloc_context *ac)
|
|
|
+{
|
|
|
+ struct page *page;
|
|
|
+
|
|
|
+ page = get_page_from_freelist(gfp_mask, order,
|
|
|
+ alloc_flags|ALLOC_CPUSET, ac);
|
|
|
+ /*
|
|
|
+ * fallback to ignore cpuset restriction if our nodes
|
|
|
+ * are depleted
|
|
|
+ */
|
|
|
+ if (!page)
|
|
|
+ page = get_page_from_freelist(gfp_mask, order,
|
|
|
+ alloc_flags, ac);
|
|
|
+
|
|
|
+ return page;
|
|
|
+}
|
|
|
+
|
|
|
static inline struct page *
|
|
|
__alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
|
|
|
const struct alloc_context *ac, unsigned long *did_some_progress)
|
|
@@ -3119,17 +3139,13 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
|
|
|
if (out_of_memory(&oc) || WARN_ON_ONCE(gfp_mask & __GFP_NOFAIL)) {
|
|
|
*did_some_progress = 1;
|
|
|
|
|
|
- if (gfp_mask & __GFP_NOFAIL) {
|
|
|
- page = get_page_from_freelist(gfp_mask, order,
|
|
|
- ALLOC_NO_WATERMARKS|ALLOC_CPUSET, ac);
|
|
|
- /*
|
|
|
- * fallback to ignore cpuset restriction if our nodes
|
|
|
- * are depleted
|
|
|
- */
|
|
|
- if (!page)
|
|
|
- page = get_page_from_freelist(gfp_mask, order,
|
|
|
+ /*
|
|
|
+ * Help non-failing allocations by giving them access to memory
|
|
|
+ * reserves
|
|
|
+ */
|
|
|
+ if (gfp_mask & __GFP_NOFAIL)
|
|
|
+ page = __alloc_pages_cpuset_fallback(gfp_mask, order,
|
|
|
ALLOC_NO_WATERMARKS, ac);
|
|
|
- }
|
|
|
}
|
|
|
out:
|
|
|
mutex_unlock(&oom_lock);
|
|
@@ -3785,6 +3801,16 @@ nopage:
|
|
|
*/
|
|
|
WARN_ON_ONCE(order > PAGE_ALLOC_COSTLY_ORDER);
|
|
|
|
|
|
+ /*
|
|
|
+ * Help non-failing allocations by giving them access to memory
|
|
|
+ * reserves but do not use ALLOC_NO_WATERMARKS because this
|
|
|
+ * could deplete whole memory reserves which would just make
|
|
|
+ * the situation worse
|
|
|
+ */
|
|
|
+ page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_HARDER, ac);
|
|
|
+ if (page)
|
|
|
+ goto got_pg;
|
|
|
+
|
|
|
cond_resched();
|
|
|
goto retry;
|
|
|
}
|