Commit 7a025e91 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

mm/vmstat: Use preempt_[dis|en]able_nested() 



Replace the open coded CONFIG_PREEMPT_RT conditional
preempt_enable/disable() pairs with the new helper functions which hide
the underlying implementation details.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Link: https://lore.kernel.org/r/20220825164131.402717-4-bigeasy@linutronix.de
parent 93f6d4e1

mm/vmstat.c

+12 −24
Original line number Original line Diff line number Diff line
@@ -355,8 +355,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item, 
	 * CPU migrations and preemption potentially corrupts a counter so

	 * CPU migrations and preemption potentially corrupts a counter so

	 * disable preemption.

	 * disable preemption.

	 */

	 */

	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_disable_nested();

		preempt_disable();





	x = delta + __this_cpu_read(*p);

	x = delta + __this_cpu_read(*p);
@@ -368,8 +367,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item, 
	}

	}

	__this_cpu_write(*p, x);

	__this_cpu_write(*p, x);





	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_enable_nested();

		preempt_enable();

}

}

EXPORT_SYMBOL(__mod_zone_page_state);

EXPORT_SYMBOL(__mod_zone_page_state);
@@ -393,8 +391,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item, 
	}

	}





	/* See __mod_node_page_state */

	/* See __mod_node_page_state */

	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_disable_nested();

		preempt_disable();





	x = delta + __this_cpu_read(*p);

	x = delta + __this_cpu_read(*p);
@@ -406,8 +403,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item, 
	}

	}

	__this_cpu_write(*p, x);

	__this_cpu_write(*p, x);





	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_enable_nested();

		preempt_enable();

}

}

EXPORT_SYMBOL(__mod_node_page_state);

EXPORT_SYMBOL(__mod_node_page_state);
@@ -441,8 +437,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item) 
	s8 v, t;

	s8 v, t;





	/* See __mod_node_page_state */

	/* See __mod_node_page_state */

	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_disable_nested();

		preempt_disable();





	v = __this_cpu_inc_return(*p);

	v = __this_cpu_inc_return(*p);

	t = __this_cpu_read(pcp->stat_threshold);

	t = __this_cpu_read(pcp->stat_threshold);
@@ -453,8 +448,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item) 
		__this_cpu_write(*p, -overstep);

		__this_cpu_write(*p, -overstep);

	}

	}





	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_enable_nested();

		preempt_enable();

}

}





void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)

void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
@@ -466,8 +460,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item) 
	VM_WARN_ON_ONCE(vmstat_item_in_bytes(item));

	VM_WARN_ON_ONCE(vmstat_item_in_bytes(item));





	/* See __mod_node_page_state */

	/* See __mod_node_page_state */

	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_disable_nested();

		preempt_disable();





	v = __this_cpu_inc_return(*p);

	v = __this_cpu_inc_return(*p);

	t = __this_cpu_read(pcp->stat_threshold);

	t = __this_cpu_read(pcp->stat_threshold);
@@ -478,8 +471,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item) 
		__this_cpu_write(*p, -overstep);

		__this_cpu_write(*p, -overstep);

	}

	}





	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_enable_nested();

		preempt_enable();

}

}





void __inc_zone_page_state(struct page *page, enum zone_stat_item item)

void __inc_zone_page_state(struct page *page, enum zone_stat_item item)
@@ -501,8 +493,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item) 
	s8 v, t;

	s8 v, t;





	/* See __mod_node_page_state */

	/* See __mod_node_page_state */

	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_disable_nested();

		preempt_disable();





	v = __this_cpu_dec_return(*p);

	v = __this_cpu_dec_return(*p);

	t = __this_cpu_read(pcp->stat_threshold);

	t = __this_cpu_read(pcp->stat_threshold);
@@ -513,8 +504,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item) 
		__this_cpu_write(*p, overstep);

		__this_cpu_write(*p, overstep);

	}

	}





	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_enable_nested();

		preempt_enable();

}

}





void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)

void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
@@ -526,8 +516,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item) 
	VM_WARN_ON_ONCE(vmstat_item_in_bytes(item));

	VM_WARN_ON_ONCE(vmstat_item_in_bytes(item));





	/* See __mod_node_page_state */

	/* See __mod_node_page_state */

	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_disable_nested();

		preempt_disable();





	v = __this_cpu_dec_return(*p);

	v = __this_cpu_dec_return(*p);

	t = __this_cpu_read(pcp->stat_threshold);

	t = __this_cpu_read(pcp->stat_threshold);
@@ -538,8 +527,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item) 
		__this_cpu_write(*p, overstep);

		__this_cpu_write(*p, overstep);

	}

	}





	if (IS_ENABLED(CONFIG_PREEMPT_RT))

	preempt_enable_nested();

		preempt_enable();

}

}





void __dec_zone_page_state(struct page *page, enum zone_stat_item item)

void __dec_zone_page_state(struct page *page, enum zone_stat_item item)