mm/nvdimm: Add is_ioremap_addr and use that to check ioremap address
Subsystems (4)
PATCH 1/1 mm/nvdimm: Add is_ioremap_addr and use that to check ioremap address
Architectures like powerpc use different address range to map ioremap and vmalloc range. The memunmap() check used by the nvdimm layer was wrongly using is_vmalloc_addr() to check for ioremap range which fails for ppc64. This result in ppc64 not freeing the ioremap mapping. The side effect of this is an unbind failure during module unload with papr_scm nvdimm driver
--- arch/powerpc/include/asm/pgtable.h | 14 ++++++++++++++ include/linux/mm.h | 5 +++++ kernel/iomem.c | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/pgtable.h +14 -0
@@ -140,6 +140,20 @@ static inline void pte_frag_set(mm_context_t *ctx, void *p) }#endif +#ifdef CONFIG_PPC64 +#define is_ioremap_addr is_ioremap_addr +static inline bool is_ioremap_addr (const void *x) +{ +#ifdef CONFIG_MMU +unsigned long addr = (unsigned long )x; + +return addr >=IOREMAP_BASE && addr <IOREMAP_END ; +#else +return false; +#endif +} +#endif /* CONFIG_PPC64 */ +#endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_PGTABLE_H */
include/linux/mm.h +5 -0
@@ -633,6 +633,11 @@ static inline bool is_vmalloc_addr(const void *x)return false;#endif } + +#ifndef is_ioremap_addr +#define is_ioremap_addr (x) is_vmalloc_addr(x) +#endif +#ifdef CONFIG_MMU extern int is_vmalloc_or_module_addr (const void *x);#else
kernel/iomem.c +1 -1
@@ -121,7 +121,7 @@ EXPORT_SYMBOL(memremap);void memunmap (void *addr) { -if (is_vmalloc_addr (addr)) +if (is_ioremap_addr (addr))iounmap ((void __iomem *) addr); }EXPORT_SYMBOL (memunmap);
Signature · 6 lines
2.21.0 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Andrew Morton
maintainerQuoted 5 lines · On Mon, 1 Jul 2019 19:10:38 +0530 "Aneesh Kumar K.V"…
Architectures like powerpc use different address range to map ioremap and vmalloc range. The
memunmap()check used by the nvdimm layer was wrongly usingis_vmalloc_addr()to check for ioremap range which fails for ppc64. This result in ppc64 not freeing the ioremap mapping. The side effect of this is an unbind failure during module unload withpapr_scmnvdimm driver
The patch applies to 5.1. Does it need a Fixes: and a Cc:stable?
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 9 lines · Andrew Morton
Quoted 5 lines · On Mon, 1 Jul 2019 19:10:38 +0530 "Aneesh Kumar K.V"…
Architectures like powerpc use different address range to map ioremap and vmalloc range. The
memunmap()check used by the nvdimm layer was wrongly usingis_vmalloc_addr()to check for ioremap range which fails for ppc64. This result in ppc64 not freeing the ioremap mapping. The side effect of this is an unbind failure during module unload withpapr_scmnvdimm driverThe patch applies to 5.1. Does it need a Fixes: and a Cc:stable?
Actually, we want it to be backported to an older kernel possibly one that added papr-scm driver, b5beae5e224f ("powerpc/pseries: Add driver for PAPR SCM regions"). But that doesn't apply easily. It does apply without conflicts to 5.0
-aneesh
Michael Ellerman
reviewerQuoted 10 lines · Aneesh Kumar K.V
Quoted 8 lines · Andrew Morton
Quoted 5 lines · On Mon, 1 Jul 2019 19:10:38 +0530 "Aneesh Kumar K.V"…
Architectures like powerpc use different address range to map ioremap and vmalloc range. The
memunmap()check used by the nvdimm layer was wrongly usingis_vmalloc_addr()to check for ioremap range which fails for ppc64. This result in ppc64 not freeing the ioremap mapping. The side effect of this is an unbind failure during module unload withpapr_scmnvdimm driver
Quoted 6 lines
Quoted 1 line
The patch applies to 5.1. Does it need a Fixes: and a Cc:stable?
Actually, we want it to be backported to an older kernel possibly one that added papr-scm driver,
b5beae5e224f("powerpc/pseries: Add driver for PAPR SCM regions"). But that doesn't apply easily. It does apply without conflicts to 5.0
Don't worry about where it applies or doesn't, just tag it with the correct Fixes: and stable versions and then if it doesn't backport cleanly then we deal with that later.
cheers