From patchwork Fri Sep 11 12:45:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 309766 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 6C8DEC2BC11 for ; Fri, 11 Sep 2020 17:37:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2ADAB221E7 for ; Fri, 11 Sep 2020 17:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599845826; bh=kiSrsTIrdXRGEnNSgk/vKpZvsLrP0+0TT4GLeyXZybI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bAB/YmsHfGivDYcRDpRnGI28fPhcNDTDrrhH7QiHMwxKElIma5gkNCX9RxFSTnq3X zGdLA5fWkGbuJxaUw1+M/6cCdtWq+XL3UXbpJe1NnIP3b+QQ1+4g5aem70tgF/yY5Q hV3onlEwZ2gGn/FMkBc1LokDMnaddD28p/n3XK5E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725997AbgIKRg5 (ORCPT ); Fri, 11 Sep 2020 13:36:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:48392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726031AbgIKMxc (ORCPT ); Fri, 11 Sep 2020 08:53:32 -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 160DC22204; Fri, 11 Sep 2020 12:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599828798; bh=kiSrsTIrdXRGEnNSgk/vKpZvsLrP0+0TT4GLeyXZybI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m+y6z/N6hPCw1wft2z0IlWAMXPoOQVPlcWIbY9phU62EtffSqyQ9gv6B41LjPxtsW v9FQ5mRvVC6jiGhI8rj/50+S26rMCee4WyAps+nrgsCC02grQMXuTmaQDSOdwuLO8C 1dpCPiTz13j7UeloOyy2Pv/AokJt3O+I+K8ZfpNg= 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.4 11/62] batman-adv: bla: use netif_rx_ni when not in interrupt context Date: Fri, 11 Sep 2020 14:45:54 +0200 Message-Id: <20200911122502.956523709@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200911122502.395450276@linuxfoundation.org> References: <20200911122502.395450276@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 cea7fdeac5aa2..9aa5daa551273 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -380,7 +380,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_free_ref(primary_if);