Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3296352rwa; Tue, 23 Aug 2022 02:12:03 -0700 (PDT) X-Google-Smtp-Source: AA6agR5KGOEJWMoxUr8tpchTbCQsuG3SzD9oSzNYzcEbTtSl5WhQ+854B1U0tyazPm51filIAvtF X-Received: by 2002:a17:907:2da6:b0:730:8b30:e517 with SMTP id gt38-20020a1709072da600b007308b30e517mr15817259ejc.291.1661245922793; Tue, 23 Aug 2022 02:12:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661245922; cv=none; d=google.com; s=arc-20160816; b=BaCFWazPHHYcc/0ZC5SoE3FZVuZ0CSWp4uHNh9oKJbXSuQV4wnuSW4OKK1O8fVV+Se aQW+sDq1p211HyMSarPLxVVNoNxMEGuGcJ7OMaIlfcRNPHhDCQ1d9hhMmkQm5RxhBYql Y/jqq3jNYguJELZnzYi2dMw3Lbt+CyyHlX3FGJ/XYNC6gf+HFvSbh/xbJ8aVYBCtBd/s 8e3i5cZ6080CiSxjZQqfPVDSd8IRmrFCaXjzjS/5hJwFEXhx3t+dlafp6x7QUBD8JEUr jqMjWuLEMSMM94U68YuNTUzZYCEbz0qUVp2xxQE2bkRvIIW5fx7GWdYz//ei9IS0l6z9 Jnsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=c7hK2JnRz8oKq6ROSc+L2JqzigPrp/6IwooAYcvAWCo=; b=rwO0ObXZoZxoEXnBtyXO6Tt/pRUE6XUhnrTgAnqyfLaXOHZc2S5DxZEpX/WRN99F+P JFJnKsAT3/oBBayEY3c59j3KbGS/1wyveN0yWT9nmiDbVRY8nMNmzuIoYkMEtEVyaeya QE55wJHe2aIzWz3DUkLHs0UBqIbAHtoTkdo8YY2XuuJvlYOJa9D0ONQtZTn1Ek1XRzcn yH4aSMiNcj4hpJtW4NEFS74QS0kbFBMrmIDstwJCrFVd9k9FrM0PCL2x6rnnlO+sauN+ MylBFAJAa/Dd49AtlPVLdUKgjkRVNbFmTMvxi+TLvpnqocLgaCzGMEbdpnU22gNA1wtT 8bOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JmseJjB+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sg17-20020a170907a41100b0073c27e03df4si12254418ejc.352.2022.08.23.02.11.34; Tue, 23 Aug 2022 02:12:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JmseJjB+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348100AbiHWJIE (ORCPT + 99 others); Tue, 23 Aug 2022 05:08:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347824AbiHWJGu (ORCPT ); Tue, 23 Aug 2022 05:06:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68D0F861C6; Tue, 23 Aug 2022 01:30:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1CCF861488; Tue, 23 Aug 2022 08:28:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22D33C433C1; Tue, 23 Aug 2022 08:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661243319; bh=43xzfGfQI0B76DhRYGDXitfPVbsJYhLVBLfkISk7KpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JmseJjB+MrgmX81Ir4y9UC5ioL/svE4yfSaI+94uSkfJAd3G1xJCjWOctakW7wQzu vcla9Yk0I1o7bKsZNmR8VWC74iI8TnMk4FvbBA2hJUg6Q33PXVcmTk1kZAiTiYc5Aa b0KBvtmwxw7bfLojju6VWMVkS3zXjIl8vSil9+IU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alan Brady , Mateusz Palczewski , Tony Nguyen , Gurucharan Subject: [PATCH 5.19 232/365] i40e: Fix to stop tx_timeout recovery if GLOBR fails Date: Tue, 23 Aug 2022 10:02:13 +0200 Message-Id: <20220823080127.937168909@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alan Brady commit 57c942bc3bef0970f0b21f8e0998e76a900ea80d upstream. When a tx_timeout fires, the PF attempts to recover by incrementally resetting. First we try a PFR, then CORER and finally a GLOBR. If the GLOBR fails, then we keep hitting the tx_timeout and incrementing the recovery level and issuing dmesgs, which is both annoying to the user and accomplishes nothing. If the GLOBR fails, then we're pretty much totally hosed, and there's not much else we can do to recover, so this makes it such that we just kill the VSI and stop hitting the tx_timeout in such a case. Fixes: 41c445ff0f48 ("i40e: main driver core") Signed-off-by: Alan Brady Signed-off-by: Mateusz Palczewski Tested-by: Gurucharan (A Contingent worker at Intel) Signed-off-by: Tony Nguyen Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -384,7 +384,9 @@ static void i40e_tx_timeout(struct net_d set_bit(__I40E_GLOBAL_RESET_REQUESTED, pf->state); break; default: - netdev_err(netdev, "tx_timeout recovery unsuccessful\n"); + netdev_err(netdev, "tx_timeout recovery unsuccessful, device is in non-recoverable state.\n"); + set_bit(__I40E_DOWN_REQUESTED, pf->state); + set_bit(__I40E_VSI_DOWN_REQUESTED, vsi->state); break; }