diff options
| author | Eric Dumazet <edumazet@google.com> | 2022-06-08 18:04:37 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-06-10 06:53:56 +0200 |
| commit | ee2640df2393141a2975af726802b349d51713be (patch) | |
| tree | ee1ded184dbb821ea3159db968a2eea9803a01d1 /net | |
| parent | net: use DEBUG_NET_WARN_ON_ONCE() in skb_release_head_state() (diff) | |
| download | linux-ee2640df2393141a2975af726802b349d51713be.tar.xz linux-ee2640df2393141a2975af726802b349d51713be.zip | |
net: add debug checks in napi_consume_skb and __napi_alloc_skb()
Commit 6454eca81eae ("net: Use lockdep_assert_in_softirq()
in napi_consume_skb()") added a check in napi_consume_skb()
which is a bit weak.
napi_consume_skb() and __napi_alloc_skb() should only
be used from BH context, not from hard irq or nmi context,
otherwise we could have races.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index cf83d9b8f41d..fec75f8bf1f4 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -560,6 +560,7 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len, struct sk_buff *skb; void *data; + DEBUG_NET_WARN_ON_ONCE(!in_softirq()); len += NET_SKB_PAD + NET_IP_ALIGN; /* If requested length is either too small or too big, @@ -981,7 +982,7 @@ void napi_consume_skb(struct sk_buff *skb, int budget) return; } - lockdep_assert_in_softirq(); + DEBUG_NET_WARN_ON_ONCE(!in_softirq()); if (!skb_unref(skb)) return; |