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

Commit b9bbfbe3 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

thp: memcg huge memory 



Add memcg charge/uncharge to hugepage faults in huge_memory.c.

Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 152c9ccb

mm/huge_memory.c

+31 −5
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ static int __do_huge_pmd_anonymous_page(struct mm_struct *mm, 
	VM_BUG_ON(!PageCompound(page));

	pgtable = pte_alloc_one(mm, haddr);

	if (unlikely(!pgtable)) {

		mem_cgroup_uncharge_page(page);

		put_page(page);

		return VM_FAULT_OOM;

	}
@@ -243,6 +244,7 @@ static int __do_huge_pmd_anonymous_page(struct mm_struct *mm, 
	spin_lock(&mm->page_table_lock);

	if (unlikely(!pmd_none(*pmd))) {

		spin_unlock(&mm->page_table_lock);

		mem_cgroup_uncharge_page(page);

		put_page(page);

		pte_free(mm, pgtable);

	} else {
@@ -286,6 +288,10 @@ int do_huge_pmd_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, 
		page = alloc_hugepage(transparent_hugepage_defrag(vma));

		if (unlikely(!page))

			goto out;

		if (unlikely(mem_cgroup_newpage_charge(page, mm, GFP_KERNEL))) {

			put_page(page);

			goto out;

		}



		return __do_huge_pmd_anonymous_page(mm, vma, haddr, pmd, page);

	}
@@ -402,9 +408,17 @@ static int do_huge_pmd_wp_page_fallback(struct mm_struct *mm, 
	for (i = 0; i < HPAGE_PMD_NR; i++) {

		pages[i] = alloc_page_vma(GFP_HIGHUSER_MOVABLE,

					  vma, address);

		if (unlikely(!pages[i])) {

			while (--i >= 0)

		if (unlikely(!pages[i] ||

			     mem_cgroup_newpage_charge(pages[i], mm,

						       GFP_KERNEL))) {

			if (pages[i])

				put_page(pages[i]);

			mem_cgroup_uncharge_start();

			while (--i >= 0) {

				mem_cgroup_uncharge_page(pages[i]);

				put_page(pages[i]);

			}

			mem_cgroup_uncharge_end();

			kfree(pages);

			ret |= VM_FAULT_OOM;

			goto out;
@@ -455,8 +469,12 @@ static int do_huge_pmd_wp_page_fallback(struct mm_struct *mm, 


out_free_pages:

	spin_unlock(&mm->page_table_lock);

	for (i = 0; i < HPAGE_PMD_NR; i++)

	mem_cgroup_uncharge_start();

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

		mem_cgroup_uncharge_page(pages[i]);

		put_page(pages[i]);

	}

	mem_cgroup_uncharge_end();

	kfree(pages);

	goto out;

}
@@ -501,14 +519,22 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, 
		goto out;

	}



	if (unlikely(mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL))) {

		put_page(new_page);

		put_page(page);

		ret |= VM_FAULT_OOM;

		goto out;

	}



	copy_user_huge_page(new_page, page, haddr, vma, HPAGE_PMD_NR);

	__SetPageUptodate(new_page);



	spin_lock(&mm->page_table_lock);

	put_page(page);

	if (unlikely(!pmd_same(*pmd, orig_pmd)))

	if (unlikely(!pmd_same(*pmd, orig_pmd))) {

		mem_cgroup_uncharge_page(new_page);

		put_page(new_page);

	else {

	} else {

		pmd_t entry;

		VM_BUG_ON(!PageHead(page));

		entry = mk_pmd(new_page, vma->vm_page_prot);