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

Commit 54acd439 authored by Kees Cook's avatar Kees Cook Committed by Paul E. McKenney
Browse files

rculist: Consolidate DEBUG_LIST for list_add_rcu() 



This commit consolidates the debug checking for list_add_rcu() into the
new single __list_add_valid() debug function.  Notably, this commit fixes
the sanity check that was added in commit 17a801f4 ("list_debug:
WARN for adding something already in the list"), which wasn't checking
RCU-protected lists.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: default avatarRik van Riel <riel@redhat.com>
parent d7c81673

include/linux/rculist.h

+3 −5
Original line number Diff line number Diff line
@@ -45,19 +45,17 @@ static inline void INIT_LIST_HEAD_RCU(struct list_head *list) 
 * This is only for internal list manipulation where we know

 * the prev/next entries already!

 */

#ifndef CONFIG_DEBUG_LIST

static inline void __list_add_rcu(struct list_head *new,

		struct list_head *prev, struct list_head *next)

{

	if (!__list_add_valid(new, prev, next))

		return;



	new->next = next;

	new->prev = prev;

	rcu_assign_pointer(list_next_rcu(prev), new);

	next->prev = new;

}

#else

void __list_add_rcu(struct list_head *new,

		    struct list_head *prev, struct list_head *next);

#endif



/**

 * list_add_rcu - add a new entry to rcu-protected list

lib/list_debug.c

+0 −19
Original line number Diff line number Diff line
@@ -77,22 +77,3 @@ void list_del(struct list_head *entry) 
	entry->prev = LIST_POISON2;

}

EXPORT_SYMBOL(list_del);
 


/*

 * RCU variants.

 */

void __list_add_rcu(struct list_head *new,

		    struct list_head *prev, struct list_head *next)

{

	WARN(next->prev != prev,

		"list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",

		prev, next->prev, next);

	WARN(prev->next != next,

		"list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",

		next, prev->next, prev);

	new->next = next;

	new->prev = prev;

	rcu_assign_pointer(list_next_rcu(prev), new);

	next->prev = new;

}

EXPORT_SYMBOL(__list_add_rcu);