Skip to content

Commit

Permalink
net: add skb_queue_empty_lockless()
Browse files Browse the repository at this point in the history
Some paths call skb_queue_empty() without holding
the queue lock. We must use a barrier in order
to not let the compiler do strange things, and avoid
KCSAN splats.

Adding a barrier in skb_queue_empty() might be overkill,
I prefer adding a new helper to clearly identify
points where the callers might be lockless. This might
help us finding real bugs.

The corresponding WRITE_ONCE() should add zero cost
for current compilers.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Oct 28, 2019
1 parent fc11078 commit d7d16a8
Showing 1 changed file with 24 additions and 9 deletions.
33 changes: 24 additions & 9 deletions include/linux/skbuff.h
Original file line number Diff line number Diff line change
Expand Up @@ -1495,6 +1495,19 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
return list->next == (const struct sk_buff *) list;
}

/**
* skb_queue_empty_lockless - check if a queue is empty
* @list: queue head
*
* Returns true if the queue is empty, false otherwise.
* This variant can be used in lockless contexts.
*/
static inline bool skb_queue_empty_lockless(const struct sk_buff_head *list)
{
return READ_ONCE(list->next) == (const struct sk_buff *) list;
}


/**
* skb_queue_is_last - check if skb is the last entry in the queue
* @list: queue head
Expand Down Expand Up @@ -1848,9 +1861,11 @@ static inline void __skb_insert(struct sk_buff *newsk,
struct sk_buff *prev, struct sk_buff *next,
struct sk_buff_head *list)
{
newsk->next = next;
newsk->prev = prev;
next->prev = prev->next = newsk;
/* see skb_queue_empty_lockless() for the opposite READ_ONCE() */
WRITE_ONCE(newsk->next, next);
WRITE_ONCE(newsk->prev, prev);
WRITE_ONCE(next->prev, newsk);
WRITE_ONCE(prev->next, newsk);
list->qlen++;
}

Expand All @@ -1861,11 +1876,11 @@ static inline void __skb_queue_splice(const struct sk_buff_head *list,
struct sk_buff *first = list->next;
struct sk_buff *last = list->prev;

first->prev = prev;
prev->next = first;
WRITE_ONCE(first->prev, prev);
WRITE_ONCE(prev->next, first);

last->next = next;
next->prev = last;
WRITE_ONCE(last->next, next);
WRITE_ONCE(next->prev, last);
}

/**
Expand Down Expand Up @@ -2006,8 +2021,8 @@ static inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list)
next = skb->next;
prev = skb->prev;
skb->next = skb->prev = NULL;
next->prev = prev;
prev->next = next;
WRITE_ONCE(next->prev, prev);
WRITE_ONCE(prev->next, next);
}

/**
Expand Down

0 comments on commit d7d16a8

Please sign in to comment.