Skip to content

Commit

Permalink
percpu_ref: release percpu memory early without PERCPU_REF_ALLOW_REINIT
Browse files Browse the repository at this point in the history
Release percpu memory after finishing the switch to the atomic mode
if only PERCPU_REF_ALLOW_REINIT isn't set.

Signed-off-by: Roman Gushchin <guro@fb.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Dennis Zhou <dennis@kernel.org>
  • Loading branch information
Roman Gushchin authored and Dennis Zhou committed May 9, 2019
1 parent ddde2af commit 7d9ab9b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions include/linux/percpu-refcount.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ struct percpu_ref {
percpu_ref_func_t *release;
percpu_ref_func_t *confirm_switch;
bool force_atomic:1;
bool allow_reinit:1;
struct rcu_head rcu;
};

Expand Down
13 changes: 11 additions & 2 deletions lib/percpu-refcount.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,14 @@ int percpu_ref_init(struct percpu_ref *ref, percpu_ref_func_t *release,
return -ENOMEM;

ref->force_atomic = flags & PERCPU_REF_INIT_ATOMIC;
ref->allow_reinit = flags & PERCPU_REF_ALLOW_REINIT;

if (flags & (PERCPU_REF_INIT_ATOMIC | PERCPU_REF_INIT_DEAD))
if (flags & (PERCPU_REF_INIT_ATOMIC | PERCPU_REF_INIT_DEAD)) {
ref->percpu_count_ptr |= __PERCPU_REF_ATOMIC;
else
ref->allow_reinit = true;
} else {
start_count += PERCPU_COUNT_BIAS;
}

if (flags & PERCPU_REF_INIT_DEAD)
ref->percpu_count_ptr |= __PERCPU_REF_DEAD;
Expand Down Expand Up @@ -119,6 +122,9 @@ static void percpu_ref_call_confirm_rcu(struct rcu_head *rcu)
ref->confirm_switch = NULL;
wake_up_all(&percpu_ref_switch_waitq);

if (!ref->allow_reinit)
percpu_ref_exit(ref);

/* drop ref from percpu_ref_switch_to_atomic() */
percpu_ref_put(ref);
}
Expand Down Expand Up @@ -194,6 +200,9 @@ static void __percpu_ref_switch_to_percpu(struct percpu_ref *ref)
if (!(ref->percpu_count_ptr & __PERCPU_REF_ATOMIC))
return;

if (WARN_ON_ONCE(!ref->allow_reinit))
return;

atomic_long_add(PERCPU_COUNT_BIAS, &ref->count);

/*
Expand Down

0 comments on commit 7d9ab9b

Please sign in to comment.