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

Commit 8a0516ed authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

mm: convert p[te|md]_numa users to p[te|md]_protnone_numa 



Convert existing users of pte_numa and friends to the new helper.  Note
that the kernel is broken after this patch is applied until the other page
table modifiers are also altered.  This patch layout is to make review
easier.

Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Acked-by: default avatarAneesh Kumar <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: default avatarSasha Levin <sasha.levin@oracle.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kirill Shutemov <kirill.shutemov@linux.intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e7bb4b6d

arch/powerpc/kvm/book3s_hv_rm_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags, 
	/* Look up the Linux PTE for the backing page */

	pte_size = psize;

	pte = lookup_linux_pte_and_update(pgdir, hva, writing, &pte_size);

	if (pte_present(pte) && !pte_numa(pte)) {

	if (pte_present(pte) && !pte_protnone(pte)) {

		if (writing && !pte_write(pte))

			/* make the actual HPTE be read-only */

			ptel = hpte_make_readonly(ptel);

arch/powerpc/mm/fault.c

+0 −5
Original line number Diff line number Diff line
@@ -398,8 +398,6 @@ good_area: 
		 * processors use the same I/D cache coherency mechanism

		 * as embedded.

		 */

		if (error_code & DSISR_PROTFAULT)

			goto bad_area;

#endif /* CONFIG_PPC_STD_MMU */



		/*
@@ -423,9 +421,6 @@ good_area: 
		flags |= FAULT_FLAG_WRITE;

	/* a read */

	} else {

		/* protection fault */

		if (error_code & 0x08000000)

			goto bad_area;

		if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))

			goto bad_area;

	}

arch/powerpc/mm/pgtable.c

+8 −3
Original line number Diff line number Diff line
@@ -172,9 +172,14 @@ static pte_t set_access_flags_filter(pte_t pte, struct vm_area_struct *vma, 
void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep,

		pte_t pte)

{

#ifdef CONFIG_DEBUG_VM

	WARN_ON(pte_val(*ptep) & _PAGE_PRESENT);

#endif

	/*

	 * When handling numa faults, we already have the pte marked

	 * _PAGE_PRESENT, but we can be sure that it is not in hpte.

	 * Hence we can use set_pte_at for them.

	 */

	VM_WARN_ON((pte_val(*ptep) & (_PAGE_PRESENT | _PAGE_USER)) ==

		(_PAGE_PRESENT | _PAGE_USER));



	/* Note: mm->context.id might not yet have been assigned as

	 * this context might not have been activated yet when this

	 * is called.

arch/powerpc/mm/pgtable_64.c

+2 −1
Original line number Diff line number Diff line
@@ -718,7 +718,8 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr, 
		pmd_t *pmdp, pmd_t pmd)

{

#ifdef CONFIG_DEBUG_VM

	WARN_ON(pmd_val(*pmdp) & _PAGE_PRESENT);

	WARN_ON((pmd_val(*pmdp) & (_PAGE_PRESENT | _PAGE_USER)) ==

		(_PAGE_PRESENT | _PAGE_USER));

	assert_spin_locked(&mm->page_table_lock);

	WARN_ON(!pmd_trans_huge(pmd));

#endif

arch/x86/mm/gup.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr, 
		struct page *page;



		/* Similar to the PMD case, NUMA hinting must take slow path */

		if (pte_numa(pte)) {

		if (pte_protnone(pte)) {

			pte_unmap(ptep);

			return 0;

		}
@@ -178,7 +178,7 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end, 
			 * slowpath for accounting purposes and so that they

			 * can be serialised against THP migration.

			 */

			if (pmd_numa(pmd))

			if (pmd_protnone(pmd))

				return 0;

			if (!gup_huge_pmd(pmd, addr, next, write, pages, nr))

				return 0;