author: Uladzislau Rezki (Sony) <urezki@gmail.com> 2021-09-02 14:57:19 -0700
committer: Linus Torvalds <torvalds@linux-foundation.org> 2021-09-03 09:58:14 -0700
commit: 12e376a6f859a000308b6c7cf4a2493eda2bb026
parent: 343ab8178f318b6006d54865972ff9c433b29e10
Commit Summary:
Diffstat:
1 file changed, 7 insertions, 10 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 24bc65f02d04..5dcb65dd9bf3 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1479,6 +1479,7 @@ static struct vmap_area *alloc_vmap_area(unsigned long size,
int node, gfp_t gfp_mask)
{
struct vmap_area *va;
+ unsigned long freed;
unsigned long addr;
int purged = 0;
int ret;
@@ -1542,13 +1543,12 @@ overflow:
goto retry;
}
- if (gfpflags_allow_blocking(gfp_mask)) {
- unsigned long freed = 0;
- blocking_notifier_call_chain(&vmap_notify_list, 0, &freed);
- if (freed > 0) {
- purged = 0;
- goto retry;
- }
+ freed = 0;
+ blocking_notifier_call_chain(&vmap_notify_list, 0, &freed);
+
+ if (freed > 0) {
+ purged = 0;
+ goto retry;
}
if (!(gfp_mask & __GFP_NOWARN) && printk_ratelimit())
@@ -2838,9 +2838,7 @@ vm_area_alloc_pages(gfp_t gfp, int nid,
for (i = 0; i < (1U << order); i++)
pages[nr_allocated + i] = page + i;
- if (gfpflags_allow_blocking(gfp))
- cond_resched();
-
+ cond_resched();
nr_allocated += 1U << order;
}