Commit a91befde authored by wuchi's avatar wuchi Committed by akpm

lib/flex_proportions.c: remove local_irq_ops in fprop_new_period()

commit e78d4833> "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.

Link: https://lkml.kernel.org/r/20220604131502.5190-1-wuchi.zero@gmail.comSigned-off-by: default avatarwuchi <wuchi.zero@gmail.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0cc011c5
...@@ -63,18 +63,13 @@ void fprop_global_destroy(struct fprop_global *p) ...@@ -63,18 +63,13 @@ void fprop_global_destroy(struct fprop_global *p)
*/ */
bool fprop_new_period(struct fprop_global *p, int periods) bool fprop_new_period(struct fprop_global *p, int periods)
{ {
s64 events; s64 events = percpu_counter_sum(&p->events);
unsigned long flags;
local_irq_save(flags);
events = percpu_counter_sum(&p->events);
/* /*
* Don't do anything if there are no events. * Don't do anything if there are no events.
*/ */
if (events <= 1) { if (events <= 1)
local_irq_restore(flags);
return false; return false;
}
write_seqcount_begin(&p->sequence); write_seqcount_begin(&p->sequence);
if (periods < 64) if (periods < 64)
events -= events >> periods; events -= events >> periods;
...@@ -82,7 +77,6 @@ bool fprop_new_period(struct fprop_global *p, int periods) ...@@ -82,7 +77,6 @@ bool fprop_new_period(struct fprop_global *p, int periods)
percpu_counter_add(&p->events, -events); percpu_counter_add(&p->events, -events);
p->period += periods; p->period += periods;
write_seqcount_end(&p->sequence); write_seqcount_end(&p->sequence);
local_irq_restore(flags);
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment