Commit df3a57d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

mm: split out the non-present case from copy_one_pte() 



This is a purely mechanical split of the copy_one_pte() function.  It's
not immediately obvious when looking at the diff because of the
indentation change, but the way to see what is going on in this commit
is to use the "-w" flag to not show pure whitespace changes, and you see
how the first part of copy_one_pte() is simply lifted out into a
separate function.

And since the non-present case is marked unlikely, don't make the new
function be inlined.  Not that gcc really seems to care, since it looks
like it will inline it anyway due to the whole "single callsite for
static function" logic.  In fact, code generation with the function
split is almost identical to before.  But not marking it inline is the
right thing to do.

This is pure prep-work and cleanup for subsequent changes.

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 805c6d3c

mm/memory.c

+79 −67
Original line number Diff line number Diff line
@@ -695,17 +695,14 @@ out: 
 * covered by this vma.

 */



static inline unsigned long

copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,

static unsigned long

copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,

		pte_t *dst_pte, pte_t *src_pte, struct vm_area_struct *vma,

		unsigned long addr, int *rss)

{

	unsigned long vm_flags = vma->vm_flags;

	pte_t pte = *src_pte;

	struct page *page;



	/* pte contains position in swap or file, so copy. */

	if (unlikely(!pte_present(pte))) {

	swp_entry_t entry = pte_to_swp_entry(pte);



	if (likely(!non_swap_entry(entry))) {
@@ -772,9 +769,25 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, 
			set_pte_at(src_mm, addr, src_pte, pte);

		}

	}

		goto out_set_pte;

	set_pte_at(dst_mm, addr, dst_pte, pte);

	return 0;

}



static inline unsigned long

copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,

		pte_t *dst_pte, pte_t *src_pte, struct vm_area_struct *vma,

		unsigned long addr, int *rss)

{

	unsigned long vm_flags = vma->vm_flags;

	pte_t pte = *src_pte;

	struct page *page;



	/* pte contains position in swap or file, so copy. */

	if (unlikely(!pte_present(pte)))

		return copy_nonpresent_pte(dst_mm, src_mm,

					   dst_pte, src_pte, vma,

					   addr, rss);



	/*

	 * If it's a COW mapping, write protect it both

	 * in the parent and the child
@@ -807,7 +820,6 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, 
		rss[mm_counter(page)]++;

	}



out_set_pte:

	set_pte_at(dst_mm, addr, dst_pte, pte);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE