Skip to content

Commit cf23e30

Browse files
Michal Hockojfvogel
authored andcommitted
mm, percpu: do not consider sleepable allocations atomic
[ Upstream commit 9a5b183 ] 28307d9 ("percpu: make pcpu_alloc() aware of current gfp context") has fixed a reclaim recursion for scoped GFP_NOFS context. It has done that by avoiding taking pcpu_alloc_mutex. This is a correct solution as the worker context with full GFP_KERNEL allocation/reclaim power and which is using the same lock cannot block the NOFS pcpu_alloc caller. On the other hand this is a very conservative approach that could lead to failures because pcpu_alloc lockless implementation is quite limited. We have a bug report about premature failures when scsi array of 193 devices is scanned. Sometimes (not consistently) the scanning aborts because the iscsid daemon fails to create the queue for a random scsi device during the scan. iscsid itself is running with PR_SET_IO_FLUSHER set so all allocations from this process context are GFP_NOIO. This in turn makes any pcpu_alloc lockless (without pcpu_alloc_mutex) which leads to pre-mature failures. It has turned out that iscsid has worked around this by dropping PR_SET_IO_FLUSHER (open-iscsi/open-iscsi#382) when scanning host. But we can do better in this case on the kernel side and use pcpu_alloc_mutex for NOIO resp. NOFS constrained allocation scopes too. We just need the WQ worker to never trigger IO/FS reclaim. Achieve that by enforcing scoped GFP_NOIO for the whole execution of pcpu_balance_workfn (this will imply NOFS constrain as well). This will remove the dependency chain and preserve the full allocation power of the pcpu_alloc call. While at it make is_atomic really test for blockable allocations. Link: https://lkml.kernel.org/r/20250206122633.167896-1-mhocko@kernel.org Fixes: 28307d9 ("percpu: make pcpu_alloc() aware of current gfp context") Signed-off-by: Michal Hocko <mhocko@suse.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Cc: Dennis Zhou <dennis@kernel.org> Cc: Filipe David Manana <fdmanana@suse.com> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: chenxin <chenxinxin@xiaomi.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 34c93e96c3a3a26716d3b8a2f32c10e2bab8e7be) Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
1 parent 72cc85e commit cf23e30

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

mm/percpu.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1758,7 +1758,7 @@ void __percpu *pcpu_alloc_noprof(size_t size, size_t align, bool reserved,
17581758
gfp = current_gfp_context(gfp);
17591759
/* whitelisted flags that can be passed to the backing allocators */
17601760
pcpu_gfp = gfp & (GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
1761-
is_atomic = (gfp & GFP_KERNEL) != GFP_KERNEL;
1761+
is_atomic = !gfpflags_allow_blocking(gfp);
17621762
do_warn = !(gfp & __GFP_NOWARN);
17631763

17641764
/*
@@ -2203,7 +2203,12 @@ static void pcpu_balance_workfn(struct work_struct *work)
22032203
* to grow other chunks. This then gives pcpu_reclaim_populated() time
22042204
* to move fully free chunks to the active list to be freed if
22052205
* appropriate.
2206+
*
2207+
* Enforce GFP_NOIO allocations because we have pcpu_alloc users
2208+
* constrained to GFP_NOIO/NOFS contexts and they could form lock
2209+
* dependency through pcpu_alloc_mutex
22062210
*/
2211+
unsigned int flags = memalloc_noio_save();
22072212
mutex_lock(&pcpu_alloc_mutex);
22082213
spin_lock_irq(&pcpu_lock);
22092214

@@ -2214,6 +2219,7 @@ static void pcpu_balance_workfn(struct work_struct *work)
22142219

22152220
spin_unlock_irq(&pcpu_lock);
22162221
mutex_unlock(&pcpu_alloc_mutex);
2222+
memalloc_noio_restore(flags);
22172223
}
22182224

22192225
/**

0 commit comments

Comments
 (0)