Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d34bc48f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

include/linux/sched/mm.h: re-inline mmdrop() 



As Peter points out, Doing a CALL+RET for just the decrement is a bit silly.

Fixes: d70f2a14 ("include/linux/sched/mm.h: uninline mmdrop_async(), etc")
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infraded.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ed1c190

include/linux/sched/mm.h

+12 −1
Original line number Diff line number Diff line
@@ -36,7 +36,18 @@ static inline void mmgrab(struct mm_struct *mm) 
	atomic_inc(&mm->mm_count);

}



extern void mmdrop(struct mm_struct *mm);

extern void __mmdrop(struct mm_struct *mm);



static inline void mmdrop(struct mm_struct *mm)

{

	/*

	 * The implicit full barrier implied by atomic_dec_and_test() is

	 * required by the membarrier system call before returning to

	 * user-space, after storing to rq->curr.

	 */

	if (unlikely(atomic_dec_and_test(&mm->mm_count)))

		__mmdrop(mm);

}



/**

 * mmget() - Pin the address space associated with a &struct mm_struct.

kernel/fork.c

+2 −13
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ static void check_mm(struct mm_struct *mm) 
 * is dropped: either by a lazy thread or by

 * mmput. Free the page directory and the mm.

 */

static void __mmdrop(struct mm_struct *mm)

void __mmdrop(struct mm_struct *mm)

{

	BUG_ON(mm == &init_mm);

	mm_free_pgd(mm);
@@ -603,18 +603,7 @@ static void __mmdrop(struct mm_struct *mm) 
	put_user_ns(mm->user_ns);

	free_mm(mm);

}



void mmdrop(struct mm_struct *mm)

{

	/*

	 * The implicit full barrier implied by atomic_dec_and_test() is

	 * required by the membarrier system call before returning to

	 * user-space, after storing to rq->curr.

	 */

	if (unlikely(atomic_dec_and_test(&mm->mm_count)))

		__mmdrop(mm);

}

EXPORT_SYMBOL_GPL(mmdrop);

EXPORT_SYMBOL_GPL(__mmdrop);



static void mmdrop_async_fn(struct work_struct *work)

{