Skip to contentSkip to conversation

mm: mmap: remove verify_mm_writelocked()

PATCH In review Yangtao Li 3 participants 3 messages Nov 8, 2018 – Nov 14, 2018

Subsystems (2)
lore
Share & tools
lore

Yangtao Li

author
#0 lore raw

PATCH 1/1 mm: mmap: remove verify_mm_writelocked()

We should get rid of this function. It no longer serves its purpose.This is a historical artifact from 2005 where do_brk was called outside of the core mm.We do have a proper abstraction in vm_brk_flags and that one does the locking properly.So there is no need to use this function.

---
 mm/mmap.c | 16 ----------------
 1 file changed, 16 deletions(-)
mm/mmap.c +0 -16
index f7cd9cb966c0..1cee506494d2 100644
@@ -2910,16 +2910,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
 	return ret;
 }
 
-static inline void verify_mm_writelocked(struct mm_struct *mm)
-{
-#ifdef CONFIG_DEBUG_VM
-	if (unlikely(down_read_trylock(&mm->mmap_sem))) {
-		WARN_ON(1);
-		up_read(&mm->mmap_sem);
-	}
-#endif
-}
-
 /*
  *  this is really a simplified "do_mmap".  it only handles
  *  anonymous maps.  eventually we may be able to do some
@@ -2946,12 +2936,6 @@ static int do_brk_flags(unsigned long addr, unsigned long len, unsigned long fla
 	if (error)
 		return error;
 
-	/*
-	 * mm->mmap_sem is required to protect against another thread
-	 * changing the mappings in case we sleep.
-	 */
-	verify_mm_writelocked(mm);
-
 	/*
 	 * Clear old maps.  this also does some error checking for us
 	 */
Signature · 1 line
2.17.0
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Yangtao Li

We should get rid of this function. It no longer serves its purpose.This is a historical artifact from 2005 where do_brk was called outside of the core mm.We do have a proper abstraction in vm_brk_flags and that one does the locking properly.So there is no need to use this function.

Quoted 41 lines
---
 mm/mmap.c | 16 ----------------
 1 file changed, 16 deletions(-)
mm/mmap.c +0 -16
index f7cd9cb966c0..1cee506494d2 100644
@@ -2910,16 +2910,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
 	return ret;
 }
 
-static inline void verify_mm_writelocked(struct mm_struct *mm)
-{
-#ifdef CONFIG_DEBUG_VM
-	if (unlikely(down_read_trylock(&mm->mmap_sem))) {
-		WARN_ON(1);
-		up_read(&mm->mmap_sem);
-	}
-#endif
-}
-
 /*
  *  this is really a simplified "do_mmap".  it only handles
  *  anonymous maps.  eventually we may be able to do some
@@ -2946,12 +2936,6 @@ static int do_brk_flags(unsigned long addr, unsigned long len, unsigned long fla
 	if (error)
 		return error;
 
-	/*
-	 * mm->mmap_sem is required to protect against another thread
-	 * changing the mappings in case we sleep.
-	 */
-	verify_mm_writelocked(mm);
-
 	/*
 	 * Clear old maps.  this also does some error checking for us
 	 */
Signature · 1 line
2.17.0
Signature · 2 lines
Michal Hocko
SUSE Labs