Commit 20d49bfc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'core-debugobjects-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull debugobjects updates from Thomas Gleixner:
 "A small set of updates for debug objects:

   - Make all debug object descriptors constant. There is no reason to
     have them writeable.

   - Free the per CPU object pool after CPU unplug to avoid memory
     waste"

* tag 'core-debugobjects-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  debugobjects: Free per CPU pool after CPU unplug
  treewide: Make all debug_obj_descriptors const
  debugobjects: Allow debug_obj_descr to be const
parents 1e6d1d96 88451f2c

drivers/gpu/drm/i915/i915_active.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void *active_debug_hint(void *addr) 
	return (void *)ref->active ?: (void *)ref->retire ?: (void *)ref;

}



static struct debug_obj_descr active_debug_desc = {

static const struct debug_obj_descr active_debug_desc = {

	.name = "i915_active",

	.debug_hint = active_debug_hint,

};

drivers/gpu/drm/i915/i915_sw_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static void *i915_sw_fence_debug_hint(void *addr) 


#ifdef CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS



static struct debug_obj_descr i915_sw_fence_debug_descr = {

static const struct debug_obj_descr i915_sw_fence_debug_descr = {

	.name = "i915_sw_fence",

	.debug_hint = i915_sw_fence_debug_hint,

};

include/linux/cpuhotplug.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ enum cpuhp_state { 
	CPUHP_X86_MCE_DEAD,

	CPUHP_VIRT_NET_DEAD,

	CPUHP_SLUB_DEAD,

	CPUHP_DEBUG_OBJ_DEAD,

	CPUHP_MM_WRITEBACK_DEAD,

	CPUHP_MM_VMSTAT_DEAD,

	CPUHP_SOFTIRQ_DEAD,

include/linux/debugobjects.h

+16 −16
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct debug_obj { 
	enum debug_obj_state	state;

	unsigned int		astate;

	void			*object;

	struct debug_obj_descr	*descr;

	const struct debug_obj_descr *descr;

};



/**
@@ -64,14 +64,14 @@ struct debug_obj_descr { 
};



#ifdef CONFIG_DEBUG_OBJECTS

extern void debug_object_init      (void *addr, struct debug_obj_descr *descr);

extern void debug_object_init      (void *addr, const struct debug_obj_descr *descr);

extern void

debug_object_init_on_stack(void *addr, struct debug_obj_descr *descr);

extern int debug_object_activate  (void *addr, struct debug_obj_descr *descr);

extern void debug_object_deactivate(void *addr, struct debug_obj_descr *descr);

extern void debug_object_destroy   (void *addr, struct debug_obj_descr *descr);

extern void debug_object_free      (void *addr, struct debug_obj_descr *descr);

extern void debug_object_assert_init(void *addr, struct debug_obj_descr *descr);

debug_object_init_on_stack(void *addr, const struct debug_obj_descr *descr);

extern int debug_object_activate  (void *addr, const struct debug_obj_descr *descr);

extern void debug_object_deactivate(void *addr, const struct debug_obj_descr *descr);

extern void debug_object_destroy   (void *addr, const struct debug_obj_descr *descr);

extern void debug_object_free      (void *addr, const struct debug_obj_descr *descr);

extern void debug_object_assert_init(void *addr, const struct debug_obj_descr *descr);



/*

 * Active state:
@@ -79,26 +79,26 @@ extern void debug_object_assert_init(void *addr, struct debug_obj_descr *descr); 
 * - Must return to 0 before deactivation.

 */

extern void

debug_object_active_state(void *addr, struct debug_obj_descr *descr,

debug_object_active_state(void *addr, const struct debug_obj_descr *descr,

			  unsigned int expect, unsigned int next);



extern void debug_objects_early_init(void);

extern void debug_objects_mem_init(void);

#else

static inline void

debug_object_init      (void *addr, struct debug_obj_descr *descr) { }

debug_object_init      (void *addr, const struct debug_obj_descr *descr) { }

static inline void

debug_object_init_on_stack(void *addr, struct debug_obj_descr *descr) { }

debug_object_init_on_stack(void *addr, const struct debug_obj_descr *descr) { }

static inline int

debug_object_activate  (void *addr, struct debug_obj_descr *descr) { return 0; }

debug_object_activate  (void *addr, const struct debug_obj_descr *descr) { return 0; }

static inline void

debug_object_deactivate(void *addr, struct debug_obj_descr *descr) { }

debug_object_deactivate(void *addr, const struct debug_obj_descr *descr) { }

static inline void

debug_object_destroy   (void *addr, struct debug_obj_descr *descr) { }

debug_object_destroy   (void *addr, const struct debug_obj_descr *descr) { }

static inline void

debug_object_free      (void *addr, struct debug_obj_descr *descr) { }

debug_object_free      (void *addr, const struct debug_obj_descr *descr) { }

static inline void

debug_object_assert_init(void *addr, struct debug_obj_descr *descr) { }

debug_object_assert_init(void *addr, const struct debug_obj_descr *descr) { }



static inline void debug_objects_early_init(void) { }

static inline void debug_objects_mem_init(void) { }

kernel/rcu/rcu.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static inline unsigned long rcu_seq_diff(unsigned long new, unsigned long old) 
# define STATE_RCU_HEAD_READY	0

# define STATE_RCU_HEAD_QUEUED	1



extern struct debug_obj_descr rcuhead_debug_descr;

extern const struct debug_obj_descr rcuhead_debug_descr;



static inline int debug_rcu_head_queue(struct rcu_head *head)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE