Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 264ef8a9 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

kmemleak: Remove alloc_bootmem annotations introduced in the past 



kmemleak_alloc() calls were added in some places where alloc_bootmem was
called. Since now kmemleak tracks bootmem allocations, these explicit
calls should be run.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent ec3a354b

kernel/pid.c

+0 −7
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <linux/pid_namespace.h>

#include <linux/init_task.h>

#include <linux/syscalls.h>

#include <linux/kmemleak.h>



#define pid_hashfn(nr, ns)	\

	hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
@@ -513,12 +512,6 @@ void __init pidhash_init(void) 
	pid_hash = alloc_bootmem(pidhash_size *	sizeof(*(pid_hash)));

	if (!pid_hash)

		panic("Could not alloc pidhash!\n");

	/*

	 * pid_hash contains references to allocated struct pid objects and it

	 * must be scanned by kmemleak to avoid false positives.

	 */

	kmemleak_alloc(pid_hash, pidhash_size *	sizeof(*(pid_hash)), 0,

		       GFP_KERNEL);

	for (i = 0; i < pidhash_size; i++)

		INIT_HLIST_HEAD(&pid_hash[i]);

}

mm/page_alloc.c

+3 −11
Original line number Diff line number Diff line
@@ -4745,8 +4745,10 @@ void *__init alloc_large_system_hash(const char *tablename, 
			 * some pages at the end of hash table which

			 * alloc_pages_exact() automatically does

			 */

			if (get_order(size) < MAX_ORDER)

			if (get_order(size) < MAX_ORDER) {

				table = alloc_pages_exact(size, GFP_ATOMIC);

				kmemleak_alloc(table, size, 1, GFP_ATOMIC);

			}

		}

	} while (!table && size > PAGE_SIZE && --log2qty);
@@ -4764,16 +4766,6 @@ void *__init alloc_large_system_hash(const char *tablename, 
	if (_hash_mask)

		*_hash_mask = (1 << log2qty) - 1;



	/*

	 * If hashdist is set, the table allocation is done with __vmalloc()

	 * which invokes the kmemleak_alloc() callback. This function may also

	 * be called before the slab and kmemleak are initialised when

	 * kmemleak simply buffers the request to be executed later

	 * (GFP_ATOMIC flag ignored in this case).

	 */

	if (!hashdist)

		kmemleak_alloc(table, size, 1, GFP_ATOMIC);



	return table;

}