Skip to content

Commit b775141

Browse files
stefanhaRHdavejiang
authored andcommitted
device-dax: avoid hang on error before devm_memremap_pages()
dax_pmem_percpu_exit() waits for dax_pmem_percpu_release() to invoke the dax_pmem->cmp completion. Unfortunately this approach to cleaning up the percpu_ref only works after devm_memremap_pages() was successful. If devm_add_action_or_reset() or devm_memremap_pages() fails, dax_pmem_percpu_release() is not invoked. Therefore dax_pmem_percpu_exit() hangs waiting for the completion: rc = devm_add_action_or_reset(dev, dax_pmem_percpu_exit, &dax_pmem->ref); if (rc) return rc; dax_pmem->pgmap.ref = &dax_pmem->ref; addr = devm_memremap_pages(dev, &dax_pmem->pgmap); Avoid the hang by calling percpu_ref_exit() in the error paths instead of going through dax_pmem_percpu_exit(). Signed-off-by: Stefan Hajnoczi <[email protected]> Signed-off-by: Dave Jiang <[email protected]>
1 parent b4d4702 commit b775141

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

drivers/dax/pmem.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,19 @@ static int dax_pmem_probe(struct device *dev)
105105
if (rc)
106106
return rc;
107107

108-
rc = devm_add_action_or_reset(dev, dax_pmem_percpu_exit,
109-
&dax_pmem->ref);
110-
if (rc)
108+
rc = devm_add_action(dev, dax_pmem_percpu_exit, &dax_pmem->ref);
109+
if (rc) {
110+
percpu_ref_exit(&dax_pmem->ref);
111111
return rc;
112+
}
112113

113114
dax_pmem->pgmap.ref = &dax_pmem->ref;
114115
addr = devm_memremap_pages(dev, &dax_pmem->pgmap);
115-
if (IS_ERR(addr))
116+
if (IS_ERR(addr)) {
117+
devm_remove_action(dev, dax_pmem_percpu_exit, &dax_pmem->ref);
118+
percpu_ref_exit(&dax_pmem->ref);
116119
return PTR_ERR(addr);
120+
}
117121

118122
rc = devm_add_action_or_reset(dev, dax_pmem_percpu_kill,
119123
&dax_pmem->ref);

0 commit comments

Comments
 (0)