bnx2x: fix page fault following EEH recovery
PATCH 1/1 bnx2x: fix page fault following EEH recovery
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.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +7 -2
@@ -14294,11 +14294,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 (); }
Signature · 1 line
2.31.1
Quoted 9 lines · David Christensen
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 functionbnx2x_nic_load(). If an error occurs duringbnx2x_nic_load(), OS and hardware resources are released and an error code is returned to the caller. When called frombnx2x_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.
Quoted 4 lines
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 <[email protected]>
Quoted 27 lines
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +7
-2@@ -14294,11 +14294,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 (); }
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 10 lines · On Thu, 8 Jun 2023 16:01:43 -0400 you wrote:
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 functionbnx2x_nic_load(). If an error occurs duringbnx2x_nic_load(), OS and hardware resources are released and an error code is returned to the caller. When called frombnx2x_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.[...]
Here is the summary with links:
- bnx2x: fix page fault following EEH recovery
https://git.kernel.org/netdev/net/c/7ebe4eda4265
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html