mm: remove swap token code (e709ffd6) · Commits · e / devices / android_kernel_fairphone_FP5

include/linux/mm_types.h

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -345,17 +345,6 @@ struct mm_struct {
	/* Architecture-specific MM context */		/* Architecture-specific MM context */
	mm_context_t context;		mm_context_t context;

	/* Swap token stuff */
	/*
	* Last value of global fault stamp as seen by this process.
	* In other words, this value gives an indication of how long
	* it has been since this task got the token.
	* Look at mm/thrash.c
	*/
	unsigned int faultstamp;
	unsigned int token_priority;
	unsigned int last_interval;

	unsigned long flags; /* Must use atomic bitops to access the bits */		unsigned long flags; /* Must use atomic bitops to access the bits */

	struct core_state core_state; / coredumping support */		struct core_state core_state; / coredumping support */

include/linux/swap.h

+0 −35

Original line number	Original line	Diff line number	Diff line
	@@ -355,23 +355,6 @@ extern int reuse_swap_page(struct page *);
	extern int try_to_free_swap(struct page *);		extern int try_to_free_swap(struct page *);
	struct backing_dev_info;		struct backing_dev_info;

	/* linux/mm/thrash.c */
	extern struct mm_struct *swap_token_mm;
	extern void grab_swap_token(struct mm_struct *);
	extern void __put_swap_token(struct mm_struct *);
	extern void disable_swap_token(struct mem_cgroup *memcg);

	static inline int has_swap_token(struct mm_struct *mm)
	{
	return (mm == swap_token_mm);
	}

	static inline void put_swap_token(struct mm_struct *mm)
	{
	if (has_swap_token(mm))
	__put_swap_token(mm);
	}

	#ifdef CONFIG_CGROUP_MEM_RES_CTLR		#ifdef CONFIG_CGROUP_MEM_RES_CTLR
	extern void		extern void
	mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout);		mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout);
	@@ -476,24 +459,6 @@ static inline swp_entry_t get_swap_page(void)
	return entry;		return entry;
	}		}

	/* linux/mm/thrash.c */
	static inline void put_swap_token(struct mm_struct *mm)
	{
	}

	static inline void grab_swap_token(struct mm_struct *mm)
	{
	}

	static inline int has_swap_token(struct mm_struct *mm)
	{
	return 0;
	}

	static inline void disable_swap_token(struct mem_cgroup *memcg)
	{
	}

	static inline void		static inline void
	mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)		mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
	{		{

include/trace/events/vmscan.h

+0 −82

Original line number	Original line	Diff line number	Diff line
	@@ -395,88 +395,6 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
	show_reclaim_flags(__entry->reclaim_flags))		show_reclaim_flags(__entry->reclaim_flags))
	);		);

	TRACE_EVENT(replace_swap_token,
	TP_PROTO(struct mm_struct *old_mm,
	struct mm_struct *new_mm),

	TP_ARGS(old_mm, new_mm),

	TP_STRUCT__entry(
	__field(struct mm_struct*, old_mm)
	__field(unsigned int, old_prio)
	__field(struct mm_struct*, new_mm)
	__field(unsigned int, new_prio)
	),

	TP_fast_assign(
	__entry->old_mm = old_mm;
	__entry->old_prio = old_mm ? old_mm->token_priority : 0;
	__entry->new_mm = new_mm;
	__entry->new_prio = new_mm->token_priority;
	),

	TP_printk("old_token_mm=%p old_prio=%u new_token_mm=%p new_prio=%u",
	__entry->old_mm, __entry->old_prio,
	__entry->new_mm, __entry->new_prio)
	);

	DECLARE_EVENT_CLASS(put_swap_token_template,
	TP_PROTO(struct mm_struct *swap_token_mm),

	TP_ARGS(swap_token_mm),

	TP_STRUCT__entry(
	__field(struct mm_struct*, swap_token_mm)
	),

	TP_fast_assign(
	__entry->swap_token_mm = swap_token_mm;
	),

	TP_printk("token_mm=%p", __entry->swap_token_mm)
	);

	DEFINE_EVENT(put_swap_token_template, put_swap_token,
	TP_PROTO(struct mm_struct *swap_token_mm),
	TP_ARGS(swap_token_mm)
	);

	DEFINE_EVENT_CONDITION(put_swap_token_template, disable_swap_token,
	TP_PROTO(struct mm_struct *swap_token_mm),
	TP_ARGS(swap_token_mm),
	TP_CONDITION(swap_token_mm != NULL)
	);

	TRACE_EVENT_CONDITION(update_swap_token_priority,
	TP_PROTO(struct mm_struct *mm,
	unsigned int old_prio,
	struct mm_struct *swap_token_mm),

	TP_ARGS(mm, old_prio, swap_token_mm),

	TP_CONDITION(mm->token_priority != old_prio),

	TP_STRUCT__entry(
	__field(struct mm_struct*, mm)
	__field(unsigned int, old_prio)
	__field(unsigned int, new_prio)
	__field(struct mm_struct*, swap_token_mm)
	__field(unsigned int, swap_token_prio)
	),

	TP_fast_assign(
	__entry->mm = mm;
	__entry->old_prio = old_prio;
	__entry->new_prio = mm->token_priority;
	__entry->swap_token_mm = swap_token_mm;
	__entry->swap_token_prio = swap_token_mm ? swap_token_mm->token_priority : 0;
	),

	TP_printk("mm=%p old_prio=%u new_prio=%u swap_token_mm=%p token_prio=%u",
	__entry->mm, __entry->old_prio, __entry->new_prio,
	__entry->swap_token_mm, __entry->swap_token_prio)
	);

	#endif /* _TRACE_VMSCAN_H */		#endif /* _TRACE_VMSCAN_H */

	/* This part must be outside protection */		/* This part must be outside protection */

