Commit 29a7287d authored by Steve Capper's avatar Steve Capper Committed by Catalin Marinas
Browse files

arm64: hugetlb: Spring clean huge pte accessors 



This patch aims to re-structure the huge pte accessors without affecting
their functionality. Control flow is changed to reduce indentation and
expanded use is made of post for loop variable modification.

It is then much easier to add break-before-make semantics in a subsequent
patch.

Cc: David Woods <dwoods@mellanox.com>
Signed-off-by: default avatarSteve Capper <steve.capper@arm.com>
Signed-off-by: default avatarPunit Agrawal <punit.agrawal@arm.com>
Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent b5b0be86

arch/arm64/mm/hugetlbpage.c

+54 −65
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, 
	size_t pgsize;

	int i;

	int ncontig;

	unsigned long pfn;

	unsigned long pfn, dpfn;

	pgprot_t hugeprot;



	/*
@@ -90,14 +90,13 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, 


	ncontig = find_num_contig(mm, addr, ptep, &pgsize);

	pfn = pte_pfn(pte);

	dpfn = pgsize >> PAGE_SHIFT;

	hugeprot = pte_pgprot(pte);

	for (i = 0; i < ncontig; i++) {



	for (i = 0; i < ncontig; i++, ptep++, addr += pgsize, pfn += dpfn) {

		pr_debug("%s: set pte %p to 0x%llx\n", __func__, ptep,

			 pte_val(pfn_pte(pfn, hugeprot)));

		set_pte_at(mm, addr, ptep, pfn_pte(pfn, hugeprot));

		ptep++;

		pfn += pgsize >> PAGE_SHIFT;

		addr += pgsize;

	}

}
@@ -195,91 +194,81 @@ pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma, 
pte_t huge_ptep_get_and_clear(struct mm_struct *mm,

			      unsigned long addr, pte_t *ptep)

{

	pte_t pte;



	if (pte_cont(*ptep)) {

	int ncontig, i;

	size_t pgsize;

		bool is_dirty = false;

	pte_t orig_pte = huge_ptep_get(ptep);



	if (!pte_cont(orig_pte))

		return ptep_get_and_clear(mm, addr, ptep);



	ncontig = find_num_contig(mm, addr, ptep, &pgsize);

		/* save the 1st pte to return */

		pte = ptep_get_and_clear(mm, addr, ptep);

		for (i = 1, addr += pgsize; i < ncontig; ++i, addr += pgsize) {

	for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) {

		/*

		 * If HW_AFDBM is enabled, then the HW could

		 * turn on the dirty bit for any of the page

		 * in the set, so check them all.

		 */

			++ptep;

		if (pte_dirty(ptep_get_and_clear(mm, addr, ptep)))

				is_dirty = true;

		}

		if (is_dirty)

			return pte_mkdirty(pte);

		else

			return pte;

	} else {

		return ptep_get_and_clear(mm, addr, ptep);

			orig_pte = pte_mkdirty(orig_pte);

	}



	return orig_pte;

}



int huge_ptep_set_access_flags(struct vm_area_struct *vma,

			       unsigned long addr, pte_t *ptep,

			       pte_t pte, int dirty)

{

	if (pte_cont(pte)) {

	int ncontig, i, changed = 0;

	size_t pgsize = 0;

		unsigned long pfn = pte_pfn(pte);

		/* Select all bits except the pfn */

		pgprot_t hugeprot = pte_pgprot(pte);

	unsigned long pfn = pte_pfn(pte), dpfn;

	pgprot_t hugeprot;



		pfn = pte_pfn(pte);

		ncontig = find_num_contig(vma->vm_mm, addr, ptep,

					  &pgsize);

		for (i = 0; i < ncontig; ++i, ++ptep, addr += pgsize) {

	if (!pte_cont(pte))

		return ptep_set_access_flags(vma, addr, ptep, pte, dirty);



	ncontig = find_num_contig(vma->vm_mm, addr, ptep, &pgsize);

	dpfn = pgsize >> PAGE_SHIFT;

	hugeprot = pte_pgprot(pte);



	for (i = 0; i < ncontig; i++, ptep++, addr += pgsize, pfn += dpfn) {

		changed |= ptep_set_access_flags(vma, addr, ptep,

							pfn_pte(pfn,

								hugeprot),

							dirty);

			pfn += pgsize >> PAGE_SHIFT;

				pfn_pte(pfn, hugeprot), dirty);

	}



	return changed;

	} else {

		return ptep_set_access_flags(vma, addr, ptep, pte, dirty);

	}

}



void huge_ptep_set_wrprotect(struct mm_struct *mm,

			     unsigned long addr, pte_t *ptep)

{

	if (pte_cont(*ptep)) {

	int ncontig, i;

		size_t pgsize = 0;

	size_t pgsize;



		ncontig = find_num_contig(mm, addr, ptep, &pgsize);

		for (i = 0; i < ncontig; ++i, ++ptep, addr += pgsize)

			ptep_set_wrprotect(mm, addr, ptep);

	} else {

	if (!pte_cont(*ptep)) {

		ptep_set_wrprotect(mm, addr, ptep);

		return;

	}



	ncontig = find_num_contig(mm, addr, ptep, &pgsize);

	for (i = 0; i < ncontig; i++, ptep++, addr += pgsize)

		ptep_set_wrprotect(mm, addr, ptep);

}



void huge_ptep_clear_flush(struct vm_area_struct *vma,

			   unsigned long addr, pte_t *ptep)

{

	if (pte_cont(*ptep)) {

	int ncontig, i;

		size_t pgsize = 0;

	size_t pgsize;



		ncontig = find_num_contig(vma->vm_mm, addr, ptep,

					  &pgsize);

		for (i = 0; i < ncontig; ++i, ++ptep, addr += pgsize)

			ptep_clear_flush(vma, addr, ptep);

	} else {

	if (!pte_cont(*ptep)) {

		ptep_clear_flush(vma, addr, ptep);

		return;

	}



	ncontig = find_num_contig(vma->vm_mm, addr, ptep, &pgsize);

	for (i = 0; i < ncontig; i++, ptep++, addr += pgsize)

		ptep_clear_flush(vma, addr, ptep);

}



static __init int setup_hugepagesz(char *opt)

CRA Git | Maintained and supported by SUSTech CRA and CCSE