From patchwork Mon Aug 24 16:21:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 18152 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id E182780408; Mon, 24 Aug 2020 18:30:48 +0200 (CEST) Received: from simonwunderlich.de (packetmixer.de [IPv6:2001:4d88:2000:24::c0de]) by diktynna.open-mesh.org (Postfix) with ESMTPS id 2E3CF803EF for ; Mon, 24 Aug 2020 18:30:46 +0200 (CEST) Received: from kero.packetmixer.de (p200300c5970d68d0e0160e8a82c5fd76.dip0.t-ipconnect.de [IPv6:2003:c5:970d:68d0:e016:e8a:82c5:fd76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by simonwunderlich.de (Postfix) with ESMTPSA id 64F0E6206D; Mon, 24 Aug 2020 18:21:15 +0200 (CEST) From: Simon Wunderlich To: davem@davemloft.net Subject: [PATCH 3/3] batman-adv: bla: use netif_rx_ni when not in interrupt context Date: Mon, 24 Aug 2020 18:21:11 +0200 Message-Id: <20200824162111.29220-4-sw@simonwunderlich.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200824162111.29220-1-sw@simonwunderlich.de> References: <20200824162111.29220-1-sw@simonwunderlich.de> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1598286646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pfO+5zaXvrrC0abQF7dV2Fy65Zshw6ESAN+H5PSMO2k=; b=Fi+RJOsEsGqBfDDuDJkFuLCJqXjoy8pAGI5JqWtdm8NlLsFddC4wfEMgFXfAZTUXcAvLIG 7eagKE+QYVp+OI/BVQyv0/+tyVXct02cyHr8wzQDqKezCOd2nXaK5qOTAs9may56QLkso/ 5QfwMsXVEmdvwerTiu0OyKwO84Ipji8= ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1598286646; a=rsa-sha256; cv=none; b=m0XcdcescKUV2ysDjEwf0+0NZ/h4PBDQrELo//rHGwxk/tARwQOAU/8W0MST+O7t5CWkYC XHc7CjNe3F9Dr8c1HMOUsrafDo4AUMB/DhCIsW1GW+c2Zjs1qd4Ie1LySl0TrjnbosMt7b 0F+cB38McrMKlPGcHLdEYbfDtkYT6to= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=none; spf=pass (diktynna.open-mesh.org: domain of sw@simonwunderlich.de designates 2001:4d88:2000:24::c0de as permitted sender) smtp.mailfrom=sw@simonwunderlich.de Message-ID-Hash: PEFQ3YETO4GT5HCEW5DZN5OVIRJI6Q27 X-Message-ID-Hash: PEFQ3YETO4GT5HCEW5DZN5OVIRJI6Q27 X-MailFrom: sw@simonwunderlich.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Jussi Kivilinna X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Jussi Kivilinna batadv_bla_send_claim() gets called from worker thread context through batadv_bla_periodic_work(), thus netif_rx_ni needs to be used in that case. This fixes "NOHZ: local_softirq_pending 08" log messages seen when batman-adv is enabled. Fixes: 23721387c409 ("batman-adv: add basic bridge loop avoidance code") Signed-off-by: Jussi Kivilinna Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- net/batman-adv/bridge_loop_avoidance.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 91a04ca373dc..8500f56cbd10 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -437,7 +437,10 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, skb->len + ETH_HLEN); - netif_rx(skb); + if (in_interrupt()) + netif_rx(skb); + else + netif_rx_ni(skb); out: if (primary_if) batadv_hardif_put(primary_if);