diff options
| author | Linus Torvalds | 2020-05-31 10:43:17 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-05-31 10:43:17 -0700 |
| commit | 3d0428232909d9aa9248c3724f04a333f6f53bb3 (patch) | |
| tree | 6859b96a64b7f2a42372213b54ced102723de70a /kernel | |
| parent | 19835b1ba6b1f2d3fb5aefffa01ebd626513ff4a (diff) | |
| parent | 18f855e574d9799a0e7489f8ae6fd8447d0dd74a (diff) | |
Merge tag 'sched-urgent-2020-05-31' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Thomas Gleixner:
"A single scheduler fix preventing a crash in NUMA balancing.
The current->mm check is not reliable as the mm might be temporary due
to use_mm() in a kthread. Check for PF_KTHREAD explictly"
* tag 'sched-urgent-2020-05-31' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/fair: Don't NUMA balance for kthreads
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 538ba5d94e99..da3e5b54715b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2908,7 +2908,7 @@ static void task_tick_numa(struct rq *rq, struct task_struct *curr) /* * We don't care about NUMA placement if we don't have memory. */ - if (!curr->mm || (curr->flags & PF_EXITING) || work->next != work) + if ((curr->flags & (PF_EXITING | PF_KTHREAD)) || work->next != work) return; /* |