Commit d08c8b6a authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Greg Kroah-Hartman

mm/nvdimm: add is_ioremap_addr and use that to check ioremap address

commit 9bd3bb67 upstream.

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

Link: http://lkml.kernel.org/r/20190701134038.14165-1-aneesh.kumar@linux.ibm.comSigned-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Fixes: b5beae5e ("powerpc/pseries: Add driver for PAPR SCM regions")
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 84a7f9ba
...@@ -137,6 +137,20 @@ static inline void pte_frag_set(mm_context_t *ctx, void *p) ...@@ -137,6 +137,20 @@ static inline void pte_frag_set(mm_context_t *ctx, void *p)
} }
#endif #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 /* __ASSEMBLY__ */
#endif /* _ASM_POWERPC_PGTABLE_H */ #endif /* _ASM_POWERPC_PGTABLE_H */
...@@ -590,6 +590,11 @@ static inline bool is_vmalloc_addr(const void *x) ...@@ -590,6 +590,11 @@ static inline bool is_vmalloc_addr(const void *x)
return false; return false;
#endif #endif
} }
#ifndef is_ioremap_addr
#define is_ioremap_addr(x) is_vmalloc_addr(x)
#endif
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
extern int is_vmalloc_or_module_addr(const void *x); extern int is_vmalloc_or_module_addr(const void *x);
#else #else
......
...@@ -121,7 +121,7 @@ EXPORT_SYMBOL(memremap); ...@@ -121,7 +121,7 @@ EXPORT_SYMBOL(memremap);
void memunmap(void *addr) void memunmap(void *addr)
{ {
if (is_vmalloc_addr(addr)) if (is_ioremap_addr(addr))
iounmap((void __iomem *) addr); iounmap((void __iomem *) addr);
} }
EXPORT_SYMBOL(memunmap); EXPORT_SYMBOL(memunmap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment