diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 57d7d4965f9aa0fc13a1cd10c06501d90c67e844..3597b4f14389b2dbb4fef37552367266fad5d016 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -604,9 +604,12 @@ static inline __u32 skb_queue_len(const struct sk_buff_head *list_) return list_->qlen; } +extern struct lock_class_key skb_queue_lock_key; + static inline void skb_queue_head_init(struct sk_buff_head *list) { spin_lock_init(&list->lock); + lockdep_set_class(&list->lock, &skb_queue_lock_key); list->prev = list->next = (struct sk_buff *)list; list->qlen = 0; } diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7cfbdb215ba2711cca6c5f8f92c3f0be640989d2..44f6a181a7545f1a4bc13dff16ca209924a66b8b 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -70,6 +70,13 @@ static kmem_cache_t *skbuff_head_cache __read_mostly; static kmem_cache_t *skbuff_fclone_cache __read_mostly; +/* + * lockdep: lock class key used by skb_queue_head_init(): + */ +struct lock_class_key skb_queue_lock_key; + +EXPORT_SYMBOL(skb_queue_lock_key); + /* * Keep out-of-line to prevent kernel bloat. * __builtin_return_address is not used because it is not always