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

Commit 1da4b35b authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

proc: drop handling non-linear mappings 



We have to handle non-linear mappings for /proc/PID/{smaps,clear_refs}
which is unused now.  Let's drop it.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d83a08db

fs/proc/task_mmu.c

+0 −16
Original line number Diff line number Diff line
@@ -443,7 +443,6 @@ struct mem_size_stats { 
	unsigned long anonymous;

	unsigned long anonymous_thp;

	unsigned long swap;

	unsigned long nonlinear;

	u64 pss;

};
@@ -484,7 +483,6 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, 
{

	struct mem_size_stats *mss = walk->private;

	struct vm_area_struct *vma = mss->vma;

	pgoff_t pgoff = linear_page_index(vma, addr);

	struct page *page = NULL;



	if (pte_present(*pte)) {
@@ -496,17 +494,10 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, 
			mss->swap += PAGE_SIZE;

		else if (is_migration_entry(swpent))

			page = migration_entry_to_page(swpent);

	} else if (pte_file(*pte)) {

		if (pte_to_pgoff(*pte) != pgoff)

			mss->nonlinear += PAGE_SIZE;

	}



	if (!page)

		return;



	if (page->index != pgoff)

		mss->nonlinear += PAGE_SIZE;



	smaps_account(mss, page, PAGE_SIZE, pte_young(*pte), pte_dirty(*pte));

}
@@ -596,7 +587,6 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) 
		[ilog2(VM_ACCOUNT)]	= "ac",

		[ilog2(VM_NORESERVE)]	= "nr",

		[ilog2(VM_HUGETLB)]	= "ht",

		[ilog2(VM_NONLINEAR)]	= "nl",

		[ilog2(VM_ARCH_1)]	= "ar",

		[ilog2(VM_DONTDUMP)]	= "dd",

#ifdef CONFIG_MEM_SOFT_DIRTY
@@ -668,10 +658,6 @@ static int show_smap(struct seq_file *m, void *v, int is_pid) 
		   (vma->vm_flags & VM_LOCKED) ?

			(unsigned long)(mss.pss >> (10 + PSS_SHIFT)) : 0);



	if (vma->vm_flags & VM_NONLINEAR)

		seq_printf(m, "Nonlinear:      %8lu kB\n",

				mss.nonlinear >> 10);



	show_smap_vma_flags(m, vma);

	m_cache_vma(m, vma);

	return 0;
@@ -772,8 +758,6 @@ static inline void clear_soft_dirty(struct vm_area_struct *vma, 
		ptent = pte_clear_flags(ptent, _PAGE_SOFT_DIRTY);

	} else if (is_swap_pte(ptent)) {

		ptent = pte_swp_clear_soft_dirty(ptent);

	} else if (pte_file(ptent)) {

		ptent = pte_file_clear_soft_dirty(ptent);

	}



	set_pte_at(vma->vm_mm, addr, pte, ptent);