Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'slab-for-6.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab
Pull slab fix from Vlastimil Babka:
- A stable fix for kmalloc_nolock() in non-preemptible contexts on
PREEMPT_RT (Swaraj Gaikwad)
* tag 'slab-for-6.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
slab: fix kmalloc_nolock() context check for PREEMPT_RT
+6
-2
+6
-2
mm/slub.c
+6
-2
mm/slub.c
···
5694
5694
if (unlikely(!size))
5695
5695
return ZERO_SIZE_PTR;
5696
5696
5697
-
if (IS_ENABLED(CONFIG_PREEMPT_RT) && (in_nmi() || in_hardirq()))
5698
-
/* kmalloc_nolock() in PREEMPT_RT is not supported from irq */
5697
+
if (IS_ENABLED(CONFIG_PREEMPT_RT) && !preemptible())
5698
+
/*
5699
+
* kmalloc_nolock() in PREEMPT_RT is not supported from
5700
+
* non-preemptible context because local_lock becomes a
5701
+
* sleeping lock on RT.
5702
+
*/
5699
5703
return NULL;
5700
5704
retry:
5701
5705
if (unlikely(size > KMALLOC_MAX_CACHE_SIZE))