Skip to content

Commit a91befd

Browse files
ChiWu-Zeroakpm00
authored andcommitted
lib/flex_proportions.c: remove local_irq_ops in fprop_new_period()
commit e78d483> "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.com Signed-off-by: wuchi <wuchi.zero@gmail.com> Reviewed-by: Jan Kara <jack@suse.cz> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 0cc011c commit a91befd

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

lib/flex_proportions.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,20 @@ void fprop_global_destroy(struct fprop_global *p)
6363
*/
6464
bool fprop_new_period(struct fprop_global *p, int periods)
6565
{
66-
s64 events;
67-
unsigned long flags;
66+
s64 events = percpu_counter_sum(&p->events);
6867

69-
local_irq_save(flags);
70-
events = percpu_counter_sum(&p->events);
7168
/*
7269
* Don't do anything if there are no events.
7370
*/
74-
if (events <= 1) {
75-
local_irq_restore(flags);
71+
if (events <= 1)
7672
return false;
77-
}
7873
write_seqcount_begin(&p->sequence);
7974
if (periods < 64)
8075
events -= events >> periods;
8176
/* Use addition to avoid losing events happening between sum and set */
8277
percpu_counter_add(&p->events, -events);
8378
p->period += periods;
8479
write_seqcount_end(&p->sequence);
85-
local_irq_restore(flags);
8680

8781
return true;
8882
}

0 commit comments

Comments
 (0)