Skip to contentSkip to conversation

mm-use-helper-function-mapping_allow_writable.patch removed from -mm tree

merged [email protected] 1 participant 1 message Oct 14, 2020

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: mm: use helper function mapping_allow_writable()
has been removed from the -mm tree. Its filename was
mm-use-helper-function-mapping_allow_writable.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Miaohe Lin <[email protected]>
Subject: mm: use helper function mapping_allow_writable()

Commit 4bb5f5d9395b ("mm: allow drivers to prevent new writable mappings") changed i_mmap_writable from unsigned int to atomic_t and add the helper function mapping_allow_writable() to atomic_inc i_mmap_writable. But it forgot to use this helper function in dup_mmap() and __vma_link_file().

Cc Christian Brauner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc "Eric W. Biederman" <[email protected]>
Cc Christian Kellner <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Adrian Reber <[email protected]>
Cc Shakeel Butt <[email protected]>
Cc Aleksa Sarai <[email protected]>
Cc Thomas Gleixner <[email protected]>

---

 kernel/fork.c |    2 +-
 mm/mmap.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/fork.c renamed from kernel/fork.c~mm-use-helper-function-mapping_allow_writable +1 -1
@@ -559,7 +559,7 @@ static __latent_entropy int dup_mmap(str
 				atomic_dec(&inode->i_writecount);
 			i_mmap_lock_write(mapping);
 			if (tmp->vm_flags & VM_SHARED)
-				atomic_inc(&mapping->i_mmap_writable);
+				mapping_allow_writable(mapping);
 			flush_dcache_mmap_lock(mapping);
 			/* insert tmp into the share list, just after mpnt */
 			vma_interval_tree_insert_after(tmp, mpnt,
mm/mmap.c renamed from mm/mmap.c~mm-use-helper-function-mapping_allow_writable +1 -1
@@ -621,7 +621,7 @@ static void __vma_link_file(struct vm_ar
 		if (vma->vm_flags & VM_DENYWRITE)
 			atomic_dec(&file_inode(file)->i_writecount);
 		if (vma->vm_flags & VM_SHARED)
-			atomic_inc(&mapping->i_mmap_writable);
+			mapping_allow_writable(mapping);
 
 		flush_dcache_mmap_lock(mapping);
 		vma_interval_tree_insert(vma, &mapping->i_mmap);

_

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

mm-vmstat-use-helper-macro-abs.patch
mm-fix-some-broken-comments.patch mm-use-helper-function-put_write_access.patch percpu_counter-use-helper-macro-abs.patch mm-migrate-avoid-possible-unnecessary-process-right-check-in-kernel_move_pages.patch