memcg: Remove the lockdep assert from __mod_objcg_mlstate().
Subsystems (2)
PATCH 1/1 memcg: Remove the lockdep assert from __mod_objcg_mlstate().
The assert was introduced in the commit cited below as an insurance that the semantic is the same after the local_irq_save() has been removed and the function has been made static.
The original requirement to disable interrupt was due the modification of per-CPU counters which require interrupts to be disabled because the counter update operation is not atomic and some of the counters are updated from interrupt context.
All callers of __mod_objcg_mlstate() acquire a lock (memcg_stock.stock_lock) which disables interrupts on !PREEMPT_RT and the lockdep assert is satisfied. On PREEMPT_RT the interrupts are not disabled and the assert triggers.
The safety of the counter update is already ensured by VM_WARN_ON_IRQS_ENABLED() which is part of memcg_stats_lock() and does not require yet another check.
Remove the lockdep assert from __mod_objcg_mlstate().
--- mm/memcontrol.c | 2 -- 1 file changed, 2 deletions(-)
mm/memcontrol.c +0 -2
@@ -3147,8 +3147,6 @@ static inline void __mod_objcg_mlstate(sstruct mem_cgroup *memcg;struct lruvec *lruvec; -lockdep_assert_irqs_disabled (); -rcu_read_lock (); memcg =obj_cgroup_memcg (objcg); lruvec =mem_cgroup_lruvec (memcg, pgdat);
Quoted 9 lines · Sebastian Andrzej Siewior
The assert was introduced in the commit cited below as an insurance that the semantic is the same after the
local_irq_save()has been removed and the function has been made static.The original requirement to disable interrupt was due the modification of per-CPU counters which require interrupts to be disabled because the counter update operation is not atomic and some of the counters are updated from interrupt context.
Quoted 8 lines
All callers of
__mod_objcg_mlstate()acquire a lock (memcg_stock.stock_lock) which disables interrupts on !PREEMPT_RT and the lockdep assert is satisfied. OnPREEMPT_RTthe interrupts are not disabled and the assert triggers.The safety of the counter update is already ensured by
VM_WARN_ON_IRQS_ENABLED()which is part ofmemcg_stats_lock()and does not require yet another check.
I think here it's __mod_memcg_lruvec_state() doing the VM_WARN_ON_ as we don't go through memcg_stats_lock()?
Quoted 4 lines
Remove the lockdep assert from
__mod_objcg_mlstate().Fixes 91882c1617c15 ("memcg: simple cleanup of stats update functions")Signed-off-by Sebastian Andrzej Siewior <[email protected]>
mm-hotfixes as it's a rc1 regression
Quoted 15 lines
--- mm/memcontrol.c | 2 -- 1 file changed, 2 deletions(-)mm/memcontrol.c +0
-2@@ -3147,8 +3147,6 @@ static inline void __mod_objcg_mlstate(sstruct mem_cgroup *memcg;struct lruvec *lruvec; -lockdep_assert_irqs_disabled (); -rcu_read_lock (); memcg =obj_cgroup_memcg (objcg); lruvec =mem_cgroup_lruvec (memcg, pgdat);
Quoted 6 lines · Vlastimil Babka (SUSE)
Quoted 3 lines
The safety of the counter update is already ensured by
VM_WARN_ON_IRQS_ENABLED()which is part ofmemcg_stats_lock()and does not require yet another check.I think here it's
__mod_memcg_lruvec_state()doing theVM_WARN_ON_as we don't go throughmemcg_stats_lock()?
It is either VM_WARN_ON_IRQS_ENABLED() directly as in __mod_memcg_lruvec_state() (which is special) or memcg_stats_lock().
Do you want me to rephrase this part?
Sebastian
Quoted 5 lines · Sebastian Andrzej Siewior
Quoted 4 lines · Vlastimil Babka (SUSE)
Quoted 3 lines
The safety of the counter update is already ensured by
VM_WARN_ON_IRQS_ENABLED()which is part ofmemcg_stats_lock()and does not require yet another check.
Quoted 7 lines
Quoted 2 lines
I think here it's
__mod_memcg_lruvec_state()doing theVM_WARN_ON_as we don't go throughmemcg_stats_lock()?It is either
VM_WARN_ON_IRQS_ENABLED()directly as in__mod_memcg_lruvec_state()(which is special) ormemcg_stats_lock().Do you want me to rephrase this part?
I think just s/memcg_stats_lock()/__mod_memcg_lruvec_state()/ in your phrasing, since we are removing the lockdep assert from path that calls __mod_memcg_lruvec_state() and not memcg_stats_lock()?
Or am I missing something?
Quoted 1 line
Sebastian
PATCH v2 1/1 memcg: Remove the lockdep assert from __mod_objcg_mlstate().
The assert was introduced in the commit cited below as an insurance that the semantic is the same after the local_irq_save() has been removed and the function has been made static.
The original requirement to disable interrupt was due the modification of per-CPU counters which require interrupts to be disabled because the counter update operation is not atomic and some of the counters are updated from interrupt context.
All callers of __mod_objcg_mlstate() acquire a lock (memcg_stock.stock_lock) which disables interrupts on !PREEMPT_RT and the lockdep assert is satisfied. On PREEMPT_RT the interrupts are not disabled and the assert triggers.
The safety of the counter update is already ensured by VM_WARN_ON_IRQS_ENABLED() which is part of __mod_memcg_lruvec_state() and does not require yet another check.
Remove the lockdep assert from __mod_objcg_mlstate().
---
Quoted 4 lines · Vlastimil Babka (SUSE)
I think just s/memcg_stats_lock()/__mod_memcg_lruvec_state()/ in your phrasing, since we are removing the lockdep assert from path that calls
__mod_memcg_lruvec_state()and notmemcg_stats_lock()?
Or am I missing something?
Yeah, makes sense.
mm/memcontrol.c | 2 -- 1 file changed, 2 deletions(-)
mm/memcontrol.c +0 -2
@@ -3147,8 +3147,6 @@ static inline void __mod_objcg_mlstate(sstruct mem_cgroup *memcg;struct lruvec *lruvec; -lockdep_assert_irqs_disabled (); -rcu_read_lock (); memcg =obj_cgroup_memcg (objcg); lruvec =mem_cgroup_lruvec (memcg, pgdat);
Quoted 18 lines · Sebastian Andrzej Siewior
The assert was introduced in the commit cited below as an insurance that the semantic is the same after the
local_irq_save()has been removed and the function has been made static.The original requirement to disable interrupt was due the modification of per-CPU counters which require interrupts to be disabled because the counter update operation is not atomic and some of the counters are updated from interrupt context.
All callers of
__mod_objcg_mlstate()acquire a lock (memcg_stock.stock_lock) which disables interrupts on !PREEMPT_RT and the lockdep assert is satisfied. OnPREEMPT_RTthe interrupts are not disabled and the assert triggers.The safety of the counter update is already ensured by
VM_WARN_ON_IRQS_ENABLED()which is part of__mod_memcg_lruvec_state()and does not require yet another check.
Quoted 5 lines
Remove the lockdep assert from
__mod_objcg_mlstate().Fixes 91882c1617c15 ("memcg: simple cleanup of stats update functions")Signed-off-by Sebastian Andrzej Siewior <[email protected]>
mm-hotfixes as it's a rc1 regression
Quoted 23 lines
---
Quoted 4 lines · Vlastimil Babka (SUSE)
I think just s/memcg_stats_lock()/__mod_memcg_lruvec_state()/ in your phrasing, since we are removing the lockdep assert from path that calls
__mod_memcg_lruvec_state()and notmemcg_stats_lock()?
Or am I missing something?Yeah, makes sense.
mm/memcontrol.c | 2 -- 1 file changed, 2 deletions(-)mm/memcontrol.c +0
-2@@ -3147,8 +3147,6 @@ static inline void __mod_objcg_mlstate(sstruct mem_cgroup *memcg;struct lruvec *lruvec; -lockdep_assert_irqs_disabled (); -rcu_read_lock (); memcg =obj_cgroup_memcg (objcg); lruvec =mem_cgroup_lruvec (memcg, pgdat);
Shakeel Butt
maintainerQuoted 9 lines · Sebastian Andrzej Siewior
The assert was introduced in the commit cited below as an insurance that the semantic is the same after the
local_irq_save()has been removed and the function has been made static.The original requirement to disable interrupt was due the modification of per-CPU counters which require interrupts to be disabled because the counter update operation is not atomic and some of the counters are updated from interrupt context.
Quoted 8 lines
All callers of
__mod_objcg_mlstate()acquire a lock (memcg_stock.stock_lock) which disables interrupts on !PREEMPT_RT and the lockdep assert is satisfied. OnPREEMPT_RTthe interrupts are not disabled and the assert triggers.The safety of the counter update is already ensured by
VM_WARN_ON_IRQS_ENABLED()which is part of__mod_memcg_lruvec_state()and does not require yet another check.
One question on VM_WARN_ON_IRQS_ENABLED() in __mod_memcg_lruvec_state(). On a PREEMPT_RT kernel with CONFIG_DEBUG_VM, will that VM_WARN_ON_IRQS_ENABLED() cause a splat or VM_WARN_ON_IRQS_ENABLED is special on PREEMPT_RT kernels?
Quoted 29 lines
Remove the lockdep assert from
__mod_objcg_mlstate().Fixes 91882c1617c15 ("memcg: simple cleanup of stats update functions")Signed-off-by Sebastian Andrzej Siewior <[email protected]>---
Quoted 4 lines · Vlastimil Babka (SUSE)
I think just s/memcg_stats_lock()/__mod_memcg_lruvec_state()/ in your phrasing, since we are removing the lockdep assert from path that calls
__mod_memcg_lruvec_state()and notmemcg_stats_lock()?
Or am I missing something?Yeah, makes sense.
mm/memcontrol.c | 2 -- 1 file changed, 2 deletions(-)mm/memcontrol.c +0
-2@@ -3147,8 +3147,6 @@ static inline void __mod_objcg_mlstate(sstruct mem_cgroup *memcg;struct lruvec *lruvec; -lockdep_assert_irqs_disabled (); -rcu_read_lock (); memcg =obj_cgroup_memcg (objcg); lruvec =mem_cgroup_lruvec (memcg, pgdat);
Quoted 15 lines · Shakeel Butt
Quoted 14 lines · Sebastian Andrzej Siewior
The assert was introduced in the commit cited below as an insurance that the semantic is the same after the
local_irq_save()has been removed and the function has been made static.The original requirement to disable interrupt was due the modification of per-CPU counters which require interrupts to be disabled because the counter update operation is not atomic and some of the counters are updated from interrupt context.
All callers of
__mod_objcg_mlstate()acquire a lock (memcg_stock.stock_lock) which disables interrupts on !PREEMPT_RT and the lockdep assert is satisfied. OnPREEMPT_RTthe interrupts are not disabled and the assert triggers.
Quoted 8 lines
Quoted 3 lines
The safety of the counter update is already ensured by
VM_WARN_ON_IRQS_ENABLED()which is part of__mod_memcg_lruvec_state()and does not require yet another check.One question on
VM_WARN_ON_IRQS_ENABLED()in__mod_memcg_lruvec_state(). On aPREEMPT_RTkernel withCONFIG_DEBUG_VM, will thatVM_WARN_ON_IRQS_ENABLED()cause a splat orVM_WARN_ON_IRQS_ENABLEDis special onPREEMPT_RTkernels?
It only does something with CONFIG_DEBUG_VM_IRQSOFF and that's disabled by dependencies on PREEMPT_RT :)
Quoted 29 lines
Quoted 29 lines
Remove the lockdep assert from
__mod_objcg_mlstate().Fixes 91882c1617c15 ("memcg: simple cleanup of stats update functions")Signed-off-by Sebastian Andrzej Siewior <[email protected]>---
Quoted 4 lines · Vlastimil Babka (SUSE)
I think just s/memcg_stats_lock()/__mod_memcg_lruvec_state()/ in your phrasing, since we are removing the lockdep assert from path that calls
__mod_memcg_lruvec_state()and notmemcg_stats_lock()?
Or am I missing something?Yeah, makes sense.
mm/memcontrol.c | 2 -- 1 file changed, 2 deletions(-)mm/memcontrol.c +0
-2@@ -3147,8 +3147,6 @@ static inline void __mod_objcg_mlstate(sstruct mem_cgroup *memcg;struct lruvec *lruvec; -lockdep_assert_irqs_disabled (); -rcu_read_lock (); memcg =obj_cgroup_memcg (objcg); lruvec =mem_cgroup_lruvec (memcg, pgdat);
Shakeel Butt
maintainerQuoted 20 lines · Vlastimil Babka (SUSE)
Quoted 19 lines · Shakeel Butt
Quoted 17 lines · Sebastian Andrzej Siewior
The assert was introduced in the commit cited below as an insurance that the semantic is the same after the
local_irq_save()has been removed and the function has been made static.The original requirement to disable interrupt was due the modification of per-CPU counters which require interrupts to be disabled because the counter update operation is not atomic and some of the counters are updated from interrupt context.
All callers of
__mod_objcg_mlstate()acquire a lock (memcg_stock.stock_lock) which disables interrupts on !PREEMPT_RT and the lockdep assert is satisfied. OnPREEMPT_RTthe interrupts are not disabled and the assert triggers.The safety of the counter update is already ensured by
VM_WARN_ON_IRQS_ENABLED()which is part of__mod_memcg_lruvec_state()and does not require yet another check.
Quoted 7 lines
Quoted 4 lines
One question on
VM_WARN_ON_IRQS_ENABLED()in__mod_memcg_lruvec_state(). On aPREEMPT_RTkernel withCONFIG_DEBUG_VM, will thatVM_WARN_ON_IRQS_ENABLED()cause a splat orVM_WARN_ON_IRQS_ENABLEDis special onPREEMPT_RTkernels?It only does something with
CONFIG_DEBUG_VM_IRQSOFFand that's disabled by dependencies onPREEMPT_RT:)
Thanks for the explanation.
Quoted 4 lines · Shakeel Butt
One question on
VM_WARN_ON_IRQS_ENABLED()in__mod_memcg_lruvec_state(). On aPREEMPT_RTkernel withCONFIG_DEBUG_VM, will thatVM_WARN_ON_IRQS_ENABLED()cause a splat orVM_WARN_ON_IRQS_ENABLEDis special onPREEMPT_RTkernels?
we have the following in the header file:
| #ifdef CONFIG_DEBUG_VM_IRQSOFF
| #define VM_WARN_ON_IRQS_ENABLED() WARN_ON_ONCE(!irqs_disabled())
| #else
| #define VM_WARN_ON_IRQS_ENABLED() do { } while (0)
| #endifand this in Kconfig:
| config DEBUG_VM_IRQSOFF | def_bool DEBUG_VM && !PREEMPT_RT |
which means on PREEMPT_RT we end up with "do {…"
Sebastian
Shakeel Butt
maintainerQuoted 14 lines · Sebastian Andrzej Siewior
Quoted 4 lines · Shakeel Butt
One question on
VM_WARN_ON_IRQS_ENABLED()in__mod_memcg_lruvec_state(). On aPREEMPT_RTkernel withCONFIG_DEBUG_VM, will thatVM_WARN_ON_IRQS_ENABLED()cause a splat orVM_WARN_ON_IRQS_ENABLEDis special onPREEMPT_RTkernels?we have the following in the header file:
| #ifdef CONFIG_DEBUG_VM_IRQSOFF | #define VM_WARN_ON_IRQS_ENABLED() WARN_ON_ONCE(!irqs_disabled()) | #else | #define VM_WARN_ON_IRQS_ENABLED() do { } while (0) | #endif
Quoted 6 lines
and this in
Kconfig:| config DEBUG_VM_IRQSOFF | def_bool DEBUG_VM && !PREEMPT_RT |which means on
PREEMPT_RTwe end up with "do {…"
Thanks for the explanation.
Quoted 18 lines · Sebastian Andrzej Siewior
The assert was introduced in the commit cited below as an insurance that the semantic is the same after the
local_irq_save()has been removed and the function has been made static.The original requirement to disable interrupt was due the modification of per-CPU counters which require interrupts to be disabled because the counter update operation is not atomic and some of the counters are updated from interrupt context.
All callers of
__mod_objcg_mlstate()acquire a lock (memcg_stock.stock_lock) which disables interrupts on !PREEMPT_RT and the lockdep assert is satisfied. OnPREEMPT_RTthe interrupts are not disabled and the assert triggers.The safety of the counter update is already ensured by
VM_WARN_ON_IRQS_ENABLED()which is part of__mod_memcg_lruvec_state()and does not require yet another check.
Quoted 5 lines
Remove the lockdep assert from
__mod_objcg_mlstate().Fixes 91882c1617c15 ("memcg: simple cleanup of stats update functions")Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Quoted 18 lines · Sebastian Andrzej Siewior
The assert was introduced in the commit cited below as an insurance that the semantic is the same after the
local_irq_save()has been removed and the function has been made static.The original requirement to disable interrupt was due the modification of per-CPU counters which require interrupts to be disabled because the counter update operation is not atomic and some of the counters are updated from interrupt context.
All callers of
__mod_objcg_mlstate()acquire a lock (memcg_stock.stock_lock) which disables interrupts on !PREEMPT_RT and the lockdep assert is satisfied. OnPREEMPT_RTthe interrupts are not disabled and the assert triggers.The safety of the counter update is already ensured by
VM_WARN_ON_IRQS_ENABLED()which is part of__mod_memcg_lruvec_state()and does not require yet another check.
Quoted 5 lines
Remove the lockdep assert from
__mod_objcg_mlstate().Fixes 91882c1617c15 ("memcg: simple cleanup of stats update functions")Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Signature · 2 lines
Michal Hocko SUSE Labs