Commit 97e5bf60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu 

Pull percpu fixes from Dennis Zhou:
 "This contains a cleanup to lib/percpu-refcount.c and an update to the
  MAINTAINERS file to more formally take over support for lib/percpu*"

* 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
  MAINTAINERS: Add lib/percpu* as part of percpu entry
  percpu_ref: Don't opencode percpu_ref_is_dying
parents 3c856a31 c547addb

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -14324,10 +14324,12 @@ PER-CPU MEMORY ALLOCATOR 
M:	Dennis Zhou <dennis@kernel.org>

M:	Tejun Heo <tj@kernel.org>

M:	Christoph Lameter <cl@linux.com>

L:	linux-mm@kvack.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git

F:	arch/*/include/asm/percpu.h

F:	include/linux/percpu*.h

F:	lib/percpu*.c

F:	mm/percpu*.c









PER-TASK DELAY ACCOUNTING
































lib/percpu-refcount.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -275,7 +275,7 @@ static void __percpu_ref_switch_mode(struct percpu_ref *ref,







	wait_event_lock_irq(percpu_ref_switch_waitq, !data->confirm_switch,









			    percpu_ref_switch_lock);



















	if (data->force_atomic || (ref->percpu_count_ptr & __PERCPU_REF_DEAD))









	if (data->force_atomic || percpu_ref_is_dying(ref))









		__percpu_ref_switch_to_atomic(ref, confirm_switch);









	else









		__percpu_ref_switch_to_percpu(ref);








@@ -385,7 +385,7 @@ void percpu_ref_kill_and_confirm(struct percpu_ref *ref,

















	spin_lock_irqsave(&percpu_ref_switch_lock, flags);



















	WARN_ONCE(ref->percpu_count_ptr & __PERCPU_REF_DEAD,









	WARN_ONCE(percpu_ref_is_dying(ref),









		  "%s called more than once on %ps!", __func__,









		  ref->data->release);


















@@ -465,7 +465,7 @@ void percpu_ref_resurrect(struct percpu_ref *ref)

















	spin_lock_irqsave(&percpu_ref_switch_lock, flags);



















	WARN_ON_ONCE(!(ref->percpu_count_ptr & __PERCPU_REF_DEAD));









	WARN_ON_ONCE(!percpu_ref_is_dying(ref));









	WARN_ON_ONCE(__ref_is_percpu(ref, &percpu_count));



















	ref->percpu_count_ptr &= ~__PERCPU_REF_DEAD;