forked from mirrors/linux
		
	Commit1f5307b1e0("mm, vmalloc: properly track vmalloc users") has pulled asm/pgtable.h include dependency to linux/vmalloc.h and that turned out to be a bad idea for some architectures. E.g. m68k fails with In file included from arch/m68k/include/asm/pgtable_mm.h:145:0, from arch/m68k/include/asm/pgtable.h:4, from include/linux/vmalloc.h:9, from arch/m68k/kernel/module.c:9: arch/m68k/include/asm/mcf_pgtable.h: In function 'nocache_page': >> arch/m68k/include/asm/mcf_pgtable.h:339:43: error: 'init_mm' undeclared (first use in this function) #define pgd_offset_k(address) pgd_offset(&init_mm, address) as spotted by kernel build bot. nios2 fails for other reason In file included from include/asm-generic/io.h:767:0, from arch/nios2/include/asm/io.h:61, from include/linux/io.h:25, from arch/nios2/include/asm/pgtable.h:18, from include/linux/mm.h:70, from include/linux/pid_namespace.h:6, from include/linux/ptrace.h:9, from arch/nios2/include/uapi/asm/elf.h:23, from arch/nios2/include/asm/elf.h:22, from include/linux/elf.h:4, from include/linux/module.h:15, from init/main.c:16: include/linux/vmalloc.h: In function '__vmalloc_node_flags': include/linux/vmalloc.h:99:40: error: 'PAGE_KERNEL' undeclared (first use in this function); did you mean 'GFP_KERNEL'? which is due to the newly added #include <asm/pgtable.h>, which on nios2 includes <linux/io.h> and thus <asm/io.h> and <asm-generic/io.h> which again includes <linux/vmalloc.h>. Tweaking that around just turns out a bigger headache than necessary. This patch reverts1f5307b1e0and reimplements the original fix in a different way. __vmalloc_node_flags can stay static inline which will cover vmalloc* functions. We only have one external user (kvmalloc_node) and we can export __vmalloc_node_flags_caller and provide the caller directly. This is much simpler and it doesn't really need any games with header files. [akpm@linux-foundation.org: coding-style fixes] [mhocko@kernel.org: revert old comment] Link: http://lkml.kernel.org/r/20170509211054.GB16325@dhcp22.suse.cz Fixes:1f5307b1e0("mm, vmalloc: properly track vmalloc users") Link: http://lkml.kernel.org/r/20170509153702.GR6481@dhcp22.suse.cz Signed-off-by: Michal Hocko <mhocko@suse.com> Cc: Tobias Klauser <tklauser@distanz.ch> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
			
				
	
	
		
			207 lines
		
	
	
	
		
			6.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			207 lines
		
	
	
	
		
			6.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#ifndef _LINUX_VMALLOC_H
 | 
						|
#define _LINUX_VMALLOC_H
 | 
						|
 | 
						|
#include <linux/spinlock.h>
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/list.h>
 | 
						|
#include <linux/llist.h>
 | 
						|
#include <asm/page.h>		/* pgprot_t */
 | 
						|
#include <linux/rbtree.h>
 | 
						|
 | 
						|
struct vm_area_struct;		/* vma defining user mapping in mm_types.h */
 | 
						|
struct notifier_block;		/* in notifier.h */
 | 
						|
 | 
						|
/* bits in flags of vmalloc's vm_struct below */
 | 
						|
#define VM_IOREMAP		0x00000001	/* ioremap() and friends */
 | 
						|
#define VM_ALLOC		0x00000002	/* vmalloc() */
 | 
						|
#define VM_MAP			0x00000004	/* vmap()ed pages */
 | 
						|
#define VM_USERMAP		0x00000008	/* suitable for remap_vmalloc_range */
 | 
						|
#define VM_UNINITIALIZED	0x00000020	/* vm_struct is not fully initialized */
 | 
						|
#define VM_NO_GUARD		0x00000040      /* don't add guard page */
 | 
						|
#define VM_KASAN		0x00000080      /* has allocated kasan shadow memory */
 | 
						|
/* bits [20..32] reserved for arch specific ioremap internals */
 | 
						|
 | 
						|
/*
 | 
						|
 * Maximum alignment for ioremap() regions.
 | 
						|
 * Can be overriden by arch-specific value.
 | 
						|
 */
 | 
						|
