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 39197C83F2A for ; Tue, 29 Aug 2023 13:35:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236550AbjH2NfO (ORCPT ); Tue, 29 Aug 2023 09:35:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236424AbjH2NeO (ORCPT ); Tue, 29 Aug 2023 09:34:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 894C7CD9; Tue, 29 Aug 2023 06:33: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 0924B65791; Tue, 29 Aug 2023 13:33:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D38CC433C7; Tue, 29 Aug 2023 13:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693316037; bh=yRyRN37PTHMzVlb8n1Eahwe2ZeMZDpDdESAEjlEta90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=omhRlHN5qQYgztZ7rPtM1bmOp3ShtSyE5UPC0t1yq5xYpWBXpDSfAcIu2Z+SUoHvt FZaHV0nkCKNfuUWpnO+O2w4GhpMBEuflI6K0w81eMqSAn3XCaC3s74XJ/bLtcnmPAz Sydg+M5PyF9vXi74wEpVl+a128bf4aH4k/oPOqL78FZnpMCn/07KWxnm4XVJaGz4EO /axRcxS6WerdMrnGE2qRLvzBC9Kd9VRkCNUPiCmt+6T401MaKDy/dOuta1Zwq3IUpx MGqf6dS7CsloAnS6USPbSML3tlZbikpX0qMcjPcjKUeJlrrfObSAWfQreQNvgle+uW 3XT6zPzgyt3+A== 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 5.4 2/6] bnx2x: fix page fault following EEH recovery Date: Tue, 29 Aug 2023 09:33:48 -0400 Message-Id: <20230829133352.520671-2-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230829133352.520671-1-sashal@kernel.org> References: <20230829133352.520671-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.254 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 b5f58c62e7d20..211fbc8f75712 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -14426,11 +14426,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.40.1