Commit 7964cf8c authored by Liam R. Howlett's avatar Liam R. Howlett Committed by Andrew Morton
Browse files

mm: remove vmacache 

By using the maple tree and the maple tree state, the vmacache is no
longer beneficial and is complicating the VMA code.  Remove the vmacache
to reduce the work in keeping it up to date and code complexity.

Link: https://lkml.kernel.org/r/20220906194824.2110408-26-Liam.Howlett@oracle.com


Signed-off-by: default avatarLiam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Tested-by: default avatarYu Zhao <yuzhao@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: SeongJae Park <sj@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4dd1b841

fs/exec.c

+0 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/file.h>

#include <linux/fdtable.h>

#include <linux/mm.h>

#include <linux/vmacache.h>

#include <linux/stat.h>

#include <linux/fcntl.h>

#include <linux/swap.h>
@@ -1027,8 +1026,6 @@ static int exec_mmap(struct mm_struct *mm) 
	activate_mm(active_mm, mm);

	if (IS_ENABLED(CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM))

		local_irq_enable();

	tsk->mm->vmacache_seqnum = 0;

	vmacache_flush(tsk);

	task_unlock(tsk);

	lru_gen_use_mm(mm);

fs/proc/task_mmu.c

+0 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/pagewalk.h>

#include <linux/vmacache.h>

#include <linux/mm_inline.h>

#include <linux/hugetlb.h>

#include <linux/huge_mm.h>

include/linux/mm_types.h

+0 −1
Original line number Diff line number Diff line
@@ -475,7 +475,6 @@ struct mm_struct { 
	struct {

		struct vm_area_struct *mmap;		/* list of VMAs */

		struct maple_tree mm_mt;

		u64 vmacache_seqnum;                   /* per-thread vmacache */

#ifdef CONFIG_MMU

		unsigned long (*get_unmapped_area) (struct file *filp,

				unsigned long addr, unsigned long len,

include/linux/mm_types_task.h

+0 −12
Original line number Diff line number Diff line
@@ -24,18 +24,6 @@ 
		IS_ENABLED(CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK))

#define ALLOC_SPLIT_PTLOCKS	(SPINLOCK_SIZE > BITS_PER_LONG/8)



/*

 * The per task VMA cache array:

 */

#define VMACACHE_BITS 2

#define VMACACHE_SIZE (1U << VMACACHE_BITS)

#define VMACACHE_MASK (VMACACHE_SIZE - 1)



struct vmacache {

	u64 seqnum;

	struct vm_area_struct *vmas[VMACACHE_SIZE];

};



/*

 * When updating this, please also update struct resident_page_types[] in

 * kernel/fork.c

include/linux/sched.h

+0 −1
Original line number Diff line number Diff line
@@ -861,7 +861,6 @@ struct task_struct { 
	struct mm_struct		*active_mm;



	/* Per-thread vma caching: */

	struct vmacache			vmacache;



#ifdef SPLIT_RSS_COUNTING

	struct task_rss_stat		rss_stat;