Skip to content

Commit 0628237

Browse files
committed
mm/memremap: Fix reuse of pgmap instances with internal references
Currently, attempts to shutdown and re-enable a device-dax instance trigger: Missing reference count teardown definition WARNING: CPU: 37 PID: 1608 at mm/memremap.c:211 devm_memremap_pages+0x234/0x850 [..] RIP: 0010:devm_memremap_pages+0x234/0x850 [..] Call Trace: dev_dax_probe+0x66/0x190 [device_dax] really_probe+0xef/0x390 driver_probe_device+0xb4/0x100 device_driver_attach+0x4f/0x60 Given that the setup path initializes pgmap->ref, arrange for it to be also torn down so devm_memremap_pages() is ready to be called again and not be mistaken for the 3rd-party per-cpu-ref case. Fixes: 24917f6 ("memremap: provide an optional internal refcount in struct dev_pagemap") Reported-by: Fan Du <[email protected]> Tested-by: Vishal Verma <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Ira Weiny <[email protected]> Cc: Jason Gunthorpe <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Link: https://lore.kernel.org/r/156530042781.2068700.8733813683117819799.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams <[email protected]>
1 parent d75996d commit 0628237

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

mm/memremap.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ static void dev_pagemap_cleanup(struct dev_pagemap *pgmap)
9191
wait_for_completion(&pgmap->done);
9292
percpu_ref_exit(pgmap->ref);
9393
}
94+
/*
95+
* Undo the pgmap ref assignment for the internal case as the
96+
* caller may re-enable the same pgmap.
97+
*/
98+
if (pgmap->ref == &pgmap->internal_ref)
99+
pgmap->ref = NULL;
94100
}
95101

96102
static void devm_memremap_pages_release(void *data)

0 commit comments

Comments
 (0)