Skip to content

Commit 52e73eb

Browse files
committed
device-dax: fix percpu_ref_exit ordering
We need to wait until the percpu_ref is released before exit. Otherwise, we sometimes lose the race and trigger this new warning that was added in v4.9 (commit a67823c "percpu-refcount: init ->confirm_switch member properly"): WARNING: CPU: 0 PID: 3629 at lib/percpu-refcount.c:107 percpu_ref_exit+0x51/0x60 [..] Call Trace: [<ffffffff814bf093>] dump_stack+0x85/0xc2 [<ffffffff810b15db>] __warn+0xcb/0xf0 [<ffffffff810b170d>] warn_slowpath_null+0x1d/0x20 [<ffffffff814d70c1>] percpu_ref_exit+0x51/0x60 [<ffffffffa005706a>] dax_pmem_percpu_exit+0x1a/0x50 [dax_pmem] [<ffffffff81615f1f>] devm_action_release+0xf/0x20 Cc: <stable@vger.kernel.org> Fixes: ab68f26 ("/dev/dax, pmem: direct access to persistent memory") Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 867dfe3 commit 52e73eb

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/dax/pmem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ static void dax_pmem_percpu_exit(void *data)
4444

4545
dev_dbg(dax_pmem->dev, "%s\n", __func__);
4646
percpu_ref_exit(ref);
47-
wait_for_completion(&dax_pmem->cmp);
4847
}
4948

5049
static void dax_pmem_percpu_kill(void *data)
@@ -54,6 +53,7 @@ static void dax_pmem_percpu_kill(void *data)
5453

5554
dev_dbg(dax_pmem->dev, "%s\n", __func__);
5655
percpu_ref_kill(ref);
56+
wait_for_completion(&dax_pmem->cmp);
5757
}
5858

5959
static int dax_pmem_probe(struct device *dev)

0 commit comments

Comments
 (0)