[<prev] [next>] [day] [month] [year] [list]
Message-ID: <877caa99-1994-5545-92d2-d0bb2e394182@virtuozzo.com>
Date: Mon, 9 Aug 2021 13:46:49 +0300
From: Vasily Averin <vvs@...tuozzo.com>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-mm@...ck.org, linux-kernel@...r.kernel.org, kernel@...nvz.org
Subject: [PATCH] mm: use in_task in mm/page_alloc.c
Obsoleted in_intrrupt() include task context with disabled BH,
it's better to use in_task() instead.
Signed-off-by: Vasily Averin <vvs@...tuozzo.com>
---
mm/page_alloc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4291639..a385194 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4212,7 +4212,7 @@ static void warn_alloc_show_mem(gfp_t gfp_mask, nodemask_t *nodemask)
if (tsk_is_oom_victim(current) ||
(current->flags & (PF_MEMALLOC | PF_EXITING)))
filter &= ~SHOW_MEM_FILTER_NODES;
- if (in_interrupt() || !(gfp_mask & __GFP_DIRECT_RECLAIM))
+ if (!in_task() || !(gfp_mask & __GFP_DIRECT_RECLAIM))
filter &= ~SHOW_MEM_FILTER_NODES;
show_mem(filter, nodemask);
@@ -4698,7 +4698,7 @@ static void wake_all_kswapds(unsigned int order, gfp_t gfp_mask,
* comment for __cpuset_node_allowed().
*/
alloc_flags &= ~ALLOC_CPUSET;
- } else if (unlikely(rt_task(current)) && !in_interrupt())
+ } else if (unlikely(rt_task(current)) && in_task())
alloc_flags |= ALLOC_HARDER;
alloc_flags = gfp_to_alloc_flags_cma(gfp_mask, alloc_flags);
@@ -5158,7 +5158,7 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order,
* When we are in the interrupt context, it is irrelevant
* to the current task context. It means that any node ok.
*/
- if (!in_interrupt() && !ac->nodemask)
+ if (in_task() && !ac->nodemask)
ac->nodemask = &cpuset_current_mems_allowed;
else
*alloc_flags |= ALLOC_CPUSET;
--
1.8.3.1
Powered by blists - more mailing lists