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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 285CFEB64DD for ; Mon, 26 Jun 2023 21:54:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231856AbjFZVyp (ORCPT ); Mon, 26 Jun 2023 17:54:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231733AbjFZVxx (ORCPT ); Mon, 26 Jun 2023 17:53:53 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 664ED1FE1; Mon, 26 Jun 2023 14:51:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 584B960F83; Mon, 26 Jun 2023 21:51:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98232C433C9; Mon, 26 Jun 2023 21:51:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687816285; bh=QHUE+zXyzvcWqTuZzozH/lL2TdrUkOQy/8+pPdo1BhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dqPadQ+5P4viscmGSaZQ6iwbaQdBLyQcdLQDK4NNQ5j05WIBbW5qUMi7M3hkvNMOP ys1bD1EL0IF1Svnkh6W3yd85SwSituOo+n7Mah1A8rHoen2IT8QcYxzfSXPDCRmCmp TBkS5m0hZqlQbnzPIzrN4KhBd9KkINJm27Ym+jPJV/YthjFPStFD5ZXw86yrASRUe2 xq1oAd6omvJAnfWf1U3eSwdLPqnzFlbCpvqCKiwC24rR28fVeadHSogu3WtYC6tEj0 oVNszlJyLcJiudM6fFWqiHg0+3U/7P6eUST0B2YD7V6+ncERqPlH//cwZMPNjZsyvU FSHZrjDnfB1Vg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Christensen , Sridhar Samudrala , "David S . Miller" , Sasha Levin , aelior@marvell.com, skalluru@marvell.com, manishc@marvell.com, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 2/5] bnx2x: fix page fault following EEH recovery Date: Mon, 26 Jun 2023 17:51:21 -0400 Message-Id: <20230626215124.179666-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626215124.179666-1-sashal@kernel.org> References: <20230626215124.179666-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.287 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: David Christensen [ Upstream commit 7ebe4eda4265642859507d1b3ca330d8c196cfe5 ] In the last step of the EEH recovery process, the EEH driver calls into bnx2x_io_resume() to re-initialize the NIC hardware via the function bnx2x_nic_load(). If an error occurs during bnx2x_nic_load(), OS and hardware resources are released and an error code is returned to the caller. When called from bnx2x_io_resume(), the return code is ignored and the network interface is brought up unconditionally. Later attempts to send a packet via this interface result in a page fault due to a null pointer reference. This patch checks the return code of bnx2x_nic_load(), prints an error message if necessary, and does not enable the interface. Signed-off-by: David Christensen Reviewed-by: Sridhar Samudrala Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 91ddde4d647c6..d21b22ed0b60a 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -14464,11 +14464,16 @@ static void bnx2x_io_resume(struct pci_dev *pdev) bp->fw_seq = SHMEM_RD(bp, func_mb[BP_FW_MB_IDX(bp)].drv_mb_header) & DRV_MSG_SEQ_NUMBER_MASK; - if (netif_running(dev)) - bnx2x_nic_load(bp, LOAD_NORMAL); + if (netif_running(dev)) { + if (bnx2x_nic_load(bp, LOAD_NORMAL)) { + netdev_err(bp->dev, "Error during driver initialization, try unloading/reloading the driver\n"); + goto done; + } + } netif_device_attach(dev); +done: rtnl_unlock(); } -- 2.39.2