Skip to content

Commit f9e0997

Browse files
Christoph Hellwigtorvalds
Christoph Hellwig
authored andcommitted
mm: turn vmap_purge_lock into a mutex
The purge_lock spinlock causes high latencies with non RT kernel. This has been reported multiple times on lkml [1] [2] and affects applications like audio. This patch replaces it with a mutex to allow preemption while holding the lock. Thanks to Joel Fernandes for the detailed report and analysis as well as an earlier attempt at fixing this issue. [1] http://lists.openwall.net/linux-kernel/2016/03/23/29 [2] https://lkml.org/lkml/2016/10/9/59 Link: http://lkml.kernel.org/r/1479474236-4139-10-git-send-email-hch@lst.de Signed-off-by: Christoph Hellwig <hch@lst.de> Tested-by: Jisheng Zhang <jszhang@marvell.com> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> Cc: Joel Fernandes <joelaf@google.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: John Dias <joaodias@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 5803ed2 commit f9e0997

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

mm/vmalloc.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ static atomic_t vmap_lazy_nr = ATOMIC_INIT(0);
606606
* by this look, but we want to avoid concurrent calls for performance
607607
* reasons and to make the pcpu_get_vm_areas more deterministic.
608608
*/
609-
static DEFINE_SPINLOCK(vmap_purge_lock);
609+
static DEFINE_MUTEX(vmap_purge_lock);
610610

611611
/* for per-CPU blocks */
612612
static void purge_fragmented_blocks_allcpus(void);
@@ -660,9 +660,9 @@ static bool __purge_vmap_area_lazy(unsigned long start, unsigned long end)
660660
*/
661661
static void try_purge_vmap_area_lazy(void)
662662
{
663-
if (spin_trylock(&vmap_purge_lock)) {
663+
if (mutex_trylock(&vmap_purge_lock)) {
664664
__purge_vmap_area_lazy(ULONG_MAX, 0);
665-
spin_unlock(&vmap_purge_lock);
665+
mutex_unlock(&vmap_purge_lock);
666666
}
667667
}
668668

@@ -671,10 +671,10 @@ static void try_purge_vmap_area_lazy(void)
671671
*/
672672
static void purge_vmap_area_lazy(void)
673673
{
674-
spin_lock(&vmap_purge_lock);
674+
mutex_lock(&vmap_purge_lock);
675675
purge_fragmented_blocks_allcpus();
676676
__purge_vmap_area_lazy(ULONG_MAX, 0);
677-
spin_unlock(&vmap_purge_lock);
677+
mutex_unlock(&vmap_purge_lock);
678678
}
679679

680680
/*
@@ -1063,11 +1063,11 @@ void vm_unmap_aliases(void)
10631063
rcu_read_unlock();
10641064
}
10651065

1066-
spin_lock(&vmap_purge_lock);
1066+
mutex_lock(&vmap_purge_lock);
10671067
purge_fragmented_blocks_allcpus();
10681068
if (!__purge_vmap_area_lazy(start, end) && flush)
10691069
flush_tlb_kernel_range(start, end);
1070-
spin_unlock(&vmap_purge_lock);
1070+
mutex_unlock(&vmap_purge_lock);
10711071
}
10721072
EXPORT_SYMBOL_GPL(vm_unmap_aliases);
10731073

0 commit comments

Comments
 (0)