Skip to contentSkip to conversation

io_uring/memmap: move vm_flags_set() outside of ctx->mmap_lock

PATCH New Jens Axboe 1 participant 1 message Mar 13, 2025 io_uring

lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

PATCH 1/1 io_uring/memmap: move vm_flags_set() outside of ctx->mmap_lock

syzbot complaints that sometimes the ordering between ctx->mmap_lock and vma->vm_lock->lock aren't the same, which obviously makes lockdep unhappy.

We'd normally expect the ctx->mmap_lock to nest inside the vma lock, but vm_flags_set() -> vma_start_write() from the ->mmap() patch can happen in the opposite order.

Move the vm_flags_set() to before ctx->mmap_lock is grabbed. This does potentially leak the VM_DONT_EXPAND set for that vma, and while that could get cleared, doesn't look like it's necessary to do so. Hence just keep it simple.

---

io_uring/memmap.c +2 -1
index 361134544427..d325b6ab6b99 100644
@@ -309,7 +309,6 @@ static int io_region_mmap(struct io_ring_ctx *ctx,
 {
 	unsigned long nr_pages = min(mr->nr_pages, max_pages);
 
-	vm_flags_set(vma, VM_DONTEXPAND);
 	return vm_insert_pages(vma, vma->vm_start, mr->pages, &nr_pages);
 }
 
@@ -322,6 +321,8 @@ __cold int io_uring_mmap(struct file *file, struct vm_area_struct *vma)
 	struct io_mapped_region *region;
 	void *ptr;
 
+	vm_flags_set(vma, VM_DONTEXPAND);
+
 	guard(mutex)(&ctx->mmap_lock);
 
 	ptr = io_uring_validate_mmap_request(file, vma->vm_pgoff, sz);
Signature · 1 line
Jens Axboe