batman-adv/patches/0048-batman-adv-bla-use-netif_rx_ni-when-not-in-interrupt.patch

   1 From: Jussi Kivilinna <jussi.kivilinna@haltian.com>
   2 Date: Tue, 18 Aug 2020 17:46:10 +0300
   3 Subject: batman-adv: bla: use netif_rx_ni when not in interrupt context
   4
   5 batadv_bla_send_claim() gets called from worker thread context through
   6 batadv_bla_periodic_work(), thus netif_rx_ni needs to be used in that
   7 case. This fixes "NOHZ: local_softirq_pending 08" log messages seen
   8 when batman-adv is enabled.
   9
  10 Fixes: a9ce0dc43e2c ("batman-adv: add basic bridge loop avoidance code")
  11 Signed-off-by: Jussi Kivilinna <jussi.kivilinna@haltian.com>
  12 Signed-off-by: Sven Eckelmann <sven@narfation.org>
  13
  14 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/3747f81a1380b65740fc52fc71c7a3af4c6e49de
  15
  16 diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
  17 index 0842080a71f4ac89b3fbebc4b95c6c27d1cc4254..ed8259ff0dc7ba129825a369a757b37cc62ce829 100644
  18 --- a/net/batman-adv/bridge_loop_avoidance.c
  19 +++ b/net/batman-adv/bridge_loop_avoidance.c
  20 @@ -450,7 +450,10 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,
  21         batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
  22                            skb->len + ETH_HLEN);
  23
  24 -       netif_rx(skb);
  25 +       if (in_interrupt())
  26 +               netif_rx(skb);
  27 +       else
  28 +               netif_rx_ni(skb);
  29  out:
  30         if (primary_if)
  31                 batadv_hardif_put(primary_if);