Commit 245245c2 authored by Liu Shixin's avatar Liu Shixin Committed by Andrew Morton
Browse files

mm/kmemleak: move the initialisation of object to __link_object 

In patch (mm: kmemleak: split __create_object into two functions), the
initialisation of object has been splited in two places.  Catalin said it
feels a bit weird and error prone.  So leave __alloc_object() to just do
the actual allocation and let __link_object() do the full initialisation.

Link: https://lkml.kernel.org/r/20231023025125.90972-1-liushixin2@huawei.com


Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
Suggested-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5e4fc577

mm/kmemleak.c

+17 −19
Original line number Diff line number Diff line
@@ -642,16 +642,32 @@ static struct kmemleak_object *__alloc_object(gfp_t gfp) 
	if (!object) {

		pr_warn("Cannot allocate a kmemleak_object structure\n");

		kmemleak_disable();

		return NULL;

	}



	return object;

}



static int __link_object(struct kmemleak_object *object, unsigned long ptr,

			 size_t size, int min_count, bool is_phys)

{



	struct kmemleak_object *parent;

	struct rb_node **link, *rb_parent;

	unsigned long untagged_ptr;

	unsigned long untagged_objp;



	INIT_LIST_HEAD(&object->object_list);

	INIT_LIST_HEAD(&object->gray_list);

	INIT_HLIST_HEAD(&object->area_list);

	raw_spin_lock_init(&object->lock);

	atomic_set(&object->use_count, 1);

	object->flags = OBJECT_ALLOCATED | (is_phys ? OBJECT_PHYS : 0);

	object->pointer = ptr;

	object->size = kfence_ksize((void *)ptr) ?: size;

	object->excess_ref = 0;

	object->min_count = min_count;

	object->count = 0;			/* white color initially */

	object->jiffies = jiffies;

	object->checksum = 0;

	object->del_state = 0;
@@ -676,24 +692,6 @@ static struct kmemleak_object *__alloc_object(gfp_t gfp) 
	/* kernel backtrace */

	object->trace_handle = set_track_prepare();



	return object;

}



static int __link_object(struct kmemleak_object *object, unsigned long ptr,

			 size_t size, int min_count, bool is_phys)

{



	struct kmemleak_object *parent;

	struct rb_node **link, *rb_parent;

	unsigned long untagged_ptr;

	unsigned long untagged_objp;



	object->flags = OBJECT_ALLOCATED | (is_phys ? OBJECT_PHYS : 0);

	object->pointer = ptr;

	object->size = kfence_ksize((void *)ptr) ?: size;

	object->min_count = min_count;

	object->jiffies = jiffies;



	untagged_ptr = (unsigned long)kasan_reset_tag((void *)ptr);

	/*

	 * Only update min_addr and max_addr with object