Skip to contentSkip to conversation

mmap_region: cleanup, remove unneeded file != NULL check

PATCH In review Oleg Nesterov 2 participants 3 messages Feb 3, 2008 – Feb 11, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmap_region: cleanup, remove unneeded file != NULL check

mmap_region() checks "file != NULL" when we know "file && vma_merge() == T". Also, swap these if/else branches, imho make the code a bit more readable.

mm/mmap.c renamed from mm/mmap.c~1_MMAP +8 -10
@@ -1189,22 +1189,20 @@ munmap_back:
 	if (vma_wants_writenotify(vma))
 		vma->vm_page_prot = vm_get_page_prot(vm_flags & ~VM_SHARED);
 
-	if (!file || !vma_merge(mm, prev, addr, vma->vm_end,
+	if (file && vma_merge(mm, prev, addr, vma->vm_end,
 			vma->vm_flags, NULL, file, pgoff, vma_policy(vma))) {
+		mpol_free(vma_policy(vma));
+		kmem_cache_free(vm_area_cachep, vma);
+		if (correct_wcount)
+			atomic_inc(&inode->i_writecount);
+		fput(file);
+	} else {
 		file = vma->vm_file;
 		vma_link(mm, vma, prev, rb_link, rb_parent);
 		if (correct_wcount)
 			atomic_inc(&inode->i_writecount);
-	} else {
-		if (file) {
-			if (correct_wcount)
-				atomic_inc(&inode->i_writecount);
-			fput(file);
-		}
-		mpol_free(vma_policy(vma));
-		kmem_cache_free(vm_area_cachep, vma);
 	}
-out:	
+out:
 	mm->total_vm += len >> PAGE_SHIFT;
 	vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
 	if (vm_flags & VM_LOCKED) {
#1 lore raw
Quoted 4 lines · Oleg Nesterov

mmap_region() checks "file != NULL" when we know "file && vma_merge() == T". Also, swap these if/else branches, imho make the code a bit more readable.

That's a great little improvement, Oleg: my difficulty in understanding the patch is all due to the obscurity of the original you're improving.

But my but is this: you can go one step further, it's silly to be repeating the "if (correct_wcount) atomic_inc..." in both the if and the else clauses.

For several minutes I thought that must indicate we already had a bug there. Eventually I realized not: we need deny_write_access() above to test and deny atomically, then once we've merged or linked the vma it's securely denying in the vma itself: so before returning we need to undo our temporary denial. A brief comment might be worthwhile, perhaps something like

	/* Once vma denies write, undo our temporary denial count */
	if (correct_wcount)
		atomic_inc(&inode->i_writecount);

Hugh

Quoted 41 lines
mm/mmap.c renamed from mm/mmap.c~1_MMAP +8 -11
@@ -1189,22 +1189,20 @@ munmap_back:
 	if (vma_wants_writenotify(vma))
 		vma->vm_page_prot = vm_get_page_prot(vm_flags & ~VM_SHARED);
 
-	if (!file || !vma_merge(mm, prev, addr, vma->vm_end,
+	if (file && vma_merge(mm, prev, addr, vma->vm_end,
 			vma->vm_flags, NULL, file, pgoff, vma_policy(vma))) {
+		mpol_free(vma_policy(vma));
+		kmem_cache_free(vm_area_cachep, vma);
+		if (correct_wcount)
+			atomic_inc(&inode->i_writecount);
+		fput(file);
+	} else {
 		file = vma->vm_file;
 		vma_link(mm, vma, prev, rb_link, rb_parent);
 		if (correct_wcount)
 			atomic_inc(&inode->i_writecount);
-	} else {
-		if (file) {
-			if (correct_wcount)
-				atomic_inc(&inode->i_writecount);
-			fput(file);
-		}
-		mpol_free(vma_policy(vma));
-		kmem_cache_free(vm_area_cachep, vma);
 	}
-out:	
+out:
 	mm->total_vm += len >> PAGE_SHIFT;
 	vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
 	if (vm_flags & VM_LOCKED) {
 
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#2 lore raw

Sorry for delay,

Quoted 6 lines · Hugh Dickins
Quoted 3 lines · Oleg Nesterov

mmap_region() checks "file != NULL" when we know "file && vma_merge() == T". Also, swap these if/else branches, imho make the code a bit more readable.

Quoted 7 lines
Quoted 1 line

But my but is this: you can go one step further, it's silly to be repeating the "if (correct_wcount) atomic_inc..." in both the if and the else clauses.

Ah. Shame on me. Of course, I noticed these 2 correct_wcount's, but didn't realize we can safely use "inode" after fput(). Not only the caller should have a reference, vma_merge() requires that vm_file == file, so fput(file) can't destroy the last reference.

Quoted 10 lines

For several minutes I thought that must indicate we already had a bug there. Eventually I realized not: we need deny_write_access() above to test and deny atomically, then once we've merged or linked the vma it's securely denying in the vma itself: so before returning we need to undo our temporary denial. A brief comment might be worthwhile, perhaps something like

	/* Once vma denies write, undo our temporary denial count */
	if (correct_wcount)
		atomic_inc(&inode->i_writecount);

Thanks Hugh, I'll redo this cleanup.

Oleg.