#ifndef IOREMAP_MAX_ORDER
 | 
						|
#define IOREMAP_MAX_ORDER	(7 + PAGE_SHIFT)	/* 128 pages */
 | 
						|
#endif
 | 
						|
 | 
						|
struct vm_struct {
 | 
						|
	struct vm_struct	*next;
 | 
						|
	void			*addr;
 | 
						|
	unsigned long		size;
 | 
						|
	unsigned long		flags;
 | 
						|
	struct page		**pages;
 | 
						|
	unsigned int		nr_pages;
 | 
						|
	phys_addr_t		phys_addr;
 | 
						|
	const void		*caller;
 | 
						|
};
 | 
						|
 | 
						|
struct vmap_area {
 | 
						|
	unsigned long va_start;
 | 
						|
	unsigned long va_end;
 | 
						|
	unsigned long flags;
 | 
						|
	struct rb_node rb_node;         /* address sorted rbtree */
 | 
						|
	struct list_head list;          /* address sorted list */
 | 
						|
	struct llist_node purge_list;    /* "lazy purge" list */
 | 
						|
	struct vm_struct *vm;
 | 
						|
	struct rcu_head rcu_head;
 | 
						|
};
 | 
						|
 | 
						|
/*
 | 
						|
 *	Highlevel APIs for driver use
 | 
						|
 */
 | 
						|
extern void vm_unmap_ram(const void *mem, unsigned int count);
 | 
						|
extern void *vm_map_ram(struct page **pages, unsigned int count,
 | 
						|
				int node, pgprot_t prot);
 | 
						|
extern void vm_unmap_aliases(void);
 | 
						|
 | 
						|
#ifdef CONFIG_MMU
 | 
						|
extern void __init vmalloc_init(void);
 | 
						|
#else
 | 
						|
static inline void vmalloc_init(void)
 | 
						|
{
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
extern void *vmalloc(unsigned long size);
 | 
						|
extern void *vzalloc(unsigned long size);
 | 
						|
extern void *vmalloc_user(unsigned long size);
 | 
						|
extern void *vmalloc_node(unsigned long size, int node);
 | 
						|
extern void *vzalloc_node(unsigned long size, int node);
 | 
						|
extern void *vmalloc_exec(unsigned long size);
 | 
						|
extern void *vmalloc_32(unsigned long size);
 | 
						|
extern void *vmalloc_32_user(unsigned long size);
 | 
						|
extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
 | 
						|
extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
 | 
						|
			unsigned long start, unsigned long end, gfp_t gfp_mask,
 | 
						|
			pgprot_t prot, unsigned long vm_flags, int node,
 | 
						|
			const void *caller);
 | 
						|
#ifndef CONFIG_MMU
 | 
						|
extern void *__vmalloc_node_flags(unsigned long size, int node, gfp_t flags);
 | 
						|
static inline void *__vmalloc_node_flags_caller(unsigned long size, int node,
 | 
						|
						gfp_t flags, void *caller)
 | 
						|
{
 | 
						|
	return __vmalloc_node_flags(size, node, flags);
 | 
						|
}
 | 
						|
#else
 | 
						|
extern void *__vmalloc_node_flags_caller(unsigned long size,
 | 
						|
					 int node, gfp_t flags, void *caller);
 | 
						|
#endif
 | 
						|
 | 
						|
extern void vfree(const void *addr);
 | 
						|
extern void vfree_atomic(const void *addr);
 | 
						|
 | 
						|
extern void *vmap(struct page **pages, unsigned int count,
 | 
						|
			unsigned long flags, pgprot_t prot);
 | 
						|
extern void vunmap(const void *addr);
 | 
						|
 | 
						|
extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
 | 
						|
				       unsigned long uaddr, void *kaddr,
 | 
						|
				       unsigned long size);
 | 
						|
 | 
						|
extern int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
 | 
						|
							unsigned long pgoff);
 | 
						|
void vmalloc_sync_all(void);
 | 
						|
 
 | 
						|
/*
 | 
						|
 *	Lowlevel-APIs (not for driver use!)
 | 
						|
 */
 | 
						|
 | 
						|