kernel/fork.c

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -614,7 +614,6 @@ void mmput(struct mm_struct *mm)
	list_del(&mm->mmlist);		list_del(&mm->mmlist);
	spin_unlock(&mmlist_lock);		spin_unlock(&mmlist_lock);
	}		}
	put_swap_token(mm);
	if (mm->binfmt)		if (mm->binfmt)
	module_put(mm->binfmt->module);		module_put(mm->binfmt->module);
	mmdrop(mm);		mmdrop(mm);
	@@ -831,10 +830,6 @@ struct mm_struct dup_mm(struct task_struct tsk)
	memcpy(mm, oldmm, sizeof(*mm));		memcpy(mm, oldmm, sizeof(*mm));
	mm_init_cpumask(mm);		mm_init_cpumask(mm);

	/* Initializing for Swap token stuff */
	mm->token_priority = 0;
	mm->last_interval = 0;

	#ifdef CONFIG_TRANSPARENT_HUGEPAGE		#ifdef CONFIG_TRANSPARENT_HUGEPAGE
	mm->pmd_huge_pte = NULL;		mm->pmd_huge_pte = NULL;
	#endif		#endif
	@@ -913,10 +908,6 @@ static int copy_mm(unsigned long clone_flags, struct task_struct *tsk)
	goto fail_nomem;		goto fail_nomem;

	good_mm:		good_mm:
	/* Initializing for Swap token stuff */
	mm->token_priority = 0;
	mm->last_interval = 0;

	tsk->mm = mm;		tsk->mm = mm;
	tsk->active_mm = mm;		tsk->active_mm = mm;
	return 0;		return 0;

mm/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@ endif
	obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o		obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o

	obj-$(CONFIG_BOUNCE) += bounce.o		obj-$(CONFIG_BOUNCE) += bounce.o
	obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o		obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o
	obj-$(CONFIG_HAS_DMA) += dmapool.o		obj-$(CONFIG_HAS_DMA) += dmapool.o
	obj-$(CONFIG_HUGETLBFS) += hugetlb.o		obj-$(CONFIG_HUGETLBFS) += hugetlb.o
	obj-$(CONFIG_NUMA) += mempolicy.o		obj-$(CONFIG_NUMA) += mempolicy.o