Skip to contentSkip to conversation

mm-vmalloc-check-free-space-in-vmap_block-lockless.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 9, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/vmalloc: check free space in vmap_block lockless
has been removed from the -mm tree. Its filename was
mm-vmalloc-check-free-space-in-vmap_block-lockless.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Thomas Gleixner <[email protected]>
Subject: mm/vmalloc: check free space in vmap_block lockless
Date: Thu, 25 May 2023 14:57:07 +0200 (CEST)

vb_alloc() unconditionally locks a vmap_block on the free list to check the free space.

This can be done locklessly because vmap_block::free never increases, it's only decreased on allocations.

Check the free space lockless and only if that succeeds, recheck under the lock.

---

 mm/vmalloc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
mm/vmalloc.c renamed from mm/vmalloc.c~mm-vmalloc-check-free-space-in-vmap_block-lockless +4 -1
@@ -2168,6 +2168,9 @@ static void *vb_alloc(unsigned long size
 	list_for_each_entry_rcu(vb, &vbq->free, free_list) {
 		unsigned long pages_off;
 
+		if (READ_ONCE(vb->free) < (1UL << order))
+			continue;
+
 		spin_lock(&vb->lock);
 		if (vb->free < (1UL << order)) {
 			spin_unlock(&vb->lock);
@@ -2176,7 +2179,7 @@ static void *vb_alloc(unsigned long size
 
 		pages_off = VMAP_BBMAP_BITS - vb->free;
 		vaddr = vmap_block_vaddr(vb->va->va_start, pages_off);
-		vb->free -= 1UL << order;
+		WRITE_ONCE(vb->free, vb->free - (1UL << order));
 		bitmap_set(vb->used_map, pages_off, (1UL << order));
 		if (vb->free == 0) {
 			spin_lock(&vbq->lock);

_

Patches currently in -mm which might be from [email protected] are