From patchwork Fri May 8 12:33:48 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: 226243 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 D82F7C47254 for ; Fri, 8 May 2020 12:47:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B180024969 for ; Fri, 8 May 2020 12:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942054; bh=SCLdLovrLVRUd93rAlaRm+4XPG7UJBYmcHAxAVBWmBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gwRvLbXIdBHoaaXVc9YmyJj4mEd/TenXXQgju9lrDgZKEgF17PxJKw5IAS9KXbBie eTw+Tjj9lji8BygH6NF295yl5LOTyHmeRWQwlPdWopJEbZo0DxgVdu8pfq/aaOWAir EUalhX7kGbo0l0hjo2Ace0KuNw3ju/ltcb/ViHjk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729557AbgEHMrc (ORCPT ); Fri, 8 May 2020 08:47:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:50252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729550AbgEHMrc (ORCPT ); Fri, 8 May 2020 08:47:32 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 F0F8921473; Fri, 8 May 2020 12:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942051; bh=SCLdLovrLVRUd93rAlaRm+4XPG7UJBYmcHAxAVBWmBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eSFGQI0AbJ3AwD0xAhrsICqS7daKdfv0uvufer5AC4XUFnqkN9uYUx+MNJ2G12rMx VS3hk5pYj7/qtKZ2LE5Z+ucx48WB1ispCL7KmiBhN3xD7GiB/GA2EMTllLbU4obOLs DqZ9SCgvtspZWCQxM3k6mYs2HZAh7oLXdF/qE9HQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Erez Shitrit , Eugenia Emantayev , Tariq Toukan , "David S. Miller" Subject: [PATCH 4.4 237/312] mlx4: do not call napi_schedule() without care Date: Fri, 8 May 2020 14:33:48 +0200 Message-Id: <20200508123141.092527537@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@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: Eric Dumazet commit 8cf699ec849f4ca1413cea01289bd7d37dbcc626 upstream. Disable BH around the call to napi_schedule() to avoid following warning [ 52.095499] NOHZ: local_softirq_pending 08 [ 52.421291] NOHZ: local_softirq_pending 08 [ 52.608313] NOHZ: local_softirq_pending 08 Fixes: 8d59de8f7bb3 ("net/mlx4_en: Process all completions in RX rings after port goes up") Signed-off-by: Eric Dumazet Cc: Erez Shitrit Cc: Eugenia Emantayev Cc: Tariq Toukan Acked-by: Tariq Toukan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -1724,8 +1724,11 @@ int mlx4_en_start_port(struct net_device /* Process all completions if exist to prevent * the queues freezing if they are full */ - for (i = 0; i < priv->rx_ring_num; i++) + for (i = 0; i < priv->rx_ring_num; i++) { + local_bh_disable(); napi_schedule(&priv->rx_cq[i]->napi); + local_bh_enable(); + } netif_tx_start_all_queues(dev); netif_device_attach(dev);