Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3028562ybt; Mon, 29 Jun 2020 13:18:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDbdmK6v+NRo9CEd6S0mCt0/X4HTKtTMszzt0Z2VqJ6KXWLQbro/anG2A67so1uJb1OHic X-Received: by 2002:a50:88e1:: with SMTP id d88mr19491348edd.74.1593461931101; Mon, 29 Jun 2020 13:18:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593461931; cv=none; d=google.com; s=arc-20160816; b=GrfdS0VDWV+x2ND4Cf2rW6GOQB/iUBIDBGeg3iajQcFMRwC1XYa/wP9cyo1/8vre+3 wDCk8GiJbvleGhW/ZuwaW1ExBOCC5Mf23ZGXGiUscZRVB5WjbnntrU4qQzNElaP5hyce jbRm+RSNQpIMCcmd5gLXDRnr0p7vk+8+aGrWl/C3dzFOr7GtFiYbE0hnOiyHvSlY9Vx3 EncJGIpbg6pteBeLDGxIikjHhWsug+XHz0AkV4chYIKlPk6Ji6G8bg17NpjuERYb71dz t4QGBr2FgXOVBYCX8eHuT0OZhs6+nH7NCHyYbs+DWgRGOha1Vj2WAcmyqiKMzN6/DsV7 CZTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vWvorYjOncQa1xCQb5iNvKGfsyQmFO07xKmWRtbSFpI=; b=A2rz+Ocj5LuXjJ8uAbm4r1bi3mBnMtnXJGCtG9LjC7noY3seFeetz0f0o/j+iRCuSg 1knraQ0hyA7gFm97TQ8D9FQohDFs/IcOMAOSOMu8R7L7Y8i6T7cyuKmDgc+cuYGogxpi ApfzlJtqKp46AvEXFWNRhClPuIQ3Sad7xa4D4z304BAYDdct+oSIENG+L0/DLvKlC+Rh Uz/dFVC6CucSZ+/0HZX3oq7i2g+jYfACIRao2eeA9KUZTscTc5y4GKPwqwLD64/JsjwM Cjbbxi4e/j8esf1Qxpe2CVCJ9X4v9/x2pPVGaQWTcmGCGZoC2UmQrutrEYSCCa1+x/py RVsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Hnw0PZVL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u26si309371edy.187.2020.06.29.13.18.28; Mon, 29 Jun 2020 13:18:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Hnw0PZVL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730217AbgF2UQ6 (ORCPT + 99 others); Mon, 29 Jun 2020 16:16:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:40536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732258AbgF2TaP (ORCPT ); Mon, 29 Jun 2020 15:30:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 97F73252DF; Mon, 29 Jun 2020 15:38:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445108; bh=3LWzOVAj8WtQ+FGMklS4trCAmcgSyc3EfKkGnueDztU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hnw0PZVL8u8GGOT7+41240R0ukmo3cd0I2fDCWtxBOneAmaDLrs61dvQuX1dkJbH1 hnLxBPPYKXhiVC2e3HCn5Gu4ANaY9/nIjLMGwkrlXNoiQmfOlDjdJpQTkm5dubqojd SyXbVOY2sC6zB4GDT2JD7TVKxR70SJ+Av2bp6K0M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Christensen , Michael Chan , "David S . Miller" , Greg Kroah-Hartman Subject: [PATCH 4.14 16/78] tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes Date: Mon, 29 Jun 2020 11:37:04 -0400 Message-Id: <20200629153806.2494953-17-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629153806.2494953-1-sashal@kernel.org> References: <20200629153806.2494953-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.186-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.14.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.14.186-rc1 X-KernelTest-Deadline: 2020-07-01T15:38+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Christensen [ Upstream commit 3a2656a211caf35e56afc9425e6e518fa52f7fbc ] The driver function tg3_io_error_detected() calls napi_disable twice, without an intervening napi_enable, when the number of EEH errors exceeds eeh_max_freezes, resulting in an indefinite sleep while holding rtnl_lock. Add check for pcierr_recovery which skips code already executed for the "Frozen" state. Signed-off-by: David Christensen Reviewed-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/tg3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index bc0221eafe5c4..e40d31b405253 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -18179,8 +18179,8 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev, rtnl_lock(); - /* We probably don't have netdev yet */ - if (!netdev || !netif_running(netdev)) + /* Could be second call or maybe we don't have netdev yet */ + if (!netdev || tp->pcierr_recovery || !netif_running(netdev)) goto done; /* We needn't recover from permanent error */ -- 2.25.1