mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-09-25 17:56:55 +00:00
Upgrade -rt patches to v4.14.29-rt25
Signed-off-by: Tiejun Chen <tiejun.china@gmail.com>
This commit is contained in:
136
kernel/patches-4.14.x-rt/0161-mm-make-vmstat-rt-aware.patch
Normal file
136
kernel/patches-4.14.x-rt/0161-mm-make-vmstat-rt-aware.patch
Normal file
@@ -0,0 +1,136 @@
|
||||
From: Ingo Molnar <mingo@elte.hu>
|
||||
Date: Fri, 3 Jul 2009 08:30:13 -0500
|
||||
Subject: mm/vmstat: Protect per cpu variables with preempt disable on RT
|
||||
|
||||
Disable preemption on -RT for the vmstat code. On vanila the code runs in
|
||||
IRQ-off regions while on -RT it is not. "preempt_disable" ensures that the
|
||||
same ressources is not updated in parallel due to preemption.
|
||||
|
||||
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
||||
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||
|
||||
---
|
||||
include/linux/vmstat.h | 4 ++++
|
||||
mm/vmstat.c | 12 ++++++++++++
|
||||
2 files changed, 16 insertions(+)
|
||||
|
||||
--- a/include/linux/vmstat.h
|
||||
+++ b/include/linux/vmstat.h
|
||||
@@ -33,7 +33,9 @@ DECLARE_PER_CPU(struct vm_event_state, v
|
||||
*/
|
||||
static inline void __count_vm_event(enum vm_event_item item)
|
||||
{
|
||||
+ preempt_disable_rt();
|
||||
raw_cpu_inc(vm_event_states.event[item]);
|
||||
+ preempt_enable_rt();
|
||||
}
|
||||
|
||||
static inline void count_vm_event(enum vm_event_item item)
|
||||
@@ -43,7 +45,9 @@ static inline void count_vm_event(enum v
|
||||
|
||||
static inline void __count_vm_events(enum vm_event_item item, long delta)
|
||||
{
|
||||
+ preempt_disable_rt();
|
||||
raw_cpu_add(vm_event_states.event[item], delta);
|
||||
+ preempt_enable_rt();
|
||||
}
|
||||
|
||||
static inline void count_vm_events(enum vm_event_item item, long delta)
|
||||
--- a/mm/vmstat.c
|
||||
+++ b/mm/vmstat.c
|
||||
@@ -249,6 +249,7 @@ void __mod_zone_page_state(struct zone *
|
||||
long x;
|
||||
long t;
|
||||
|
||||
+ preempt_disable_rt();
|
||||
x = delta + __this_cpu_read(*p);
|
||||
|
||||
t = __this_cpu_read(pcp->stat_threshold);
|
||||
@@ -258,6 +259,7 @@ void __mod_zone_page_state(struct zone *
|
||||
x = 0;
|
||||
}
|
||||
__this_cpu_write(*p, x);
|
||||
+ preempt_enable_rt();
|
||||
}
|
||||
EXPORT_SYMBOL(__mod_zone_page_state);
|
||||
|
||||
@@ -269,6 +271,7 @@ void __mod_node_page_state(struct pglist
|
||||
long x;
|
||||
long t;
|
||||
|
||||
+ preempt_disable_rt();
|
||||
x = delta + __this_cpu_read(*p);
|
||||
|
||||
t = __this_cpu_read(pcp->stat_threshold);
|
||||
@@ -278,6 +281,7 @@ void __mod_node_page_state(struct pglist
|
||||
x = 0;
|
||||
}
|
||||
__this_cpu_write(*p, x);
|
||||
+ preempt_enable_rt();
|
||||
}
|
||||
EXPORT_SYMBOL(__mod_node_page_state);
|
||||
|
||||
@@ -310,6 +314,7 @@ void __inc_zone_state(struct zone *zone,
|
||||
s8 __percpu *p = pcp->vm_stat_diff + item;
|
||||
s8 v, t;
|
||||
|
||||
+ preempt_disable_rt();
|
||||
v = __this_cpu_inc_return(*p);
|
||||
t = __this_cpu_read(pcp->stat_threshold);
|
||||
if (unlikely(v > t)) {
|
||||
@@ -318,6 +323,7 @@ void __inc_zone_state(struct zone *zone,
|
||||
zone_page_state_add(v + overstep, zone, item);
|
||||
__this_cpu_write(*p, -overstep);
|
||||
}
|
||||
+ preempt_enable_rt();
|
||||
}
|
||||
|
||||
void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
|
||||
@@ -326,6 +332,7 @@ void __inc_node_state(struct pglist_data
|
||||
s8 __percpu *p = pcp->vm_node_stat_diff + item;
|
||||
s8 v, t;
|
||||
|
||||
+ preempt_disable_rt();
|
||||
v = __this_cpu_inc_return(*p);
|
||||
t = __this_cpu_read(pcp->stat_threshold);
|
||||
if (unlikely(v > t)) {
|
||||
@@ -334,6 +341,7 @@ void __inc_node_state(struct pglist_data
|
||||
node_page_state_add(v + overstep, pgdat, item);
|
||||
__this_cpu_write(*p, -overstep);
|
||||
}
|
||||
+ preempt_enable_rt();
|
||||
}
|
||||
|
||||
void __inc_zone_page_state(struct page *page, enum zone_stat_item item)
|
||||
@@ -354,6 +362,7 @@ void __dec_zone_state(struct zone *zone,
|
||||
s8 __percpu *p = pcp->vm_stat_diff + item;
|
||||
s8 v, t;
|
||||
|
||||
+ preempt_disable_rt();
|
||||
v = __this_cpu_dec_return(*p);
|
||||
t = __this_cpu_read(pcp->stat_threshold);
|
||||
if (unlikely(v < - t)) {
|
||||
@@ -362,6 +371,7 @@ void __dec_zone_state(struct zone *zone,
|
||||
zone_page_state_add(v - overstep, zone, item);
|
||||
__this_cpu_write(*p, overstep);
|
||||
}
|
||||
+ preempt_enable_rt();
|
||||
}
|
||||
|
||||
void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
|
||||
@@ -370,6 +380,7 @@ void __dec_node_state(struct pglist_data
|
||||
s8 __percpu *p = pcp->vm_node_stat_diff + item;
|
||||
s8 v, t;
|
||||
|
||||
+ preempt_disable_rt();
|
||||
v = __this_cpu_dec_return(*p);
|
||||
t = __this_cpu_read(pcp->stat_threshold);
|
||||
if (unlikely(v < - t)) {
|
||||
@@ -378,6 +389,7 @@ void __dec_node_state(struct pglist_data
|
||||
node_page_state_add(v - overstep, pgdat, item);
|
||||
__this_cpu_write(*p, overstep);
|
||||
}
|
||||
+ preempt_enable_rt();
|
||||
}
|
||||
|
||||
void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
|
Reference in New Issue
Block a user