static inline size_t get_vm_area_size(const struct vm_struct *area)
 | 
						|
{
 | 
						|
	if (!(area->flags & VM_NO_GUARD))
 | 
						|
		/* return actual size without guard page */
 | 
						|
		return area->size - PAGE_SIZE;
 | 
						|
	else
 | 
						|
		return area->size;
 | 
						|
 | 
						|
}
 | 
						|
 | 
						|
extern struct vm_struct *get_vm_area(unsigned long size, unsigned long flags);
 | 
						|
extern struct vm_struct *get_vm_area_caller(unsigned long size,
 | 
						|
					unsigned long flags, const void *caller);
 | 
						|
extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
 | 
						|
					unsigned long start, unsigned long end);
 | 
						|
extern struct vm_struct *__get_vm_area_caller(unsigned long size,
 | 
						|
					unsigned long flags,
 | 
						|
					unsigned long start, unsigned long end,
 | 
						|
					const void *caller);
 | 
						|
extern struct vm_struct *remove_vm_area(const void *addr);
 | 
						|
extern struct vm_struct *find_vm_area(const void *addr);
 | 
						|
 | 
						|
extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
 | 
						|
			struct page **pages);
 | 
						|
#ifdef CONFIG_MMU
 | 
						|
extern int map_kernel_range_noflush(unsigned long start, unsigned long size,
 | 
						|
				    pgprot_t prot, struct page **pages);
 | 
						|
extern void unmap_kernel_range_noflush(unsigned long addr, unsigned long size);
 | 
						|
extern void unmap_kernel_range(unsigned long addr, unsigned long size);
 | 
						|
#else
 | 
						|
static inline int
 | 
						|
map_kernel_range_noflush(unsigned long start, unsigned long size,
 | 
						|
			pgprot_t prot, struct page **pages)
 | 
						|
{
 | 
						|
	return size >> PAGE_SHIFT;
 | 
						|
}
 | 
						|
static inline void
 | 
						|
unmap_kernel_range_noflush(unsigned long addr, unsigned long size)
 | 
						|
{
 | 
						|
}
 | 
						|
static inline void
 | 
						|
unmap_kernel_range(unsigned long addr, unsigned long size)
 | 
						|
{
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
/* Allocate/destroy a 'vmalloc' VM area. */
 | 
						|
extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes);
 | 
						|
extern void free_vm_area(struct vm_struct *area);
 | 
						|
 | 
						|
/* for /dev/kmem */
 | 
						|
extern long vread(char *buf, char *addr, unsigned long count);
 | 
						|
extern long vwrite(char *buf, char *addr, unsigned long count);
 | 
						|
 | 
						|
/*
 | 
						|
 *	Internals.  Dont't use..
 | 
						|
 */
 | 
						|
extern struct list_head vmap_area_list;
 | 
						|
extern __init void vm_area_add_early(struct vm_struct *vm);
 | 
						|
extern __init void vm_area_register_early(struct vm_struct *vm, size_t align);
 | 
						|
 | 
						|
#ifdef CONFIG_SMP
 | 
						|
# ifdef CONFIG_MMU
 | 
						|
struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
 | 
						|
				     const size_t *sizes, int nr_vms,
 | 
						|
				     size_t align);
 | 
						|
 | 
						|
void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);
 | 
						|
# else
 | 
						|
static inline struct vm_struct **
 | 
						|
pcpu_get_vm_areas(const unsigned long *offsets,
 | 
						|
		const size_t *sizes, int nr_vms,
 | 
						|
		size_t align)
 | 
						|
{
 | 
						|
	return NULL;
 | 
						|
}
 | 
						|
 | 
						|
static inline void
 | 
						|
pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms)
 | 
						|
{
 | 
						|
}
 | 
						|
# endif
 | 
						|
#endif
 | 
						|
 | 
						|
#ifdef CONFIG_MMU
 | 
						|
#define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
 | 
						|
#else
 | 
						|
#define VMALLOC_TOTAL 0UL
 | 
						|
#endif
 | 
						|
 | 
						|
int register_vmap_purge_notifier(struct notifier_block *nb);
 | 
						|
int unregister_vmap_purge_notifier(struct notifier_block *nb);
 | 
						|
 | 
						|
#endif /* _LINUX_VMALLOC_H */
 |