net: in_irq() cleanup
Subsystems (4)
PATCH 1/1 net: in_irq() cleanup
Replace the obsolete and ambiguos macro in_irq() with new macro in_hardirq().
Signed-off-by Changbin Du <[email protected]>
--- include/linux/netdevice.h | 2 +- net/core/bpf_sk_storage.c | 4 ++-- net/core/dev.c | 2 +- net/core/skbuff.c | 6 +++--- net/nfc/rawsock.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
include/linux/netdevice.h +1 -1
@@ -3948,7 +3948,7 @@ void __dev_kfree_skb_any(struct sk_buff *skb, enum skb_free_reason reason);/* * It is not allowed to call kfree_skb() or consume_skb() from hardware * interrupt context or with hardware interrupts being disabled. -* (in_irq() || irqs_disabled()) +* (in_hardirq() || irqs_disabled()) * * We provide four helpers that can be used in following contexts : *
net/core/bpf_sk_storage.c +2 -2
@@ -416,7 +416,7 @@ static bool bpf_sk_storage_tracing_allowed(const struct bpf_prog *prog) BPF_CALL_4(bpf_sk_storage_get_tracing, struct bpf_map *, map, struct sock *, sk, void *, value, u64, flags) { -if (in_irq () ||in_nmi ()) +if (in_hardirq () ||in_nmi ())return (unsigned long )NULL ;return (unsigned long )____bpf_sk_storage_get (map, sk, value, flags);
@@ -425,7 +425,7 @@ BPF_CALL_4(bpf_sk_storage_get_tracing, struct bpf_map *, map, struct sock *, sk, BPF_CALL_2(bpf_sk_storage_delete_tracing, struct bpf_map *, map, struct sock *, sk) { -if (in_irq () ||in_nmi ()) +if (in_hardirq () ||in_nmi ())return -EPERM ;return ____bpf_sk_storage_delete (map, sk);
net/core/dev.c +1 -1
@@ -3190,7 +3190,7 @@ EXPORT_SYMBOL(__dev_kfree_skb_irq);void __dev_kfree_skb_any (struct sk_buff *skb,enum skb_free_reason reason) { -if (in_irq () ||irqs_disabled ()) +if (in_hardirq () ||irqs_disabled ())__dev_kfree_skb_irq (skb, reason);else dev_kfree_skb (skb);
net/core/skbuff.c +3 -3
@@ -156,7 +156,7 @@ void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align_mask)void *data; fragsz =SKB_DATA_ALIGN (fragsz); -if (in_irq () ||irqs_disabled ()) { +if (in_hardirq () ||irqs_disabled ()) { nc =this_cpu_ptr (&netdev_alloc_cache); data =page_frag_alloc_align (nc, fragsz,GFP_ATOMIC , align_mask); }else {
@@ -502,7 +502,7 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,if (sk_memalloc_socks ()) gfp_mask |= __GFP_MEMALLOC; -if (in_irq () ||irqs_disabled ()) { +if (in_hardirq () ||irqs_disabled ()) { nc =this_cpu_ptr (&netdev_alloc_cache); data =page_frag_alloc (nc, len, gfp_mask); pfmemalloc = nc->pfmemalloc;
@@ -724,7 +724,7 @@ void skb_release_head_state(struct sk_buff *skb) {skb_dst_drop (skb);if (skb->destructor) { -WARN_ON (in_irq ()); +WARN_ON (in_hardirq ()); skb->destructor (skb); }#if IS_ENABLED (CONFIG_NF_CONNTRACK )
net/nfc/rawsock.c +1 -1
@@ -140,7 +140,7 @@ static void rawsock_data_exchange_complete(void *context, struct sk_buff *skb, {struct sock *sk = (struct sock *) context; -BUG_ON (in_irq ()); +BUG_ON (in_hardirq ());pr_debug ("sk=%p err=%d\n" , sk, err);
Signature · 1 line
2.30.2
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 11 lines · On Fri, 13 Aug 2021 22:57:49 +0800 you wrote:
Replace the obsolete and ambiguos macro
in_irq()with new macroin_hardirq().Signed-off-by Changbin Du <[email protected]>--- include/linux/netdevice.h | 2 +- net/core/bpf_sk_storage.c | 4 ++-- net/core/dev.c | 2 +- net/core/skbuff.c | 6 +++--- net/nfc/rawsock.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
Here is the summary with links:
- net: in_irq() cleanup
https://git.kernel.org/netdev/net-next/c/afa79d08c6c8
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html