Commit 2dff4405 authored by Vegard Nossum's avatar Vegard Nossum
Browse files

kmemcheck: add mm functions 



With kmemcheck enabled, the slab allocator needs to do this:

1. Tell kmemcheck to allocate the shadow memory which stores the status of
   each byte in the allocation proper, e.g. whether it is initialized or
   uninitialized.
2. Tell kmemcheck which parts of memory that should be marked uninitialized.
   There are actually a few more states, such as "not yet allocated" and
   "recently freed".

If a slab cache is set up using the SLAB_NOTRACK flag, it will never return
memory that can take page faults because of kmemcheck.

If a slab cache is NOT set up using the SLAB_NOTRACK flag, callers can still
request memory with the __GFP_NOTRACK flag. This does not prevent the page
faults from occuring, however, but marks the object in question as being
initialized so that no warnings will ever be produced for this object.

In addition to (and in contrast to) __GFP_NOTRACK, the
__GFP_NOTRACK_FALSE_POSITIVE flag indicates that the allocation should
not be tracked _because_ it would produce a false positive. Their values
are identical, but need not be so in the future (for example, we could now
enable/disable false positives with a config option).

Parts of this patch were contributed by Pekka Enberg but merged for
atomicity.

Signed-off-by: default avatarVegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>

[rebased for mainline inclusion]
Signed-off-by: default avatarVegard Nossum <vegard.nossum@gmail.com>
parent f8561296

arch/x86/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void arch_task_cache_init(void) 
        task_xstate_cachep =

        	kmem_cache_create("task_xstate", xstate_size,

				  __alignof__(union thread_xstate),

				  SLAB_PANIC, NULL);

				  SLAB_PANIC | SLAB_NOTRACK, NULL);

}



/*

include/linux/gfp.h

+8 −1
Original line number Diff line number Diff line
@@ -51,8 +51,15 @@ struct vm_area_struct; 
#define __GFP_THISNODE	((__force gfp_t)0x40000u)/* No fallback, no policies */

#define __GFP_RECLAIMABLE ((__force gfp_t)0x80000u) /* Page is reclaimable */

#define __GFP_MOVABLE	((__force gfp_t)0x100000u)  /* Page is movable */

#define __GFP_NOTRACK	((__force gfp_t)0x200000u)  /* Don't track with kmemcheck */



#define __GFP_BITS_SHIFT 21	/* Room for 21 __GFP_FOO bits */

/*

 * This may seem redundant, but it's a way of annotating false positives vs.

 * allocations that simply cannot be supported (e.g. page tables).

 */

#define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)



#define __GFP_BITS_SHIFT 22	/* Room for 22 __GFP_FOO bits */

#define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))



/* This equals 0, but use constants in case they ever change */

include/linux/kmemcheck.h

+47 −0
Original line number Diff line number Diff line
@@ -7,11 +7,58 @@ 
#ifdef CONFIG_KMEMCHECK

extern int kmemcheck_enabled;



/* The slab-related functions. */

void kmemcheck_alloc_shadow(struct kmem_cache *s, gfp_t flags, int node,

			    struct page *page, int order);

void kmemcheck_free_shadow(struct kmem_cache *s, struct page *page, int order);

void kmemcheck_slab_alloc(struct kmem_cache *s, gfp_t gfpflags, void *object,

			  size_t size);

void kmemcheck_slab_free(struct kmem_cache *s, void *object, size_t size);



void kmemcheck_show_pages(struct page *p, unsigned int n);

void kmemcheck_hide_pages(struct page *p, unsigned int n);



bool kmemcheck_page_is_tracked(struct page *p);



void kmemcheck_mark_unallocated(void *address, unsigned int n);

void kmemcheck_mark_uninitialized(void *address, unsigned int n);

void kmemcheck_mark_initialized(void *address, unsigned int n);

void kmemcheck_mark_freed(void *address, unsigned int n);



void kmemcheck_mark_unallocated_pages(struct page *p, unsigned int n);

void kmemcheck_mark_uninitialized_pages(struct page *p, unsigned int n);



int kmemcheck_show_addr(unsigned long address);

int kmemcheck_hide_addr(unsigned long address);

#else

#define kmemcheck_enabled 0



static inline void

kmemcheck_alloc_shadow(struct kmem_cache *s, gfp_t flags, int node,

		       struct page *page, int order)

{

}



static inline void

kmemcheck_free_shadow(struct kmem_cache *s, struct page *page, int order)

{

}



static inline void

kmemcheck_slab_alloc(struct kmem_cache *s, gfp_t gfpflags, void *object,

		     size_t size)

{

}



static inline void kmemcheck_slab_free(struct kmem_cache *s, void *object,

				       size_t size)

{

}



static inline bool kmemcheck_page_is_tracked(struct page *p)

{

	return false;

}

#endif /* CONFIG_KMEMCHECK */



#endif /* LINUX_KMEMCHECK_H */

include/linux/slab.h

+7 −0
Original line number Diff line number Diff line
@@ -64,6 +64,13 @@ 


#define SLAB_NOLEAKTRACE	0x00800000UL	/* Avoid kmemleak tracing */



/* Don't track use of uninitialized memory */

#ifdef CONFIG_KMEMCHECK

# define SLAB_NOTRACK		0x01000000UL

#else

# define SLAB_NOTRACK		0x00000000UL

#endif



/* The following flags affect the page allocator grouping pages by mobility */

#define SLAB_RECLAIM_ACCOUNT	0x00020000UL		/* Objects are reclaimable */

#define SLAB_TEMPORARY		SLAB_RECLAIM_ACCOUNT	/* Objects are short-lived */

kernel/fork.c

+7 −7
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ void __init fork_init(unsigned long mempages) 
	/* create a slab on which task_structs can be allocated */

	task_struct_cachep =

		kmem_cache_create("task_struct", sizeof(struct task_struct),

			ARCH_MIN_TASKALIGN, SLAB_PANIC, NULL);

			ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);

#endif



	/* do the arch specific task caches init */
@@ -1470,20 +1470,20 @@ void __init proc_caches_init(void) 
{

	sighand_cachep = kmem_cache_create("sighand_cache",

			sizeof(struct sighand_struct), 0,

			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_DESTROY_BY_RCU,

			sighand_ctor);

			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_DESTROY_BY_RCU|

			SLAB_NOTRACK, sighand_ctor);

	signal_cachep = kmem_cache_create("signal_cache",

			sizeof(struct signal_struct), 0,

			SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);

			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);

	files_cachep = kmem_cache_create("files_cache",

			sizeof(struct files_struct), 0,

			SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);

			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);

	fs_cachep = kmem_cache_create("fs_cache",

			sizeof(struct fs_struct), 0,

			SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);

			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);

	mm_cachep = kmem_cache_create("mm_struct",

			sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,

			SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);

			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);

	vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);

	mmap_init();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE