lib/flex_proportions.c: Remove local_irq_ops in fprop_new_period()
PATCH 1/1 lib/flex_proportions.c: Remove local_irq_ops in fprop_new_period()
The commit <e78d4833c03e28> (lib: Fix possible deadlock in flexible proportion code) adds the local_irq_ops because percpu_counter_{sum |add} ops'lock can cause deadlock by interrupts. Now percpu_counter _{sum|add} ops use raw_spin_(un)lock_irq*, so revert the commit and resolve the conflict.
--- lib/flex_proportions.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
lib/flex_proportions.c +2 -8
@@ -63,18 +63,13 @@ void fprop_global_destroy(struct fprop_global *p)*/ bool fprop_new_period (struct fprop_global *p,int periods) { -s64 events; -unsigned long flags; +s64 events =percpu_counter_sum (&p->events); -local_irq_save (flags); - events =percpu_counter_sum (&p->events);/* * Don't do anything if there are no events. */ -if (events <=1 ) { -local_irq_restore (flags); +if (events <=1 )return false; - }write_seqcount_begin (&p->sequence);if (periods <64 ) events -= events >> periods;
@@ -82,7 +77,6 @@ bool fprop_new_period(struct fprop_global *p, int periods)percpu_counter_add (&p->events, -events); p->period += periods;write_seqcount_end (&p->sequence); -local_irq_restore (flags);return true; }
Signature · 1 line
2.20.1
Quoted 7 lines · wuchi
The commit <
e78d4833c03e28> (lib: Fix possible deadlock in flexible proportion code) adds thelocal_irq_opsbecause percpu_counter_{sum |add} ops'lock can cause deadlock by interrupts. Nowpercpu_counter_{sum|add} ops use raw_spin_(un)lock_irq*, so revert the commit and resolve the conflict.Signed-off-by wuchi <[email protected]>
Yes, good point. Thanks for cleaning this up. Feel free to add:
I guess Andrew will pickup this patch, or should I do it Andrew?
Honza
Quoted 40 lines
--- lib/flex_proportions.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)lib/flex_proportions.c +2
-8@@ -63,18 +63,13 @@ void fprop_global_destroy(struct fprop_global *p)*/ bool fprop_new_period (struct fprop_global *p,int periods) { -s64 events; -unsigned long flags; +s64 events =percpu_counter_sum (&p->events); -local_irq_save (flags); - events =percpu_counter_sum (&p->events);/* * Don't do anything if there are no events. */ -if (events <=1 ) { -local_irq_restore (flags); +if (events <=1 )return false; - }write_seqcount_begin (&p->sequence);if (periods <64 ) events -= events >> periods;@@ -82,7 +77,6 @@ bool fprop_new_period(struct fprop_global *p, int periods)percpu_counter_add (&p->events, -events); p->period += periods;write_seqcount_end (&p->sequence); -local_irq_restore (flags);return true; }Signature · 1 line
2.20.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 7 lines · Jan Kara
Quoted 6 lines · wuchi
The commit <
e78d4833c03e28> (lib: Fix possible deadlock in flexible proportion code) adds thelocal_irq_opsbecause percpu_counter_{sum |add} ops'lock can cause deadlock by interrupts. Nowpercpu_counter_{sum|add} ops use raw_spin_(un)lock_irq*, so revert the commit and resolve the conflict.
Quoted 7 lines
Quoted 1 line
Signed-off-by wuchi <[email protected]>Yes, good point. Thanks for cleaning this up. Feel free to add:
Reviewed-by Jan Kara <[email protected]>I guess Andrew will pickup this patch, or should I do it Andrew?
Oh, I can see Andrew already did pickup the patch. So everything is fine :).
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR