From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22B93C433E2 for ; Fri, 11 Sep 2020 17:26:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D765E221ED for ; Fri, 11 Sep 2020 17:26:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599845201; bh=DuIXZbSJbcyKH0JuNzWZl348XxL1fJoS1J5T2eOykbY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gl5PtdlAGuCtBMKs5s5YbEqu8BOlt2s8SnWnY6/iNBmyiw415gt6mILw5vL5C6/Zg MuyMr7znPc3YnFjF52c+IHydp/So3EgjdehPJFBA+55JwcQdO2rcpuy5J9wqwVF3QO o/q9VfSARmuG8yLLuilIQKdDIwcFS7qQS6iXS1n4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726459AbgIKR0h (ORCPT ); Fri, 11 Sep 2020 13:26:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:49242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726030AbgIKM7I (ORCPT ); Fri, 11 Sep 2020 08:59:08 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 41AE52225F; Fri, 11 Sep 2020 12:55:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599828958; bh=DuIXZbSJbcyKH0JuNzWZl348XxL1fJoS1J5T2eOykbY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XIyfm6PIozCpg0ZVcGtiMvU0my8aKNWizMCmz7HjSo6zdJctXjoEbzGo8S4BgfES8 36U9HEp9dKe4TQjO2nyqYqROm75eSwgNtPhNH8axxJnywEhAOx84g6VXUOOUdIadc8 +nEHaiimmWRA90+iOjmyYF7xLzrJbHcaBOmNl4n0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jussi Kivilinna , Sven Eckelmann , Simon Wunderlich , Sasha Levin Subject: [PATCH 4.9 11/71] batman-adv: bla: use netif_rx_ni when not in interrupt context Date: Fri, 11 Sep 2020 14:45:55 +0200 Message-Id: <20200911122505.505597894@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200911122504.928931589@linuxfoundation.org> References: <20200911122504.928931589@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jussi Kivilinna [ Upstream commit 279e89b2281af3b1a9f04906e157992c19c9f163 ] 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 Signed-off-by: Sasha Levin --- 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 00123064eb26d..e545b42ab0b98 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -451,7 +451,10 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, skb->len + ETH_HLEN); soft_iface->last_rx = jiffies; - netif_rx(skb); + if (in_interrupt()) + netif_rx(skb); + else + netif_rx_ni(skb); out: if (primary_if) batadv_hardif_put(primary_if); -- 2.25.1